Module Name: src
Committed By: nat
Date: Fri Jun 9 10:11:20 UTC 2017
Modified Files:
src/sys/dev/usb: uaudio.c
Log Message:
Start as half as many transfers for recording. This fixes recording and
play back when uaudio is used in full duplex mode.
The transfer scheduling probably is to blame.
Ok skrll@.
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/dev/usb/uaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.153 src/sys/dev/usb/uaudio.c:1.154
--- src/sys/dev/usb/uaudio.c:1.153 Thu Jun 1 02:45:12 2017
+++ src/sys/dev/usb/uaudio.c Fri Jun 9 10:11:20 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.153 2017/06/01 02:45:12 chs Exp $ */
+/* $NetBSD: uaudio.c,v 1.154 2017/06/09 10:11:20 nat Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.153 2017/06/01 02:45:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.154 2017/06/09 10:11:20 nat Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2610,8 +2610,11 @@ uaudio_trigger_input(void *addr, void *s
ch->intr = intr;
ch->arg = arg;
- /* XXX -1 shouldn't be needed */
- for (i = 0; i < UAUDIO_NCHANBUFS - 1; i++) {
+ /*
+ * Start as half as many channels for recording as for playback.
+ * This stops playback from stuttering in full-duplex operation.
+ */
+ for (i = 0; i < UAUDIO_NCHANBUFS / 2; i++) {
uaudio_chan_rtransfer(ch);
}
@@ -2663,8 +2666,7 @@ uaudio_trigger_output(void *addr, void *
ch->intr = intr;
ch->arg = arg;
- /* XXX -1 shouldn't be needed */
- for (i = 0; i < UAUDIO_NCHANBUFS - 1; i++)
+ for (i = 0; i < UAUDIO_NCHANBUFS; i++)
uaudio_chan_ptransfer(ch);
mutex_enter(&sc->sc_lock);
mutex_enter(&sc->sc_intr_lock);
