patch-1.3.71 linux/drivers/sound/pas2_pcm.c

Next file: linux/drivers/sound/sb16_dsp.c
Previous file: linux/drivers/sound/os.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.70/linux/drivers/sound/pas2_pcm.c linux/drivers/sound/pas2_pcm.c
@@ -324,6 +324,9 @@
       pcm_count = count;
     }
   pas_write (pas_read (FILTER_FREQUENCY) | F_F_PCM_BUFFER_COUNTER | F_F_PCM_RATE_COUNTER, FILTER_FREQUENCY);
+#ifdef NO_TRIGGER
+  pas_write (pas_read (PCM_CONTROL) | P_C_PCM_ENABLE | P_C_PCM_DAC_MODE, PCM_CONTROL);
+#endif
 
   pcm_mode = PCM_DAC;
 
@@ -370,12 +373,16 @@
       pcm_count = count;
     }
   pas_write (pas_read (FILTER_FREQUENCY) | F_F_PCM_BUFFER_COUNTER | F_F_PCM_RATE_COUNTER, FILTER_FREQUENCY);
+#ifdef NO_TRIGGER
+  pas_write ((pas_read (PCM_CONTROL) | P_C_PCM_ENABLE) & ~P_C_PCM_DAC_MODE, PCM_CONTROL);
+#endif
 
   pcm_mode = PCM_ADC;
 
   restore_flags (flags);
 }
 
+#ifndef NO_TRIGGER
 static void
 pas_pcm_trigger (int dev, int state)
 {
@@ -394,6 +401,7 @@
 
   restore_flags (flags);
 }
+#endif
 
 static int
 pas_pcm_prepare_for_input (int dev, int bsize, int bcount)
@@ -426,7 +434,11 @@
   NULL,
   NULL,
   NULL,
+#ifndef NO_TRIGGER
   pas_pcm_trigger
+#else
+  NULL
+#endif
 };
 
 long

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