Module Name: src
Committed By: nat
Date: Mon Jun 19 23:54:00 UTC 2017
Modified Files:
src/sys/dev/pad: pad.c
Log Message:
Use defines to specify pad audio format. NFCI.
Ok christos@.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pad/pad.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/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.36 src/sys/dev/pad/pad.c:1.37
--- src/sys/dev/pad/pad.c:1.36 Tue Jun 6 07:32:41 2017
+++ src/sys/dev/pad/pad.c Mon Jun 19 23:54:00 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.36 2017/06/06 07:32:41 nat Exp $ */
+/* $NetBSD: pad.c,v 1.37 2017/06/19 23:54:00 nat Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.36 2017/06/06 07:32:41 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.37 2017/06/19 23:54:00 nat Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -54,6 +54,11 @@ __KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.36
#define PADUNIT(x) minor(x)
+#define PADFREQ 44100
+#define PADCHAN 2
+#define PADPREC 16
+#define PADENC AUDIO_ENCODING_SLINEAR_LE
+
extern struct cfdriver pad_cd;
typedef struct pad_block {
@@ -120,8 +125,8 @@ static const struct audio_hw_if pad_hw_i
#define PAD_NFORMATS 1
static const struct audio_format pad_formats[PAD_NFORMATS] = {
- { NULL, AUMODE_PLAY|AUMODE_RECORD, AUDIO_ENCODING_SLINEAR_LE, 16, 16,
- 2, AUFMT_STEREO, 1, { 44100 } },
+ { NULL, AUMODE_PLAY|AUMODE_RECORD, PADENC, PADPREC, PADPREC,
+ PADCHAN, AUFMT_STEREO, 1, { PADFREQ } },
};
extern void padattach(int);
@@ -339,8 +344,8 @@ pad_close(dev_t dev, int flags, int fmt,
return 0;
}
-#define PAD_BYTES_PER_SEC (44100 * sizeof(int16_t) * 2)
-#define BYTESTOSLEEP (int64_t)(PAD_BLKSIZE)
+#define PAD_BYTES_PER_SEC (PADFREQ * PADPREC / NBBY * PADCHAN)
+#define BYTESTOSLEEP (int64_t)(PAD_BLKSIZE)
#define TIMENEXTREAD (int64_t)(BYTESTOSLEEP * 1000000 / PAD_BYTES_PER_SEC)
int
