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

• Lines: 263
• Date: Sun Jun 30 11:43:39 1996
• Orig file: v2.0.0/linux/drivers/sound/sound_calls.h
• Orig date: Sun Mar 24 22:49:43 1996

diff -u --recursive --new-file v2.0.0/linux/drivers/sound/sound_calls.h linux/drivers/sound/sound_calls.h
@@ -11,7 +11,7 @@
 int DMAbuf_start_output(int dev, int buff_no, int l);
 int DMAbuf_set_count(int dev, int buff_no, int l);
 int DMAbuf_ioctl(int dev, unsigned int cmd, caddr_t arg, int local);
-long DMAbuf_init(long mem_start);
+void DMAbuf_init(void);
 int DMAbuf_start_dma (int dev, unsigned long physaddr, int count, int dma_mode);
 int DMAbuf_open_dma (int dev);
 void DMAbuf_close_dma (int dev);
@@ -32,7 +32,7 @@
 int audio_ioctl (int dev, struct fileinfo *file,
 	   unsigned int cmd, caddr_t arg);
 int audio_lseek (int dev, struct fileinfo *file, off_t offset, int orig);
-long audio_init (long mem_start);
+void audio_init (void);
 
 int audio_select(int dev, struct fileinfo *file, int sel_type, select_table_handle * wait);
 
@@ -47,7 +47,7 @@
 int sequencer_ioctl (int dev, struct fileinfo *file,
 	   unsigned int cmd, caddr_t arg);
 int sequencer_lseek (int dev, struct fileinfo *file, off_t offset, int orig);
-long sequencer_init (long mem_start);
+void sequencer_init (void);
 void sequencer_timer(unsigned long dummy);
 int note_to_freq(int note_num);
 unsigned long compute_finetune(unsigned long base_freq, int bend, int range);
@@ -68,7 +68,7 @@
 	   unsigned int cmd, caddr_t arg);
 int MIDIbuf_lseek (int dev, struct fileinfo *file, off_t offset, int orig);
 void MIDIbuf_bytes_received(int dev, unsigned char *buf, int count);
-long MIDIbuf_init(long mem_start);
+void MIDIbuf_init(void);
 
 int MIDIbuf_select(int dev, struct fileinfo *file, int sel_type, select_table_handle * wait);
 
@@ -83,7 +83,7 @@
 void request_sound_timer (int count);
 void sound_stop_timer(void);
 int snd_ioctl_return(int *addr, int value);
-int snd_set_irq_handler (int interrupt_level, void(*hndlr)(int, void*, struct pt_regs *), char *name, int *osp);
+int snd_set_irq_handler (int interrupt_level, void(*iproc)(int, void*, struct pt_regs *), char *name, int *osp);
 void snd_release_irq(int vect);
 void sound_dma_malloc(int dev);
 void sound_dma_free(int dev);
@@ -98,51 +98,33 @@
 int sound_ioctl_sw (int dev, struct fileinfo *file,
 	     unsigned int cmd, caddr_t arg);
 
-/*	From sb_dsp.c	*/
-int sb_dsp_detect (struct address_info *hw_config);
-long sb_dsp_init (long mem_start, struct address_info *hw_config);
-void sb_dsp_disable_midi(void);
-int sb_get_irq(void);
-void sb_free_irq(void);
-int sb_dsp_command (unsigned char val);
-int sb_reset_dsp (void);
-void sb_dsp_unload(struct address_info *);
-
-/*	From sb16_dsp.c	*/
-void sb16_dsp_interrupt (int irq);
-long sb16_dsp_init(long mem_start, struct address_info *hw_config);
-int sb16_dsp_detect(struct address_info *hw_config);
-
-/*	From sb16_midi.c	*/
-void sb16midiintr (int unit);
-long attach_sb16midi(long mem_start, struct address_info * hw_config);
-int probe_sb16midi(struct address_info *hw_config);
-void sb_midi_interrupt(int dummy);
-void sbmidiintr(int irq, void *dev_id, struct pt_regs * dummy);
-
-/*	From sb_midi.c	*/
-void sb_midi_init(int model);
-
-/*	From sb_mixer.c	*/
-void sb_setmixer (unsigned int port, unsigned int value);
-int sb_getmixer (unsigned int port);
-void sb_mixer_set_stereo(int mode);
-int sb_mixer_init(int major_model);
-
 /*	From opl3.c	*/
 int opl3_detect (int ioaddr, int *osp);
