patch-2.3.99-pre4 linux/drivers/sound/sb_common.c

• Lines: 53
• Date: Mon Mar 27 11:02:55 2000
• Orig file: v2.3.99-pre3/linux/drivers/sound/sb_common.c
• Orig date: Mon Mar 27 08:08:28 2000

diff -u --recursive --new-file v2.3.99-pre3/linux/drivers/sound/sb_common.c linux/drivers/sound/sb_common.c
@@ -53,14 +53,6 @@
 	0, 1, 0, 2, 0, 3, 0, 4
 };
 
-/* Do acer notebook init? */
-int acer = 0;
-
-/* soundman games? */
-int sm_games = 0;
-
-extern int esstype;
-
 void *smw_free = NULL;
 
 /*
@@ -503,12 +495,16 @@
 #endif
 }
 
-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)
 {
 	sb_devc sb_info;
 	sb_devc *devc = &sb_info;
 
 	memset((char *) &sb_info, 0, sizeof(sb_info));	/* Zero everything */
+
+	/* Copy module options in place */
+	if(sbmo) memcpy(&devc->sbmo, sbmo, sizeof(struct sb_module_options));
+
 	sb_info.my_mididev = -1;
 	sb_info.my_mixerdev = -1;
 	sb_info.dev = -1;
@@ -553,7 +549,7 @@
 		printk("Yamaha PCI mode.\n");
 	}
 	
-	if (acer)
+	if (devc->sbmo.acer)
 	{
 		cli();
 		inb(devc->base + 0x09);
@@ -1294,10 +1290,6 @@
 #endif
 	unload_uart401(hw_config);
 }
-
-MODULE_PARM(acer, "i");
-MODULE_PARM(sm_games, "i");
-MODULE_PARM(esstype, "i");
 
 EXPORT_SYMBOL(sb_dsp_init);
 EXPORT_SYMBOL(sb_dsp_detect);