patch-2.0.3 linux/drivers/sound/sscape.c

• Lines: 97
• Date: Sat Jul 6 13:31:15 1996
• Orig file: v2.0.2/linux/drivers/sound/sscape.c
• Orig date: Wed Jul 3 22:05:17 1996

diff -u --recursive --new-file v2.0.2/linux/drivers/sound/sscape.c linux/drivers/sound/sscape.c
@@ -1,7 +1,7 @@
 /*
  * sound/sscape.c
  *
- * Low level driver for Ensoniq Soundscape
+ * Low level driver for Ensoniq SoundScape
  */
 /*
  * Copyright (C) by Hannu Savolainen 1993-1996
@@ -304,10 +304,10 @@
       printk ("SSCAPE: Host interrupt, data=%02x\n", host_read (devc));
     }
 
-#if defined(CONFIG_UART401) && defined(CONFIG_MIDI)
+#if defined(CONFIG_MPU401) && defined(CONFIG_MIDI)
   if (bits & 0x01)
     {
-      uart401intr (irq, NULL, NULL);
+      mpuintr (irq, NULL, NULL);
       if (debug++ > 10)		/* Temporary debugging hack */
 	{
 	  sscape_write (devc, GA_INTENA_REG, 0x00);	/* Disable all interrupts */
@@ -436,8 +436,10 @@
       save_flags (flags);
       cli ();
       codec_dma_bits = sscape_read (devc, GA_CDCFG_REG);
+#if 0
       sscape_write (devc, GA_CDCFG_REG,
 		    codec_dma_bits & ~0x08);	/* Disable codec DMA */
+#endif
 
       if (devc->dma_allocated == 0)
 	{
@@ -716,10 +718,10 @@
   if (old_hardware)
     {
       valid_interrupts = valid_interrupts_old;
-      conf_printf ("Ensoniq Soundscape (old)", hw_config);
+      conf_printf ("Ensoniq SoundScape (old)", hw_config);
     }
   else
-    conf_printf ("Ensoniq Soundscape", hw_config);
+    conf_printf ("Ensoniq SoundScape", hw_config);
 
   for (i = 0; i < sizeof (valid_interrupts); i++)
     if (hw_config->irq == valid_interrupts[i])
@@ -785,17 +787,17 @@
   }
 #endif
 
-#if defined(CONFIG_MIDI) && defined(CONFIG_UART401)
-  if (probe_uart401 (hw_config))
+#if defined(CONFIG_MIDI) && defined(CONFIG_MPU401)
+  if (probe_mpu401 (hw_config))
     hw_config->always_detect = 1;
   {
     int             prev_devs;
 
     prev_devs = num_midis;
-    hw_config->name = "Soundscape";
+    hw_config->name = "SoundScape";
 
     hw_config->irq *= -1;	/* Negative value signals IRQ sharing */
-    attach_uart401 (hw_config);
+    attach_mpu401 (hw_config);
     hw_config->irq *= -1;	/* Restore it */
 
     if (num_midis == (prev_devs + 1))	/* The MPU driver installed itself */
@@ -824,7 +826,7 @@
 
   /*
      * First check that the address register of "ODIE" is
-     * there and that it has exactly 4 writeable bits.
+     * there and that it has exactly 4 writable bits.
      * First 4 bits
    */
   if ((save = inb (PORT (ODIE_ADDR))) & 0xf0)
@@ -938,7 +940,7 @@
   sscape_write (devc, GA_DMACFG_REG, 0x50);
 
   /*
-     * Take the gate-arry off of the DMA channel.
+     * Take the gate-array off of the DMA channel.
    */
   sscape_write (devc, GA_DMAB_REG, 0x20);
 
@@ -988,8 +990,8 @@
 void
 unload_sscape (struct address_info *hw_config)
 {
-#if defined(CONFIG_UART401) && defined(CONFIG_MIDI)
-  unload_uart401 (hw_config);
+#if defined(CONFIG_MPU401) && defined(CONFIG_MIDI)
+  unload_mpu401 (hw_config);
 #endif
   snd_release_irq (hw_config->irq);
 }