[PATCH] autofs4: add v5 expire logic

[linux-2.6-omap-h63xx.git] / sound / usb / usbquirks.h

diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index ba506c3871f443f437ec909998c3885a691cc4d2..0992a0923f1aa8b40c3353632af81b164fdc47d5 100644 (file)
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -45,7 +45,7 @@
 
 #define YAMAHA_DEVICE(id, name) { \
        USB_DEVICE(0x0499, id), \
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { \
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { \
                .vendor_name = "Yamaha", \
                .product_name = name, \
                .ifnum = QUIRK_ANY_INTERFACE, \
@@ -54,7 +54,7 @@
 }
 #define YAMAHA_INTERFACE(id, intf, name) { \
        USB_DEVICE_VENDOR_SPEC(0x0499, id), \
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) { \
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { \
                .vendor_name = "Yamaha", \
                .product_name = name, \
                .ifnum = intf, \
@@ -82,6 +82,7 @@ YAMAHA_DEVICE(0x1012, "TYROS"),
 YAMAHA_DEVICE(0x1013, "PF-500"),
 YAMAHA_DEVICE(0x1014, "S90"),
 YAMAHA_DEVICE(0x1015, "MOTIF-R"),
+YAMAHA_DEVICE(0x1016, "MDP-5"),
 YAMAHA_DEVICE(0x1017, "CVP-204"),
 YAMAHA_DEVICE(0x1018, "CVP-206"),
 YAMAHA_DEVICE(0x1019, "CVP-208"),
@@ -90,6 +91,7 @@ YAMAHA_DEVICE(0x101b, "PSR-1100"),
 YAMAHA_DEVICE(0x101c, "PSR-2100"),
 YAMAHA_DEVICE(0x101d, "CLP-175"),
 YAMAHA_DEVICE(0x101e, "PSR-K1"),
+YAMAHA_DEVICE(0x101f, "EZ-J24"),
 YAMAHA_DEVICE(0x1020, "EZ-250i"),
 YAMAHA_DEVICE(0x1021, "MOTIF ES 6"),
 YAMAHA_DEVICE(0x1022, "MOTIF ES 7"),
@@ -149,12 +151,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
  */
 {
        USB_DEVICE(0x0582, 0x0000),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "UA-100",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
@@ -192,7 +194,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0007,
                                        .in_cables  = 0x0007
                                }
@@ -205,12 +207,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE(0x0582, 0x0002),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UM-4",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -222,7 +224,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x000f,
                                        .in_cables  = 0x000f
                                }
@@ -235,12 +237,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE(0x0582, 0x0003),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "SC-8850",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -252,7 +254,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x003f,
                                        .in_cables  = 0x003f
                                }
@@ -265,12 +267,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE(0x0582, 0x0004),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "U-8",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -282,7 +284,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0005,
                                        .in_cables  = 0x0005
                                }
@@ -294,14 +296,15 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
-       /* a later revision uses ID 0x0099 */
+       /* Has ID 0x0099 when not in "Advanced Driver" mode.
+        * The UM-2EX has only one input, but we cannot detect this. */
        USB_DEVICE(0x0582, 0x0005),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UM-2",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -313,7 +316,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0003,
                                        .in_cables  = 0x0003
                                }
@@ -326,12 +329,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE(0x0582, 0x0007),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "SC-8820",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -343,7 +346,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0013,
                                        .in_cables  = 0x0013
                                }
@@ -356,12 +359,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE(0x0582, 0x0008),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "PC-300",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -373,7 +376,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0001,
                                        .in_cables  = 0x0001
                                }
@@ -385,14 +388,14 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
-       /* a later revision uses ID 0x009d */
+       /* has ID 0x009d when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0009),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UM-1",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -404,7 +407,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0001,
                                        .in_cables  = 0x0001
                                }
@@ -417,12 +420,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE(0x0582, 0x000b),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "SK-500",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -434,7 +437,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0013,
                                        .in_cables  = 0x0013
                                }
@@ -449,12 +452,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        /* thanks to Emiliano Grilli <emillo@libero.it>
         * for helping researching this data */
        USB_DEVICE(0x0582, 0x000c),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "SC-D70",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
