From 23dcee9d39acf0acbda3ed2e33b4038f9d5e8132 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 9 May 2002 15:06:30 +0000 Subject: 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 --- sys/arch/alpha/conf/GENERIC | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'sys/arch/alpha') diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 0554e38ec4d..dbb5409547f 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.106 2002/05/02 22:56:06 miod Exp $ +# $OpenBSD: GENERIC,v 1.107 2002/05/09 15:06:29 nate Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ machine alpha @@ -53,7 +53,12 @@ usb* at ohci? uhub* at usb? # USB Hubs uhub* at uhub? port ? configuration ? # USB Hubs -uhid* at uhub? port ? configuration ? # USB Generic HID devices +uhidev* at uhub? port ? configuration ? interface ? +ums* at uhidev? reportid ? # USB Mice +wsmouse* at ums? mux 0 +ukbd* at uhidev? reportid ? # USB Keyboards +wskbd* at ukbd? console ? mux 1 +uhid* at uhidev? reportid ? # USB Generic HID devices umodem* at uhub? port ? configuration ? # USB Modems/Serial ucom* at umodem? uvisor* at uhub? port ? configuration ? # Handspring Visor @@ -62,12 +67,8 @@ uftdi* at uhub? port ? ucom* at uftdi? portno ? uaudio* at uhub? port ? configuration ? # USB Audio ulpt* at uhub? port ? configuration ? # USB Printers -ukbd* at uhub? port ? configuration ? # USB Keyboards -wskbd* at ukbd? console ? umass* at uhub? port ? configuration ? # USB Mass Storage devices scsibus* at umass? -ums* at uhub? port ? configuration ? # USB Mice -wsmouse* at ums? aue* at uhub? port ? # ADMtek AN986 Pegasus Ethernet cue* at uhub? port ? # CATC USB-EL1201A based Ethernet kue* at uhub? port ? # Kawasaki KL5KUSB101B based Ethernet -- cgit v1.2.3