-long opl3_init(long mem_start, int ioaddr, int *osp);
+void opl3_init(int ioaddr, int *osp);
 
 /*	From sb_card.c	*/
-long attach_sb_card(long mem_start, struct address_info *hw_config);
+void attach_sb_card(struct address_info *hw_config);
 int probe_sb(struct address_info *hw_config);
 
+/*	From sb_common.c */
+void sb_dsp_disable_midi(int port);
+void sb_dsp_disable_recording(int port);
+void attach_sbmpu (struct address_info *hw_config);
+int probe_sbmpu (struct address_info *hw_config);
+void unload_sbmpu (struct address_info *hw_config);
+
+/*	From uart401.c */
+void attach_uart401 (struct address_info *hw_config);
+int probe_uart401 (struct address_info *hw_config);
+void unload_uart401 (struct address_info *hw_config);
+void uart401intr (int irq, void *dev_id, struct pt_regs * dummy);
+
 /*	From adlib_card.c	*/
-long attach_adlib_card(long mem_start, struct address_info *hw_config);
+void attach_adlib_card(struct address_info *hw_config);
 int probe_adlib(struct address_info *hw_config);
 
 /*	From pas_card.c	*/
-long attach_pas_card(long mem_start, struct address_info *hw_config);
+void attach_pas_card(struct address_info *hw_config);
 int probe_pas(struct address_info *hw_config);
 int pas_set_intr(int mask);
 int pas_remove_intr(int mask);
@@ -151,26 +133,26 @@
 
 /*	From pas_audio.c */
 void pas_pcm_interrupt(unsigned char status, int cause);
-long pas_pcm_init(long mem_start, struct address_info *hw_config);
+void pas_pcm_init(struct address_info *hw_config);
 
 /*	From pas_mixer.c */
 int pas_init_mixer(void);
 
 /*	From pas_midi.c */
-long pas_midi_init(long mem_start);
+void pas_midi_init(void);
 void pas_midi_interrupt(void);
 
 /*	From gus_card.c */
-long attach_gus_card(long mem_start, struct address_info * hw_config);
+void attach_gus_card(struct address_info * hw_config);
 int probe_gus(struct address_info *hw_config);
 int gus_set_midi_irq(int num);
 void gusintr(int irq, void *dev_id, struct pt_regs * dummy);
-long attach_gus_db16(long mem_start, struct address_info * hw_config);
+void attach_gus_db16(struct address_info * hw_config);
 int probe_gus_db16(struct address_info *hw_config);
 
 /*	From gus_wave.c */
 int gus_wave_detect(int baseaddr);
-long gus_wave_init(long mem_start, struct address_info *hw_config);
+void gus_wave_init(struct address_info *hw_config);
 void gus_wave_unload (void);
 void gus_voice_irq(void);
 unsigned char gus_read8 (int reg);
@@ -181,16 +163,16 @@
 void gus_timer_command (unsigned int addr, unsigned int val);
 
 /*	From gus_midi.c */
-long gus_midi_init(long mem_start);
+void gus_midi_init(void);
 void gus_midi_interrupt(int dummy);
 
 /*	From mpu401.c */
-long attach_mpu401(long mem_start, struct address_info * hw_config);
+void attach_mpu401(struct address_info * hw_config);
 int probe_mpu401(struct address_info *hw_config);
 void mpuintr(int irq, void *dev_id, struct pt_regs * dummy);
 
 /*	From uart6850.c */
-long attach_uart6850(long mem_start, struct address_info * hw_config);
+void attach_uart6850(struct address_info * hw_config);
 int probe_uart6850(struct address_info *hw_config);
 
 /*	From opl3.c */
@@ -206,7 +188,7 @@
 				    unsigned long parm3, unsigned long parm4);
 
 /* 	From ics2101.c */
-long ics2101_mixer_init(long mem_start);
+void ics2101_mixer_init(void);
 
 /*	From sound_timer.c */
 void sound_timer_interrupt(void);
@@ -221,25 +203,25 @@
 #define AD_F_CS4248	0x0001	/* Returned if a CS4248 (or compatible) detected */
 
 void     ad1848_interrupt (int irq, void *dev_id, struct pt_regs * dummy);
