Skip to content

Commit

Permalink
[ALSA] snd_usb_caiaq: make high sample rates work with A8DJ
Browse files Browse the repository at this point in the history
This patch for snd_usb_caiaq makes sample rates higher dann 48KHz work
with devices which have more than 2 stereo input/output pairs.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Daniel Mack authored and Takashi Iwai committed Apr 24, 2008
1 parent 6849d49 commit 6e9fc6b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions sound/usb/caiaq/caiaq-audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sound/usb/caiaq/caiaq-device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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},"
Expand Down

0 comments on commit 6e9fc6b

Please sign in to comment.