From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Mack Subject: Re: [PATCH] ALSA: usb-audio: Add support for Focusrite Saffire 6 USB Date: Fri, 20 Dec 2013 10:58:37 +0100 Message-ID: <52B414CD.9040107@zonque.org> References: <1387526818-3080-1-git-send-email-edgilmutdinov@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.zonque.de (svenfoo.org [82.94.215.22]) by alsa0.perex.cz (Postfix) with ESMTP id 32DE126534C for ; Fri, 20 Dec 2013 10:58:39 +0100 (CET) In-Reply-To: <1387526818-3080-1-git-send-email-edgilmutdinov@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Eduard Gilmutdinov Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org On 12/20/2013 09:06 AM, Eduard Gilmutdinov wrote: > Signed-off-by: Eduard Gilmutdinov 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 */ >