aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/timer.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-10-10 05:49:49 -0400
committerJaroslav Kysela <perex@suse.cz>2005-11-04 07:17:47 -0500
commit07799e756c76ecd52cb01a812ba48b7d8ac67633 (patch)
tree5b6a006d90e631e6b70264aba355314a7cedbbe5 /sound/core/timer.c
parent7c22f1aaa23370bf9ba2dd3abbccbed70dced216 (diff)
[ALSA] Use getnstimeofday()
Modules: Documentation,PCM Midlevel,Timer Midlevel,ALSA Core Use the standard getnstimeofday() function instead of ALSA's own one. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/timer.c')
-rw-r--r--sound/core/timer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 128916c66085..8ecec9134acd 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -385,7 +385,7 @@ static void snd_timer_notify1(snd_timer_instance_t *ti, enum sndrv_timer_event e
385 struct list_head *n; 385 struct list_head *n;
386 struct timespec tstamp; 386 struct timespec tstamp;
387 387
388 snd_timestamp_now(&tstamp, 1); 388 getnstimeofday(&tstamp);
389 snd_assert(event >= SNDRV_TIMER_EVENT_START && event <= SNDRV_TIMER_EVENT_PAUSE, return); 389 snd_assert(event >= SNDRV_TIMER_EVENT_START && event <= SNDRV_TIMER_EVENT_PAUSE, return);
390 if (event == SNDRV_TIMER_EVENT_START || event == SNDRV_TIMER_EVENT_CONTINUE) 390 if (event == SNDRV_TIMER_EVENT_START || event == SNDRV_TIMER_EVENT_CONTINUE)
391 resolution = snd_timer_resolution(ti); 391 resolution = snd_timer_resolution(ti);
@@ -1156,14 +1156,14 @@ static void snd_timer_user_tinterrupt(snd_timer_instance_t *timeri,
1156 struct timespec tstamp; 1156 struct timespec tstamp;
1157 int prev, append = 0; 1157 int prev, append = 0;
1158 1158
1159 snd_timestamp_zero(&tstamp); 1159 memset(&tstamp, 0, sizeof(tstamp));
1160 spin_lock(&tu->qlock); 1160 spin_lock(&tu->qlock);
1161 if ((tu->filter & ((1 << SNDRV_TIMER_EVENT_RESOLUTION)|(1 << SNDRV_TIMER_EVENT_TICK))) == 0) { 1161 if ((tu->filter & ((1 << SNDRV_TIMER_EVENT_RESOLUTION)|(1 << SNDRV_TIMER_EVENT_TICK))) == 0) {
1162 spin_unlock(&tu->qlock); 1162 spin_unlock(&tu->qlock);
1163 return; 1163 return;
1164 } 1164 }
1165 if (tu->last_resolution != resolution || ticks > 0) 1165 if (tu->last_resolution != resolution || ticks > 0)
1166 snd_timestamp_now(&tstamp, 1); 1166 getnstimeofday(&tstamp);
1167 if ((tu->filter & (1 << SNDRV_TIMER_EVENT_RESOLUTION)) && tu->last_resolution != resolution) { 1167 if ((tu->filter & (1 << SNDRV_TIMER_EVENT_RESOLUTION)) && tu->last_resolution != resolution) {
1168 r1.event = SNDRV_TIMER_EVENT_RESOLUTION; 1168 r1.event = SNDRV_TIMER_EVENT_RESOLUTION;
1169 r1.tstamp = tstamp; 1169 r1.tstamp = tstamp;