diff mbox series

HID: sony: Add support for Guitar Hero Guitars

Message ID 20191030092956.17934-1-sanjay.govind9@gmail.com (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show
Series HID: sony: Add support for Guitar Hero Guitars | expand

Commit Message

sanjay.govind9@gmail.com Oct. 30, 2019, 9:29 a.m. UTC 
From: Sanjay Govind <sanjay.govind9@gmail.com>

Guitar Hero Guitars use the accelerometer x axis for tilt. Currently,
they are treated as a regular HID device, and this does not allow the
usage of the accelerometer. Add in support for both the PS3 and the 
PC guitars (they are the same guitars, with different vids and pids).

Signed-off-by: Sanjay Govind <sanjay.govind9@gmail.com>
---
 drivers/hid/hid-ids.h  |  5 +++++
 drivers/hid/hid-sony.c | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

Comments

Roderick Colenbrander Nov. 3, 2019, 12:08 a.m. UTC | #1 
Hi Sanjay,

Thanks for sharing your patch. The code itself looks fine at first
glance, but I have been thinking about where this code belongs. I'm a
bit reluctant of adding code to hid-sony for essentially non-sony
devices. As Sony we are now supporting this driver unmodified in an
official capacity on various devices (all Android devices starting
Android 10) mostly for DualShock devices. I would rather convolute the
driver more with devices, which we don't have ourselves to test (and
nor for our partners as Google to test and QA).

Since these devices are non-Sony (though one of them use a Sony
partner vendor ID), I would prefer to have them in a "hid-activision"
driver.

Thanks,
Roderick

