* [PATCH] [ALSA] Enable the E-MU 0204 USB
@ 2011-02-08 6:28 josteich
0 siblings, 0 replies; 2+ messages in thread
From: josteich @ 2011-02-08 6:28 UTC (permalink / raw)
To: patch; +Cc: alsa-devel, Joseph Teichman
From: Joseph Teichman <josteich@gmail.com>
Signed-off-by: Joseph Teichman <josteich@gmail.com>
diff --git a/usb/mixer.c b/usb/mixer.c
index 7df89b3..85af605 100644
--- a/usb/mixer.c
+++ b/usb/mixer.c
@@ -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;
diff --git a/usb/quirks-table.h b/usb/quirks-table.h
index 3599987..921a86f 100644
--- a/usb/quirks-table.h
+++ b/usb/quirks-table.h
@@ -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
diff --git a/usb/quirks.c b/usb/quirks.c
index cf8bf08..e314cdb 100644
--- a/usb/quirks.c
+++ b/usb/quirks.c
@@ -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;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [ALSA] Enable the E-MU 0204 USB
[not found] <4d50e147.4f80dc0a.6911.7cc1@mx.google.com>
@ 2011-02-08 7:37 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2011-02-08 7:37 UTC (permalink / raw)
To: jteich3; +Cc: alsa-devel, Joseph Teichman
At Tue, 8 Feb 2011 01:22:36 -0500,
jteich3@gmail.com wrote:
>
> From: Joseph Teichman <josteich@gmail.com>
>
>
> Signed-off-by: Joseph Teichman <josteich@gmail.com>
Applied now. Thanks!
Takashi
> diff --git a/usb/mixer.c b/usb/mixer.c
> index 7df89b3..85af605 100644
> --- a/usb/mixer.c
> +++ b/usb/mixer.c
> @@ -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;
> diff --git a/usb/quirks-table.h b/usb/quirks-table.h
> index 3599987..921a86f 100644
> --- a/usb/quirks-table.h
> +++ b/usb/quirks-table.h
> @@ -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
> diff --git a/usb/quirks.c b/usb/quirks.c
> index cf8bf08..e314cdb 100644
> --- a/usb/quirks.c
> +++ b/usb/quirks.c
> @@ -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;
> }
> --
> 1.7.0.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-08 7:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-08 6:28 [PATCH] [ALSA] Enable the E-MU 0204 USB josteich
[not found] <4d50e147.4f80dc0a.6911.7cc1@mx.google.com>
2011-02-08 7:37 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).