patch-1.3.18 linux/drivers/sound/pas2_card.c

• Lines: 48
• Date: Sat Aug 12 21:54:35 1995
• Orig file: v1.3.17/linux/drivers/sound/pas2_card.c
• Orig date: Mon Jul 31 15:59:02 1995

diff -u --recursive --new-file v1.3.17/linux/drivers/sound/pas2_card.c linux/drivers/sound/pas2_card.c
@@ -57,7 +57,7 @@
 /*
  * to support other than the default base address
  */
-extern void mix_write (unsigned char data, int ioaddr);
+extern void     mix_write (unsigned char data, int ioaddr);
 
 unsigned char
 pas_read (int ioaddr)
@@ -99,10 +99,8 @@
   if (status & I_S_MIDI_IRQ)
     {
 #ifndef EXCLUDE_MIDI
-#ifdef EXCLUDE_PRO_MIDI
       pas_midi_interrupt ();
 #endif
-#endif
       status &= ~I_S_MIDI_IRQ;
     }
 
@@ -253,7 +251,7 @@
 								 * 17.897 kHz
 								 */
 #if 1
-    pas_write (8, PRESCALE_DIVIDER);
+  pas_write (8, PRESCALE_DIVIDER);
 #else
   if (pas_model == PAS_16 || pas_model == PAS_16D)
     pas_write (8, PRESCALE_DIVIDER);
@@ -264,7 +262,7 @@
   mix_write (P_M_MV508_ADDRESS | 5, PARALLEL_MIXER);
   mix_write (5, PARALLEL_MIXER);
 
-#if !defined(EXCLUDE_SB_EMULATION) || !defined(EXCLUDE_SB)
+#if !defined(EXCLUDE_SB_EMULATION) && !defined(EXCLUDE_SB)
 
   {
     struct address_info *sb_config;
@@ -396,9 +394,7 @@
 #endif
 
 #ifndef EXCLUDE_MIDI
-#ifdef EXCLUDE_PRO_MIDI
 	  mem_start = pas_midi_init (mem_start);
-#endif
 #endif
 
 	  pas_init_mixer ();