summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2008-08-25 16:15:54 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2008-08-25 16:15:54 +0000
commitbb32c1632b010ffdcda6dab25beadefc677494f8 (patch)
treefaabaa25e230f8b15923ba5652c42846c2b737ac
parent18a67839c8abff9cac51433d209feabebf4ccbd3 (diff)
- add a bunch of enabled usb devices that have been tested.
together with the previous commits by jsing@, OpenBSD/sgi does USB now. ok jsing@ miod@
-rw-r--r--sys/arch/sgi/conf/GENERIC37
-rw-r--r--sys/arch/sgi/conf/RAMDISK33
2 files changed, 68 insertions, 2 deletions
diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC
index 4170ec5861c..9673a540627 100644
--- a/sys/arch/sgi/conf/GENERIC
+++ b/sys/arch/sgi/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.31 2008/08/20 18:04:44 jsing Exp $
+# $OpenBSD: GENERIC,v 1.32 2008/08/25 16:15:53 jasper Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -69,6 +69,41 @@ scsibus* at siop?
scsibus* at ahc?
scsibus* at mpi?
+# USB Controllers
+ohci* at pci? # Open Host Controller
+uhci* at pci? # Universal Host Controller
+ehci* at pci? # Enhanced Host Controller
+
+# USB bus support
+usb* at ohci?
+usb* at uhci?
+usb* at ehci?
+
+# USB devices
+uhub* at usb? # USB Hubs
+uhub* at uhub? # USB Hubs
+umodem* at uhub? # USB Modems/Serial
+ucom* at umodem?
+uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
+ucom* at uvscom?
+ubsa* at uhub? # Belkin serial adapter
+ucom* at ubsa?
+ulpt* at uhub? # USB Printers
+umass* at uhub? # USB Mass Storage devices
+scsibus* 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
+ugen* at uhub? # USB Generic driver
+
+# USB Video
+uvideo* at uhub? disable
+video* at uvideo?
+
#### NICs
dc* at pci? # 21143, "tulip" clone ethernet
ep* at pci? # 3Com 3c59x
diff --git a/sys/arch/sgi/conf/RAMDISK b/sys/arch/sgi/conf/RAMDISK
index 3c32222d9a7..cb16d76566d 100644
--- a/sys/arch/sgi/conf/RAMDISK
+++ b/sys/arch/sgi/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.22 2008/07/01 04:50:59 brad Exp $
+# $OpenBSD: RAMDISK,v 1.23 2008/08/25 16:15:53 jasper Exp $
#
machine sgi mips64
@@ -66,6 +66,37 @@ pci* at macepcibr? # PCI is on pci bridge
ahc* at pci?
siop* at pci?
+# USB Controllers
+ohci* at pci? # Open Host Controller
+uhci* at pci? # Universal Host Controller
+ehci* at pci? # Enhanced Host Controller
+
+# USB bus support
+usb* at ohci?
+usb* at uhci?
+usb* at ehci?
+
+# USB devices
+uhub* at usb? # USB Hubs
+uhub* at uhub? # USB Hubs
+umodem* at uhub? # USB Modems/Serial
+ucom* at umodem?
+uvscom* at uhub? # SUNTAC Slipper U VS-10U serial
+ucom* at uvscom?
+ubsa* at uhub? # Belkin serial adapter
+ucom* at ubsa?
+ulpt* at uhub? # USB Printers
+umass* at uhub? # USB Mass Storage devices
+scsibus* 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
+ugen* at uhub? # USB Generic driver
+
#### NICs
dc* at pci? # 21143, "tulip" clone ethernet
ep* at pci? # 3Com 3c59x