On Wed, Oct 30, 2019 at 2:40 AM <sanjay.govind9@gmail.com> wrote:
>
> From: Sanjay Govind <sanjay.govind9@gmail.com>
>
> Guitar Hero Guitars use the accelerometer x axis for tilt. Currently,
> they are treated as a regular HID device, and this does not allow the
> usage of the accelerometer. Add in support for both the PS3 and the
> PC guitars (they are the same guitars, with different vids and pids).
>
> Signed-off-by: Sanjay Govind <sanjay.govind9@gmail.com>
> ---
>  drivers/hid/hid-ids.h  |  5 +++++
>  drivers/hid/hid-sony.c | 26 ++++++++++++++++++++++++++
>  2 files changed, 31 insertions(+)
>
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 447e8db21174..1d640f94c5bc 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -40,6 +40,9 @@
>  #define USB_VENDOR_ID_ACTIONSTAR       0x2101
>  #define USB_DEVICE_ID_ACTIONSTAR_1011  0x1011
>
> +#define USB_VENDOR_ID_ACTIVISION 0x1430
> +#define USB_DEVICE_ID_ACTIVISION_GUITAR 0x474c
> +
>  #define USB_VENDOR_ID_ADS_TECH         0x06e1
>  #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X    0xa155
>
> @@ -1031,6 +1034,7 @@
>
>
>  #define USB_VENDOR_ID_SONY                     0x054c
> +#define USB_VENDOR_ID_SONY2                    0x12BA
>  #define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE      0x024b
>  #define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE      0x0374
>  #define USB_DEVICE_ID_SONY_PS3_BDREMOTE                0x0306
> @@ -1042,6 +1046,7 @@
>  #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER       0x042f
>  #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER             0x0002
>  #define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER    0x1000
> +#define USB_DEVICE_ID_SONY_GUITAR_CONTROLLER 0x0100
>
>  #define USB_VENDOR_ID_SINO_LITE                        0x1345
>  #define USB_DEVICE_ID_SINO_LITE_CONTROLLER     0x3008
> diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
> index 4c6ed6ef31f1..410c855fb830 100644
> --- a/drivers/hid/hid-sony.c
> +++ b/drivers/hid/hid-sony.c
> @@ -56,6 +56,7 @@
>  #define NSG_MR5U_REMOTE_BT        BIT(14)
>  #define NSG_MR7U_REMOTE_BT        BIT(15)
>  #define SHANWAN_GAMEPAD           BIT(16)
> +#define GH_GUITAR_CONTROLLER      BIT(17)
>
>  #define SIXAXIS_CONTROLLER (SIXAXIS_CONTROLLER_USB | SIXAXIS_CONTROLLER_BT)
>  #define MOTION_CONTROLLER (MOTION_CONTROLLER_USB | MOTION_CONTROLLER_BT)
> @@ -507,6 +508,8 @@ struct motion_output_report_02 {
>  #define SIXAXIS_INPUT_REPORT_ACC_X_OFFSET 41
>  #define SIXAXIS_ACC_RES_PER_G 113
>
> +#define GUITAR_TILT_USAGE 44
> +
>  static DEFINE_SPINLOCK(sony_dev_list_lock);
>  static LIST_HEAD(sony_device_list);
>  static DEFINE_IDA(sony_device_id_allocator);
> @@ -757,6 +760,20 @@ static int navigation_mapping(struct hid_device *hdev, struct hid_input *hi,
>         return -1;
>  }
>
> +static int guitar_mapping(struct hid_device *hdev, struct hid_input *hi,
> +                         struct hid_field *field, struct hid_usage *usage,
> +                         unsigned long **bit, int *max)
> +{
> +       if ((usage->hid & HID_USAGE_PAGE) == HID_UP_MSVENDOR) {
> +               unsigned int abs = usage->hid & HID_USAGE;
> +
> +               if (abs == GUITAR_TILT_USAGE) {
> +                       hid_map_usage_clear(hi, usage, bit, max, EV_ABS, ABS_RY);
> +                       return 1;
> +               }
> +       }
> +       return 0;
> +}
>
>  static int sixaxis_mapping(struct hid_device *hdev, struct hid_input *hi,
>                           struct hid_field *field, struct hid_usage *usage,
> @@ -1340,6 +1357,9 @@ static int sony_mapping(struct hid_device *hdev, struct hid_input *hi,
>         if (sc->quirks & SIXAXIS_CONTROLLER)
>                 return sixaxis_mapping(hdev, hi, field, usage, bit, max);
>
> +       if (sc->quirks & GH_GUITAR_CONTROLLER)
> +               return guitar_mapping(hdev, hi, field, usage, bit, max);
> +
>         if (sc->quirks & DUALSHOCK4_CONTROLLER)
>                 return ds4_mapping(hdev, hi, field, usage, bit, max);
>
> @@ -2950,6 +2970,12 @@ static int sony_resume(struct hid_device *hdev)
>  #endif
>
>  static const struct hid_device_id sony_devices[] = {
> +       { HID_USB_DEVICE(USB_VENDOR_ID_ACTIVISION, USB_DEVICE_ID_ACTIVISION_GUITAR),
> +               .driver_data = GH_GUITAR_CONTROLLER },
> +       { HID_USB_DEVICE(USB_VENDOR_ID_SONY2, USB_DEVICE_ID_SONY_GUITAR_CONTROLLER),
> +               .driver_data = GH_GUITAR_CONTROLLER },
> +       { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER),
> +               .driver_data = SIXAXIS_CONTROLLER_USB },
>         { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER),
>                 .driver_data = SIXAXIS_CONTROLLER_USB },
>         { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER),
> --
> 2.23.0
>
diff mbox series

Patch

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 447e8db21174..1d640f94c5bc 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -40,6 +40,9 @@ 
 #define USB_VENDOR_ID_ACTIONSTAR	0x2101
 #define USB_DEVICE_ID_ACTIONSTAR_1011	0x1011
 
+#define USB_VENDOR_ID_ACTIVISION 0x1430
+#define USB_DEVICE_ID_ACTIVISION_GUITAR 0x474c
+
 #define USB_VENDOR_ID_ADS_TECH		0x06e1
 #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X	0xa155
 
@@ -1031,6 +1034,7 @@ 
 
 
 #define USB_VENDOR_ID_SONY			0x054c
+#define USB_VENDOR_ID_SONY2			0x12BA
 #define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE	0x024b
 #define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE	0x0374
 #define USB_DEVICE_ID_SONY_PS3_BDREMOTE		0x0306
@@ -1042,6 +1046,7 @@ 
 #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER	0x042f
 #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER		0x0002
 #define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER	0x1000
+#define USB_DEVICE_ID_SONY_GUITAR_CONTROLLER 0x0100
 
 #define USB_VENDOR_ID_SINO_LITE			0x1345
 #define USB_DEVICE_ID_SINO_LITE_CONTROLLER	0x3008
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 4c6ed6ef31f1..410c855fb830 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -56,6 +56,7 @@ 
 #define NSG_MR5U_REMOTE_BT        BIT(14)
 #define NSG_MR7U_REMOTE_BT        BIT(15)
 #define SHANWAN_GAMEPAD           BIT(16)
+#define GH_GUITAR_CONTROLLER      BIT(17)
 
 #define SIXAXIS_CONTROLLER (SIXAXIS_CONTROLLER_USB | SIXAXIS_CONTROLLER_BT)
 #define MOTION_CONTROLLER (MOTION_CONTROLLER_USB | MOTION_CONTROLLER_BT)
@@ -507,6 +508,8 @@  struct motion_output_report_02 {
 #define SIXAXIS_INPUT_REPORT_ACC_X_OFFSET 41
 #define SIXAXIS_ACC_RES_PER_G 113
 
+#define GUITAR_TILT_USAGE 44
+
 static DEFINE_SPINLOCK(sony_dev_list_lock);
 static LIST_HEAD(sony_device_list);
 static DEFINE_IDA(sony_device_id_allocator);
@@ -757,6 +760,20 @@  static int navigation_mapping(struct hid_device *hdev, struct hid_input *hi,
 	return -1;
 }
 
+static int guitar_mapping(struct hid_device *hdev, struct hid_input *hi,
+			  struct hid_field *field, struct hid_usage *usage,
+			  unsigned long **bit, int *max)
+{
+	if ((usage->hid & HID_USAGE_PAGE) == HID_UP_MSVENDOR) {
+		unsigned int abs = usage->hid & HID_USAGE;
+
+		if (abs == GUITAR_TILT_USAGE) {
+			hid_map_usage_clear(hi, usage, bit, max, EV_ABS, ABS_RY);
+			return 1;
+		}
+	}
+	return 0;
+}
 
 static int sixaxis_mapping(struct hid_device *hdev, struct hid_input *hi,
 			  struct hid_field *field, struct hid_usage *usage,
@@ -1340,6 +1357,9 @@  static int sony_mapping(struct hid_device *hdev, struct hid_input *hi,
 	if (sc->quirks & SIXAXIS_CONTROLLER)
 		return sixaxis_mapping(hdev, hi, field, usage, bit, max);
 
+	if (sc->quirks & GH_GUITAR_CONTROLLER)
+		return guitar_mapping(hdev, hi, field, usage, bit, max);
+
 	if (sc->quirks & DUALSHOCK4_CONTROLLER)
 		return ds4_mapping(hdev, hi, field, usage, bit, max);
 
@@ -2950,6 +2970,12 @@  static int sony_resume(struct hid_device *hdev)
 #endif
 
 static const struct hid_device_id sony_devices[] = {
+	{ HID_USB_DEVICE(USB_VENDOR_ID_ACTIVISION, USB_DEVICE_ID_ACTIVISION_GUITAR),
+		.driver_data = GH_GUITAR_CONTROLLER },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY2, USB_DEVICE_ID_SONY_GUITAR_CONTROLLER),
+		.driver_data = GH_GUITAR_CONTROLLER },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER),
+		.driver_data = SIXAXIS_CONTROLLER_USB },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER),
 		.driver_data = SIXAXIS_CONTROLLER_USB },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER),