Module Name: src
Committed By: isaki
Date: Sat Sep 2 13:28:11 UTC 2017
Modified Files:
src/sys/dev: audio.c
Log Message:
Remove duplicated code.
For hwvc, audio_calc_blksize() appears soon again.
For user vc, the userland format and HW format are separeted, so
audio_calc_blksize() here is no longer necessary. In addition,
vc->sc_mpr.blksize is already initialized in audio_open().
To generate a diff of this commit:
cvs rdiff -u -r1.404 -r1.405 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.404 src/sys/dev/audio.c:1.405
--- src/sys/dev/audio.c:1.404 Sat Sep 2 13:22:51 2017
+++ src/sys/dev/audio.c Sat Sep 2 13:28:11 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.404 2017/09/02 13:22:51 isaki Exp $ */
+/* $NetBSD: audio.c,v 1.405 2017/09/02 13:28:11 isaki Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <[email protected]>
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.404 2017/09/02 13:22:51 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.405 2017/09/02 13:28:11 isaki Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -4610,13 +4610,6 @@ audiosetinfo(struct audio_softc *sc, str
vc->sc_rparams = rp;
}
- /* Play params can affect the record params, so recalculate blksize. */
- if (nr > 0 || np > 0 || reset) {
- if (nr > 0)
- audio_calc_blksize(sc, AUMODE_RECORD, vc);
- if (np > 0)
- audio_calc_blksize(sc, AUMODE_PLAY, vc);
- }
#ifdef AUDIO_DEBUG
if (audiodebug > 1 && nr > 0) {
audio_print_params("audiosetinfo() After setting record params:",
@@ -4706,9 +4699,6 @@ audiosetinfo(struct audio_softc *sc, str
audio_calc_blksize(sc, AUMODE_PLAY, vc);
sc->sc_pr.blksize = vc->sc_mpr.blksize;
sc->sc_rr.blksize = vc->sc_mrr.blksize;
- } else {
- vc->sc_mpr.blksize = sc->sc_pr.blksize;
- vc->sc_mrr.blksize = sc->sc_rr.blksize;
}
if (hw->commit_settings && sc->sc_opens == 0) {
