patch-2.1.67 linux/drivers/sound/sound_calls.h

• Lines: 44
• Date: Sat Nov 29 10:33:21 1997
• Orig file: v2.1.66/linux/drivers/sound/sound_calls.h
• Orig date: Wed Nov 12 13:34:27 1997

diff -u --recursive --new-file v2.1.66/linux/drivers/sound/sound_calls.h linux/drivers/sound/sound_calls.h
@@ -108,7 +108,7 @@
 
 /*	From opl3.c	*/
 int opl3_detect (int ioaddr, int *osp);
-void opl3_init(int ioaddr, int *osp);
+int opl3_init(int ioaddr, int *osp);
 
 /*	From sb_card.c	*/
 void attach_sb_card(struct address_info *hw_config);
@@ -161,7 +161,7 @@
 /*	From gus_wave.c */
 int gus_wave_detect(int baseaddr);
 void gus_wave_init(struct address_info *hw_config);
-void gus_wave_unload (void);
+void gus_wave_unload (struct address_info *hw_config);
 void gus_voice_irq(void);
 void gus_write8(int reg, unsigned int data);
 void guswave_dma_irq(void);
@@ -170,7 +170,7 @@
 void gus_timer_command (unsigned int addr, unsigned int val);
 
 /*	From gus_midi.c */
-void gus_midi_init(void);
+void gus_midi_init(struct address_info *hw_config);
 void gus_midi_interrupt(int dummy);
 
 /*	From mpu401.c */
@@ -186,14 +186,14 @@
 void enable_opl3_mode(int left, int right, int both);
 
 /* 	From ics2101.c */
-void ics2101_mixer_init(void);
+int ics2101_mixer_init(void);
 
 /*	From sound_timer.c */
 void sound_timer_interrupt(void);
 void sound_timer_syncinterval(unsigned int new_usecs);
 
 /*	From ad1848.c */
-void ad1848_init (char *name, int io_base, int irq, int dma_playback, int dma_capture, int share_dma, int *osp);
+int ad1848_init (char *name, int io_base, int irq, int dma_playback, int dma_capture, int share_dma, int *osp);
 void ad1848_unload (int io_base, int irq, int dma_playback, int dma_capture, int share_dma);
 
 int ad1848_detect (int io_base, int *flags, int *osp);