@@ -492,7 +495,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0007,
                                        .in_cables  = 0x0007
                                }
@@ -513,12 +516,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         * the 96kHz sample rate.
         */
        USB_DEVICE(0x0582, 0x0010),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UA-5",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 1,
                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
@@ -536,12 +539,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0013 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0012),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "XV-5050",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -550,12 +553,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0015 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0014),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UM-880",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x01ff,
                        .in_cables  = 0x01ff
                }
@@ -564,12 +567,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0017 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0016),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "SD-90",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -581,7 +584,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x000f,
                                        .in_cables  = 0x000f
                                }
@@ -595,12 +598,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x001c when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x001b),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "MMP-2",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -612,7 +615,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 2,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0001,
                                        .in_cables  = 0x0001
                                }
@@ -626,12 +629,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x001e when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x001d),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "V-SYNTH",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -640,12 +643,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0024 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0023),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UM-550",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x003f,
                        .in_cables  = 0x003f
                }
@@ -658,23 +661,57 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         * and no MIDI.
         */
        USB_DEVICE(0x0582, 0x0025),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UA-20",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
+                       {
+                               .ifnum = 0,
+                               .type = QUIRK_IGNORE_INTERFACE
+                       },
                        {
                                .ifnum = 1,
-                               .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                               .type = QUIRK_AUDIO_FIXED_ENDPOINT,
+                               .data = & (const struct audioformat) {
+                                       .format = SNDRV_PCM_FORMAT_S24_3LE,
+                                       .channels = 2,
+                                       .iface = 1,
+                                       .altsetting = 1,
+                                       .altset_idx = 1,
+                                       .attributes = 0,
+                                       .endpoint = 0x01,
+                                       .ep_attr = 0x01,
+                                       .rates = SNDRV_PCM_RATE_CONTINUOUS,
+                                       .rate_min = 44100,
+                                       .rate_max = 44100,
+                               }
                        },
                        {
                                .ifnum = 2,
-                               .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                               .type = QUIRK_AUDIO_FIXED_ENDPOINT,
+                               .data = & (const struct audioformat) {
+                                       .format = SNDRV_PCM_FORMAT_S24_3LE,
+                                       .channels = 2,
+                                       .iface = 2,
+                                       .altsetting = 1,
+                                       .altset_idx = 1,
+                                       .attributes = 0,
+                                       .endpoint = 0x82,
+                                       .ep_attr = 0x01,
+                                       .rates = SNDRV_PCM_RATE_CONTINUOUS,
+                                       .rate_min = 44100,
+                                       .rate_max = 44100,
+                               }
                        },
                        {
                                .ifnum = 3,
-                               .type = QUIRK_MIDI_STANDARD_INTERFACE
+                               .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
+                                       .out_cables = 0x0001,
+                                       .in_cables  = 0x0001
+                               }
                        },
                        {
                                .ifnum = -1
@@ -685,12 +722,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0028 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0027),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "SD-20",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0003,
                        .in_cables  = 0x0007
                }
@@ -699,12 +736,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x002a when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0029),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "SD-80",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x000f,
                        .in_cables  = 0x000f
                }
@@ -717,12 +754,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         * but offers only 16-bit PCM and no MIDI.
         */
        USB_DEVICE_VENDOR_SPEC(0x0582, 0x002b),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UA-700",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 1,
                                .type = QUIRK_AUDIO_EDIROL_UA700_UA25
@@ -744,12 +781,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x002e when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x002d),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "XV-2020",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -758,12 +795,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0030 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x002f),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "VariOS",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0007,
                        .in_cables  = 0x0007
                }
@@ -772,12 +809,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0034 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0033),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "PCR",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0003,
                        .in_cables  = 0x0007
                }
@@ -790,12 +827,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         * later revisions use IDs 0x0054 and 0x00a2.
         */
        USB_DEVICE(0x0582, 0x0037),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "Digital Piano",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -808,12 +845,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         * and no MIDI.
         */
        USB_DEVICE_VENDOR_SPEC(0x0582, 0x003b),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "BOSS",
                .product_name = "GS-10",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = & (const snd_usb_audio_quirk_t[]) {
+               .data = & (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 1,
                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
@@ -835,12 +872,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0041 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0040),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "GI-20",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -849,12 +886,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0043 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0042),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "RS-70",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -862,12 +899,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE(0x0582, 0x0044),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "UA-1000",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 1,
                                .type = QUIRK_AUDIO_EDIROL_UA1000
