From f8f6afaf7c5701f16bbff717bb4c386af33dea49 Mon Sep 17 00:00:00 2001 From: Amancio Hasty Date: Sun, 23 Nov 1997 20:31:20 +0000 Subject: [PATCH] minor code clean up to sb_dsp.c and fix compile error with uart6850.c --- sys/i386/isa/sound/sb_dsp.c | 1 + sys/i386/isa/sound/uart6850.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/i386/isa/sound/sb_dsp.c b/sys/i386/isa/sound/sb_dsp.c index 47e93b22008..f9d38e7f103 100644 --- a/sys/i386/isa/sound/sb_dsp.c +++ b/sys/i386/isa/sound/sb_dsp.c @@ -105,6 +105,7 @@ static void sb_dsp_reset(int dev); sound_os_info *sb_osp = NULL; #if defined(CONFIG_MIDI) || defined(CONFIG_AUDIO) +void dsp_speaker(char state); /* * Common code for the midi and pcm functions diff --git a/sys/i386/isa/sound/uart6850.c b/sys/i386/isa/sound/uart6850.c index c9d5c396249..e978fc703c2 100644 --- a/sys/i386/isa/sound/uart6850.c +++ b/sys/i386/isa/sound/uart6850.c @@ -60,7 +60,8 @@ static int my_dev; static int reset_uart6850(void); static void (*midi_input_intr) (int dev, u_char data); -static void poll_uart6850(u_long dummy); +static void poll_uart6850(void *dummy); + static sound_os_info *uart6850_osp; @@ -97,7 +98,7 @@ m6850intr(int irq) */ static void -poll_uart6850(u_long dummy) +poll_uart6850(void * dummy) { u_long flags; @@ -110,7 +111,7 @@ poll_uart6850(u_long dummy) uart6850_input_loop(); - timeout((timeout_func_t) poll_uart6850, 0, 1);; /* Come back later */ + timeout( poll_uart6850, 0, 1); /* Come back later */ splx(flags); }