xpadneo: Add XBE2 firmware 5.13 support

Closes: atar-axis#338 See-also: atar-axis#344 Signed-off-by: Kai Krakow <[email protected]>
kakra · Apr 30, 2022 · 66d9120 · 66d9120
1 parent f0f10c1
commit 66d9120
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/hid-xpadneo/etc-modprobe.d/xpadneo.conf b/hid-xpadneo/etc-modprobe.d/xpadneo.conf
@@ -3,3 +3,4 @@ alias hid:b0005g*v0000045Ep000002FD hid_xpadneo
 alias hid:b0005g*v0000045Ep00000B05 hid_xpadneo
 alias hid:b0005g*v0000045Ep00000B13 hid_xpadneo
 alias hid:b0005g*v0000045Ep00000B20 hid_xpadneo
+alias hid:b0005g*v0000045Ep00000B22 hid_xpadneo
diff --git a/hid-xpadneo/etc-udev-rules.d/60-xpadneo.rules b/hid-xpadneo/etc-udev-rules.d/60-xpadneo.rules
@@ -1,5 +1,5 @@
 # Rebind driver to xpadneo
-ACTION=="bind", SUBSYSTEM=="hid", DRIVER!="xpadneo", KERNEL=="0005:045E:*", KERNEL=="*:02FD.*|*:02E0.*|*:0B05.*|*:0B13.*|*:0B20.*", ATTR{driver/unbind}="%k", ATTR{[drivers/hid:xpadneo]bind}="%k"
+ACTION=="bind", SUBSYSTEM=="hid", DRIVER!="xpadneo", KERNEL=="0005:045E:*", KERNEL=="*:02FD.*|*:02E0.*|*:0B05.*|*:0B13.*|*:0B20.*|*:0B22.*", ATTR{driver/unbind}="%k", ATTR{[drivers/hid:xpadneo]bind}="%k"
 
 # Tag xpadneo devices for access in the user session
 ACTION=="add|change", DRIVERS=="xpadneo", SUBSYSTEM=="input", TAG+="uaccess"
diff --git a/hid-xpadneo/src/hid-xpadneo.c b/hid-xpadneo/src/hid-xpadneo.c
@@ -860,15 +860,20 @@ static int xpadneo_raw_event(struct hid_device *hdev, struct hid_report *report,
 	}
 
 	/* XBE2: track the current controller settings */
-	if (report->id == 1 && reportsize >= 21) {
+	if (report->id == 1 && reportsize >= 20) {
 		if (reportsize == 55) {
 			hid_notice_once(hdev,
 					"detected broken XBE2 v1 packet format, please update the firmware");
 			xpadneo_switch_profile(xdata, data[35] & 0x03, false);
 			xpadneo_switch_triggers(xdata, data[36] & 0x0F);
-		} else {
+		} else if (reportsize >= 21) {
+			/* firmware 4.x style packet */
 			xpadneo_switch_profile(xdata, data[19] & 0x03, false);
 			xpadneo_switch_triggers(xdata, data[20] & 0x0F);
+		} else {
+			/* firmware 5.x style packet */
+			xpadneo_switch_profile(xdata, data[17] & 0x03, false);
+			xpadneo_switch_triggers(xdata, data[18] & 0x0F);
 		}
 	}
 
@@ -1276,6 +1281,8 @@ static const struct hid_device_id xpadneo_devices[] = {
 
 	/* XBOX ONE Elite Series 2 */
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x0B05) },
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x0B22),
+	 .driver_data = XPADNEO_QUIRK_SHARE_BUTTON },
 
 	/* XBOX Series X|S / Xbox Wireless Controller (BLE) */
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x0B13),