From 9dd560ddf76ab285640dbbe4c727601add7e69a7 Mon Sep 17 00:00:00 2001
From: kent <kent@NetBSD.org>
Date: Sun, 16 Jan 2005 12:46:00 +0000
Subject: [PATCH] * uaudio_round_blocksize()   calculate playing blocksize and
 recording blocksize independently

---
 sys/dev/usb/uaudio.c | 45 ++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index dac27142390f..12206e23763d 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uaudio.c,v 1.95 2005/01/16 06:02:19 dsainty Exp $	*/
+/*	$NetBSD: uaudio.c,v 1.96 2005/01/16 12:46:00 kent Exp $	*/
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.95 2005/01/16 06:02:19 dsainty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.96 2005/01/16 12:46:00 kent Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2220,26 +2220,35 @@ uaudio_round_blocksize(void *addr, int blk,
 		       int mode, const audio_params_t *param)
 {
 	struct uaudio_softc *sc;
-	int bpf;
+	int b;
 
 	sc = addr;
-	DPRINTF(("uaudio_round_blocksize: p.bpf=%d r.bpf=%d\n",
-		 sc->sc_playchan.bytes_per_frame,
-		 sc->sc_recchan.bytes_per_frame));
-	if (sc->sc_playchan.bytes_per_frame > sc->sc_recchan.bytes_per_frame) {
-		bpf = sc->sc_playchan.bytes_per_frame
-		    + sc->sc_playchan.sample_size;
+	DPRINTF(("uaudio_round_blocksize: blk=%d mode=%s\n", blk,
+	    mode == AUMODE_PLAY ? "AUMODE_PLAY" : "AUMODE_RECORD"));
+
+	/* chan.bytes_per_frame can be 0. */
+	if (mode == AUMODE_PLAY || sc->sc_recchan.bytes_per_frame <= 0) {
+		b = param->sample_rate * UAUDIO_NFRAMES * UAUDIO_NCHANBUFS;
+
+		/*
+		 * This does not make accurate value in the case
+		 * of b % USB_FRAMES_PER_SECOND != 0
+		 */
+		b /= USB_FRAMES_PER_SECOND;
+
+		b *= param->precision / 8 * param->channels;
 	} else {
-		bpf = sc->sc_recchan.bytes_per_frame
-		    + sc->sc_recchan.sample_size;
+		/*
+		 * use wMaxPacketSize in bytes_per_frame.
+		 * See uaudio_set_params() and uaudio_chan_init()
+		 */
+		b = sc->sc_recchan.bytes_per_frame
+		    * UAUDIO_NFRAMES * UAUDIO_NCHANBUFS;
 	}
-	/* XXX */
-	bpf *= UAUDIO_NFRAMES * UAUDIO_NCHANBUFS;
 
-	bpf = (bpf + 15) &~ 15;
-
-	if (blk < bpf)
-		blk = bpf;
+	if (b <= 0)
+		b = 1;
+	blk = blk <= b ? b : blk / b * b;
 
 #ifdef DIAGNOSTIC
 	if (blk <= 0) {
@@ -2248,7 +2257,7 @@ uaudio_round_blocksize(void *addr, int blk,
 	}
 #endif
 
-	DPRINTFN(1,("uaudio_round_blocksize: blk=%d\n", blk));
+	DPRINTF(("uaudio_round_blocksize: resultant blk=%d\n", blk));
 	return blk;
 }