ALSA: ctxfi - Use native timer interrupt on emu20k1

emu20k1 has a native timer interrupt based on the audio clock, which
is more accurate than the system timer (from the synchronization POV).
This patch adds the code to handle this with multiple streams.

The system timer is still used on emu20k2, and can be used also for
emu20k1 easily by changing USE_SYSTEM_TIMER to 1 in cttimer.c.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 5 insertions, 4 deletions

diff --git a/sound/pci/ctxfi/ctatc.h b/sound/pci/ctxfi/ctatc.h
index b86d12cd4a19..a3f9b1bc7dcc 100644
--- a/sound/pci/ctxfi/ctatc.h
+++ b/sound/pci/ctxfi/ctatc.h
@@ -59,16 +59,15 @@ struct ct_atc_chip_details {
 };
 
 struct ct_atc;
+struct ct_timer;
+struct ct_timer_instance;
 
 /* alsa pcm stream descriptor */
 struct ct_atc_pcm {
         struct snd_pcm_substream *substream;
         void (*interrupt)(struct ct_atc_pcm *apcm);
+        struct ct_timer_instance *timer;
         unsigned int started:1;
-        unsigned int stop_timer:1;
-        struct timer_list timer;
-        spinlock_t timer_lock;
-        unsigned int position;
 
         /* Only mono and interleaved modes are supported now. */
         struct ct_vm_block *vm_block;
@@ -144,6 +143,8 @@ struct ct_atc {
         unsigned char n_src;
         unsigned char n_srcimp;
         unsigned char n_pcm;
+
+        struct ct_timer *timer;
 };