Input: joydev: Don't expose DualSense motion sensors as jsX
Subsystems (3)
PATCH RESEND 1/1 Input: joydev: Don't expose DualSense motion sensors as jsX
Without this, DualSense (PS5) gamepads are allocated a second jsX device for their gyroscope/accelerometer, confusing programs such as /lib/udev/js-set-enum-leds which look at jsX device numbers to determine the player number. Ideally, we should have only one jsX device per gamepad.
This follows the schema started by:
commit 20ac95d52a28 ("Input: joydev - blacklist ds3/ds4/udraw motion sensors")
--- drivers/input/joydev.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/input/joydev.c +4 -0
@@ -753,6 +753,8 @@ static void joydev_cleanup(struct joydev *joydev)#define USB_DEVICE_ID_SONY_PS4_CONTROLLER 0x05c4#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 0x09cc#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE 0x0ba0 +#define USB_DEVICE_ID_SONY_PS5_CONTROLLER 0x0ce6 +#define USB_DEVICE_ID_SONY_PS5_CONTROLLER_2 0x0df2#define USB_VENDOR_ID_THQ 0x20d6#define USB_DEVICE_ID_THQ_PS3_UDRAW 0xcb17
@@ -793,6 +795,8 @@ static const struct input_device_id joydev_blacklist[] = {ACCEL_DEV (USB_VENDOR_ID_SONY ,USB_DEVICE_ID_SONY_PS4_CONTROLLER ),ACCEL_DEV (USB_VENDOR_ID_SONY ,USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 ),ACCEL_DEV (USB_VENDOR_ID_SONY ,USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE ), +ACCEL_DEV (USB_VENDOR_ID_SONY ,USB_DEVICE_ID_SONY_PS5_CONTROLLER ), +ACCEL_DEV (USB_VENDOR_ID_SONY ,USB_DEVICE_ID_SONY_PS5_CONTROLLER_2 ),ACCEL_DEV (USB_VENDOR_ID_THQ ,USB_DEVICE_ID_THQ_PS3_UDRAW ),ACCEL_DEV (USB_VENDOR_ID_NINTENDO ,USB_DEVICE_ID_NINTENDO_PROCON ), ACCEL_DEV(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_CHRGGRIP),
Signature · 1 line
2.47.3
Hi Max,
This looks good to me. It was an oversight from when hid-playstation was added to not add the filter to joydev.
Thanks,
Roderick Colenbrander
Quoted 43 lines · Max Staudt
Without this, DualSense (PS5) gamepads are allocated a second jsX device for their gyroscope/accelerometer, confusing programs such as
/lib/udev/js-set-enum-ledswhich look at jsX device numbers to determine the player number. Ideally, we should have only one jsX device per gamepad.This follows the schema started by:
commit20ac95d52a28("Input: joydev - blacklist ds3/ds4/udraw motion sensors")Fixes 402987c5d98a ("HID: playstation: add DualSense accelerometer and gyroscope support.")Signed-off-by Max Staudt <[email protected]>--- drivers/input/joydev.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/input/joydev.c +4
-1@@ -753,6 +753,8 @@ static void joydev_cleanup(struct joydev *joydev)#define USB_DEVICE_ID_SONY_PS4_CONTROLLER 0x05c4#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 0x09cc#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE 0x0ba0 +#define USB_DEVICE_ID_SONY_PS5_CONTROLLER 0x0ce6 +#define USB_DEVICE_ID_SONY_PS5_CONTROLLER_2 0x0df2#define USB_VENDOR_ID_THQ 0x20d6#define USB_DEVICE_ID_THQ_PS3_UDRAW 0xcb17@@ -793,6 +795,8 @@ static const struct input_device_id joydev_blacklist[] = {ACCEL_DEV (USB_VENDOR_ID_SONY ,USB_DEVICE_ID_SONY_PS4_CONTROLLER ),ACCEL_DEV (USB_VENDOR_ID_SONY ,USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 ),ACCEL_DEV (USB_VENDOR_ID_SONY ,USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE ), +ACCEL_DEV (USB_VENDOR_ID_SONY ,USB_DEVICE_ID_SONY_PS5_CONTROLLER ), +ACCEL_DEV (USB_VENDOR_ID_SONY ,USB_DEVICE_ID_SONY_PS5_CONTROLLER_2 ),ACCEL_DEV (USB_VENDOR_ID_THQ ,USB_DEVICE_ID_THQ_PS3_UDRAW ),ACCEL_DEV (USB_VENDOR_ID_NINTENDO ,USB_DEVICE_ID_NINTENDO_PROCON ), ACCEL_DEV(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_CHRGGRIP), --2.47.3