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

Commit 1cdfa9f3 authored by Joseph Teichman's avatar Joseph Teichman Committed by Takashi Iwai
Browse files

ALSA: usbaudio - Enable the E-MU 0204 USB 



Signed-off-by: default avatarJoseph Teichman <josteich@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 460c92fa

sound/usb/mixer.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ enum { 
};





/*E-mu 0202(0404) eXtension Unit(XU) control*/

/*E-mu 0202/0404/0204 eXtension Unit(XU) control*/

enum {

	USB_XU_CLOCK_RATE 		= 0xe301,

	USB_XU_CLOCK_SOURCE		= 0xe302,
@@ -1566,7 +1566,7 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, void *raw 
			cval->initialized = 1;

		} else {

			if (type == USB_XU_CLOCK_RATE) {

				/* E-Mu USB 0404/0202/TrackerPre

				/* E-Mu USB 0404/0202/TrackerPre/0204

				 * samplerate control quirk

				 */

				cval->min = 0;

sound/usb/quirks-table.h

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,13 @@ 
	.idProduct = 0x3f0a,

	.bInterfaceClass = USB_CLASS_AUDIO,

},

{

	/* E-Mu 0204 USB */

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor = 0x041e,

	.idProduct = 0x3f19,

	.bInterfaceClass = USB_CLASS_AUDIO,

},



/*

 * Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface

sound/usb/quirks.c

+2 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ int snd_usb_is_big_endian_format(struct snd_usb_audio *chip, struct audioformat 
}



/*

 * For E-Mu 0404USB/0202USB/TrackerPre sample rate should be set for device,

 * For E-Mu 0404USB/0202USB/TrackerPre/0204 sample rate should be set for device,

 * not for interface.

 */
@@ -589,6 +589,7 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, 
	case USB_ID(0x041e, 0x3f02): /* E-Mu 0202 USB */

	case USB_ID(0x041e, 0x3f04): /* E-Mu 0404 USB */

	case USB_ID(0x041e, 0x3f0a): /* E-Mu Tracker Pre */

	case USB_ID(0x041e, 0x3f19): /* E-Mu 0204 USB */

		set_format_emu_quirk(subs, fmt);

		break;

	}