| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220408140902.15966-1-dbdaniel42@gmail.com>
Date: Fri, 8 Apr 2022 09:09:02 -0500
From: Daniel Bomar <dbdaniel42@...il.com>
To: Jiri Kosina <jikos@...nel.org>,
Benjamin Tissoires <benjamin.tissoires@...hat.com>
Cc: linux-input@...r.kernel.org, linux-kernel@...r.kernel.org,
Daniel Bomar <dbdaniel42@...il.com>
Subject: [PATCH] HID: microsoft: Fix button/axis mapping for Xbox One S Controller
Remaps several buttons and axes to match how these are mapped in the
xpad driver (same controller over USB).
This is also how they are documented to be mapped in
Documentation/input/gamepad.rst
---
drivers/hid/hid-microsoft.c | 73 ++++++++++++++++++++++++++++++++++++-
1 file changed, 72 insertions(+), 1 deletion(-)
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
index 071fd093a5f4..903e09a3d898 100644
--- a/drivers/hid/hid-microsoft.c
+++ b/drivers/hid/hid-microsoft.c
@@ -27,6 +27,7 @@
#define MS_DUPLICATE_USAGES BIT(5)
#define MS_SURFACE_DIAL BIT(6)
#define MS_QUIRK_FF BIT(7)
+#define MS_XBOX BIT(8)
struct ms_data {
unsigned long quirks;
@@ -179,6 +180,70 @@ static int ms_surface_dial_quirk(struct hid_input *hi, struct hid_field *field,
return 0;
}
+#define ms_map_abs_clear(c) hid_map_usage_clear(hi, usage, bit, max, \
+ EV_ABS, (c))
+/*
+ * Remap buttons and axes on Xbox controllers over bluetooth so they match
+ * with the xpad driver (USB interface) and with mapping specified in
+ * Documentation/input/gamepad.rst
+*/
+static int ms_xbox_quirk(struct hid_input *hi, struct hid_usage *usage,
+ unsigned long **bit, int *max)
+{
+ int code;
+ switch (usage->hid & HID_USAGE_PAGE) {
+ /*
+ * Remap "Xbox" and Select buttons from consumer page to gamepad buttons.
+ * This allows these buttons to show up on the /dev/input/js* interface.
+ */
+ case HID_UP_CONSUMER:
+ switch (usage->hid & HID_USAGE) {
+ case 0x223:
+ ms_map_key_clear(BTN_MODE);
+ return 1;
+ case 0x224:
+ ms_map_key_clear(BTN_SELECT);
+ return 1;
+ }
+ break;
+ /* These buttons do not physically exist on the controller. Ignore them. */
+ case HID_UP_BUTTON:
+ code = ((usage->hid - 1) & HID_USAGE) + BTN_GAMEPAD;
+ switch (code) {
+ case BTN_C:
+ case BTN_Z:
+ case BTN_TL2:
+ case BTN_TR2:
+ return -1;
+ }
+ break;
+ /* Remap right joystick to RX/RY */
+ case HID_UP_GENDESK:
+ switch (usage->hid) {
+ case HID_GD_Z:
+ ms_map_abs_clear(ABS_RX);
+ return 1;
+ case HID_GD_RZ:
+ ms_map_abs_clear(ABS_RY);
+ return 1;
+ }
+ break;
+ /* Remap left and right triggers from "gas" and "break" to RZ/Z */
+ case HID_UP_SIMULATION:
+ switch (usage->hid & HID_USAGE) {
+ case 0xc4:
+ ms_map_abs_clear(ABS_RZ);
+ return 1;
+ case 0xc5:
+ ms_map_abs_clear(ABS_Z);
+ return 1;
+ }
+ break;
+ }
+
+ return 0;
+}
+
static int ms_input_mapping(struct hid_device *hdev, struct hid_input *hi,
struct hid_field *field, struct hid_usage *usage,
unsigned long **bit, int *max)
@@ -203,6 +268,12 @@ static int ms_input_mapping(struct hid_device *hdev, struct hid_input *hi,
return ret;
}
+ if (quirks & MS_XBOX) {
+ int ret = ms_xbox_quirk(hi, usage, bit, max);
+ if (ret)
+ return ret;
+ }
+
return 0;
}
@@ -447,7 +518,7 @@ static const struct hid_device_id ms_devices[] = {
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B),
.driver_data = MS_SURFACE_DIAL },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER),
- .driver_data = MS_QUIRK_FF },
+ .driver_data = MS_QUIRK_FF | MS_XBOX },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS),
.driver_data = MS_QUIRK_FF },
{ }
--
2.35.1
Powered by blists - more mailing lists