patch-1.3.9 linux/drivers/sound/pas2_midi.c

Next file: linux/drivers/sound/pas2_mixer.c
Previous file: linux/drivers/sound/pas2_card.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.8/linux/drivers/sound/pas2_midi.c linux/drivers/sound/pas2_midi.c
@@ -83,8 +83,8 @@
 
   if (mode == OPEN_READ || mode == OPEN_READWRITE)
     {
-      ctrl |= M_C_ENA_INPUT_IRQ;/*
-					 * Enable input
+      ctrl |= M_C_ENA_INPUT_IRQ;	/*
+					   * Enable input
 					 */
       input_opened = 1;
     }
@@ -134,9 +134,9 @@
 
   fifo_space = ((x = pas_read (MIDI_FIFO_STATUS)) >> 4) & 0x0f;
 
-  if (fifo_space == 15 || (fifo_space < 2 && ofifo_bytes > 13))	/*
-									 * Fifo
-									 * full
+  if (fifo_space == 15 || (fifo_space < 2 && ofifo_bytes > 13))		/*
+									   * Fifo
+									   * full
 									 */
     {
       return 0;			/*
@@ -239,6 +239,7 @@
 {
   {"Pro Audio Spectrum", 0, 0, SNDCARD_PAS},
   &std_midi_synth,
+  {0},
   pas_midi_open,
   pas_midi_close,
   pas_midi_ioctl,
@@ -319,8 +320,10 @@
       RESTORE_INTR (flags);
     }
 
+#if 0
   if (stat & M_S_FRAMING_ERROR)
     printk ("MIDI framing error\n");
+#endif
 
   if (stat & M_S_OUTPUT_OVERRUN)
     {
@@ -328,8 +331,8 @@
       ofifo_bytes = 100;
     }
 
-  pas_write (stat, MIDI_STATUS);/*
-					 * Acknowledge interrupts
+  pas_write (stat, MIDI_STATUS);	/*
+					   * Acknowledge interrupts
 					 */
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this