Module Name: src
Committed By: isaki
Date: Sun Apr 19 03:52:22 UTC 2020
Modified Files:
src/sys/dev/audio: audio.c
Log Message:
Improve the blocksize notation.
The blocksize is expressed in bytes, and the millisecond notation
is supplementary information to make it easier to understand.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/audio/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/audio.c
diff -u src/sys/dev/audio/audio.c:1.66 src/sys/dev/audio/audio.c:1.67
--- src/sys/dev/audio/audio.c:1.66 Fri Apr 17 07:48:35 2020
+++ src/sys/dev/audio/audio.c Sun Apr 19 03:52:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.66 2020/04/17 07:48:35 isaki Exp $ */
+/* $NetBSD: audio.c,v 1.67 2020/04/19 03:52:22 isaki Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.66 2020/04/17 07:48:35 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.67 2020/04/19 03:52:22 isaki Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -4788,6 +4788,7 @@ audio_mixer_init(struct audio_softc *sc,
const audio_format2_t *hwfmt, const audio_filter_reg_t *reg)
{
char codecbuf[64];
+ char blkdmsbuf[8];
audio_trackmixer_t *mixer;
void (*softint_handler)(void *);
int len;
@@ -4796,6 +4797,7 @@ audio_mixer_init(struct audio_softc *sc,
size_t bufsize;
int hwblks;
int blkms;
+ int blkdms;
int error;
KASSERT(hwfmt != NULL);
@@ -4975,13 +4977,20 @@ audio_mixer_init(struct audio_softc *sc,
mixer->hwbuf.fmt.precision);
}
blkms = mixer->blktime_n * 1000 / mixer->blktime_d;
- aprint_normal_dev(sc->sc_dev, "%s:%d%s %dch %dHz, blk %dms for %s\n",
+ blkdms = (mixer->blktime_n * 10000 / mixer->blktime_d) % 10;
+ blkdmsbuf[0] = '\0';
+ if (blkdms != 0) {
+ snprintf(blkdmsbuf, sizeof(blkdmsbuf), ".%1d", blkdms);
+ }
+ aprint_normal_dev(sc->sc_dev,
+ "%s:%d%s %dch %dHz, blk %d bytes (%d%sms) for %s\n",
audio_encoding_name(mixer->track_fmt.encoding),
mixer->track_fmt.precision,
codecbuf,
mixer->track_fmt.channels,
mixer->track_fmt.sample_rate,
- blkms,
+ blksize,
+ blkms, blkdmsbuf,
(mode == AUMODE_PLAY) ? "playback" : "recording");
return 0;
