Skip to contentSkip to conversation

HID: sony: add support for more instruments

PATCH In review Rosalie Wanders 2 participants 8 messages Apr 7 – Apr 8 HID

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 HID: sony: add support for more instruments

This patch adds support for the following instruments:

* Rock Band 1/2/3 Wii/PS3 instruments
* Rock Band 3 PS3 Pro instruments
* DJ Hero Turntable

Wii and PS3 instruments are the same besides the vendor and product ID.

This patch also fixes the mappings for the existing Guitar Hero instruments.

---
changes:
v2: correct squier device name and remove non-existent squier usb device

 drivers/hid/hid-ids.h  |  26 +++-
 drivers/hid/hid-sony.c | 274 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 253 insertions(+), 47 deletions(-)
drivers/hid/hid-ids.h +24 -2
index 3e299a30dcde..3dab8b910831 100644
@@ -664,6 +664,18 @@
 #define USB_DEVICE_ID_UGCI_FLYING	0x0020
 #define USB_DEVICE_ID_UGCI_FIGHTING	0x0030
 
+#define USB_VENDOR_ID_HARMONIX		0x1bad
+#define USB_DEVICE_ID_HARMONIX_WII_RB1_GUITAR	0x0004
+#define USB_DEVICE_ID_HARMONIX_WII_RB2_GUITAR	0x3010
+#define USB_DEVICE_ID_HARMONIX_WII_RB1_DRUMS	    0x0005
+#define USB_DEVICE_ID_HARMONIX_WII_RB2_DRUMS	    0x3110
+#define USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_DRUMS_MODE	0x3138
+#define USB_DEVICE_ID_HARMONIX_WII_RB3_MUSTANG_GUITAR	0x3430
+#define USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_MUSTANG_MODE	0x3438
+#define USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_SQUIER_MODE	0x3538
+#define USB_DEVICE_ID_HARMONIX_WII_RB3_KEYBOARD	        0x3330
+#define USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_KEYBOARD_MODE	0x3338
+
 #define USB_VENDOR_ID_HP		0x03f0
 #define USB_PRODUCT_ID_HP_ELITE_PRESENTER_MOUSE_464A		0x464a
 #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A	0x0a4a
@@ -1298,8 +1310,18 @@
 #define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER	0x1000
 
 #define USB_VENDOR_ID_SONY_RHYTHM	0x12ba
-#define USB_DEVICE_ID_SONY_PS3WIIU_GHLIVE_DONGLE	0x074b
-#define USB_DEVICE_ID_SONY_PS3_GUITAR_DONGLE	0x0100
+#define USB_DEVICE_ID_SONY_PS3WIIU_GHLIVE	0x074b
+#define USB_DEVICE_ID_SONY_PS3_GH_GUITAR	0x0100
+#define USB_DEVICE_ID_SONY_PS3_GH_DRUMS		0x0120
+#define USB_DEVICE_ID_SONY_PS3_DJH_TURNTABLE	0x0140
+#define USB_DEVICE_ID_SONY_PS3_RB_GUITAR	0x0200
+#define USB_DEVICE_ID_SONY_PS3_RB_DRUMS		0x0210
+#define USB_DEVICE_ID_SONY_PS3_RB3_MPA_DRUMS_MODE	0x0218
+#define USB_DEVICE_ID_SONY_PS3_RB3_MUSTANG_GUITAR	0x2430
+#define USB_DEVICE_ID_SONY_PS3_RB3_MPA_MUSTANG_MODE	0x2438
+#define USB_DEVICE_ID_SONY_PS3_RB3_MPA_SQUIER_MODE	0x2538
+#define USB_DEVICE_ID_SONY_PS3_RB3_KEYBOARD	        0x2330
+#define USB_DEVICE_ID_SONY_PS3_RB3_MPA_KEYBOARD_MODE	0x2338
 
 #define USB_VENDOR_ID_SINO_LITE			0x1345
 #define USB_DEVICE_ID_SINO_LITE_CONTROLLER	0x3008
drivers/hid/hid-sony.c +229 -45

408 lines not on this page · raw message

Signature · 1 line
2.53.0
maintainer
#1 lore raw
Quoted 11 lines · Rosalie Wanders

This patch adds support for the following instruments:

* Rock Band 1/2/3 Wii/PS3 instruments
* Rock Band 3 PS3 Pro instruments
* DJ Hero Turntable

Wii and PS3 instruments are the same besides the vendor and product ID.

This patch also fixes the mappings for the existing Guitar Hero instruments.

Quoted 8 lines

---
changes:
v2: correct squier device name and remove non-existent squier usb device

Rosalie,

as v1 is already sitting in hid.git#for-7.1/sony for some time, could you please send this as a followup fix instead?

Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs
author
#2 lore raw

Hello,

I've sent 'HID: sony: fix incorrect Squier name and remove non-existent device', though I will mention you didn't apply 'HID: quirks: update hid-sony supported devices' cleanly because it duplicated the vendor and device ID defines in hid-ids.h for the Wii instruments so it will not compile, I'd advise you apply the patches in the following order to prevent issues:

1) v1 of 'HID: sony: add support for more instruments'
2) 'HID: sony: fix incorrect Squier name and remove non-existent device'
3) v2 of 'HID: quirks: update hid-sony supported devices' but without changing hid-ids.h
4) v2 of 'HID: sony: fix style issues' (if you want this patch to be included that is)

alternatively you could also do:

1) v2 of 'HID: sony: add support for more instruments'
2) v2 of 'HID: quirks: update hid-sony supported devices'
3) v2 of 'HID: sony: fix style issues'

I hope this doesn't cause too much hassle,
Rosalie