-long attach_ms_sound(long mem_start, struct address_info * hw_config);
+void attach_ms_sound(struct address_info * hw_config);
 int probe_ms_sound(struct address_info *hw_config);
-long attach_pnp_ad1848(long mem_start, struct address_info * hw_config);
+void attach_pnp_ad1848(struct address_info * hw_config);
 int probe_pnp_ad1848(struct address_info *hw_config);
 void unload_pnp_ad1848(struct address_info *hw_info);
 
 /* 	From pss.c */
 int probe_pss (struct address_info *hw_config);
-long attach_pss (long mem_start, struct address_info *hw_config);
+void attach_pss (struct address_info *hw_config);
 int probe_pss_mpu (struct address_info *hw_config);
-long attach_pss_mpu (long mem_start, struct address_info *hw_config);
+void attach_pss_mpu (struct address_info *hw_config);
 int probe_pss_mss (struct address_info *hw_config);
-long attach_pss_mss (long mem_start, struct address_info *hw_config);
+void attach_pss_mss (struct address_info *hw_config);
 
 /* 	From sscape.c */
 int probe_sscape (struct address_info *hw_config);
-long attach_sscape (long mem_start, struct address_info *hw_config);
+void attach_sscape (struct address_info *hw_config);
 int probe_ss_ms_sound (struct address_info *hw_config);
-long attach_ss_ms_sound(long mem_start, struct address_info * hw_config);
+void attach_ss_ms_sound(struct address_info * hw_config);
 
 int pss_read (int dev, struct fileinfo *file, char *buf, int count);
 int pss_write (int dev, struct fileinfo *file, char *buf, int count);
@@ -248,7 +230,7 @@
 int pss_ioctl (int dev, struct fileinfo *file,
 	   unsigned int cmd, caddr_t arg);
 int pss_lseek (int dev, struct fileinfo *file, off_t offset, int orig);
-long pss_init(long mem_start);
+void pss_init(void);
 
 /* From aedsp16.c */
 int InitAEDSP16_SBPRO(struct address_info *hw_config);
@@ -259,21 +241,19 @@
 void do_midi_msg (int synthno, unsigned char *msg, int mlen);
 
 /*	From trix.c	*/
-long attach_trix_wss (long mem_start, struct address_info *hw_config);
+void attach_trix_wss (struct address_info *hw_config);
 int probe_trix_wss (struct address_info *hw_config);
-long attach_trix_sb (long mem_start, struct address_info *hw_config);
+void attach_trix_sb (struct address_info *hw_config);
 int probe_trix_sb (struct address_info *hw_config);
-long attach_trix_mpu (long mem_start, struct address_info *hw_config);
+void attach_trix_mpu (struct address_info *hw_config);
 int probe_trix_mpu (struct address_info *hw_config);
 
 /*	From mad16.c	*/
-long attach_mad16 (long mem_start, struct address_info *hw_config);
+void attach_mad16 (struct address_info *hw_config);
 int probe_mad16 (struct address_info *hw_config);
-long attach_mad16_mpu (long mem_start, struct address_info *hw_config);
+void attach_mad16_mpu (struct address_info *hw_config);
 int probe_mad16_mpu (struct address_info *hw_config);
 int mad16_sb_dsp_detect (struct address_info *hw_config);
-long mad16_sb_dsp_init (long mem_start, struct address_info *hw_config);
-void mad16_sb_dsp_unload(struct address_info *hw_config);
 
 /*	Unload routines from various source files*/
 void unload_pss(struct address_info *hw_info);
@@ -303,14 +283,14 @@
 /* From cs4232.c */
 
 int probe_cs4232 (struct address_info *hw_config);
-long attach_cs4232 (long mem_start, struct address_info *hw_config);
+void attach_cs4232 (struct address_info *hw_config);
 int probe_cs4232_mpu (struct address_info *hw_config);
-long attach_cs4232_mpu (long mem_start, struct address_info *hw_config);
+void attach_cs4232_mpu (struct address_info *hw_config);
 
 /*	From maui.c */
-long attach_maui(long mem_start, struct address_info * hw_config);
+void attach_maui(struct address_info * hw_config);
 int probe_maui(struct address_info *hw_config);
 
 /*	From sound_pnp.c */
-void sound_pnp_init(void);
+void sound_pnp_init(int *osp);
 void sound_pnp_disconnect(void);