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

• Lines: 138
• Date: Mon Jun 12 15:47:27 1995
• Orig file: v1.3.8/linux/drivers/sound/sound_calls.h
• Orig date: Fri Jan 20 10:24:13 1995

diff -u --recursive --new-file v1.3.8/linux/drivers/sound/sound_calls.h linux/drivers/sound/sound_calls.h
@@ -4,18 +4,21 @@
 
 int DMAbuf_open(int dev, int mode);
 int DMAbuf_release(int dev, int mode);
-int DMAbuf_getwrbuffer(int dev, char **buf, int *size);
-int DMAbuf_getrdbuffer(int dev, char **buf, int *len);
+int DMAbuf_getwrbuffer(int dev, char **buf, int *size, int dontblock);
+int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock);
 int DMAbuf_rmchars(int dev, int buff_no, int c);
 int DMAbuf_start_output(int dev, int buff_no, int l);
 int DMAbuf_ioctl(int dev, unsigned int cmd, unsigned int 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 chan);
-void DMAbuf_close_dma (int chan);
-void DMAbuf_reset_dma (int chan);
+int DMAbuf_open_dma (int dev);
+void DMAbuf_close_dma (int dev);
+void DMAbuf_reset_dma (int dev);
 void DMAbuf_inputintr(int dev);
 void DMAbuf_outputintr(int dev, int underflow_flag);
+#ifdef ALLOW_SELECT
+int DMAbuf_select(int dev, struct fileinfo *file, int sel_type, select_table * wait);
+#endif
 
 /*
  *	System calls for /dev/dsp and /dev/audio
@@ -30,6 +33,10 @@
 int audio_lseek (int dev, struct fileinfo *file, off_t offset, int orig);
 long audio_init (long mem_start);
 
+#ifdef ALLOW_SELECT
+int audio_select(int dev, struct fileinfo *file, int sel_type, select_table * wait);
+#endif
+
 /*
  *	System calls for the /dev/sequencer
  */
@@ -86,21 +93,13 @@
  *	Misc calls from various sources
  */
 
-/* 	From pro_midi.c 	*/
-
-long pro_midi_attach(long mem_start);
-int  pro_midi_open(int dev, int mode);
-void pro_midi_close(int dev);
-int pro_midi_write(int dev, snd_rw_buf *uio);
-int pro_midi_read(int dev, snd_rw_buf *uio);
-
 /*	From soundcard.c	*/
 long soundcard_init(long mem_start);
 void tenmicrosec(void);
 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 *));
+int snd_set_irq_handler (int interrupt_level, INT_HANDLER_PROTO(), char *name);
 void snd_release_irq(int vect);
 void sound_dma_malloc(int dev);
 void sound_dma_free(int dev);
@@ -123,7 +122,7 @@
 int sb_reset_dsp (void);
 
 /*	From sb16_dsp.c	*/
-void sb16_dsp_interrupt (int unused);
+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);
 
@@ -177,7 +176,7 @@
 long attach_gus_card(long mem_start, struct address_info * hw_config);
 int probe_gus(struct address_info *hw_config);
 int gus_set_midi_irq(int num);
-void gusintr(int, struct pt_regs * regs);
+void gusintr(INT_HANDLER_PARMS(irq, dummy));
 long attach_gus_db16(long mem_start, struct address_info * hw_config);
 int probe_gus_db16(struct address_info *hw_config);
 
@@ -198,6 +197,7 @@
 /*	From mpu401.c */
 long attach_mpu401(long mem_start, struct address_info * hw_config);
 int probe_mpu401(struct address_info *hw_config);
+void mpuintr(INT_HANDLER_PARMS(irq, dummy));
 
 /*	From uart6850.c */
 long attach_uart6850(long mem_start, struct address_info * hw_config);
@@ -225,13 +225,23 @@
 /*	From ad1848.c */
 void ad1848_init (char *name, int io_base, int irq, int dma_playback, int dma_capture);
 int ad1848_detect (int io_base);
-void     ad1848_interrupt (int dev, struct pt_regs *regs);
+void     ad1848_interrupt (INT_HANDLER_PARMS(irq, dummy));
 long attach_ms_sound(long mem_start, struct address_info * hw_config);
 int probe_ms_sound(struct address_info *hw_config);
 
 /* 	From pss.c */
 int probe_pss (struct address_info *hw_config);
 long attach_pss (long mem_start, 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);
+int probe_pss_mss (struct address_info *hw_config);
+long attach_pss_mss (long mem_start, 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);
+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);
@@ -241,3 +251,25 @@
 	   unsigned int cmd, unsigned int arg);
 int pss_lseek (int dev, struct fileinfo *file, off_t offset, int orig);
 long pss_init(long mem_start);
+
+/* From aedsp16.c */
+int InitAEDSP16_SBPRO(struct address_info *hw_config);
+int InitAEDSP16_MSS(struct address_info *hw_config);
+int InitAEDSP16_MPU401(struct address_info *hw_config);
+
+/*	From midi_synth.c	*/
+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);
+int probe_trix_wss (struct address_info *hw_config);
+long attach_trix_sb (long mem_start, 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);
+int probe_trix_mpu (struct address_info *hw_config);
+
+/*	From mad16.c	*/
+long attach_mad16 (long mem_start, 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);
+int probe_mad16_mpu (struct address_info *hw_config);