USB support

ok mickey@

3 files changed, 120 insertions, 89 deletions

diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 7a875a9f514..e44c5da7b31 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.75 2005/06/17 23:50:37 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.76 2005/06/21 17:43:34 martin Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -80,69 +80,72 @@ option		PCMCIADEBUG,PCMCIAVERBOSE
 pcmcia*		at cardslot?
 
 # PCI USB Controllers
-#ehci*	at pci?			# Enhanced Host Controller
-#ehci*	at cardbus?
-#ohci*	at pci?			# Open Host Controller
-#ohci*	at cardbus?
-#uhci*	at pci?			# Universal Host Controller (Intel)
+ehci*	at pci?			# Enhanced Host Controller
+ehci*	at cardbus?
+ohci*	at pci?			# Open Host Controller
+ohci*	at cardbus?
+uhci*	at pci?			# Universal Host Controller (Intel)
 
 # USB bus support
-#usb*	at ehci?
-#usb*	at uhci?
-#usb*	at ohci?
+usb*	at ehci?
+usb*	at uhci?
+usb*	at ohci?
 
 # USB devices
-#uhub*	at usb?			# USB Hubs
-#uhub*	at uhub?		# USB Hubs
-#umodem*	at uhub?	# USB Modems/Serial
-#ucom*	at umodem?
-#uvisor*	at uhub?	# Handspring Visor
-#ucom*	at uvisor?
-#uvscom*	at uhub?	# SUNTAC Slipper U VS-10U serial
-#ucom*	at uvscom?
-#ubsa*	at uhub?		# Belkin serial adapter
-#ucom*	at ubsa?
-#uftdi*	at uhub?		# FTDI FT8U100AX serial adapter
-#ucom*	at uftdi?
-#uplcom* at uhub?		# I/O DATA USB-RSAQ2 serial adapter
-#ucom*	at uplcom?
-#umct*	at uhub?		# MCT USB-RS232 serial adapter
-#ucom*	at umct?
-#uipaq*	at uhub?		# iPAQ serial adapter
-#ucom*	at uipaq?
-#uaudio* at uhub?		# USB Audio
-#audio*	at uaudio?
-#umidi*	at uhub?		# USB MIDI
-#midi*	at umidi?
-#ulpt*	at uhub?		# USB Printers
-#umass*	at uhub?		# USB Mass Storage devices
-#scsibus* at umass?
-#atapiscsi* at umass?
-#uhidev*	at uhub?	# Human Interface Devices
-#ums*	at uhidev?		# USB mouse
-#wsmouse* at ums? mux 0
-#ukbd*	at uhidev?		# USB keyboard
-#wskbd*	at ukbd? mux 1
-#uhid*	at uhidev?		# USB generic HID support
-#aue*	at uhub?		# ADMtek AN986 Pegasus Ethernet
-#atu*	at uhub?		# Atmel AT76c50x based 802.11b
-#axe*	at uhub?		# ASIX Electronics AX88172 USB Ethernet
-#cue*	at uhub?		# CATC USB-EL1201A based Ethernet
-#kue*	at uhub?		# Kawasaki KL5KUSB101B based Ethernet
-#cdce*	at uhub?		# CDC Ethernet
-#udav*	at uhub?		# Davicom DM9601 based Ethernet
-#upl*	at uhub?		# Prolific PL2301/PL2302 host-to-host `network'
-#url*	at uhub?		# Realtek RTL8150L based adapters
-#wi*	at uhub?		# WaveLAN IEEE 802.11DS
-#urio*	at uhub?		# Diamond Multimedia Rio 500
-#uscanner* at uhub?		# USB Scanners
-#usscanner* at uhub?		# USB SCSI scanners, e.g., HP5300
-#scsibus* at usscanner?
-#uyap*	at uhub?		# Y@P firmware loader
-#udsbr*	at uhub?		# D-Link DSB-R100 radio
-#radio*	at udsbr?		# USB radio
+uhub*	at usb?			# USB Hubs
+uhub*	at uhub?		# USB Hubs
+uftdi*	at uhub?		# FTDI FT8U100AX serial adapter
+ucom*	at uftdi?
+umass*	at uhub?		# USB Mass Storage devices
+scsibus* at umass?
+atapiscsi* at umass?
+uhidev*	at uhub?		# Human Interface Devices
+ums*	at uhidev?		# USB mouse
+wsmouse* at ums? mux 0
+ukbd*	at uhidev?		# USB keyboard
+wskbd*	at ukbd? mux 1
+uhid*	at uhidev?		# USB generic HID support
+
+# untested USB devices
+umodem*	at uhub?		# USB Modems/Serial
+ucom*	at umodem?
+uvisor*	at uhub?		# Handspring Visor
+ucom*	at uvisor?
+uvscom*	at uhub?		# SUNTAC Slipper U VS-10U serial
+ucom*	at uvscom?
+ubsa*	at uhub?		# Belkin serial adapter
+ucom*	at ubsa?
+uplcom* at uhub?		# I/O DATA USB-RSAQ2 serial adapter
+ucom*	at uplcom?
+umct*	at uhub?		# MCT USB-RS232 serial adapter
+ucom*	at umct?
+uipaq*	at uhub?		# iPAQ serial adapter
+ucom*	at uipaq?
+uaudio* at uhub?		# USB Audio
+audio*	at uaudio?
+umidi*	at uhub?		# USB MIDI
+midi*	at umidi?
+ulpt*	at uhub?		# USB Printers
+aue*	at uhub?		# ADMtek AN986 Pegasus Ethernet
+atu*	at uhub?		# Atmel AT76c50x based 802.11b
+axe*	at uhub?		# ASIX Electronics AX88172 USB Ethernet
+cue*	at uhub?		# CATC USB-EL1201A based Ethernet
+kue*	at uhub?		# Kawasaki KL5KUSB101B based Ethernet
+cdce*	at uhub?		# CDC Ethernet
+udav*	at uhub?		# Davicom DM9601 based Ethernet
+upl*	at uhub?		# Prolific PL2301/PL2302 host-to-host `network'
+url*	at uhub?		# Realtek RTL8150L based adapters
+wi*	at uhub?		# WaveLAN IEEE 802.11DS
+urio*	at uhub?		# Diamond Multimedia Rio 500
+uscanner* at uhub?		# USB Scanners
+usscanner* at uhub?		# USB SCSI scanners, e.g., HP5300
+scsibus* at usscanner?
+uyap*	at uhub?		# Y@P firmware loader
+udsbr*	at uhub?		# D-Link DSB-R100 radio
+radio*	at udsbr?		# USB radio
 #ubt*	at uhub?		# USB Bluetooth
