patch-2.1.6 linux/drivers/sound/gus_midi.c

• Lines: 96
• Date: Tue Oct 29 09:31:32 1996
• Orig file: v2.1.5/linux/drivers/sound/gus_midi.c
• Orig date: Sun Jun 30 11:43:56 1996

diff -u --recursive --new-file v2.1.5/linux/drivers/sound/gus_midi.c linux/drivers/sound/gus_midi.c
@@ -6,7 +6,7 @@
 /*
  * Copyright (C) by Hannu Savolainen 1993-1996
  *
- * USS/Lite for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
+ * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
  * Version 2 (June 1991). See the "COPYING" file distributed with this software
  * for more info.
  */
@@ -17,7 +17,7 @@
 
 #include "gus_hw.h"
 
-#if defined(CONFIG_GUS) && defined(CONFIG_MIDI)
+#if defined(CONFIG_GUSHW) && defined(CONFIG_MIDI)
 
 static int      midi_busy = 0, input_opened = 0;
 static int      my_dev;
@@ -48,10 +48,10 @@
   if (midi_busy)
     {
       printk ("GUS: Midi busy\n");
-      return -(EBUSY);
+      return -EBUSY;
     }
 
-  outb (MIDI_RESET, u_MidiControl);
+  outb ((MIDI_RESET), u_MidiControl);
   gus_delay ();
 
   gus_midi_control = 0;
@@ -64,7 +64,7 @@
     }
 
 
-  outb (gus_midi_control, u_MidiControl);	/* Enable */
+  outb ((gus_midi_control), u_MidiControl);	/* Enable */
 
   midi_busy = 1;
   qlen = qhead = qtail = output_used = 0;
@@ -87,7 +87,7 @@
   if (GUS_MIDI_STATUS () & MIDI_XMIT_EMPTY)
     {
       ok = 1;
-      outb (midi_byte, u_MidiData);
+      outb ((midi_byte), u_MidiData);
     }
   else
     {
@@ -95,7 +95,7 @@
        * Enable Midi xmit interrupts (again)
        */
       gus_midi_control |= MIDI_ENABLE_XMIT;
-      outb (gus_midi_control, u_MidiControl);
+      outb ((gus_midi_control), u_MidiControl);
     }
 
   restore_flags (flags);
@@ -109,7 +109,7 @@
    * Reset FIFO pointers, disable intrs
    */
 
-  outb (MIDI_RESET, u_MidiControl);
+  outb ((MIDI_RESET), u_MidiControl);
   midi_busy = 0;
 }
 
@@ -180,7 +180,7 @@
 static int
 gus_midi_ioctl (int dev, unsigned cmd, caddr_t arg)
 {
-  return -(EINVAL);
+  return -EINVAL;
 }
 
 static void
@@ -242,7 +242,7 @@
       return;
     }
 
-  outb (MIDI_RESET, u_MidiControl);
+  outb ((MIDI_RESET), u_MidiControl);
 
   std_midi_synth.midi_dev = my_dev = num_midis;
   midi_devs[num_midis++] = &gus_midi_operations;
@@ -282,8 +282,8 @@
 	       * Disable Midi output interrupts, since no data in the buffer
 	       */
 	      gus_midi_control &= ~MIDI_ENABLE_XMIT;
-	      outb (gus_midi_control, u_MidiControl);
-	      outb (gus_midi_control, u_MidiControl);
+	      outb ((gus_midi_control), u_MidiControl);
+	      outb ((gus_midi_control), u_MidiControl);
 	    }
 	}