diff options
| author | Nathan Binkert <nate@cvs.openbsd.org> | 2002-05-09 15:06:30 +0000 |
|---|---|---|
| committer | Nathan Binkert <nate@cvs.openbsd.org> | 2002-05-09 15:06:30 +0000 |
| commit | 23dcee9d39acf0acbda3ed2e33b4038f9d5e8132 (patch) | |
| tree | c27e422c42192be2a5812b0859e70bb3754bd8b5 /sys/arch/sparc64 | |
| parent | 02a2153e2ea77635df4c6b97678b0749f66bee42 (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/sparc64')
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 8ace8ace53d..253578f0bcf 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.58 2002/04/18 14:15:11 jason Exp $ +# $OpenBSD: GENERIC,v 1.59 2002/05/09 15:06:29 nate Exp $ # $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $ machine sparc64 @@ -60,11 +60,12 @@ usb* at ohci? flags 0x1 # USB devices uhub* at usb? uhub* at uhub? port ? configuration ? -ukbd* at uhub? # USB keyboard -wskbd* at ukbd? console ? -ums* at uhub? port ? configuration ? # USB mouse -wsmouse* at ums? -uhid* at uhub? port ? configuration ? # USB generic human interface +uhidev* at uhub? port ? configuration ? interface ? +ukbd* at uhidev? reportid ? +wskbd* at ukbd? console ? mux 1 +ums* at uhidev? reportid ? +wsmouse* at ums? mux 0 +uhid* at uhidev? reportid ? ugen* at uhub? port ? configuration ? # USB generic device #### Standard system devices -- all required for a given architecture |