diff options
author | Simon Wood <simon@mungewell.org> | 2015-06-09 23:27:04 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-06-12 05:37:41 -0400 |
commit | b3bca326fa813e4770f74f9ceffe97b72e281475 (patch) | |
tree | f184369673fa891f27590bfc239a7adffbf06e85 | |
parent | a4afa8544d49237a7d9e492ead047501de69aa25 (diff) |
HID: sony: Add quirk for MOTION_CONTROLLER_BT
Split quirk for PS Move Controller as it has to be treated differently
when connected via BT.
Signed-off-by: Simon Wood <simon@mungewell.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/hid-sony.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 6fcc2b4d826b..28dba6c4c273 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c | |||
@@ -46,9 +46,11 @@ | |||
46 | #define PS3REMOTE BIT(4) | 46 | #define PS3REMOTE BIT(4) |
47 | #define DUALSHOCK4_CONTROLLER_USB BIT(5) | 47 | #define DUALSHOCK4_CONTROLLER_USB BIT(5) |
48 | #define DUALSHOCK4_CONTROLLER_BT BIT(6) | 48 | #define DUALSHOCK4_CONTROLLER_BT BIT(6) |
49 | #define MOTION_CONTROLLER BIT(7) | 49 | #define MOTION_CONTROLLER_USB BIT(7) |
50 | #define MOTION_CONTROLLER_BT BIT(8) | ||
50 | 51 | ||
51 | #define SIXAXIS_CONTROLLER (SIXAXIS_CONTROLLER_USB | SIXAXIS_CONTROLLER_BT) | 52 | #define SIXAXIS_CONTROLLER (SIXAXIS_CONTROLLER_USB | SIXAXIS_CONTROLLER_BT) |
53 | #define MOTION_CONTROLLER (MOTION_CONTROLLER_USB | MOTION_CONTROLLER_BT) | ||
52 | #define DUALSHOCK4_CONTROLLER (DUALSHOCK4_CONTROLLER_USB |\ | 54 | #define DUALSHOCK4_CONTROLLER (DUALSHOCK4_CONTROLLER_USB |\ |
53 | DUALSHOCK4_CONTROLLER_BT) | 55 | DUALSHOCK4_CONTROLLER_BT) |
54 | #define SONY_LED_SUPPORT (SIXAXIS_CONTROLLER | BUZZ_CONTROLLER |\ | 56 | #define SONY_LED_SUPPORT (SIXAXIS_CONTROLLER | BUZZ_CONTROLLER |\ |
@@ -2261,9 +2263,9 @@ static const struct hid_device_id sony_devices[] = { | |||
2261 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER), | 2263 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER), |
2262 | .driver_data = SIXAXIS_CONTROLLER_USB }, | 2264 | .driver_data = SIXAXIS_CONTROLLER_USB }, |
2263 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_MOTION_CONTROLLER), | 2265 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_MOTION_CONTROLLER), |
2264 | .driver_data = MOTION_CONTROLLER }, | 2266 | .driver_data = MOTION_CONTROLLER_USB }, |
2265 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_MOTION_CONTROLLER), | 2267 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_MOTION_CONTROLLER), |
2266 | .driver_data = MOTION_CONTROLLER }, | 2268 | .driver_data = MOTION_CONTROLLER_BT }, |
2267 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER), | 2269 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER), |
2268 | .driver_data = SIXAXIS_CONTROLLER_BT }, | 2270 | .driver_data = SIXAXIS_CONTROLLER_BT }, |
2269 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE), | 2271 | { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE), |