Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6155aff8 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[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: default avatarClemens Ladisch <clemens@ladisch.de>
parent b1c6ef52

sound/usb/usbaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -2970,7 +2970,7 @@ static int snd_usb_create_quirk(snd_usb_audio_t *chip, 
	case QUIRK_MIDI_YAMAHA:

	case QUIRK_MIDI_MIDIMAN:

	case QUIRK_MIDI_NOVATION:

	case QUIRK_MIDI_MOTU:

	case QUIRK_MIDI_RAW:

	case QUIRK_MIDI_EMAGIC:

		return snd_usb_create_midi_interface(chip, iface, quirk);

	case QUIRK_COMPOSITE:

sound/usb/usbaudio.h

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ struct snd_usb_audio { 
#define QUIRK_AUDIO_EDIROL_UA1000	8

#define QUIRK_IGNORE_INTERFACE		9

#define QUIRK_MIDI_NOVATION		10

#define QUIRK_MIDI_MOTU			11

#define QUIRK_MIDI_RAW			11

#define QUIRK_MIDI_EMAGIC		12



typedef struct snd_usb_audio_quirk snd_usb_audio_quirk_t;
@@ -205,7 +205,7 @@ struct snd_usb_midi_endpoint_info { 


/* for QUIRK_IGNORE_INTERFACE, data is NULL */



/* for QUIRK_MIDI_NOVATION and _MOTU, data is NULL */

/* for QUIRK_MIDI_NOVATION and _RAW, data is NULL */



/* for QUIRK_MIDI_EMAGIC, data points to a snd_usb_midi_endpoint_info

 * structure (out_cables and in_cables only) */

sound/usb/usbmidi.c

+9 −9
Original line number Diff line number Diff line
@@ -524,16 +524,16 @@ static struct usb_protocol_ops snd_usbmidi_novation_ops = { 
};



/*

 * Mark of the Unicorn USB MIDI protocol: raw MIDI.

 * "raw" protocol: used by the MOTU FastLane.

 */



static void snd_usbmidi_motu_input(snd_usb_midi_in_endpoint_t* ep,

static void snd_usbmidi_raw_input(snd_usb_midi_in_endpoint_t* ep,

				  uint8_t* buffer, int buffer_length)

{

	snd_usbmidi_input_data(ep, 0, buffer, buffer_length);

}



static void snd_usbmidi_motu_output(snd_usb_midi_out_endpoint_t* ep)

static void snd_usbmidi_raw_output(snd_usb_midi_out_endpoint_t* ep)

{

	int count;
@@ -549,9 +549,9 @@ static void snd_usbmidi_motu_output(snd_usb_midi_out_endpoint_t* ep) 
	ep->urb->transfer_buffer_length = count;

}



static struct usb_protocol_ops snd_usbmidi_motu_ops = {

	.input = snd_usbmidi_motu_input,

	.output = snd_usbmidi_motu_output,

static struct usb_protocol_ops snd_usbmidi_raw_ops = {

	.input = snd_usbmidi_raw_input,

	.output = snd_usbmidi_raw_output,

};



/*
@@ -1505,8 +1505,8 @@ int snd_usb_create_midi_interface(snd_usb_audio_t* chip, 
			umidi->usb_protocol_ops = &snd_usbmidi_novation_ops;

			err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);

			break;

		case QUIRK_MIDI_MOTU:

			umidi->usb_protocol_ops = &snd_usbmidi_motu_ops;

		case QUIRK_MIDI_RAW:

			umidi->usb_protocol_ops = &snd_usbmidi_raw_ops;

			err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);

			break;

		case QUIRK_MIDI_EMAGIC:

sound/usb/usbquirks.h

+1 −1
Original line number Diff line number Diff line
@@ -1269,7 +1269,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), 
		.data = & (const snd_usb_audio_quirk_t[]) {

			{

				.ifnum = 0,

				.type = QUIRK_MIDI_MOTU

				.type = QUIRK_MIDI_RAW

			},

			{

				.ifnum = 1,