[alsa-devel] [PATCH] [ALSA] usb-audio - Support for Roland GAIA SH-01 Synthesizer
Added table quirks entry for Roland GAIA SH-01 Synthesizer based upon Roland SH-201 table entry as template. USB MIDI and audio was tested with Muse and Audacity.
Signed-off-by: John F Leach jfleach@jfleach.com Cc: Daniel Mack zonque@gmail.com Cc: Clemens Ladisch clemens@ladisch.de Cc: Takashi Iwai tiwai@suse.de --- sound/usb/quirks-table.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index b61945f..6380665 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1400,6 +1400,37 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, { + /* Roland GAIA SH-01 */ + USB_DEVICE(0x0582, 0x0111), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .vendor_name = "Roland", + .product_name = "GAIA", + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 1, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 2, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = & (const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0003, + .in_cables = 0x0003 + } + }, + { + .ifnum = -1 + } + } + } +}, +{ /* Roland SH-201 */ USB_DEVICE(0x0582, 0x00ad), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
On 11/27/2011 03:34 PM, John F Leach wrote:
Added table quirks entry for Roland GAIA SH-01 Synthesizer based upon Roland SH-201 table entry as template. USB MIDI and audio was tested with Muse and Audacity.
Signed-off-by: John F Leach jfleach@jfleach.com Cc: Daniel Mack zonque@gmail.com Cc: Clemens Ladisch clemens@ladisch.de Cc: Takashi Iwai tiwai@suse.de
sound/usb/quirks-table.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index b61945f..6380665 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1400,6 +1400,37 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, {
- /* Roland GAIA SH-01 */
- USB_DEVICE(0x0582, 0x0111),
Entries in this list should be ordered by the USB vendor/product ID, which is not the case judging from the next block:
/* Roland SH-201 */ USB_DEVICE(0x0582, 0x00ad), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
Otherwise looks good.
Thanks for sending patches!
Daniel
- .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
.vendor_name = "Roland",.product_name = "GAIA",.ifnum = QUIRK_ANY_INTERFACE,.type = QUIRK_COMPOSITE,.data = (const struct snd_usb_audio_quirk[]) {{.ifnum = 0,.type = QUIRK_AUDIO_STANDARD_INTERFACE},{.ifnum = 1,.type = QUIRK_AUDIO_STANDARD_INTERFACE},{.ifnum = 2,.type = QUIRK_MIDI_FIXED_ENDPOINT,.data = & (const structsnd_usb_midi_endpoint_info) {
.out_cables = 0x0003,.in_cables = 0x0003}},{.ifnum = -1}}- }
+}, +{ /* Roland SH-201 */ USB_DEVICE(0x0582, 0x00ad), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
Added table quirks entry for Roland GAIA SH-01 Synthesizer based upon Roland SH-201 table entry as template. USB MIDI and audio was tested with Muse and Audacity.
Signed-off-by: John F Leach jfleach@jfleach.com Cc: Daniel Mack zonque@gmail.com Cc: Clemens Ladisch clemens@ladisch.de Cc: Takashi Iwai tiwai@suse.de --- sound/usb/quirks-table.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index b61945f..b77027d 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1633,6 +1633,37 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, { + /* Roland GAIA SH-01 */ + USB_DEVICE(0x0582, 0x0111), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .vendor_name = "Roland", + .product_name = "GAIA", + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 1, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 2, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = & (const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0003, + .in_cables = 0x0003 + } + }, + { + .ifnum = -1 + } + } + } +}, +{ USB_DEVICE(0x0582, 0x0113), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { /* .vendor_name = "BOSS", */
Entries in this list should be ordered by the USB vendor/product ID, which is not the case judging from the next block:
/* Roland SH-201 */ USB_DEVICE(0x0582, 0x00ad), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
Otherwise looks good.
Thanks for sending patches!
Daniel
Thanks for the feedback Daniel; I submitted a revised patch with the correct list order and fixed the wrapped line for the driver_info.
Regards,
John F Leach
On 11/27/2011 05:10 PM, John F Leach wrote:
Entries in this list should be ordered by the USB vendor/product ID, which is not the case judging from the next block:
/* Roland SH-201 */ USB_DEVICE(0x0582, 0x00ad), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
Otherwise looks good.
Thanks for sending patches!
Daniel
Thanks for the feedback Daniel; I submitted a revised patch with the correct list order and fixed the wrapped line for the driver_info.
Nice. The only thing worth mentioning here is that your "change log" shouldn't be placed in the mail subject (which will be the patch headline eventually). Next time, just put things you don't want to be part of the actual patch itself underneath the "---" line below the diffstat.
But I think this time, Takashi can fix it up when commiting? :)
Daniel
At Sun, 27 Nov 2011 17:42:29 +0100, Daniel Mack wrote:
On 11/27/2011 05:10 PM, John F Leach wrote:
Entries in this list should be ordered by the USB vendor/product ID, which is not the case judging from the next block:
/* Roland SH-201 */ USB_DEVICE(0x0582, 0x00ad), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
Otherwise looks good.
Thanks for sending patches!
Daniel
Thanks for the feedback Daniel; I submitted a revised patch with the correct list order and fixed the wrapped line for the driver_info.
Nice. The only thing worth mentioning here is that your "change log" shouldn't be placed in the mail subject (which will be the patch headline eventually). Next time, just put things you don't want to be part of the actual patch itself underneath the "---" line below the diffstat.
But I think this time, Takashi can fix it up when commiting? :)
Yes, I can fix it by myself. But, the patch doesn't pass checkpatch.pl test, so I postpone for now.
John, please fix warnings scripts/checkaptch.pl gives as much as possible. Some warnings can be ignored (e.g. over 80 chars), but space issues should be fixed at least.
thanks,
Takashi
Yes, I can fix it by myself. But, the patch doesn't pass checkpatch.pl test, so I postpone for now.
John, please fix warnings scripts/checkaptch.pl gives as much as possible. Some warnings can be ignored (e.g. over 80 chars), but space issues should be fixed at least.
Takashi,
I replaced the spaces with tabs, I didn't realize I was supposed to run checkpatch.pl before submitting. How do I fix the ERROR: space prohibited after that '&' (ctx:WxW)? All of the other table entries look like this.
$ scripts/checkpatch.pl 0001-ALSA-usb-audio-Support-for-Roland-GAIA-SH-01-Synthes.patch ERROR: space prohibited after that '&' (ctx:WxW) #28: FILE: sound/usb/quirks-table.h:1638: + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { ^
WARNING: line over 80 characters #45: FILE: sound/usb/quirks-table.h:1655: + .data = & (const struct snd_usb_midi_endpoint_info) {
ERROR: space prohibited after that '&' (ctx:WxW) #45: FILE: sound/usb/quirks-table.h:1655: + .data = & (const struct snd_usb_midi_endpoint_info) { ^
total: 2 errors, 1 warnings, 37 lines checked
0001-ALSA-usb-audio-Support-for-Roland-GAIA-SH-01-Synthes.patch has style problems, please review.
If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.
Regards,
John F Leach
At Sun, 27 Nov 2011 17:15:30 -0500, John F Leach wrote:
Yes, I can fix it by myself. But, the patch doesn't pass checkpatch.pl test, so I postpone for now.
John, please fix warnings scripts/checkaptch.pl gives as much as possible. Some warnings can be ignored (e.g. over 80 chars), but space issues should be fixed at least.
Takashi,
I replaced the spaces with tabs, I didn't realize I was supposed to run checkpatch.pl before submitting. How do I fix the ERROR: space prohibited after that '&' (ctx:WxW)?
Just remove a space after '&'. If checkpatch still complains, ignore it.
Takashi
Added table quirks entry for Roland GAIA SH-01 Synthesizer based upon Roland SH-201 table entry as template. USB MIDI and audio was tested with Muse and Audacity.
Signed-off-by: John F Leach jfleach@jfleach.com Cc: Daniel Mack zonque@gmail.com Cc: Clemens Ladisch clemens@ladisch.de Cc: Takashi Iwai tiwai@suse.de --- sound/usb/quirks-table.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index b61945f..32d2a21 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1633,6 +1633,37 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, { + /* Roland GAIA SH-01 */ + USB_DEVICE(0x0582, 0x0111), + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + .vendor_name = "Roland", + .product_name = "GAIA", + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 1, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 2, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = &(const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0003, + .in_cables = 0x0003 + } + }, + { + .ifnum = -1 + } + } + } +}, +{ USB_DEVICE(0x0582, 0x0113), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { /* .vendor_name = "BOSS", */
At Mon, 28 Nov 2011 19:41:27 -0500, John F Leach wrote:
Added table quirks entry for Roland GAIA SH-01 Synthesizer based upon Roland SH-201 table entry as template. USB MIDI and audio was tested with Muse and Audacity.
Signed-off-by: John F Leach jfleach@jfleach.com Cc: Daniel Mack zonque@gmail.com Cc: Clemens Ladisch clemens@ladisch.de Cc: Takashi Iwai tiwai@suse.de
Applied now to sound git tree. Thanks.
Takashi
sound/usb/quirks-table.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index b61945f..32d2a21 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1633,6 +1633,37 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, {
- /* Roland GAIA SH-01 */
- USB_DEVICE(0x0582, 0x0111),
- .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
.vendor_name = "Roland",.product_name = "GAIA",.ifnum = QUIRK_ANY_INTERFACE,.type = QUIRK_COMPOSITE,.data = (const struct snd_usb_audio_quirk[]) {{.ifnum = 0,.type = QUIRK_AUDIO_STANDARD_INTERFACE},{.ifnum = 1,.type = QUIRK_AUDIO_STANDARD_INTERFACE},{.ifnum = 2,.type = QUIRK_MIDI_FIXED_ENDPOINT,.data = &(const struct snd_usb_midi_endpoint_info) {.out_cables = 0x0003,.in_cables = 0x0003}},{.ifnum = -1}}- }
+}, +{ USB_DEVICE(0x0582, 0x0113), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { /* .vendor_name = "BOSS", */ -- 1.7.0.4
participants (3)
-
Daniel Mack -
John F Leach -
Takashi Iwai