-#ugen*	at uhub?		# USB Generic driver
+ugen*	at uhub?		# USB Generic driver
+ural*	at uhub?		# Ralink RT2500
 
 sti0	at mainbus0 irq 11	# [H]CRX-{8,24,48}[Z] graphics
 sti0	at phantomas0 irq 11	# builtin graphics on BC*
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index 189cb4c8fb5..f988c4ade5e 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.49 2005/06/09 18:01:36 mickey Exp $
+#	$OpenBSD: RAMDISK,v 1.50 2005/06/21 17:43:34 martin Exp $
 #
 # Diskless kernel config
 #
@@ -87,18 +87,31 @@ pcmcia*		at cardslot?
 # PCI USB Controllers
 #ehci*	at pci?			# Enhanced Host Controller
 #ehci*	at cardbus?
-#ohci*	at pci?			# Open Host Controller
-#ohci*	at cardbus?
-#uhci*	at pci?			# Universal Host Controller (Intel)
+ohci*	at pci?			# Open Host Controller
+ohci*	at cardbus?
+uhci*	at pci?			# Universal Host Controller (Intel)
 
 # USB bus support
 #usb*	at ehci?
-#usb*	at uhci?
-#usb*	at ohci?
+usb*	at uhci?
+usb*	at ohci?
 
 # USB devices
-#uhub*	at usb?			# USB Hubs
-#uhub*	at uhub?		# USB Hubs
+uhub*	at usb?			# USB Hubs
+uhub*	at uhub?		# USB Hubs
+#uftdi*	at uhub?		# FTDI FT8U100AX serial adapter
+#ucom*	at uftdi?
+umass*	at uhub?		# USB Mass Storage devices
+scsibus* at umass?
+atapiscsi* at umass?
+uhidev*	at uhub?		# Human Interface Devices
+ums*	at uhidev?		# USB mouse
+wsmouse* at ums? mux 0
+ukbd*	at uhidev?		# USB keyboard
+wskbd*	at ukbd? mux 1
+uhid*	at uhidev?		# USB generic HID support
+
+# untested USB devices
 #umodem*	at uhub?	# USB Modems/Serial
 #ucom*	at umodem?
 #uvisor*	at uhub?	# Handspring Visor
@@ -107,35 +120,26 @@ pcmcia*		at cardslot?
 #ucom*	at uvscom?
 #ubsa*	at uhub?		# Belkin serial adapter
 #ucom*	at ubsa?
-#uftdi*	at uhub?		# FTDI FT8U100AX serial adapter
-#ucom*	at uftdi?
 #uplcom* at uhub?		# I/O DATA USB-RSAQ2 serial adapter
 #ucom*	at uplcom?
 #umct*	at uhub?		# MCT USB-RS232 serial adapter
 #ucom*	at umct?
+#uipaq*	at uhub?		# iPAQ serial adapter
+#ucom*	at uipaq?
 #uaudio* at uhub?		# USB Audio
 #audio*	at uaudio?
 #umidi*	at uhub?		# USB MIDI
 #midi*	at umidi?