@@ -879,7 +916,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 3,
                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0003,
                                        .in_cables  = 0x0003
                                }
@@ -893,12 +930,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x004a when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0048),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UR-80",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0003,
                        .in_cables  = 0x0007
                }
@@ -908,12 +945,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x004f when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x004d),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "PCR-A",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0003,
                        .in_cables  = 0x0007
                }
@@ -925,12 +962,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         * is standard compliant, but has only 16-bit PCM.
         */
        USB_DEVICE(0x0582, 0x0050),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UA-3FX",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 1,
                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
@@ -947,7 +984,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE(0x0582, 0x0052),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UM-1SX",
                .ifnum = 0,
@@ -958,12 +995,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0067 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0065),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "PCR-1",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0003
                }
@@ -972,12 +1009,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x006b when not in "Advanced Driver" mode */
        USB_DEVICE_VENDOR_SPEC(0x0582, 0x006a),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "SP-606",
                .ifnum = 3,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -986,12 +1023,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x006e when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x006d),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                .product_name = "FANTOM-X",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -1004,12 +1041,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         * offers only 16-bit PCM at 44.1 kHz and no MIDI.
         */
        USB_DEVICE_VENDOR_SPEC(0x0582, 0x0074),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "EDIROL",
                .product_name = "UA-25",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = (const snd_usb_audio_quirk_t[]) {
+               .data = (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_AUDIO_EDIROL_UA700_UA25
@@ -1031,12 +1068,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x0076 when not in "Advanced Driver" mode */
        USB_DEVICE(0x0582, 0x0075),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "BOSS",
                .product_name = "DR-880",
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -1045,17 +1082,64 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* has ID 0x007b when not in "Advanced Driver" mode */
        USB_DEVICE_VENDOR_SPEC(0x0582, 0x007a),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Roland",
                /* "RD" or "RD-700SX"? */
                .ifnum = 0,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0003,
                        .in_cables  = 0x0003
                }
        }
 },
+       /* TODO: add Edirol UA-101 support */
+{
+       /* has ID 0x0081 when not in "Advanced Driver" mode */
+       USB_DEVICE(0x0582, 0x0080),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "Roland",
+               .product_name = "G-70",
+               .ifnum = 0,
+               .type = QUIRK_MIDI_FIXED_ENDPOINT,
+               .data = & (const struct snd_usb_midi_endpoint_info) {
+                       .out_cables = 0x0001,
+                       .in_cables  = 0x0001
+               }
+       }
+},
+       /* TODO: add Roland V-SYNTH XT support */
+       /* TODO: add BOSS GT-PRO support */
+{
+       /* has ID 0x008c when not in "Advanced Driver" mode */
+       USB_DEVICE(0x0582, 0x008b),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "EDIROL",
+               .product_name = "PC-50",
+               .ifnum = 0,
+               .type = QUIRK_MIDI_FIXED_ENDPOINT,
+               .data = & (const struct snd_usb_midi_endpoint_info) {
+                       .out_cables = 0x0001,
+                       .in_cables  = 0x0001
+               }
+       }
+},
+       /* TODO: add Edirol PC-80 support */
+       /* TODO: add Edirol UA-1EX support */
+{
+       USB_DEVICE(0x0582, 0x009a),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "EDIROL",
+               .product_name = "UM-3EX",
+               .ifnum = 0,
+               .type = QUIRK_MIDI_FIXED_ENDPOINT,
+               .data = & (const struct snd_usb_midi_endpoint_info) {
+                       .out_cables = 0x000f,
+                       .in_cables  = 0x000f
+               }
+       }
+},
+       /* TODO: add Edirol MD-P1 support */
 
 /* Guillemot devices */
 {
@@ -1066,36 +1150,27 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         * compliant USB MIDI ports for external MIDI and controls.
         */
        USB_DEVICE_VENDOR_SPEC(0x06f8, 0xb000),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Hercules",
                .product_name = "DJ Console (WE)",
                .ifnum = 4,
                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables = 0x0001
                }
        }
 },
