9 files changed, 15 insertions, 16 deletions

diff --git a/sys/i386/isa/sound/midibuf.c b/sys/i386/isa/sound/midibuf.c
index c05d44000e86..58ff1ee1e7ec 100644
--- a/sys/i386/isa/sound/midibuf.c
+++ b/sys/i386/isa/sound/midibuf.c
@@ -61,7 +61,7 @@ static struct midi_buf *midi_in_buf[MAX_MIDI_DEV] =
 {NULL};
 static struct midi_parms parms[MAX_MIDI_DEV];
 
-static void     midi_poll (unsigned long dummy);
+static void     midi_poll (void *dummy);
 
 DEFINE_TIMER (poll_timer, midi_poll);
 static volatile int open_devs = 0;
@@ -141,7 +141,7 @@ midi_output_intr (int dev)
 }
 
 static void
-midi_poll (unsigned long dummy)
+midi_poll (void *dummy)
 {
   unsigned long   flags;
   int             dev;
diff --git a/sys/i386/isa/sound/mpu401.c b/sys/i386/isa/sound/mpu401.c
index 26ed9269a041..62b5ecdfe126 100644
--- a/sys/i386/isa/sound/mpu401.c
+++ b/sys/i386/isa/sound/mpu401.c
@@ -1659,7 +1659,7 @@ mpu_timer_interrupt (void)
   if (curr_ticks >= next_event_time)
     {
       next_event_time = 0xffffffff;
-      sequencer_timer ();
+      sequencer_timer (NULL);
     }
 }
 
diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h
index 9ee44a1384c6..a98790813f9a 100644
--- a/sys/i386/isa/sound/os.h
+++ b/sys/i386/isa/sound/os.h
@@ -307,8 +307,7 @@ extern unsigned long get_time(void);
  * The ACTIVATE_TIMER requests system to call 'proc' after 'time' ticks.
  */
 
-#define ACTIVATE_TIMER(name, proc, time) \
-	timeout((timeout_func_t)proc, 0, time);
+#define ACTIVATE_TIMER(name, proc, time)	timeout(proc, 0, time)
 /*
  * The rest of this file is not complete yet. The functions using these
  * macros will not work
diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c
index b49baed2e919..49be353763f3 100644
--- a/sys/i386/isa/sound/sequencer.c
+++ b/sys/i386/isa/sound/sequencer.c
@@ -1824,7 +1824,7 @@ sequencer_select (int dev, struct fileinfo *file, int sel_type, select_table * w
 #endif
 
 void
-sequencer_timer (void)
+sequencer_timer (void *arg)
 {
   seq_startplay ();
 }
diff --git a/sys/i386/isa/sound/sound_calls.h b/sys/i386/isa/sound/sound_calls.h
index 40aa55bc345f..f5aa363f8a76 100644
--- a/sys/i386/isa/sound/sound_calls.h
+++ b/sys/i386/isa/sound/sound_calls.h
@@ -49,7 +49,7 @@ int sequencer_ioctl (int dev, struct fileinfo *file,
 	   unsigned int cmd, unsigned int arg);
 int sequencer_lseek (int dev, struct fileinfo *file, off_t offset, int orig);
 long sequencer_init (long mem_start);
-void sequencer_timer(void);
+void sequencer_timer(void *arg);
 int note_to_freq(int note_num);
 unsigned long compute_finetune(unsigned long base_freq, int bend, int range);
 void seq_input_event(unsigned char *event, int len);
diff --git a/sys/i386/isa/sound/sound_timer.c b/sys/i386/isa/sound/sound_timer.c
index 8e4e002f803f..b887375ec08d 100644
--- a/sys/i386/isa/sound/sound_timer.c
+++ b/sys/i386/isa/sound/sound_timer.c
@@ -373,7 +373,7 @@ sound_timer_interrupt (void)
   if (curr_ticks >= next_event_time)
     {
       next_event_time = 0xffffffff;
-      sequencer_timer ();
+      sequencer_timer (NULL);
     }
 }
 
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 78fbca6a9d69..5541db49c7d7 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: soundcard.c,v 1.48 1997/02/22 09:38:16 peter Exp $
+ * $Id: soundcard.c,v 1.49 1997/03/26 17:12:31 ache Exp $
  */
 
 #include <i386/isa/sound/sound_config.h>
@@ -477,7 +477,7 @@ request_sound_timer (int count)
   int             tmp = count;
 
   if (count < 0)
-    timeout ((timeout_func_t)sequencer_timer, 0, -count);
+    timeout (sequencer_timer, 0, -count);
   else
     {
 
@@ -491,7 +491,7 @@ request_sound_timer (int count)
       if (!count)
 	count = 1;
 
-      timeout ((timeout_func_t)sequencer_timer, 0, count);
+      timeout (sequencer_timer, 0, count);
     }
   timer_running = 1;
 }
@@ -500,7 +500,7 @@ void
 sound_stop_timer (void)
 {
   if (timer_running)
-    untimeout ((timeout_func_t)sequencer_timer, 0);
+    untimeout (sequencer_timer, 0);
   timer_running = 0;
 }
 #endif
diff --git a/sys/i386/isa/sound/sys_timer.c b/sys/i386/isa/sound/sys_timer.c
index 2c752f7bb89b..74b42b2461bf 100644
--- a/sys/i386/isa/sound/sys_timer.c
+++ b/sys/i386/isa/sound/sys_timer.c
@@ -43,7 +43,7 @@ static volatile unsigned long curr_ticks;
 static volatile unsigned long next_event_time;
 static unsigned long prev_event_time;
 
-static void     poll_def_tmr (unsigned long dummy);
+static void     poll_def_tmr (void *dummy);
 
 DEFINE_TIMER (def_tmr, poll_def_tmr);
 
@@ -65,7 +65,7 @@ tmr2ticks (int tmr_value)
 }
 
 static void
-poll_def_tmr (unsigned long dummy)
+poll_def_tmr (void *dummy)
 {
 
   if (opened)
@@ -80,7 +80,7 @@ poll_def_tmr (unsigned long dummy)
 	  if (curr_ticks >= next_event_time)
 	    {
 	      next_event_time = 0xffffffff;
-	      sequencer_timer ();
+	      sequencer_timer (NULL);
 	    }
 	}
     }
diff --git a/sys/i386/isa/sound/uart6850.c b/sys/i386/isa/sound/uart6850.c
index d925727b86de..5160bec7b5cf 100644
--- a/sys/i386/isa/sound/uart6850.c
+++ b/sys/i386/isa/sound/uart6850.c
@@ -105,7 +105,7 @@ m6850intr (int unit)
  */
 
 static void
-poll_uart6850 (unsigned long dummy)
+poll_uart6850 (void *dummy)
 {
   unsigned long   flags;