aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-07-04 03:20:42 -0400
committerJaroslav Kysela <perex@suse.cz>2005-07-28 06:21:41 -0400
commit6155aff84b98b2aa35eaa4384b539dfbab86afcc (patch)
tree6a4ea213fd8ecce8784a3ce6c2f6aae9c01d5e86
parentb1c6ef52e2623c81c2124801c783a903f6e5437a (diff)
[ALSA] usb-audio - rename QUIRK_MIDI_MOTU to QUIRK_MIDI_RAW
USB generic driver Rename the protocol used by the MOTU FastLane to 'raw' because it might be useful with other devices, and there are other MOTU interfaces that do not use this protocol. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
-rw-r--r--sound/usb/usbaudio.c2
-rw-r--r--sound/usb/usbaudio.h4
-rw-r--r--sound/usb/usbmidi.c18
-rw-r--r--sound/usb/usbquirks.h2
4 files changed, 13 insertions, 13 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index aee3c0f28eb6..3eaa08e3e6a6 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -2970,7 +2970,7 @@ static int snd_usb_create_quirk(snd_usb_audio_t *chip,
2970 case QUIRK_MIDI_YAMAHA: 2970 case QUIRK_MIDI_YAMAHA:
2971 case QUIRK_MIDI_MIDIMAN: 2971 case QUIRK_MIDI_MIDIMAN:
2972 case QUIRK_MIDI_NOVATION: 2972 case QUIRK_MIDI_NOVATION:
2973 case QUIRK_MIDI_MOTU: 2973 case QUIRK_MIDI_RAW:
2974 case QUIRK_MIDI_EMAGIC: 2974 case QUIRK_MIDI_EMAGIC:
2975 return snd_usb_create_midi_interface(chip, iface, quirk); 2975 return snd_usb_create_midi_interface(chip, iface, quirk);
2976 case QUIRK_COMPOSITE: 2976 case QUIRK_COMPOSITE:
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index aedb42aaa749..a87912205477 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -165,7 +165,7 @@ struct snd_usb_audio {
165#define QUIRK_AUDIO_EDIROL_UA1000 8 165#define QUIRK_AUDIO_EDIROL_UA1000 8
166#define QUIRK_IGNORE_INTERFACE 9 166#define QUIRK_IGNORE_INTERFACE 9
167#define QUIRK_MIDI_NOVATION 10 167#define QUIRK_MIDI_NOVATION 10
168#define QUIRK_MIDI_MOTU 11 168#define QUIRK_MIDI_RAW 11
169#define QUIRK_MIDI_EMAGIC 12 169#define QUIRK_MIDI_EMAGIC 12
170 170
171typedef struct snd_usb_audio_quirk snd_usb_audio_quirk_t; 171typedef struct snd_usb_audio_quirk snd_usb_audio_quirk_t;
@@ -205,7 +205,7 @@ struct snd_usb_midi_endpoint_info {
205 205
206/* for QUIRK_IGNORE_INTERFACE, data is NULL */ 206/* for QUIRK_IGNORE_INTERFACE, data is NULL */
207 207
208/* for QUIRK_MIDI_NOVATION and _MOTU, data is NULL */ 208/* for QUIRK_MIDI_NOVATION and _RAW, data is NULL */
209 209
210/* for QUIRK_MIDI_EMAGIC, data points to a snd_usb_midi_endpoint_info 210/* for QUIRK_MIDI_EMAGIC, data points to a snd_usb_midi_endpoint_info
211 * structure (out_cables and in_cables only) */ 211 * structure (out_cables and in_cables only) */
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index bee70068dce0..5c754879c2b6 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -524,16 +524,16 @@ static struct usb_protocol_ops snd_usbmidi_novation_ops = {
524}; 524};
525 525
526/* 526/*
527 * Mark of the Unicorn USB MIDI protocol: raw MIDI. 527 * "raw" protocol: used by the MOTU FastLane.
528 */ 528 */
529 529
530static void snd_usbmidi_motu_input(snd_usb_midi_in_endpoint_t* ep, 530static void snd_usbmidi_raw_input(snd_usb_midi_in_endpoint_t* ep,
531 uint8_t* buffer, int buffer_length) 531 uint8_t* buffer, int buffer_length)
532{ 532{
533 snd_usbmidi_input_data(ep, 0, buffer, buffer_length); 533 snd_usbmidi_input_data(ep, 0, buffer, buffer_length);
534} 534}
535 535
536static void snd_usbmidi_motu_output(snd_usb_midi_out_endpoint_t* ep) 536static void snd_usbmidi_raw_output(snd_usb_midi_out_endpoint_t* ep)
537{ 537{
538 int count; 538 int count;
539 539
@@ -549,9 +549,9 @@ static void snd_usbmidi_motu_output(snd_usb_midi_out_endpoint_t* ep)
549 ep->urb->transfer_buffer_length = count; 549 ep->urb->transfer_buffer_length = count;
550} 550}
551 551
552static struct usb_protocol_ops snd_usbmidi_motu_ops = { 552static struct usb_protocol_ops snd_usbmidi_raw_ops = {
553 .input = snd_usbmidi_motu_input, 553 .input = snd_usbmidi_raw_input,
554 .output = snd_usbmidi_motu_output, 554 .output = snd_usbmidi_raw_output,
555}; 555};
556 556
557/* 557/*
@@ -1505,8 +1505,8 @@ int snd_usb_create_midi_interface(snd_usb_audio_t* chip,
1505 umidi->usb_protocol_ops = &snd_usbmidi_novation_ops; 1505 umidi->usb_protocol_ops = &snd_usbmidi_novation_ops;
1506 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints); 1506 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
1507 break; 1507 break;
1508 case QUIRK_MIDI_MOTU: 1508 case QUIRK_MIDI_RAW:
1509 umidi->usb_protocol_ops = &snd_usbmidi_motu_ops; 1509 umidi->usb_protocol_ops = &snd_usbmidi_raw_ops;
1510 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints); 1510 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
1511 break; 1511 break;
1512 case QUIRK_MIDI_EMAGIC: 1512 case QUIRK_MIDI_EMAGIC:
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index cc2e3c9933ee..ed1eba1ef5c6 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -1269,7 +1269,7 @@ YAMAHA_DEVICE(0x7010, "UB99"),
1269 .data = & (const snd_usb_audio_quirk_t[]) { 1269 .data = & (const snd_usb_audio_quirk_t[]) {
1270 { 1270 {
1271 .ifnum = 0, 1271 .ifnum = 0,
1272 .type = QUIRK_MIDI_MOTU 1272 .type = QUIRK_MIDI_RAW
1273 }, 1273 },
1274 { 1274 {
1275 .ifnum = 1, 1275 .ifnum = 1,