lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: usbaudio - Enable the E-MU 0204 USB

Browse Source 
Signed-off-by: Joseph Teichman <josteich@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Joseph Teichman
2011-02-08 01:22:36 -05:00
committed by Takashi Iwai
parent 460c92fa38
commit 1cdfa9f34a
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/usb/mixer.c
View File

@@ -95,7 +95,7 @@ enum {
}; };
/*E-mu 0202(0404) eXtension Unit(XU) control*/ /*E-mu 0202/0404/0204 eXtension Unit(XU) control*/
enum { enum {
USB_XU_CLOCK_RATE = 0xe301, USB_XU_CLOCK_RATE = 0xe301,
USB_XU_CLOCK_SOURCE = 0xe302, 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; cval->initialized = 1;
} else { } else {
if (type == USB_XU_CLOCK_RATE) { if (type == USB_XU_CLOCK_RATE) {
/* E-Mu USB 0404/0202/TrackerPre /* E-Mu USB 0404/0202/TrackerPre/0204
* samplerate control quirk * samplerate control quirk
*/ */
cval->min = 0; cval->min = 0;

7
sound/usb/quirks-table.h
View File

@@ -79,6 +79,13 @@
.idProduct = 0x3f0a, .idProduct = 0x3f0a,
.bInterfaceClass = USB_CLASS_AUDIO, .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 * Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface

3
sound/usb/quirks.c
View File

@@ -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. * 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, 0x3f02): /* E-Mu 0202 USB */
case USB_ID(0x041e, 0x3f04): /* E-Mu 0404 USB */ case USB_ID(0x041e, 0x3f04): /* E-Mu 0404 USB */
case USB_ID(0x041e, 0x3f0a): /* E-Mu Tracker Pre */ case USB_ID(0x041e, 0x3f0a): /* E-Mu Tracker Pre */
case USB_ID(0x041e, 0x3f19): /* E-Mu 0204 USB */
set_format_emu_quirk(subs, fmt); set_format_emu_quirk(subs, fmt);
break; break;
} }