Module Name: src
Committed By: christos
Date: Fri Dec 9 13:26:11 UTC 2016
Modified Files:
src/sys/dev: audiobell.c audiobellvar.h spkr_synth.c
Log Message:
restore audiobell api
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/audiobell.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/audiobellvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/spkr_synth.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/audiobell.c
diff -u src/sys/dev/audiobell.c:1.10 src/sys/dev/audiobell.c:1.11
--- src/sys/dev/audiobell.c:1.10 Fri Dec 9 08:16:22 2016
+++ src/sys/dev/audiobell.c Fri Dec 9 08:26:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: audiobell.c,v 1.10 2016/12/09 13:16:22 christos Exp $ */
+/* $NetBSD: audiobell.c,v 1.11 2016/12/09 13:26:11 christos Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.10 2016/12/09 13:16:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.11 2016/12/09 13:26:11 christos Exp $");
#include <sys/audioio.h>
#include <sys/conf.h>
@@ -137,14 +137,14 @@ audiobell_synthesize(uint8_t *buf, u_int
}
void
-audiobell(int unit, u_int pitch, u_int period, u_int volume, int poll)
+audiobell(void *unit, u_int pitch, u_int period, u_int volume, int poll)
{
uint8_t *buf;
struct audio_info ai;
struct uio auio;
struct iovec aiov;
int size, len, offset;
- dev_t audio = (dev_t)(AUDIO_DEVICE | unit);
+ dev_t audio = (dev_t)(AUDIO_DEVICE | *(int *)unit);
/* The audio system isn't built for polling. */
if (poll) return;
Index: src/sys/dev/audiobellvar.h
diff -u src/sys/dev/audiobellvar.h:1.8 src/sys/dev/audiobellvar.h:1.9
--- src/sys/dev/audiobellvar.h:1.8 Fri Dec 9 08:16:22 2016
+++ src/sys/dev/audiobellvar.h Fri Dec 9 08:26:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: audiobellvar.h,v 1.8 2016/12/09 13:16:22 christos Exp $ */
+/* $NetBSD: audiobellvar.h,v 1.9 2016/12/09 13:26:11 christos Exp $ */
/*-
* Copyright (c) 2004 Ben Harris
@@ -38,4 +38,4 @@
* This function is designed to be passed to pckbd_hookup_bell() and
* equivalents.
*/
-void audiobell(int, u_int, u_int, u_int, int);
+void audiobell(void *, u_int, u_int, u_int, int);
Index: src/sys/dev/spkr_synth.c
diff -u src/sys/dev/spkr_synth.c:1.4 src/sys/dev/spkr_synth.c:1.5
--- src/sys/dev/spkr_synth.c:1.4 Fri Dec 9 08:16:22 2016
+++ src/sys/dev/spkr_synth.c Fri Dec 9 08:26:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_synth.c,v 1.4 2016/12/09 13:16:22 christos Exp $ */
+/* $NetBSD: spkr_synth.c,v 1.5 2016/12/09 13:26:11 christos Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.4 2016/12/09 13:16:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.5 2016/12/09 13:26:11 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@ struct spkr_attach_args {
void
spkr_tone(u_int xhz, u_int ticks)
{
- audiobell(beep_unit, xhz, ticks * (1000 / hz), 80, 0);
+ audiobell(&beep_unit, xhz, ticks * (1000 / hz), 80, 0);
}
void
@@ -107,7 +107,7 @@ spkr_rest(int ticks)
printf("%s: %d\n", __func__, ticks);
#endif /* SPKRDEBUG */
if (ticks > 0)
- audiobell(beep_unit, 0, ticks * (1000 / hz), 80, 0);
+ audiobell(&beep_unit, 0, ticks * (1000 / hz), 80, 0);
}
device_t
@@ -202,7 +202,7 @@ bell_thread(void *arg)
bperiod = vb->period;
bvolume = vb->volume;
mutex_exit(&sc_bellock);
- audiobell(beep_unit, bpitch, bperiod, bvolume, 0);
+ audiobell(&beep_unit, bpitch, bperiod, bvolume, 0);
}
}
