diff options
| author | thfr <thfr@cvs.openbsd.org> | 2021-01-23 05:08:37 +0000 |
|---|---|---|
| committer | thfr <thfr@cvs.openbsd.org> | 2021-01-23 05:08:37 +0000 |
| commit | 465727b6ef872bb6ef291d41b481c48699219736 (patch) | |
| tree | 9648626a90aa45244a1e1f8858ecf575d5773998 /sys/arch/macppc | |
| parent | f8fe3070cac839f2df26356a22f41b38716174e1 (diff) | |
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/arch/macppc')
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/conf.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 7f33c756d24..46cd7397286 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.271 2020/01/24 04:44:14 krw Exp $g +# $OpenBSD: GENERIC,v 1.272 2021/01/23 05:08:35 thfr Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -260,6 +260,7 @@ uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART ucom* at uslhcom? uhid* at uhidev? # USB generic HID support fido* at uhidev? # FIDO/U2F security key support +ujoy* at uhidev? # USB joystick/gamecontroller support upd* at uhidev? # USB Power Devices sensors aue* at uhub? # ADMtek AN986 Pegasus Ethernet atu* at uhub? # Atmel AT76c50x based 802.11b diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c index a7c0ef70971..6a67a394fe4 100644 --- a/sys/arch/macppc/macppc/conf.c +++ b/sys/arch/macppc/macppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.72 2020/07/06 04:32:25 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.73 2021/01/23 05:08:35 thfr Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -98,6 +98,7 @@ cdev_decl(com); #include "usb.h" #include "uhid.h" #include "fido.h" +#include "ujoy.h" #include "ugen.h" #include "ulpt.h" #include "ucom.h" @@ -231,6 +232,7 @@ struct cdevsw cdevsw[] = { cdev_switch_init(NSWITCH,switch), /* 89: switch(4) control interface */ cdev_fido_init(NFIDO,fido), /* 90: FIDO/U2F security key */ cdev_pppx_init(NPPPX,pppac), /* 91: PPP Access Concentrator */ + cdev_ujoy_init(NUJOY,ujoy), /* 92: USB joystick/gamecontroller */ }; int nchrdev = nitems(cdevsw); |