summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/conf/GENERIC
diff options
context:
space:
mode:
authorNathan Binkert <nate@cvs.openbsd.org>2002-05-09 15:06:30 +0000
committerNathan Binkert <nate@cvs.openbsd.org>2002-05-09 15:06:30 +0000
commit23dcee9d39acf0acbda3ed2e33b4038f9d5e8132 (patch)
treec27e422c42192be2a5812b0859e70bb3754bd8b5 /sys/arch/macppc/conf/GENERIC
parent02a2153e2ea77635df4c6b97678b0749f66bee42 (diff)
Sync hid stuff including ukbd, ums, and uhid with NetBSD
This adds a uhidev device which can be thought of as something like a uhid bus. It allows more than one ukbd, ums, or uhid to attach to the same device instance. This functionality is found on many of the newer keyboards that have extra buttons. (The extra buttons show up as uhid device(s)). Tested by me on i386, dale on macppc, and jason on sparc64
Diffstat (limited to 'sys/arch/macppc/conf/GENERIC')
-rw-r--r--sys/arch/macppc/conf/GENERIC9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 7febcd75f87..13c4cce8b0b 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.22 2002/04/08 17:02:44 drahn Exp $g
+# $OpenBSD: GENERIC,v 1.23 2002/05/09 15:06:29 nate Exp $g
#
# PPC GENERIC config file
#
@@ -143,9 +143,10 @@ usb* at ohci? flags 0x1
uhub* at usb?
uhub* at uhub? port ? configuration ? interface ?
-uhid* at uhub? port ? configuration ? # USB Generic HID devices
-ukbd* at uhub? port ? configuration ? # USB HID Keyboard devices
-ums* at uhub? port ? configuration ? # USB Mice
+uhidev* at uhub? port ? configuration ? interface ?
+uhid* at uhidev? reportid ? # USB Generic HID devices
+ukbd* at uhidev? reportid ? # USB HID Keyboard devices
+ums* at uhidev? reportid ? # USB Mice
wsmouse* at ums? mux 0
uaudio* at uhub? port ? configuration ? # USB Audio
ulpt* at uhub? port ? configuration ? # USB Printer