-       /* TODO: add Edirol UA-101 support */
-       /* TODO: add Roland G-70 support */
-       /* TODO: add Roland V-SYNTH XT support */
-       /* TODO: add BOSS GT-PRO support */
-       /* TODO: add Edirol PC-50 support */
-       /* TODO: add Edirol PC-80 support */
-       /* TODO: add Edirol UA-1EX support */
-       /* TODO: add Edirol UM-3 support */
-       /* TODO: add Edirol MD-P1 support */
 
 /* Midiman/M-Audio devices */
 {
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x1002),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "MidiSport 2x2",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_MIDI_MIDIMAN,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0003,
                        .in_cables  = 0x0003
                }
@@ -1103,12 +1178,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x1011),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "MidiSport 1x1",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_MIDI_MIDIMAN,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -1116,12 +1191,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x1015),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "Keystation",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_MIDI_MIDIMAN,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -1129,12 +1204,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x1021),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "MidiSport 4x4",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_MIDI_MIDIMAN,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x000f,
                        .in_cables  = 0x000f
                }
@@ -1147,12 +1222,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         * Thanks to Olaf Giesbrecht <Olaf_Giesbrecht@yahoo.de>
         */
        USB_DEVICE_VER(0x0763, 0x1031, 0x0100, 0x0109),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "MidiSport 8x8",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_MIDI_MIDIMAN,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x01ff,
                        .in_cables  = 0x01ff
                }
@@ -1160,12 +1235,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x1033),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "MidiSport 8x8",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_MIDI_MIDIMAN,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x01ff,
                        .in_cables  = 0x01ff
                }
@@ -1173,12 +1248,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x1041),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "MidiSport 2x4",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_MIDI_MIDIMAN,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x000f,
                        .in_cables  = 0x0003
                }
