summaryrefslogtreecommitdiff
path: root/sys/dev/usb/files.usb
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-07-31 16:04:51 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-07-31 16:04:51 +0000
commit719914f7d11cca5a6e29b46198ed50c4f1e1fa27 (patch)
treeb2a3c1737c957e2304815cde026ae0dce5ac6ff6 /sys/dev/usb/files.usb
parent6aa735007a06d259dcbcbfa42a14b0285e4a6474 (diff)
Factorization of the bluetooth and usb hid input driver logic, to reduce code
duplication and divergence. Thanks to mlarkin@ for bluetooth devices tests.
Diffstat (limited to 'sys/dev/usb/files.usb')
-rw-r--r--sys/dev/usb/files.usb12
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index 741ed827d35..a7e092a3eff 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-# $OpenBSD: files.usb,v 1.91 2010/07/03 03:59:17 krw Exp $
+# $OpenBSD: files.usb,v 1.92 2010/07/31 16:04:50 miod 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.
@@ -80,13 +80,17 @@ attach uhid at uhidbus
file dev/usb/uhid.c uhid needs-flag
# Keyboards
-device ukbd: hid, wskbddev
+define hidkbd
+file dev/usb/hidkbd.c hidkbd needs-flag
+file dev/usb/ukbdmap.c hidkbd
+device ukbd: hid, hidkbd, wskbddev
attach ukbd at uhidbus
file dev/usb/ukbd.c ukbd needs-flag
-file dev/usb/ukbdmap.c ukbd | btkbd
# Mice
-device ums: hid, wsmousedev
+define hidms
+file dev/usb/hidms.c hidms
+device ums: hid, hidms, wsmousedev
attach ums at uhidbus
file dev/usb/ums.c ums