patch-1.3.71 linux/drivers/sound/sb_dsp.c

• Lines: 40
• Date: Fri Mar 1 19:20:50 1996
• Orig file: v1.3.70/linux/drivers/sound/sb_dsp.c
• Orig date: Sat Mar 2 10:43:42 1996

diff -u --recursive --new-file v1.3.70/linux/drivers/sound/sb_dsp.c linux/drivers/sound/sb_dsp.c
@@ -55,6 +55,7 @@
 static int      dsp_count = 0;
 static int      trigger_bits;
 static int      mpu_base = 0, mpu_irq = 0;
+static int      sb16_inited = 0;
 
 /*
  * The DSP channel can be used either for input or output. Variable
@@ -1613,11 +1614,20 @@
 
   sb_dsp_ok = 1;
   sb_reset_dsp ();
+
+  if (sb16 || hw_config->dma2 >= 0)
+    {
+      if (sb16_dsp_detect (hw_config))
+	{
+	  sb16_inited = 1;
+	  return sb16_dsp_init (mem_start, hw_config);
+	}
+    }
   return mem_start;
 }
 
 void
-sb_dsp_unload (void)
+sb_dsp_unload (struct address_info *hw_config)
 {
   sound_free_dma (dma8);
 
@@ -1634,6 +1644,9 @@
     {
       snd_release_irq (ess_mpu_irq);
     }
+
+  if (sb16_inited)
+    unload_sb16 (hw_config);
 }
 
 void