This patch for snd_usb_caiaq makes sample rates higher than 49KHz work
with devices which have more than 2 stereo input/output pairs.

Signed-off-by: Daniel Mack <daniel@caiaq.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-audio.c | 8 ++++++--
ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-device.c | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-audio.c b/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-audio.c
index ebf3281..24970a5 100644
--- a/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-audio.c
+++ b/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-audio.c
@@ -39,7 +39,8 @@
#define BYTES_PER_SAMPLE 3
#define BYTES_PER_SAMPLE_USB 4
#define MAX_BUFFER_SIZE (128*1024)
-
+#define MAX_ENDPOINT_SIZE 512
+
#define ENDPOINT_CAPTURE 2
#define ENDPOINT_PLAYBACK 6

@@ -221,7 +222,10 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)

bpp = ((runtime->rate / 8000) + CLOCK_DRIFT_TOLERANCE)
* bytes_per_sample * CHANNELS_PER_STREAM * dev->n_streams;
-
+
+ if (bpp > MAX_ENDPOINT_SIZE)
+ bpp = MAX_ENDPOINT_SIZE;
+
ret = snd_usb_caiaq_set_audio_params(dev, runtime->rate,
runtime->sample_bits, bpp);
if (ret)
diff --git a/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-device.c b/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-device.c
index 4dc5cdd..5a986ee 100644
--- a/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-device.c
+++ b/ubuntu/sound/alsa-kernel/usb/caiaq/caiaq-device.c
@@ -42,7 +42,7 @@
#endif

MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
-MODULE_DESCRIPTION("caiaq USB audio, version 1.3.5");
+MODULE_DESCRIPTION("caiaq USB audio, version 1.3.6");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
"{Native Instruments, RigKontrol3},"
--
1.5.4.3


--------------080505070703000409060509
Content-Type: message/rfc822;
name="Re: [ALSA] request for kernel patch.eml"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="Re: [ALSA] request for kernel patch.eml"

Return-Path: <daniel@caiaq.de>
X-Original-To: stefan.bader@cleanmail.canonical.com
Delivered-To: smb@mail.canonical.com
Received: from cluster-j.mailcontrol.com (cluster-j.mailcontrol.com [86.111.223.190])
by fiordland.canonical.com (Postfix) with ESMTP id F38041988096
for <stefan.bader@cleanmail.canonical.com>; Wed, 16 Apr 2008 11:45:06 +0100 (BST)
Received: from arctowski.canonical.com (arctowski.canonical.com [91.189.94.158])
by rly27j.srv.mailcontrol.com (MailControl) with ESMTP id m3GAiudv021062
for <stefan.bader@cleanmail.canonical.com>; Wed, 16 Apr 2008 11:44:59 +0100
Received: from fiordland.canonical.com ([91.189.94.145])
by arctowski.canonical.com with esmtp (Exim 4.60)
(envelope-from <daniel@caiaq.de>)
id 1Jm57b-0004wC-0i
for stefan.bader@cleanmail.canonical.com; Wed, 16 Apr 2008 11:44:11 +0100
Received: from buzzloop.caiaq.de (buzzloop.caiaq.de [212.112.241.133])
by fiordland.canonical.com (Postfix) with ESMTP id DCF6B288807B
for <stefan.bader@canonical.com>; Wed, 16 Apr 2008 11:44:10 +0100 (BST)
Received: from localhost (localhost [127.0.0.1])
by buzzloop.caiaq.de (Postfix) with ESMTP id 8CA7F7F4036
for <stefan.bader@canonical.com>; Wed, 16 Apr 2008 12:44:10 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at buzzloop.caiaq.de
Received: from buzzloop.caiaq.de ([127.0.0.1])
by localhost (buzzloop.caiaq.de [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id 0PU35BApcZr0 for <stefan.bader@canonical.com>;
Wed, 16 Apr 2008 12:44:00 +0200 (CEST)
Received: from [192.168.1.117] (pd95699b2.dip0.t-ipconnect.de [217.86.153.178])
(using TLSv1 with cipher AES128-SHA (128/128 bits))
(No client certificate requested)
by buzzloop.caiaq.de (Postfix) with ESMTPSA id 710927F4029
for <stefan.bader@canonical.com>; Wed, 16 Apr 2008 12:44:00 +0200 (CEST)
Message-Id: <D7DAD622-6113-4727-9590-C2879D05B6D7@caiaq.de>
From: Daniel Mack <daniel@caiaq.de>
To: Stefan Bader <stefan.bader@canonical.com>
In-Reply-To: <7224DA6E-D2AA-44B6-9B15-A934EFF9CBC6@caiaq.de>
Content-Type: text/plain; charset=US-ASCII; format=flowed
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Apple Message framework v919.2)
Subject: Re: [ALSA] request for kernel patch
Date: Wed, 16 Apr 2008 12:43:59 +0200
References: <8787DE65-2D8F-465E-A39B-2051D514C9FB@caiaq.de> <47FBDE49.8090906@canonical.com> <7224DA6E-D2AA-44B6-9B15-A934EFF9CBC6@caiaq.de>
X-Mailer: Apple Mail (2.919.2)
X-Mailcontrol-Inbound: uq3drnD2P+ps5SfEb0fvr78+NoP1DHBZwGqKpaXB2eTgNv8D6K LIxb8+NoP1DHBZ8VSaBg0k0xw=
X-Spam-Score: 3.8
X-Scanned-By: MailControl A-08-00-05 (www.mailcontrol.com) on 10.74.0.137

Hi,

On 10.04.2008, at 14:24, Daniel Mack wrote:
> Hi,
>
> On 08.04.2008, at 23:06, Stefan Bader wrote:
>> I have applied that patch to linux-ubuntu-modules.
>
> Great, thanks. Could you take those two as well, please?
>
> http://article.gmane.org/gmane.linux.alsa.devel/52496
> http://article.gmane.org/gmane.linux.alsa.devel/52513

Just curious because I didn't get any feedback - are those taken?

Thanks,
Daniel


--------------080505070703000409060509
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

--------------080505070703000409060509--