diff options
| author |   nate <nate@openbsd.org> | 2002-05-09 15:06:29 +0000 |
|---|---|---|
| committer | nate <nate@openbsd.org> | 2002-05-09 15:06:29 +0000 |
| commit | a66cb31e58a16ed957a52ce1b92aafc08fc4900d (patch) | |
| tree | 1ad385544a77c9a6186a9b11532a5b9a6db8a103 /sys/dev/usb/files.usb | |
| parent | add support for SoundForte Theatre X-treme 5.1 SF256-PCS; from jumbo@ (diff) | |
| download | wireguard-openbsd-a66cb31e58a16ed957a52ce1b92aafc08fc4900d.tar.xz wireguard-openbsd-a66cb31e58a16ed957a52ce1b92aafc08fc4900d.zip | |
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/dev/usb/files.usb')
| -rw-r--r-- | sys/dev/usb/files.usb | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb index 5936f8fc971..f5fd7406e34 100644 --- a/sys/dev/usb/files.usb +++ b/sys/dev/usb/files.usb @@ -1,4 +1,4 @@ -# $OpenBSD: files.usb,v 1.24 2002/05/07 19:32:49 nate Exp $ +# $OpenBSD: files.usb,v 1.25 2002/05/09 15:06:29 nate Exp $ # $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $ # # Config file and device description for machine-independent USB code. @@ -7,7 +7,6 @@ device usb { } attach usb at usbus -file dev/usb/hid.c usb file dev/usb/usb.c usb needs-flag file dev/usb/usbdi.c usb file dev/usb/usbdi_util.c usb @@ -45,16 +44,35 @@ device ugen attach ugen at uhub file dev/usb/ugen.c ugen needs-flag -# Generic HID devices -device uhid -attach uhid at uhub -file dev/usb/uhid.c uhid needs-flag +# HID +# HID "bus" +define uhidbus {[ reportid = -1 ]} + +# HID processing +define hid +file dev/usb/hid.c hid +# HID root device for multiple report IDs +device uhidev: hid, uhidbus +attach uhidev at uhub +file dev/usb/uhidev.c uhidev + +# Generic HID devices +device uhid: hid +attach uhid at uhidbus +file dev/usb/uhid.c uhid needs-flag + # Keyboards -device ukbd: wskbddev -attach ukbd at uhub -file dev/usb/ukbd.c ukbd needs-flag -file dev/usb/ukbdmap.c ukbd +device ukbd: hid, wskbddev +attach ukbd at uhidbus +file dev/usb/ukbd.c ukbd needs-flag +file dev/usb/ukbdmap.c ukbd + +# Mice +device ums: hid, wsmousedev +attach ums at uhidbus +file dev/usb/ums.c ums + # Printers device ulpt @@ -71,11 +89,6 @@ device umodem: ucombus attach umodem at uhub file dev/usb/umodem.c umodem -# Mice -device ums: wsmousedev -attach ums at uhub -file dev/usb/ums.c ums - # Diamond Multimedia Rio 500 device urio attach urio at uhub |