aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2006-02-07 11:11:06 -0500
committerJaroslav Kysela <perex@suse.cz>2006-03-22 04:28:22 -0500
commitcc7a59bd8dcee9b01e0c9ab21380071f0ae6ef0d (patch)
tree0b0a9b2c18b2a71d7cc9788b78c27e0a849fbd59 /sound/usb
parente957ebf164e880ddb0c057418195db47d013c4ac (diff)
[ALSA] usb-audio: rename QUIRK_MIDI_MIDITECH to QUIRK_MIDI_CME
Modules: USB generic driver Rename QUIRK_MIDI_MIDITECH to QUIRK_MIDI_CME because Miditech keyboards are built by CME and use the same protocol, and don't force a Miditech product name for the USB ID used by both Miditech and CME UF-x keyboards. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usbaudio.c2
-rw-r--r--sound/usb/usbaudio.h4
-rw-r--r--sound/usb/usbmidi.c2
-rw-r--r--sound/usb/usbquirks.h10
4 files changed, 10 insertions, 8 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 51a862637f2..7b1b9f29f37 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -3074,7 +3074,7 @@ static int snd_usb_create_quirk(struct snd_usb_audio *chip,
3074 [QUIRK_MIDI_NOVATION] = snd_usb_create_midi_interface, 3074 [QUIRK_MIDI_NOVATION] = snd_usb_create_midi_interface,
3075 [QUIRK_MIDI_RAW] = snd_usb_create_midi_interface, 3075 [QUIRK_MIDI_RAW] = snd_usb_create_midi_interface,
3076 [QUIRK_MIDI_EMAGIC] = snd_usb_create_midi_interface, 3076 [QUIRK_MIDI_EMAGIC] = snd_usb_create_midi_interface,
3077 [QUIRK_MIDI_MIDITECH] = snd_usb_create_midi_interface, 3077 [QUIRK_MIDI_CME] = snd_usb_create_midi_interface,
3078 [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk, 3078 [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk,
3079 [QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk, 3079 [QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk,
3080 [QUIRK_AUDIO_EDIROL_UA700_UA25] = create_ua700_ua25_quirk, 3080 [QUIRK_AUDIO_EDIROL_UA700_UA25] = create_ua700_ua25_quirk,
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index ecd724bfe5a..88733524d0f 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -161,7 +161,7 @@ enum quirk_type {
161 QUIRK_MIDI_NOVATION, 161 QUIRK_MIDI_NOVATION,
162 QUIRK_MIDI_RAW, 162 QUIRK_MIDI_RAW,
163 QUIRK_MIDI_EMAGIC, 163 QUIRK_MIDI_EMAGIC,
164 QUIRK_MIDI_MIDITECH, 164 QUIRK_MIDI_CME,
165 QUIRK_AUDIO_STANDARD_INTERFACE, 165 QUIRK_AUDIO_STANDARD_INTERFACE,
166 QUIRK_AUDIO_FIXED_ENDPOINT, 166 QUIRK_AUDIO_FIXED_ENDPOINT,
167 QUIRK_AUDIO_EDIROL_UA700_UA25, 167 QUIRK_AUDIO_EDIROL_UA700_UA25,
@@ -209,7 +209,7 @@ struct snd_usb_midi_endpoint_info {
209/* for QUIRK_MIDI_EMAGIC, data points to a snd_usb_midi_endpoint_info 209/* for QUIRK_MIDI_EMAGIC, data points to a snd_usb_midi_endpoint_info
210 * structure (out_cables and in_cables only) */ 210 * structure (out_cables and in_cables only) */
211 211
212/* for QUIRK_MIDI_MIDITECH, data is NULL */ 212/* for QUIRK_MIDI_CME, data is NULL */
213 213
214/* 214/*
215 */ 215 */
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 7f7e371c5df..7580339dba2 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -1576,7 +1576,7 @@ int snd_usb_create_midi_interface(struct snd_usb_audio* chip,
1576 sizeof(struct snd_usb_midi_endpoint_info)); 1576 sizeof(struct snd_usb_midi_endpoint_info));
1577 err = snd_usbmidi_detect_endpoints(umidi, &endpoints[0], 1); 1577 err = snd_usbmidi_detect_endpoints(umidi, &endpoints[0], 1);
1578 break; 1578 break;
1579 case QUIRK_MIDI_MIDITECH: 1579 case QUIRK_MIDI_CME:
1580 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints); 1580 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
1581 break; 1581 break;
1582 default: 1582 default:
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index bb7829cf98d..0485e21861a 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -1537,22 +1537,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
1537 } 1537 }
1538}, 1538},
1539 1539
1540/* Miditech devices */
1540{ 1541{
1541 USB_DEVICE(0x4752, 0x0011), 1542 USB_DEVICE(0x4752, 0x0011),
1542 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { 1543 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
1543 .vendor_name = "Miditech", 1544 .vendor_name = "Miditech",
1544 .product_name = "Midistart-2", 1545 .product_name = "Midistart-2",
1545 .ifnum = 0, 1546 .ifnum = 0,
1546 .type = QUIRK_MIDI_MIDITECH 1547 .type = QUIRK_MIDI_CME
1547 } 1548 }
1548}, 1549},
1550
1551/* Central Music devices */
1549{ 1552{
1553 /* this ID used by both Miditech MidiStudio-2 and CME UF-x */
1550 USB_DEVICE(0x7104, 0x2202), 1554 USB_DEVICE(0x7104, 0x2202),
1551 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { 1555 .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
1552 .vendor_name = "Miditech",
1553 .product_name = "MidiStudio-2",
1554 .ifnum = 0, 1556 .ifnum = 0,
1555 .type = QUIRK_MIDI_MIDITECH 1557 .type = QUIRK_MIDI_CME
1556 } 1558 }
1557}, 1559},
1558 1560