xpadneo, init: Do not report paddles unconditionally

SDL2 author @slouken pointed out that the bitmap cannot be properly tested for the existence of the XBE2 paddles. This commit fixes that by first testing if the paddles exist in the bitmap, and only then enable the remaining three paddles. The underlying problem is that the HID descriptor does not have a properly defined bitmap for the paddles but a single 4-bit value instead. See-also: #428 Signed-off-by: Kai Krakow <[email protected]>
atar-axis · Feb 12, 2024 · 3cbdc5b · 3cbdc5b
1 parent ea5662f
commit 3cbdc5b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/hid-xpadneo/src/hid-xpadneo.c b/hid-xpadneo/src/hid-xpadneo.c
@@ -906,11 +906,12 @@ static int xpadneo_input_configured(struct hid_device *hdev, struct hid_input *h
 	/* do not report the consumer control buttons as part of the gamepad */
 	__clear_bit(BTN_SHARE, xdata->idev->keybit);
 
-	/* add paddles as part of the gamepad */
-	__set_bit(BTN_PADDLES(0), xdata->idev->keybit);
-	__set_bit(BTN_PADDLES(1), xdata->idev->keybit);
-	__set_bit(BTN_PADDLES(2), xdata->idev->keybit);
-	__set_bit(BTN_PADDLES(3), xdata->idev->keybit);
+	/* ensure all four paddles exist as part of the gamepad */
+	if (test_bit(BTN_PADDLES(0), xdata->idev->keybit)) {
+		__set_bit(BTN_PADDLES(1), xdata->idev->keybit);
+		__set_bit(BTN_PADDLES(2), xdata->idev->keybit);
+		__set_bit(BTN_PADDLES(3), xdata->idev->keybit);
+	}
 
 	return 0;
 }