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

• Lines: 147
• Date: Sat Feb 10 22:04:25 1996
• Orig file: v1.3.62/linux/drivers/sound/sound_calls.h
• Orig date: Tue Jan 23 21:15:48 1996

diff -u --recursive --new-file v1.3.62/linux/drivers/sound/sound_calls.h linux/drivers/sound/sound_calls.h
@@ -10,7 +10,7 @@
 int DMAbuf_rmchars(int dev, int buff_no, int c);
 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, ioctl_arg arg, int local);
+int DMAbuf_ioctl(int dev, unsigned int cmd, caddr_t arg, int local);
 long DMAbuf_init(long mem_start);
 int DMAbuf_start_dma (int dev, unsigned long physaddr, int count, int dma_mode);
 int DMAbuf_open_dma (int dev);
@@ -25,12 +25,12 @@
  *	System calls for /dev/dsp and /dev/audio
  */
 
-int audio_read (int dev, struct fileinfo *file, snd_rw_buf *buf, int count);
-int audio_write (int dev, struct fileinfo *file, const snd_rw_buf *buf, int count);
+int audio_read (int dev, struct fileinfo *file, char *buf, int count);
+int audio_write (int dev, struct fileinfo *file, const char *buf, int count);
 int audio_open (int dev, struct fileinfo *file);
 void audio_release (int dev, struct fileinfo *file);
 int audio_ioctl (int dev, struct fileinfo *file,
-	   unsigned int cmd, ioctl_arg arg);
+	   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);
 
@@ -40,12 +40,12 @@
  *	System calls for the /dev/sequencer
  */
 
-int sequencer_read (int dev, struct fileinfo *file, snd_rw_buf *buf, int count);
-int sequencer_write (int dev, struct fileinfo *file, const snd_rw_buf *buf, int count);
+int sequencer_read (int dev, struct fileinfo *file, char *buf, int count);
+int sequencer_write (int dev, struct fileinfo *file, const char *buf, int count);
 int sequencer_open (int dev, struct fileinfo *file);
 void sequencer_release (int dev, struct fileinfo *file);
 int sequencer_ioctl (int dev, struct fileinfo *file,
-	   unsigned int cmd, ioctl_arg arg);
+	   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_timer(unsigned long dummy);
@@ -60,12 +60,12 @@
  *	System calls for the /dev/midi
  */
 
-int MIDIbuf_read (int dev, struct fileinfo *file, snd_rw_buf *buf, int count);
-int MIDIbuf_write (int dev, struct fileinfo *file, const snd_rw_buf *buf, int count);
+int MIDIbuf_read (int dev, struct fileinfo *file, char *buf, int count);
+int MIDIbuf_write (int dev, struct fileinfo *file, const char *buf, int count);
 int MIDIbuf_open (int dev, struct fileinfo *file);
 void MIDIbuf_release (int dev, struct fileinfo *file);
 int MIDIbuf_ioctl (int dev, struct fileinfo *file,
-	   unsigned int cmd, ioctl_arg arg);
+	   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);
@@ -79,11 +79,11 @@
 
 /*	From soundcard.c	*/
 void soundcard_init(void);
-void tenmicrosec(sound_os_info *osp);
+void tenmicrosec(int *osp);
 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, struct pt_regs *), char *name, sound_os_info *osp);
+int snd_set_irq_handler (int interrupt_level, void(*hndlr)(int, 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);
@@ -91,12 +91,12 @@
 void conf_printf2(char *name, int base, int irq, int dma, int dma2);
 
 /*	From sound_switch.c	*/
-int sound_read_sw (int dev, struct fileinfo *file, snd_rw_buf *buf, int count);
-int sound_write_sw (int dev, struct fileinfo *file, const snd_rw_buf *buf, int count);
+int sound_read_sw (int dev, struct fileinfo *file, char *buf, int count);
+int sound_write_sw (int dev, struct fileinfo *file, const char *buf, int count);
 int sound_open_sw (int dev, struct fileinfo *file);
 void sound_release_sw (int dev, struct fileinfo *file);
 int sound_ioctl_sw (int dev, struct fileinfo *file,
-	     unsigned int cmd, ioctl_arg arg);
+	     unsigned int cmd, caddr_t arg);
 
 /*	From sb_dsp.c	*/
 int sb_dsp_detect (struct address_info *hw_config);
@@ -130,8 +130,8 @@
 int sb_mixer_init(int major_model);
 
 /*	From opl3.c	*/
-int opl3_detect (int ioaddr, sound_os_info *osp);
-long opl3_init(long mem_start, int ioaddr, sound_os_info *osp);
+int opl3_detect (int ioaddr, int *osp);
+long opl3_init(long mem_start, int ioaddr, int *osp);
 
 /*	From sb_card.c	*/
 long attach_sb_card(long mem_start, struct address_info *hw_config);
@@ -177,7 +177,7 @@
 void gus_write8(int reg, unsigned int data);
 void guswave_dma_irq(void);
 void gus_delay(void);
-int gus_default_mixer_ioctl (int dev, unsigned int cmd, ioctl_arg arg);
+int gus_default_mixer_ioctl (int dev, unsigned int cmd, caddr_t arg);
 void gus_timer_command (unsigned int addr, unsigned int val);
 
 /*	From gus_midi.c */
@@ -199,8 +199,8 @@
 /*	From patmgr.c */
 int pmgr_open(int dev);
 void pmgr_release(int dev);
-int pmgr_read (int dev, struct fileinfo *file, snd_rw_buf * buf, int count);
-int pmgr_write (int dev, struct fileinfo *file, const snd_rw_buf * buf, int count);
+int pmgr_read (int dev, struct fileinfo *file, char * buf, int count);
+int pmgr_write (int dev, struct fileinfo *file, const char * buf, int count);
 int pmgr_access(int dev, struct patmgr_info *rec);
 int pmgr_inform(int dev, int event, unsigned long parm1, unsigned long parm2,
 				    unsigned long parm3, unsigned long parm4);
@@ -213,10 +213,10 @@
 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, sound_os_info *osp);
+void 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, sound_os_info *osp);
+int ad1848_detect (int io_base, int *flags, int *osp);
 #define AD_F_CS4231	0x0001	/* Returned if a CS4232 (or compatible) detected */
 #define AD_F_CS4248	0x0001	/* Returned if a CS4248 (or compatible) detected */
 
@@ -241,12 +241,12 @@
 int probe_ss_ms_sound (struct address_info *hw_config);
 long attach_ss_ms_sound(long mem_start, struct address_info * hw_config);
 
-int pss_read (int dev, struct fileinfo *file, snd_rw_buf *buf, int count);
-int pss_write (int dev, struct fileinfo *file, snd_rw_buf *buf, int count);
+int pss_read (int dev, struct fileinfo *file, char *buf, int count);
+int pss_write (int dev, struct fileinfo *file, char *buf, int count);
 int pss_open (int dev, struct fileinfo *file);
 void pss_release (int dev, struct fileinfo *file);
 int pss_ioctl (int dev, struct fileinfo *file,
-	   unsigned int cmd, ioctl_arg arg);
+	   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);