aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/usb/usbmidi.c4
-rw-r--r--sound/usb/usbquirks.h52
2 files changed, 23 insertions, 33 deletions
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 905e33e60681..7f7e371c5df1 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -1082,6 +1082,8 @@ static struct {
1082 { USB_ID(0x0582, 0x004d), 0, "%s MIDI" }, 1082 { USB_ID(0x0582, 0x004d), 0, "%s MIDI" },
1083 { USB_ID(0x0582, 0x004d), 1, "%s 1" }, 1083 { USB_ID(0x0582, 0x004d), 1, "%s 1" },
1084 { USB_ID(0x0582, 0x004d), 2, "%s 2" }, 1084 { USB_ID(0x0582, 0x004d), 2, "%s 2" },
1085 /* Edirol UM-3EX */
1086 { USB_ID(0x0582, 0x009a), 3, "%s Control" },
1085 /* M-Audio MidiSport 8x8 */ 1087 /* M-Audio MidiSport 8x8 */
1086 { USB_ID(0x0763, 0x1031), 8, "%s Control" }, 1088 { USB_ID(0x0763, 0x1031), 8, "%s Control" },
1087 { USB_ID(0x0763, 0x1033), 8, "%s Control" }, 1089 { USB_ID(0x0763, 0x1033), 8, "%s Control" },
@@ -1092,8 +1094,6 @@ static struct {
1092 { USB_ID(0x086a, 0x0001), 8, "%s Broadcast" }, 1094 { USB_ID(0x086a, 0x0001), 8, "%s Broadcast" },
1093 { USB_ID(0x086a, 0x0002), 8, "%s Broadcast" }, 1095 { USB_ID(0x086a, 0x0002), 8, "%s Broadcast" },
1094 { USB_ID(0x086a, 0x0003), 4, "%s Broadcast" }, 1096 { USB_ID(0x086a, 0x0003), 4, "%s Broadcast" },
1095 /* Edirol UM-3ex */
1096 { USB_ID(0x0582, 0x009a), 3, "%s Control" },
1097}; 1097};
1098 1098
1099static void snd_usbmidi_init_substream(struct snd_usb_midi* umidi, 1099static void snd_usbmidi_init_substream(struct snd_usb_midi* umidi,
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 8f348611bb00..381d9a8ccee1 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -204,28 +204,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
204 } 204 }
205}, 205},
206{ 206{
207 USB_DEVICE(0x0582, 0x009a),
208 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
209 .vendor_name = "EDIROL",
210 .product_name = "UM-3ex",
211 .ifnum = QUIRK_ANY_INTERFACE,
212 .type = QUIRK_COMPOSITE,
213 .data = (const struct snd_usb_audio_quirk[]) {
214 {
215 .ifnum = 0,
216 .type = QUIRK_MIDI_FIXED_ENDPOINT,
217 .data = & (const struct snd_usb_midi_endpoint_info) {
218 .out_cables = 0x000f,
219 .in_cables = 0x000f
220 }
221 },
222 {
223 .ifnum = -1
224 }
225 }
226 }
227},
228{
229 USB_DEVICE(0x0582, 0x0002), 207 USB_DEVICE(0x0582, 0x0002),
230 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { 208 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
231 .vendor_name = "EDIROL", 209 .vendor_name = "EDIROL",
@@ -1112,6 +1090,27 @@ YAMAHA_DEVICE(0x7010, "UB99"),
1112 } 1090 }
1113 } 1091 }
1114}, 1092},
1093 /* TODO: add Edirol UA-101 support */
1094 /* TODO: add Roland G-70 support */
1095 /* TODO: add Roland V-SYNTH XT support */
1096 /* TODO: add BOSS GT-PRO support */
1097 /* TODO: add Edirol PC-50 support */
1098 /* TODO: add Edirol PC-80 support */
1099 /* TODO: add Edirol UA-1EX support */
1100{
1101 USB_DEVICE(0x0582, 0x009a),
1102 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
1103 .vendor_name = "EDIROL",
1104 .product_name = "UM-3EX",
1105 .ifnum = 0,
1106 .type = QUIRK_MIDI_FIXED_ENDPOINT,
1107 .data = & (const struct snd_usb_midi_endpoint_info) {
1108 .out_cables = 0x000f,
1109 .in_cables = 0x000f
1110 }
1111 }
1112},
1113 /* TODO: add Edirol MD-P1 support */
1115 1114
1116/* Guillemot devices */ 1115/* Guillemot devices */
1117{ 1116{
@@ -1133,15 +1132,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
1133 } 1132 }
1134 } 1133 }
1135}, 1134},
1136 /* TODO: add Edirol UA-101 support */
1137 /* TODO: add Roland G-70 support */
1138 /* TODO: add Roland V-SYNTH XT support */
1139 /* TODO: add BOSS GT-PRO support */
1140 /* TODO: add Edirol PC-50 support */
1141 /* TODO: add Edirol PC-80 support */
1142 /* TODO: add Edirol UA-1EX support */
1143 /* TODO: add Edirol UM-3 support */
1144 /* TODO: add Edirol MD-P1 support */
1145 1135
1146/* Midiman/M-Audio devices */ 1136/* Midiman/M-Audio devices */
1147{ 1137{