patch-1.3.38 linux/drivers/sound/midi_synth.c

• Lines: 60
• Date: Tue Nov 7 10:14:17 1995
• Orig file: v1.3.37/linux/drivers/sound/midi_synth.c
• Orig date: Mon Oct 23 18:02:14 1995

diff -u --recursive --new-file v1.3.37/linux/drivers/sound/midi_synth.c linux/drivers/sound/midi_synth.c
@@ -47,6 +47,9 @@
 {0};
 static unsigned char prev_out_status[MAX_MIDI_DEV];
 
+#ifdef EXCLUDE_SEQUENCER
+#define STORE(cmd)
+#else
 #define STORE(cmd) \
 { \
   int len; \
@@ -54,6 +57,8 @@
   cmd; \
   seq_input_event(obuf, len); \
 }
+#endif
+
 #define _seqbuf obuf
 #define _seqbufptr 0
 #define _SEQ_ADVBUF(x) len=x
@@ -538,12 +543,9 @@
   left = sysex.len;
   src_offs = 0;
 
-  {
-    sysex_sleep_flag.aborting = 0;
-    sysex_sleep_flag.mode = WK_NONE;
-  };
+  sysex_sleep_flag.mode = WK_NONE;
 
-  for (i = 0; i < left && !((current->signal & ~current->blocked)); i++)
+  for (i = 0; i < left && !(current->signal & ~current->blocked); i++)
     {
       unsigned char   data;
 
@@ -564,22 +566,20 @@
 	}
 
       while (!midi_devs[orig_dev]->putc (orig_dev, (unsigned char) (data & 0xff)) &&
-	     !((current->signal & ~current->blocked)))
+	     !(current->signal & ~current->blocked))
 
 	{
 	  unsigned long   tl;
 
 	  if (1)
-	    tl = current->timeout = jiffies + (1);
+	    current->timeout = tl = jiffies + (1);
 	  else
 	    tl = 0xffffffff;
 	  sysex_sleep_flag.mode = WK_SLEEP;
 	  interruptible_sleep_on (&sysex_sleeper);
 	  if (!(sysex_sleep_flag.mode & WK_WAKEUP))
 	    {
-	      if (current->signal & ~current->blocked)
-		sysex_sleep_flag.aborting = 1;
-	      else if (jiffies >= tl)
+	      if (jiffies >= tl)
 		sysex_sleep_flag.mode |= WK_TIMEOUT;
 	    }
 	  sysex_sleep_flag.mode &= ~WK_SLEEP;