@@ -1186,12 +1261,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x2001),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "Quattro",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = & (const snd_usb_audio_quirk_t[]) {
+               .data = & (const struct snd_usb_audio_quirk[]) {
                        /*
                         * Interfaces 0-2 are "Windows-compatible", 16-bit only,
                         * and share endpoints with the other interfaces.
@@ -1237,7 +1312,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 9,
                                .type = QUIRK_MIDI_MIDIMAN,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0001,
                                        .in_cables  = 0x0001
                                }
@@ -1250,12 +1325,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x2003),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "AudioPhile",
                .ifnum = 6,
                .type = QUIRK_MIDI_MIDIMAN,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -1263,12 +1338,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x2008),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "Ozone",
                .ifnum = 3,
                .type = QUIRK_MIDI_MIDIMAN,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x0001,
                        .in_cables  = 0x0001
                }
@@ -1276,12 +1351,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x200d),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "M-Audio",
                .product_name = "OmniStudio",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = & (const snd_usb_audio_quirk_t[]) {
+               .data = & (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_IGNORE_INTERFACE
@@ -1321,7 +1396,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                        {
                                .ifnum = 9,
                                .type = QUIRK_MIDI_MIDIMAN,
-                               .data = & (const snd_usb_midi_endpoint_info_t) {
+                               .data = & (const struct snd_usb_midi_endpoint_info) {
                                        .out_cables = 0x0001,
                                        .in_cables  = 0x0001
                                }
@@ -1333,6 +1408,27 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 
+/* Casio devices */
+{
+       USB_DEVICE(0x07cf, 0x6801),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "Casio",
+               .product_name = "PL-40R",
+               .ifnum = 0,
+               .type = QUIRK_MIDI_YAMAHA
+       }
+},
+{
+       /* this ID is used by several devices without a product ID */
+       USB_DEVICE(0x07cf, 0x6802),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "Casio",
+               .product_name = "Keyboard",
+               .ifnum = 0,
+               .type = QUIRK_MIDI_YAMAHA
+       }
+},
+
 /* Mark of the Unicorn devices */
 {
        /* thanks to Robert A. Lerche <ral 'at' msbit.com> */
@@ -1342,12 +1438,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        .idVendor = 0x07fd,
        .idProduct = 0x0001,
        .bDeviceSubClass = 2,
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "MOTU",
                .product_name = "Fastlane",
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
-               .data = & (const snd_usb_audio_quirk_t[]) {
+               .data = & (const struct snd_usb_audio_quirk[]) {
                        {
                                .ifnum = 0,
                                .type = QUIRK_MIDI_RAW
@@ -1366,7 +1462,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 {
        /* Creative Sound Blaster MP3+ */
        USB_DEVICE(0x041e, 0x3010),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Creative Labs",
                .product_name = "Sound Blaster MP3+",
                .ifnum = QUIRK_NO_INTERFACE
@@ -1377,12 +1473,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 /* Emagic devices */
 {
        USB_DEVICE(0x086a, 0x0001),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Emagic",
                /* .product_name = "Unitor8", */
                .ifnum = 2,
                .type = QUIRK_MIDI_EMAGIC,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x80ff,
                        .in_cables  = 0x80ff
                }
@@ -1390,12 +1486,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE(0x086a, 0x0002),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Emagic",
                /* .product_name = "AMT8", */
                .ifnum = 2,
                .type = QUIRK_MIDI_EMAGIC,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x80ff,
                        .in_cables  = 0x80ff
                }
@@ -1403,12 +1499,12 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE(0x086a, 0x0003),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Emagic",
                /* .product_name = "MT4", */
                .ifnum = 2,
                .type = QUIRK_MIDI_EMAGIC,
-               .data = & (const snd_usb_midi_endpoint_info_t) {
+               .data = & (const struct snd_usb_midi_endpoint_info) {
                        .out_cables = 0x800f,
                        .in_cables  = 0x8003
                }
@@ -1418,7 +1514,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 /* TerraTec devices */
 {
        USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0012),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "TerraTec",
                .product_name = "PHASE 26",
                .ifnum = 3,
@@ -1427,18 +1523,27 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x0ccd, 0x0013),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "TerraTec",
                .product_name = "PHASE 26",
                .ifnum = 3,
                .type = QUIRK_MIDI_STANDARD_INTERFACE
        }
 },
+{
+       USB_DEVICE(0x0ccd, 0x0035),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "Miditech",
+               .product_name = "Play'n Roll",
+               .ifnum = 0,
+               .type = QUIRK_MIDI_CME
+       }
+},
 
 /* Novation EMS devices */
 {
        USB_DEVICE_VENDOR_SPEC(0x1235, 0x0001),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Novation",
                .product_name = "ReMOTE Audio/XStation",
                .ifnum = 4,
@@ -1447,7 +1552,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x1235, 0x0002),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Novation",
                .product_name = "Speedio",
                .ifnum = 3,
@@ -1456,7 +1561,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
 },
 {
        USB_DEVICE_VENDOR_SPEC(0x1235, 0x4661),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Novation",
                .product_name = "ReMOTE25",
                .ifnum = 0,
@@ -1464,22 +1569,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 
+/* Miditech devices */
 {
        USB_DEVICE(0x4752, 0x0011),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .vendor_name = "Miditech",
                .product_name = "Midistart-2",
                .ifnum = 0,
-               .type = QUIRK_MIDI_MIDITECH
+               .type = QUIRK_MIDI_CME
        }
 },
+
+/* Central Music devices */
 {
+       /* this ID used by both Miditech MidiStudio-2 and CME UF-x */
        USB_DEVICE(0x7104, 0x2202),
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
-               .vendor_name = "Miditech",
-               .product_name = "MidiStudio-2",
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .ifnum = 0,
-               .type = QUIRK_MIDI_MIDITECH
+               .type = QUIRK_MIDI_CME
        }
 },
 
@@ -1492,7 +1599,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                       USB_DEVICE_ID_MATCH_INT_SUBCLASS,
        .bInterfaceClass = USB_CLASS_AUDIO,
        .bInterfaceSubClass = USB_SUBCLASS_MIDI_STREAMING,
-       .driver_info = (unsigned long) & (const snd_usb_audio_quirk_t) {
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_MIDI_STANDARD_INTERFACE
        }