* [PATCH] ALSA: usb-audio: Add support for Focusrite Saffire 6 USB
@ 2013-12-19 12:14 Eduard Gilmutdinov
2013-12-19 12:24 ` Daniel Mack
0 siblings, 1 reply; 6+ messages in thread
From: Eduard Gilmutdinov @ 2013-12-19 12:14 UTC (permalink / raw)
To: daniel; +Cc: alsa-devel
This patch add support for playback through external audio card
Focusrite Saffire 6 USB. Capture and MIDI is not tested.
Signed-off-by: Eduard Gilmutdinov <edgilmutdinov@gmail.com>
---
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index f5f0595..158beb4 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2569,6 +2569,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.type = QUIRK_MIDI_NOVATION
}
},
+{
+ USB_DEVICE(0x1235, 0x0010),
+ .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+ .vendor_name = "Focusrite",
+ .product_name = "Saffire 6 USB",
+ .ifnum = QUIRK_ANY_INTERFACE,
+ .type = QUIRK_COMPOSITE,
+ .data = (const struct snd_usb_audio_quirk[]) {
+ {
+ .ifnum = 0,
+ .type = QUIRK_AUDIO_FIXED_ENDPOINT,
+ .data = &(const struct audioformat) {
+ .formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ .channels = 4,
+ .iface = 0,
+ .altsetting = 1,
+ .altset_idx = 1,
+ .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
+ .endpoint = 0x01,
+ .ep_attr = USB_ENDPOINT_XFER_ISOC,
+ .rates = SNDRV_PCM_RATE_44100 |
+ SNDRV_PCM_RATE_48000,
+ .rate_min = 44100,
+ .rate_max = 48000,
+ .nr_rates = 2,
+ .rate_table = (unsigned int[]) {
+ 44100, 48000
+ }
+ }
+ },
+ {
+ .ifnum = 1,
+ .type = QUIRK_MIDI_RAW_BYTES
+ },
+ {
+ .ifnum = -1
+ }
+ }
+ }
+},
/* Access Music devices */
{
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 0df9ede..3ea9627 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -660,10 +660,11 @@ static int snd_usb_cm6206_boot_quirk(struct
usb_device *dev)
return err;
}
-/*
+/*
* Novation Twitch DJ controller
+ * Focusrite(Novation) Saffire 6 USB audio card
*/
-static int snd_usb_twitch_boot_quirk(struct usb_device *dev)
+static int snd_usb_novation_boot_quirk(struct usb_device *dev)
{
/* preemptively set up the device because otherwise the
* raw MIDI endpoints are not active */
@@ -972,9 +973,9 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
/* Digidesign Mbox 2 */
return snd_usb_mbox2_boot_quirk(dev);
- case USB_ID(0x1235, 0x0018):
- /* Focusrite Novation Twitch */
- return snd_usb_twitch_boot_quirk(dev);
+ case USB_ID(0x1235, 0x0010): /* Focusrite Novation Saffire 6 USB */
+ case USB_ID(0x1235, 0x0018): /* Focusrite Novation Twitch */
+ return snd_usb_novation_boot_quirk(dev);
case USB_ID(0x133e, 0x0815):
/* Access Music VirusTI Desktop */
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ALSA: usb-audio: Add support for Focusrite Saffire 6 USB
2013-12-19 12:14 Eduard Gilmutdinov
@ 2013-12-19 12:24 ` Daniel Mack
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Mack @ 2013-12-19 12:24 UTC (permalink / raw)
To: Eduard Gilmutdinov; +Cc: alsa-devel
On 12/19/2013 01:14 PM, Eduard Gilmutdinov wrote:
> This patch add support for playback through external audio card
> Focusrite Saffire 6 USB. Capture and MIDI is not tested.
Hmm, scripts/checkpatch.pl still shows lots of messages like this:
WARNING: please, no spaces at the start of a line
#12: FILE: sound/usb/quirks-table.h:2574:
+ .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {$
Can you fix them up and resend?
Also, your patch doesn't apply to the latest developer git. Can you
rebase your patch on top of this tree?
https://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/
Thanks,
Daniel
>
> Signed-off-by: Eduard Gilmutdinov <edgilmutdinov@gmail.com>
> ---
> diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
> index f5f0595..158beb4 100644
> --- a/sound/usb/quirks-table.h
> +++ b/sound/usb/quirks-table.h
> @@ -2569,6 +2569,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
> .type = QUIRK_MIDI_NOVATION
> }
> },
> +{
> + USB_DEVICE(0x1235, 0x0010),
> + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> + .vendor_name = "Focusrite",
> + .product_name = "Saffire 6 USB",
> + .ifnum = QUIRK_ANY_INTERFACE,
> + .type = QUIRK_COMPOSITE,
> + .data = (const struct snd_usb_audio_quirk[]) {
> + {
> + .ifnum = 0,
> + .type = QUIRK_AUDIO_FIXED_ENDPOINT,
> + .data = &(const struct audioformat) {
> + .formats = SNDRV_PCM_FMTBIT_S24_3LE,
> + .channels = 4,
> + .iface = 0,
> + .altsetting = 1,
> + .altset_idx = 1,
> + .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
> + .endpoint = 0x01,
> + .ep_attr = USB_ENDPOINT_XFER_ISOC,
> + .rates = SNDRV_PCM_RATE_44100 |
> + SNDRV_PCM_RATE_48000,
> + .rate_min = 44100,
> + .rate_max = 48000,
> + .nr_rates = 2,
> + .rate_table = (unsigned int[]) {
> + 44100, 48000
> + }
> + }
> + },
> + {
> + .ifnum = 1,
> + .type = QUIRK_MIDI_RAW_BYTES
> + },
> + {
> + .ifnum = -1
> + }
> + }
> + }
> +},
>
> /* Access Music devices */
> {
> diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
> index 0df9ede..3ea9627 100644
> --- a/sound/usb/quirks.c
> +++ b/sound/usb/quirks.c
> @@ -660,10 +660,11 @@ static int snd_usb_cm6206_boot_quirk(struct
> usb_device *dev)
> return err;
> }
>
> -/*
> +/*
> * Novation Twitch DJ controller
> + * Focusrite(Novation) Saffire 6 USB audio card
> */
> -static int snd_usb_twitch_boot_quirk(struct usb_device *dev)
> +static int snd_usb_novation_boot_quirk(struct usb_device *dev)
> {
> /* preemptively set up the device because otherwise the
> * raw MIDI endpoints are not active */
> @@ -972,9 +973,9 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
> /* Digidesign Mbox 2 */
> return snd_usb_mbox2_boot_quirk(dev);
>
> - case USB_ID(0x1235, 0x0018):
> - /* Focusrite Novation Twitch */
> - return snd_usb_twitch_boot_quirk(dev);
> + case USB_ID(0x1235, 0x0010): /* Focusrite Novation Saffire 6 USB */
> + case USB_ID(0x1235, 0x0018): /* Focusrite Novation Twitch */
> + return snd_usb_novation_boot_quirk(dev);
>
> case USB_ID(0x133e, 0x0815):
> /* Access Music VirusTI Desktop */
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ALSA: usb-audio: Add support for Focusrite Saffire 6 USB
@ 2013-12-20 8:06 Eduard Gilmutdinov
2013-12-20 9:58 ` Daniel Mack
0 siblings, 1 reply; 6+ messages in thread
From: Eduard Gilmutdinov @ 2013-12-20 8:06 UTC (permalink / raw)
To: daniel; +Cc: alsa-devel
Signed-off-by: Eduard Gilmutdinov <edgilmutdinov@gmail.com>
---
sound/usb/quirks-table.h | 40 ++++++++++++++++++++++++++++++++++++++++
sound/usb/quirks.c | 9 +++++----
2 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index f5f0595..3454780 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2569,6 +2569,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.type = QUIRK_MIDI_NOVATION
}
},
+{
+ USB_DEVICE(0x1235, 0x0010),
+ .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+ .vendor_name = "Focusrite",
+ .product_name = "Saffire 6 USB",
+ .ifnum = QUIRK_ANY_INTERFACE,
+ .type = QUIRK_COMPOSITE,
+ .data = (const struct snd_usb_audio_quirk[]) {
+ {
+ .ifnum = 0,
+ .type = QUIRK_AUDIO_FIXED_ENDPOINT,
+ .data = &(const struct audioformat) {
+ .formats = SNDRV_PCM_FMTBIT_S24_3LE,
+ .channels = 4,
+ .iface = 0,
+ .altsetting = 1,
+ .altset_idx = 1,
+ .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
+ .endpoint = 0x01,
+ .ep_attr = USB_ENDPOINT_XFER_ISOC,
+ .rates = SNDRV_PCM_RATE_44100 |
+ SNDRV_PCM_RATE_48000,
+ .rate_min = 44100,
+ .rate_max = 48000,
+ .nr_rates = 2,
+ .rate_table = (unsigned int[]) {
+ 44100, 48000
+ }
+ }
+ },
+ {
+ .ifnum = 1,
+ .type = QUIRK_MIDI_RAW_BYTES
+ },
+ {
+ .ifnum = -1
+ }
+ }
+ }
+},
/* Access Music devices */
{
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 0df9ede..e9a59e9 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -662,8 +662,9 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
/*
* Novation Twitch DJ controller
+ * Focusrite Novation Saffire 6 USB audio card
*/
-static int snd_usb_twitch_boot_quirk(struct usb_device *dev)
+static int snd_usb_novation_boot_quirk(struct usb_device *dev)
{
/* preemptively set up the device because otherwise the
* raw MIDI endpoints are not active */
@@ -972,9 +973,9 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
/* Digidesign Mbox 2 */
return snd_usb_mbox2_boot_quirk(dev);
- case USB_ID(0x1235, 0x0018):
- /* Focusrite Novation Twitch */
- return snd_usb_twitch_boot_quirk(dev);
+ case USB_ID(0x1235, 0x0010): /* Focusrite Novation Saffire 6 USB */
+ case USB_ID(0x1235, 0x0018): /* Focusrite Novation Twitch */
+ return snd_usb_novation_boot_quirk(dev);
case USB_ID(0x133e, 0x0815):
/* Access Music VirusTI Desktop */
--
1.8.5.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ALSA: usb-audio: Add support for Focusrite Saffire 6 USB
2013-12-20 8:06 [PATCH] ALSA: usb-audio: Add support for Focusrite Saffire 6 USB Eduard Gilmutdinov
@ 2013-12-20 9:58 ` Daniel Mack
2014-01-14 12:41 ` Daniel Mack
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Mack @ 2013-12-20 9:58 UTC (permalink / raw)
To: Eduard Gilmutdinov; +Cc: alsa-devel
On 12/20/2013 09:06 AM, Eduard Gilmutdinov wrote:
> Signed-off-by: Eduard Gilmutdinov <edgilmutdinov@gmail.com>
Looks good to me, except for the fact that the ordering of the quirk
entry is not optimal (0x0010 should be above 0x0018).
But I see that there's another misplaced item (Focusrite Scarlett 18i6),
so I'll fix both in a new patch on top of this one.
Thanks for your submission again!
Daniel
> ---
> sound/usb/quirks-table.h | 40 ++++++++++++++++++++++++++++++++++++++++
> sound/usb/quirks.c | 9 +++++----
> 2 files changed, 45 insertions(+), 4 deletions(-)
>
> diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
> index f5f0595..3454780 100644
> --- a/sound/usb/quirks-table.h
> +++ b/sound/usb/quirks-table.h
> @@ -2569,6 +2569,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
> .type = QUIRK_MIDI_NOVATION
> }
> },
> +{
> + USB_DEVICE(0x1235, 0x0010),
> + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> + .vendor_name = "Focusrite",
> + .product_name = "Saffire 6 USB",
> + .ifnum = QUIRK_ANY_INTERFACE,
> + .type = QUIRK_COMPOSITE,
> + .data = (const struct snd_usb_audio_quirk[]) {
> + {
> + .ifnum = 0,
> + .type = QUIRK_AUDIO_FIXED_ENDPOINT,
> + .data = &(const struct audioformat) {
> + .formats = SNDRV_PCM_FMTBIT_S24_3LE,
> + .channels = 4,
> + .iface = 0,
> + .altsetting = 1,
> + .altset_idx = 1,
> + .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
> + .endpoint = 0x01,
> + .ep_attr = USB_ENDPOINT_XFER_ISOC,
> + .rates = SNDRV_PCM_RATE_44100 |
> + SNDRV_PCM_RATE_48000,
> + .rate_min = 44100,
> + .rate_max = 48000,
> + .nr_rates = 2,
> + .rate_table = (unsigned int[]) {
> + 44100, 48000
> + }
> + }
> + },
> + {
> + .ifnum = 1,
> + .type = QUIRK_MIDI_RAW_BYTES
> + },
> + {
> + .ifnum = -1
> + }
> + }
> + }
> +},
>
> /* Access Music devices */
> {
> diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
> index 0df9ede..e9a59e9 100644
> --- a/sound/usb/quirks.c
> +++ b/sound/usb/quirks.c
> @@ -662,8 +662,9 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
>
> /*
> * Novation Twitch DJ controller
> + * Focusrite Novation Saffire 6 USB audio card
> */
> -static int snd_usb_twitch_boot_quirk(struct usb_device *dev)
> +static int snd_usb_novation_boot_quirk(struct usb_device *dev)
> {
> /* preemptively set up the device because otherwise the
> * raw MIDI endpoints are not active */
> @@ -972,9 +973,9 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
> /* Digidesign Mbox 2 */
> return snd_usb_mbox2_boot_quirk(dev);
>
> - case USB_ID(0x1235, 0x0018):
> - /* Focusrite Novation Twitch */
> - return snd_usb_twitch_boot_quirk(dev);
> + case USB_ID(0x1235, 0x0010): /* Focusrite Novation Saffire 6 USB */
> + case USB_ID(0x1235, 0x0018): /* Focusrite Novation Twitch */
> + return snd_usb_novation_boot_quirk(dev);
>
> case USB_ID(0x133e, 0x0815):
> /* Access Music VirusTI Desktop */
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ALSA: usb-audio: Add support for Focusrite Saffire 6 USB
2013-12-20 9:58 ` Daniel Mack
@ 2014-01-14 12:41 ` Daniel Mack
2014-01-14 12:57 ` Takashi Iwai
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Mack @ 2014-01-14 12:41 UTC (permalink / raw)
To: tiwai; +Cc: alsa-devel, Eduard Gilmutdinov
On Fri, Dec 20, 2013 at 10:58:37AM +0100, Daniel Mack wrote:
> On 12/20/2013 09:06 AM, Eduard Gilmutdinov wrote:
> > Signed-off-by: Eduard Gilmutdinov <edgilmutdinov@gmail.com>
>
> Looks good to me, except for the fact that the ordering of the quirk
> entry is not optimal (0x0010 should be above 0x0018).
>
> But I see that there's another misplaced item (Focusrite Scarlett 18i6),
> so I'll fix both in a new patch on top of this one.
>
>
> Thanks for your submission again!
Takashi, could you queue this in your tree? I'll send a fixup patch for
the reording after that.
Thanks,
Daniel
> > ---
> > sound/usb/quirks-table.h | 40 ++++++++++++++++++++++++++++++++++++++++
> > sound/usb/quirks.c | 9 +++++----
> > 2 files changed, 45 insertions(+), 4 deletions(-)
> >
> > diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
> > index f5f0595..3454780 100644
> > --- a/sound/usb/quirks-table.h
> > +++ b/sound/usb/quirks-table.h
> > @@ -2569,6 +2569,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
> > .type = QUIRK_MIDI_NOVATION
> > }
> > },
> > +{
> > + USB_DEVICE(0x1235, 0x0010),
> > + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > + .vendor_name = "Focusrite",
> > + .product_name = "Saffire 6 USB",
> > + .ifnum = QUIRK_ANY_INTERFACE,
> > + .type = QUIRK_COMPOSITE,
> > + .data = (const struct snd_usb_audio_quirk[]) {
> > + {
> > + .ifnum = 0,
> > + .type = QUIRK_AUDIO_FIXED_ENDPOINT,
> > + .data = &(const struct audioformat) {
> > + .formats = SNDRV_PCM_FMTBIT_S24_3LE,
> > + .channels = 4,
> > + .iface = 0,
> > + .altsetting = 1,
> > + .altset_idx = 1,
> > + .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
> > + .endpoint = 0x01,
> > + .ep_attr = USB_ENDPOINT_XFER_ISOC,
> > + .rates = SNDRV_PCM_RATE_44100 |
> > + SNDRV_PCM_RATE_48000,
> > + .rate_min = 44100,
> > + .rate_max = 48000,
> > + .nr_rates = 2,
> > + .rate_table = (unsigned int[]) {
> > + 44100, 48000
> > + }
> > + }
> > + },
> > + {
> > + .ifnum = 1,
> > + .type = QUIRK_MIDI_RAW_BYTES
> > + },
> > + {
> > + .ifnum = -1
> > + }
> > + }
> > + }
> > +},
> >
> > /* Access Music devices */
> > {
> > diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
> > index 0df9ede..e9a59e9 100644
> > --- a/sound/usb/quirks.c
> > +++ b/sound/usb/quirks.c
> > @@ -662,8 +662,9 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
> >
> > /*
> > * Novation Twitch DJ controller
> > + * Focusrite Novation Saffire 6 USB audio card
> > */
> > -static int snd_usb_twitch_boot_quirk(struct usb_device *dev)
> > +static int snd_usb_novation_boot_quirk(struct usb_device *dev)
> > {
> > /* preemptively set up the device because otherwise the
> > * raw MIDI endpoints are not active */
> > @@ -972,9 +973,9 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
> > /* Digidesign Mbox 2 */
> > return snd_usb_mbox2_boot_quirk(dev);
> >
> > - case USB_ID(0x1235, 0x0018):
> > - /* Focusrite Novation Twitch */
> > - return snd_usb_twitch_boot_quirk(dev);
> > + case USB_ID(0x1235, 0x0010): /* Focusrite Novation Saffire 6 USB */
> > + case USB_ID(0x1235, 0x0018): /* Focusrite Novation Twitch */
> > + return snd_usb_novation_boot_quirk(dev);
> >
> > case USB_ID(0x133e, 0x0815):
> > /* Access Music VirusTI Desktop */
> >
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ALSA: usb-audio: Add support for Focusrite Saffire 6 USB
2014-01-14 12:41 ` Daniel Mack
@ 2014-01-14 12:57 ` Takashi Iwai
0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2014-01-14 12:57 UTC (permalink / raw)
To: Daniel Mack; +Cc: alsa-devel, Eduard Gilmutdinov
At Tue, 14 Jan 2014 13:41:59 +0100,
Daniel Mack wrote:
>
> On Fri, Dec 20, 2013 at 10:58:37AM +0100, Daniel Mack wrote:
> > On 12/20/2013 09:06 AM, Eduard Gilmutdinov wrote:
> > > Signed-off-by: Eduard Gilmutdinov <edgilmutdinov@gmail.com>
> >
> > Looks good to me, except for the fact that the ordering of the quirk
> > entry is not optimal (0x0010 should be above 0x0018).
> >
> > But I see that there's another misplaced item (Focusrite Scarlett 18i6),
> > so I'll fix both in a new patch on top of this one.
> >
> >
> > Thanks for your submission again!
>
> Takashi, could you queue this in your tree? I'll send a fixup patch for
> the reording after that.
OK, now I applied it and pushed out.
Takashi
>
>
> Thanks,
> Daniel
>
>
> > > ---
> > > sound/usb/quirks-table.h | 40 ++++++++++++++++++++++++++++++++++++++++
> > > sound/usb/quirks.c | 9 +++++----
> > > 2 files changed, 45 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
> > > index f5f0595..3454780 100644
> > > --- a/sound/usb/quirks-table.h
> > > +++ b/sound/usb/quirks-table.h
> > > @@ -2569,6 +2569,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
> > > .type = QUIRK_MIDI_NOVATION
> > > }
> > > },
> > > +{
> > > + USB_DEVICE(0x1235, 0x0010),
> > > + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
> > > + .vendor_name = "Focusrite",
> > > + .product_name = "Saffire 6 USB",
> > > + .ifnum = QUIRK_ANY_INTERFACE,
> > > + .type = QUIRK_COMPOSITE,
> > > + .data = (const struct snd_usb_audio_quirk[]) {
> > > + {
> > > + .ifnum = 0,
> > > + .type = QUIRK_AUDIO_FIXED_ENDPOINT,
> > > + .data = &(const struct audioformat) {
> > > + .formats = SNDRV_PCM_FMTBIT_S24_3LE,
> > > + .channels = 4,
> > > + .iface = 0,
> > > + .altsetting = 1,
> > > + .altset_idx = 1,
> > > + .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
> > > + .endpoint = 0x01,
> > > + .ep_attr = USB_ENDPOINT_XFER_ISOC,
> > > + .rates = SNDRV_PCM_RATE_44100 |
> > > + SNDRV_PCM_RATE_48000,
> > > + .rate_min = 44100,
> > > + .rate_max = 48000,
> > > + .nr_rates = 2,
> > > + .rate_table = (unsigned int[]) {
> > > + 44100, 48000
> > > + }
> > > + }
> > > + },
> > > + {
> > > + .ifnum = 1,
> > > + .type = QUIRK_MIDI_RAW_BYTES
> > > + },
> > > + {
> > > + .ifnum = -1
> > > + }
> > > + }
> > > + }
> > > +},
> > >
> > > /* Access Music devices */
> > > {
> > > diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
> > > index 0df9ede..e9a59e9 100644
> > > --- a/sound/usb/quirks.c
> > > +++ b/sound/usb/quirks.c
> > > @@ -662,8 +662,9 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
> > >
> > > /*
> > > * Novation Twitch DJ controller
> > > + * Focusrite Novation Saffire 6 USB audio card
> > > */
> > > -static int snd_usb_twitch_boot_quirk(struct usb_device *dev)
> > > +static int snd_usb_novation_boot_quirk(struct usb_device *dev)
> > > {
> > > /* preemptively set up the device because otherwise the
> > > * raw MIDI endpoints are not active */
> > > @@ -972,9 +973,9 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
> > > /* Digidesign Mbox 2 */
> > > return snd_usb_mbox2_boot_quirk(dev);
> > >
> > > - case USB_ID(0x1235, 0x0018):
> > > - /* Focusrite Novation Twitch */
> > > - return snd_usb_twitch_boot_quirk(dev);
> > > + case USB_ID(0x1235, 0x0010): /* Focusrite Novation Saffire 6 USB */
> > > + case USB_ID(0x1235, 0x0018): /* Focusrite Novation Twitch */
> > > + return snd_usb_novation_boot_quirk(dev);
> > >
> > > case USB_ID(0x133e, 0x0815):
> > > /* Access Music VirusTI Desktop */
> > >
> >
> > _______________________________________________
> > Alsa-devel mailing list
> > Alsa-devel@alsa-project.org
> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-14 12:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-20 8:06 [PATCH] ALSA: usb-audio: Add support for Focusrite Saffire 6 USB Eduard Gilmutdinov
2013-12-20 9:58 ` Daniel Mack
2014-01-14 12:41 ` Daniel Mack
2014-01-14 12:57 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2013-12-19 12:14 Eduard Gilmutdinov
2013-12-19 12:24 ` Daniel Mack
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.