patch-2.3.99-pre4 linux/drivers/sound/sb.h

• Lines: 43
• Date: Mon Mar 27 11:02:54 2000
• Orig file: v2.3.99-pre3/linux/drivers/sound/sb.h
• Orig date: Mon Mar 27 08:08:28 2000

diff -u --recursive --new-file v2.3.99-pre3/linux/drivers/sound/sb.h linux/drivers/sound/sb.h
@@ -70,6 +70,13 @@
 typedef struct mixer_def mixer_tab[32][2];
 typedef struct mixer_def mixer_ent;
 
+struct sb_module_options
+{
+	int  esstype;	/* ESS chip type */
+	int  acer;	/* Do acer notebook init? */
+	int  sm_games;	/* Logitech soundman games? */
+};
+
 typedef struct sb_devc {
 	   int dev;
 
@@ -128,7 +135,10 @@
 	   int input_opened;
 	   int midi_broken;
 	   void (*midi_input_intr) (int dev, unsigned char data);
-	   void *midi_irq_cookie;	/* IRQ cookie for the midi */
+	   void *midi_irq_cookie;		/* IRQ cookie for the midi */
+
+	   struct sb_module_options sbmo;	/* Module options */
+
 	} sb_devc;
 	
 /*
@@ -147,7 +157,7 @@
 int sb_dsp_reset (sb_devc *devc);
 void sb_setmixer (sb_devc *devc, unsigned int port, unsigned int value);
 unsigned int sb_getmixer (sb_devc *devc, unsigned int port);
-int sb_dsp_detect (struct address_info *hw_config, int pci, int pciio);
+int sb_dsp_detect (struct address_info *hw_config, int pci, int pciio, struct sb_module_options *sbmo);
 int sb_dsp_init (struct address_info *hw_config);
 void sb_dsp_unload(struct address_info *hw_config, int sbmpu);
 int sb_mixer_init(sb_devc *devc);
@@ -163,7 +173,6 @@
 int sb_audio_open(int dev, int mode);
 void sb_audio_close(int dev);
 
-extern int acer;
 extern sb_devc *last_sb;
 
 /*	From sb_common.c */