Commit 030a07e4 authored by Karsten Wiese's avatar Karsten Wiese Committed by Jaroslav Kysela
Browse files

ALSA: Add USB US122L driver 



Added a new US122L usb-audio driver.  This driver works together with a
dedicated alsa-lib plugin.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 896e6cc2

include/sound/asound.h

+2 −1
Original line number Diff line number Diff line
@@ -93,9 +93,10 @@ enum { 
	SNDRV_HWDEP_IFACE_PCXHR,	/* Digigram PCXHR */

	SNDRV_HWDEP_IFACE_SB_RC,	/* SB Extigy/Audigy2NX remote control */

	SNDRV_HWDEP_IFACE_HDA,		/* HD-audio */

	SNDRV_HWDEP_IFACE_USB_STREAM,	/* direct access to usb stream */



	/* Don't forget to change the following: */

	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_HDA

	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USB_STREAM

};



struct snd_hwdep_info {

sound/usb/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -67,5 +67,16 @@ config SND_USB_CAIAQ_INPUT 
	   * Native Instruments Kore Controller 2

	   * Native Instruments Audio Kontrol 1



config SND_USB_US122L

	tristate "Tascam US-122L USB driver"

	depends on X86 && EXPERIMENTAL

	select SND_RAWMIDI

	help

	  Say Y here to include support for Tascam US-122L USB Audio/MIDI

	  interfaces.



	  To compile this driver as a module, choose M here: the module

	  will be called snd-usb-us122l.



endif	# SND_USB

sound/usb/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,5 +8,6 @@ snd-usb-lib-objs := usbmidi.o 
# Toplevel Module Dependency

obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usb-lib.o

obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-lib.o

obj-$(CONFIG_SND_USB_US122L) += snd-usb-lib.o



obj-$(CONFIG_SND) += usx2y/ caiaq/

sound/usb/usbaudio.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ enum quirk_type { 
	QUIRK_MIDI_RAW,

	QUIRK_MIDI_EMAGIC,

	QUIRK_MIDI_CME,

	QUIRK_MIDI_US122L,

	QUIRK_AUDIO_STANDARD_INTERFACE,

	QUIRK_AUDIO_FIXED_ENDPOINT,

	QUIRK_AUDIO_EDIROL_UA700_UA25,

sound/usb/usbmidi.c

+39 −0
Original line number Diff line number Diff line
@@ -669,6 +669,42 @@ static struct usb_protocol_ops snd_usbmidi_raw_ops = { 
	.output = snd_usbmidi_raw_output,

};



static void snd_usbmidi_us122l_input(struct snd_usb_midi_in_endpoint *ep,

				     uint8_t *buffer, int buffer_length)

{

	if (buffer_length != 9)

		return;

	buffer_length = 8;

	while (buffer_length && buffer[buffer_length - 1] == 0xFD)

		buffer_length--;

	if (buffer_length)

		snd_usbmidi_input_data(ep, 0, buffer, buffer_length);

}



static void snd_usbmidi_us122l_output(struct snd_usb_midi_out_endpoint *ep)

{

	int count;



	if (!ep->ports[0].active)

		return;

	count = ep->urb->dev->speed == USB_SPEED_HIGH ? 1 : 2;

	count = snd_rawmidi_transmit(ep->ports[0].substream,

				     ep->urb->transfer_buffer,

				     count);

	if (count < 1) {

		ep->ports[0].active = 0;

		return;

	}



	memset(ep->urb->transfer_buffer + count, 0xFD, 9 - count);

	ep->urb->transfer_buffer_length = count;

}



static struct usb_protocol_ops snd_usbmidi_122l_ops = {

	.input = snd_usbmidi_us122l_input,

	.output = snd_usbmidi_us122l_output,

};



/*

 * Emagic USB MIDI protocol: raw MIDI with "F5 xx" port switching.

 */
@@ -1714,6 +1750,9 @@ int snd_usb_create_midi_interface(struct snd_usb_audio* chip, 
			umidi->usb_protocol_ops =

				&snd_usbmidi_maudio_broken_running_status_ops;

		break;

	case QUIRK_MIDI_US122L:

		umidi->usb_protocol_ops = &snd_usbmidi_122l_ops;

		/* fall through */

	case QUIRK_MIDI_FIXED_ENDPOINT:

		memcpy(&endpoints[0], quirk->data,

		       sizeof(struct snd_usb_midi_endpoint_info));