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/hppa | |
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/hppa')
-rw-r--r-- | sys/arch/hppa/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/hppa/hppa/conf.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index d1fb312f04c..d95e5a8977b 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.180 2019/12/17 13:08:55 reyk Exp $ +# $OpenBSD: GENERIC,v 1.181 2021/01/23 05:08:34 thfr Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -111,6 +111,7 @@ ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 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 url* at uhub? # Realtek RTL8150L based adapters diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c index ddf72299e9c..4d7a12bac26 100644 --- a/sys/arch/hppa/hppa/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.70 2020/07/06 04:32:25 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.71 2021/01/23 05:08:35 thfr Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -114,6 +114,7 @@ cdev_decl(pci); #include "usb.h" #include "uhid.h" #include "fido.h" +#include "ujoy.h" #include "ugen.h" #include "ulpt.h" #include "ucom.h" @@ -191,6 +192,7 @@ struct cdevsw cdevsw[] = cdev_switch_init(NSWITCH,switch), /* 60: switch(4) control interface */ cdev_fido_init(NFIDO,fido), /* 61: FIDO/U2F security key */ cdev_pppx_init(NPPPX,pppac), /* 62: PPP Access Concentrator */ + cdev_ujoy_init(NUJOY,ujoy), /* 63: USB joystick/gamecontroller */ }; int nchrdev = nitems(cdevsw); |