summaryrefslogtreecommitdiff
path: root/sys/arch/powerpc64
diff options
context:
space:
mode:
authorthfr <thfr@cvs.openbsd.org>2021-01-23 05:08:37 +0000
committerthfr <thfr@cvs.openbsd.org>2021-01-23 05:08:37 +0000
commit465727b6ef872bb6ef291d41b481c48699219736 (patch)
tree9648626a90aa45244a1e1f8858ecf575d5773998 /sys/arch/powerpc64
parentf8fe3070cac839f2df26356a22f41b38716174e1 (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/powerpc64')
-rw-r--r--sys/arch/powerpc64/conf/GENERIC3
-rw-r--r--sys/arch/powerpc64/powerpc64/conf.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/powerpc64/conf/GENERIC b/sys/arch/powerpc64/conf/GENERIC
index d874b1e308a..75e26260d84 100644
--- a/sys/arch/powerpc64/conf/GENERIC
+++ b/sys/arch/powerpc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.22 2020/11/16 19:04:57 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.23 2021/01/23 05:08:36 thfr Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -126,6 +126,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
umstc* at uhidev? # Microsoft Surface Type Cover
aue* at uhub? # ADMtek AN986 Pegasus Ethernet
diff --git a/sys/arch/powerpc64/powerpc64/conf.c b/sys/arch/powerpc64/powerpc64/conf.c
index 060e7501cd1..4f6b805b142 100644
--- a/sys/arch/powerpc64/powerpc64/conf.c
+++ b/sys/arch/powerpc64/powerpc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.10 2020/10/24 21:06:56 kettenis Exp $ */
+/* $OpenBSD: conf.c,v 1.11 2021/01/23 05:08:36 thfr Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -64,6 +64,7 @@ cdev_decl(com);
#include "drm.h"
#include "dt.h"
#include "fido.h"
+#include "ujoy.h"
#include "fuse.h"
#include "hotplug.h"
#include "ipmi.h"
@@ -203,6 +204,7 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(), /* 93 */
#endif
+ cdev_ujoy_init(NUJOY,ujoy), /* 94: USB joystick/gamecontroller */
};
int nchrdev = nitems(cdevsw);