Quoted 29 lines · Jiri Kosina
Quoted 11 lines · Rosalie Wanders

This patch adds support for the following instruments:

* Rock Band 1/2/3 Wii/PS3 instruments
* Rock Band 3 PS3 Pro instruments
* DJ Hero Turntable

Wii and PS3 instruments are the same besides the vendor and product ID.

This patch also fixes the mappings for the existing Guitar Hero instruments.

Quoted 8 lines

---
changes:
v2: correct squier device name and remove non-existent squier usb device

Rosalie,

as v1 is already sitting in hid.git#for-7.1/sony for some time, could you please send this as a followup fix instead?

Thanks,

maintainer
#3 lore raw
Quoted 15 lines · Rosalie

Hello,

I've sent 'HID: sony: fix incorrect Squier name and remove non-existent device', though I will mention you didn't apply 'HID: quirks: update hid-sony supported devices' cleanly because it duplicated the vendor and device ID defines in hid-ids.h for the Wii instruments so it will not compile, I'd advise you apply the patches in the following order to prevent issues:

1) v1 of 'HID: sony: add support for more instruments'
2) 'HID: sony: fix incorrect Squier name and remove non-existent device'
3) v2 of 'HID: quirks: update hid-sony supported devices' but without changing hid-ids.h
4) v2 of 'HID: sony: fix style issues' (if you want this patch to be included that is)

Quoted 7 lines

alternatively you could also do:

1) v2 of 'HID: sony: add support for more instruments'
2) v2 of 'HID: quirks: update hid-sony supported devices'
3) v2 of 'HID: sony: fix style issues'

I hope this doesn't cause too much hassle,

Thanks, I will look into it. But going forward, you really should either send this as series, or clearly mark the dependencies. Sending it as a followup fix in the same thread also works.

Or, even better, send a pull request against a git branch if the interdependencies are tricky.

Imagine you're getting higher tens of patches a day (including e.g. quite often v1->v5 within a timeframe of a few hours), and you are somehow magically expected to untangle all this.

Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs
author
#4 lore raw

Hello,

Yes I do apologize, and I'll be mindful of either doing a series, mark dependencies clearly or do a pull request.

I didn't expect to be sending this many patches at all in the first place, but one minor annoyance of the code bothers me one day and then another day someone else mentions that e.g a device name is incorrect, so that kinda led to this chaos.

Apologies and I'll try preventing it in the future, and thanks for the advice, Rosalie

Quoted 38 lines · Jiri Kosina
Quoted 15 lines · Rosalie

Hello,

I've sent 'HID: sony: fix incorrect Squier name and remove non-existent device', though I will mention you didn't apply 'HID: quirks: update hid-sony supported devices' cleanly because it duplicated the vendor and device ID defines in hid-ids.h for the Wii instruments so it will not compile, I'd advise you apply the patches in the following order to prevent issues:

1) v1 of 'HID: sony: add support for more instruments'
2) 'HID: sony: fix incorrect Squier name and remove non-existent device'
3) v2 of 'HID: quirks: update hid-sony supported devices' but without changing hid-ids.h
4) v2 of 'HID: sony: fix style issues' (if you want this patch to be included that is)

Quoted 7 lines

alternatively you could also do:

1) v2 of 'HID: sony: add support for more instruments'
2) v2 of 'HID: quirks: update hid-sony supported devices'
3) v2 of 'HID: sony: fix style issues'

I hope this doesn't cause too much hassle,

Thanks, I will look into it. But going forward, you really should either send this as series, or clearly mark the dependencies. Sending it as a followup fix in the same thread also works.

Or, even better, send a pull request against a git branch if the interdependencies are tricky.

Imagine you're getting higher tens of patches a day (including e.g. quite often v1->v5 within a timeframe of a few hours), and you are somehow magically expected to untangle all this.

Thanks,

maintainer
#5 lore raw
Quoted 9 lines · Rosalie

Yes I do apologize, and I'll be mindful of either doing a series, mark dependencies clearly or do a pull request.

I didn't expect to be sending this many patches at all in the first place, but one minor annoyance of the code bothers me one day and then another day someone else mentions that e.g a device name is incorrect, so that kinda led to this chaos.

Apologies and I'll try preventing it in the future, and thanks for the advice,

No worries. I've just update hid.git#for-7.1/sony and I believe it's now in proper state with all the patch dependencies correctly captured. If you see any issue there, please let me know.

Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs
author
#6 lore raw
Quoted 10 lines · Jiri Kosina
Quoted 8 lines · Rosalie

Yes I do apologize, and I'll be mindful of either doing a series, mark dependencies clearly or do a pull request.

I didn't expect to be sending this many patches at all in the first place, but one minor annoyance of the code bothers me one day and then another day someone else mentions that e.g a device name is incorrect, so that kinda led to this chaos.

Quoted 8 lines
Quoted 1 line

Apologies and I'll try preventing it in the future, and thanks for the advice,

No worries. I've just update hid.git#for-7.1/sony and I believe it's now in proper state with all the patch dependencies correctly captured. If you see any issue there, please let me know.

Thanks,

It looks fine to me code wise, and it compiles! but you forgot to apply a patch you applied earlier to the for-7.1/sony branch, namely 'HID: sony: update module description'

Other than that, it's fine, and again I apologize for the chaos, Rosalie

maintainer
#7 lore raw
Quoted 3 lines · Rosalie

It looks fine to me code wise, and it compiles! but you forgot to apply a patch you applied earlier to the for-7.1/sony branch, namely 'HID: sony:
update module description'

Thanks for checking.

Yes, I am aware of that one missing for now, it's in the queue for next time.

Quoted 1 line

Other than that, it's fine, and again I apologize for the chaos,

Np. Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs