Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ALSA] usb-audio: cosmetic changes

Browse source 
Modules: USB generic driver

Move some entries around to keep them sorted by ID.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2006-01-10 18:56:23 +01:00 committed by Jaroslav Kysela
parent e03173fce2
commit 7c79b7682e
2 changed files with 23 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/usb/usbmidi.c
View file

@ -1082,6 +1082,8 @@ static struct {
{ USB_ID(0x0582, 0x004d), 0, "%s MIDI" }, { USB_ID(0x0582, 0x004d), 0, "%s MIDI" },
{ USB_ID(0x0582, 0x004d), 1, "%s 1" }, { USB_ID(0x0582, 0x004d), 1, "%s 1" },
{ USB_ID(0x0582, 0x004d), 2, "%s 2" }, { USB_ID(0x0582, 0x004d), 2, "%s 2" },
/* Edirol UM-3EX */
{ USB_ID(0x0582, 0x009a), 3, "%s Control" },
/* M-Audio MidiSport 8x8 */ /* M-Audio MidiSport 8x8 */
{ USB_ID(0x0763, 0x1031), 8, "%s Control" }, { USB_ID(0x0763, 0x1031), 8, "%s Control" },
{ USB_ID(0x0763, 0x1033), 8, "%s Control" }, { USB_ID(0x0763, 0x1033), 8, "%s Control" },
@ -1092,8 +1094,6 @@ static struct {
{ USB_ID(0x086a, 0x0001), 8, "%s Broadcast" }, { USB_ID(0x086a, 0x0001), 8, "%s Broadcast" },
{ USB_ID(0x086a, 0x0002), 8, "%s Broadcast" }, { USB_ID(0x086a, 0x0002), 8, "%s Broadcast" },
{ USB_ID(0x086a, 0x0003), 4, "%s Broadcast" }, { USB_ID(0x086a, 0x0003), 4, "%s Broadcast" },
/* Edirol UM-3ex */
{ USB_ID(0x0582, 0x009a), 3, "%s Control" },
}; };
static void snd_usbmidi_init_substream(struct snd_usb_midi* umidi, static void snd_usbmidi_init_substream(struct snd_usb_midi* umidi,

52
sound/usb/usbquirks.h
View file

@ -203,28 +203,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
} }
} }
}, },
{
USB_DEVICE(0x0582, 0x009a),
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
.vendor_name = "EDIROL",
.product_name = "UM-3ex",
.ifnum = QUIRK_ANY_INTERFACE,
.type = QUIRK_COMPOSITE,
.data = (const struct snd_usb_audio_quirk[]) {
{
.ifnum = 0,
.type = QUIRK_MIDI_FIXED_ENDPOINT,
.data = & (const struct snd_usb_midi_endpoint_info) {
.out_cables = 0x000f,
.in_cables = 0x000f
}
},
{
.ifnum = -1
}
}
}
},
{ {
USB_DEVICE(0x0582, 0x0002), USB_DEVICE(0x0582, 0x0002),
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
@ -1112,6 +1090,27 @@ YAMAHA_DEVICE(0x7010, "UB99"),
} }
} }
}, },
/* 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 */
{
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 */ /* Guillemot devices */
{ {
@ -1133,15 +1132,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
} }
} }
}, },
/* 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 */ /* Midiman/M-Audio devices */
{ {