summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2001-01-28 19:51:49 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2001-01-28 19:51:49 +0000
commitff6c045c3e17f4004f60605435ec7a3ce568eaaf (patch)
tree0476ce4a5a7fe30e1b7ffdfc0582c4f9ccf6b3e9 /sys
parent26427514c0f9a58640eac6a4ed998aef181d9540 (diff)
Support ADB bus devices: aed (events), akbd (keyboard) and ams (mouse)
in generic kernel.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/powerpc/conf/GENERIC16
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 9e655cbf3c8..cdc64059aa2 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.21 2000/12/07 18:19:31 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.22 2001/01/28 19:51:48 drahn Exp $
#
# PPC GENERIC config file
#
@@ -75,9 +75,9 @@ bm* at obio? # bmac ethernet
#mesh* at obio? flags 0xffff # MESH SCSI
#nvram* at obio? # nvram
adb* at obio? # Apple Desktop Bus
-#aed* at adb? # ADB Event Device
-#akbd* at adb? # ADB keyboard
-#ams* at adb? # ADB mouse
+aed* at adb? # ADB Event Device
+akbd* at adb? # ADB keyboard
+ams* at adb? # ADB mouse
#zsc* at obio?
#zstty* at zsc? channel ?
@@ -123,8 +123,11 @@ wsmouse* at ums? mux 0
# USB Printer
ulpt* at uhub? port ? configuration ? interface ?
+# USB Scanner driver
+uscanner* at uhub? port ? configuration ? interface ?
+
# USB Generic driver
-ugen* at uhub? port ? configuration ? interface ?
+ugen* at uhub? port ? configuration ? interface ?
#### Workstation Console attachments
@@ -144,7 +147,6 @@ uk* at scsibus? target ? lun ?
# mostly unused currently
ofbus* at openfirm?
ofrtc* at openfirm?
-#ofdisk* at openfirm? # used for floppy support
-#ofnet* at openfirm?
ofcons* at openfirm?
+#pseudo-device wsmux 2 # mouse & keyboard multiplexor