diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2006-02-07 17:11:06 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 10:28:22 +0100 |
| commit | cc7a59bd8dcee9b01e0c9ab21380071f0ae6ef0d (patch) | |
| tree | 0b0a9b2c18b2a71d7cc9788b78c27e0a849fbd59 | |
| parent | e957ebf164e880ddb0c057418195db47d013c4ac (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>
| -rw-r--r-- | sound/usb/usbaudio.c | 2 | ||||
| -rw-r--r-- | sound/usb/usbaudio.h | 4 | ||||
| -rw-r--r-- | sound/usb/usbmidi.c | 2 | ||||
| -rw-r--r-- | sound/usb/usbquirks.h | 10 |
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, [QUIRK_MIDI_NOVATION] = snd_usb_create_midi_interface, [QUIRK_MIDI_RAW] = snd_usb_create_midi_interface, [QUIRK_MIDI_EMAGIC] = snd_usb_create_midi_interface, - [QUIRK_MIDI_MIDITECH] = snd_usb_create_midi_interface, + [QUIRK_MIDI_CME] = snd_usb_create_midi_interface, [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk, [QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk, [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 { QUIRK_MIDI_NOVATION, QUIRK_MIDI_RAW, QUIRK_MIDI_EMAGIC, - QUIRK_MIDI_MIDITECH, + QUIRK_MIDI_CME, QUIRK_AUDIO_STANDARD_INTERFACE, QUIRK_AUDIO_FIXED_ENDPOINT, QUIRK_AUDIO_EDIROL_UA700_UA25, @@ -209,7 +209,7 @@ struct snd_usb_midi_endpoint_info { /* for QUIRK_MIDI_EMAGIC, data points to a snd_usb_midi_endpoint_info * structure (out_cables and in_cables only) */ -/* for QUIRK_MIDI_MIDITECH, data is NULL */ +/* for QUIRK_MIDI_CME, data is NULL */ /* */ 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, sizeof(struct snd_usb_midi_endpoint_info)); err = snd_usbmidi_detect_endpoints(umidi, &endpoints[0], 1); break; - case QUIRK_MIDI_MIDITECH: + case QUIRK_MIDI_CME: err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints); break; 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"), } }, +/* Miditech devices */ { USB_DEVICE(0x4752, 0x0011), .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 struct snd_usb_audio_quirk) { - .vendor_name = "Miditech", - .product_name = "MidiStudio-2", .ifnum = 0, - .type = QUIRK_MIDI_MIDITECH + .type = QUIRK_MIDI_CME } }, |