patch-1.3.74 linux/drivers/sound/gus_card.c

• Lines: 35
• Date: Wed Mar 13 09:12:37 1996
• Orig file: v1.3.73/linux/drivers/sound/gus_card.c
• Orig date: Sat Mar 2 10:43:42 1996

diff -u --recursive --new-file v1.3.73/linux/drivers/sound/gus_card.c linux/drivers/sound/gus_card.c
@@ -41,6 +41,7 @@
 extern int      gus_wave_volume;
 extern int      gus_pcm_volume;
 extern int      have_gus_max;
+int             gus_pnp_flag = 0;
 
 int            *gus_osp;
 
@@ -115,6 +116,9 @@
 
   gus_osp = hw_config->osp;
 
+  if (hw_config->card_subtype == 1)
+    gus_pnp_flag = 1;
+
   irq = hw_config->irq;
 
   if (hw_config->card_subtype == 0)	/* GUS/MAX/ACE */
@@ -125,10 +129,12 @@
 	return 0;
       }
 
-  if (!check_region (hw_config->io_base, 16))
-    if (!check_region (hw_config->io_base + 0x100, 16))
-      if (gus_wave_detect (hw_config->io_base))
-	return 1;
+  if (check_region (hw_config->io_base, 16))
+    printk ("GUS: I/O range conflict (1)\n");
+  else if (check_region (hw_config->io_base + 0x100, 16))
+    printk ("GUS: I/O range conflict (2)\n");
+  else if (gus_wave_detect (hw_config->io_base))
+    return 1;
 
 #ifndef EXCLUDE_GUS_IODETECT