-#ulpt*	at uhub?		# USB Printers
-#umass*	at uhub?		# USB Mass Storage devices
-#scsibus* at umass?
-#atapiscsi* at umass?
-#uhidev*	at uhub?	# Human Interface Devices
-#ums*	at uhidev?		# USB mouse
-#wsmouse* at ums? mux 0
-#ukbd*	at uhidev?		# USB keyboard
-#wskbd*	at ukbd? mux 1
-#uhid*	at uhidev?		# USB generic HID support
-#aue*	at uhub?		# ADMtek AN986 Pegasus Ethernet
-#axe*	at uhub?		# ASIX Electronics AX88172 USB Ethernet
-#cue*	at uhub?		# CATC USB-EL1201A based Ethernet
-#kue*	at uhub?		# Kawasaki KL5KUSB101B based Ethernet
-#cdce*	at uhub?		# CDC Ethernet
-#udav*	at uhub?		# Davicom DM9601 based Ethernet
-#upl*	at uhub?		# Prolific PL2301/PL2302 host-to-host `network'
-#url*	at uhub?		# Realtek RTL8150L based adapters
-#wi*	at uhub?		# WaveLAN IEEE 802.11DS
+aue*	at uhub?		# ADMtek AN986 Pegasus Ethernet
+atu*	at uhub?		# Atmel AT76c50x based 802.11b
+axe*	at uhub?		# ASIX Electronics AX88172 USB Ethernet
+cue*	at uhub?		# CATC USB-EL1201A based Ethernet
+kue*	at uhub?		# Kawasaki KL5KUSB101B based Ethernet
+cdce*	at uhub?		# CDC Ethernet
+udav*	at uhub?		# Davicom DM9601 based Ethernet
+upl*	at uhub?		# Prolific PL2301/PL2302 host-to-host `network'
+url*	at uhub?		# Realtek RTL8150L based adapters
+wi*	at uhub?		# WaveLAN IEEE 802.11DS
 #urio*	at uhub?		# Diamond Multimedia Rio 500
 #uscanner* at uhub?		# USB Scanners
 #usscanner* at uhub?		# USB SCSI scanners, e.g., HP5300
@@ -143,7 +147,9 @@ pcmcia*		at cardslot?
 #uyap*	at uhub?		# Y@P firmware loader
 #udsbr*	at uhub?		# D-Link DSB-R100 radio
 #radio*	at udsbr?		# USB radio
+#ubt*	at uhub?		# USB Bluetooth
 #ugen*	at uhub?		# USB Generic driver
+ural*	at uhub?		# Ralink RT2500
 
 sti0	at mainbus0 irq 11	# [H]CRX-{8,24,48}[Z] graphics
 sti0	at phantomas0 irq 11	# builtin graphics on BC*
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index e20ab551213..34ce8783929 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.32 2004/08/06 20:29:47 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.33 2005/06/21 17:43:34 martin Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -120,6 +120,14 @@ cdev_decl(com);
 cdev_decl(pci);
 #endif
 
+#include "usb.h"
+#include "uhid.h"
+#include "ugen.h"
+#include "ulpt.h"
+#include "urio.h"
+#include "ucom.h"
+#include "uscanner.h"
+
 struct cdevsw   cdevsw[] =
 {
 	cdev_cn_init(1,cn),		/*  0: virtual console */
@@ -171,6 +179,13 @@ struct cdevsw   cdevsw[] =
 	cdev_ses_init(NSES,ses),	/* 37: SCSI SES/SAF-TE */
 	cdev_ptm_init(NPTY,ptm),	/* 38: pseudo-tty ptm device */
 	cdev_disk_init(NWD,wd),		/* 39: ST506 disk */
+	cdev_usb_init(NUSB,usb),	/* 40: USB controller */
+	cdev_usbdev_init(NUHID,uhid),	/* 41: USB generic HID */
+	cdev_usbdev_init(NUGEN,ugen),	/* 42: USB generic driver */
+	cdev_ulpt_init(NULPT,ulpt),	/* 43: USB printers */
+	cdev_urio_init(NURIO,urio),	/* 44: USB Diamond Rio 500 */
+	cdev_tty_init(NUCOM,ucom),	/* 45: USB tty */
+	cdev_usbdev_init(NUSCANNER,uscanner), /* 46: USB scanners */
 	cdev_lkm_dummy(),
 	cdev_lkm_dummy(),
 	cdev_lkm_dummy(),
@@ -236,6 +251,13 @@ int chrtoblktbl[] = {
 	/* 37 */	NODEV,
 	/* 38 */	NODEV,
 	/* 39 */	NODEV,
+	/* 40 */	NODEV,
+	/* 41 */	NODEV,
+	/* 42 */	NODEV,
+	/* 43 */	NODEV,
+	/* 44 */	NODEV,
+	/* 45 */	NODEV,
+	/* 46 */	NODEV
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);