summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/files.usb
diff options
context:
space:
mode:
authorthfr <thfr@openbsd.org>2021-01-23 05:08:33 +0000
committerthfr <thfr@openbsd.org>2021-01-23 05:08:33 +0000
commit1d44892edf51d2b78a17901b1aa49c83bd9a69e0 (patch)
treec61093a1fb091ca578a3e5a590de82014a7af6ff /sys/dev/usb/files.usb
parentGracefully handle any erroneous closing bracket/brace trailers in (diff)
downloadwireguard-openbsd-1d44892edf51d2b78a17901b1aa49c83bd9a69e0.tar.xz
wireguard-openbsd-1d44892edf51d2b78a17901b1aa49c83bd9a69e0.zip
introduce ujoy(4), a restricted subset of uhid(4) for gamecontrollers.
This includes ujoy_hid_is_collection() to work around limitations of hid_is_collection() until this can be combined without fallout. input, testing with 8bitdo controller, and ok brynet@ PS4 controller testing, fix for hid_is_collection, and ok mglocker@
Diffstat (limited to 'sys/dev/usb/files.usb')
-rw-r--r--sys/dev/usb/files.usb9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index 1d673cf635d..ff94bf8765b 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-# $OpenBSD: files.usb,v 1.143 2020/05/31 18:15:37 jcs Exp $
+# $OpenBSD: files.usb,v 1.144 2021/01/23 05:08:36 thfr 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.
@@ -74,13 +74,18 @@ file dev/usb/uhidev.c uhidev
# Generic HID devices
device uhid: hid
attach uhid at uhidbus
-file dev/usb/uhid.c uhid | fido needs-flag
+file dev/usb/uhid.c uhid | fido | ujoy needs-flag
# FIDO/U2F security keys
device fido: hid
attach fido at uhidbus
file dev/usb/fido.c fido needs-flag
+# USB Joysticks/Gamecontrollers
+device ujoy: hid
+attach ujoy at uhidbus
+file dev/usb/ujoy.c ujoy needs-flag
+
# Keyboards
file dev/usb/ukbdmap.c hidkbd
device ukbd: hid, hidkbd, wskbddev