Update of /cvsroot/alsa/alsa-kernel/core In directory sc8-pr-cvs1:/tmp/cvs-serv6882
Modified Files: timer.c Log Message: Fill status.tstamp Index: timer.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/core/timer.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- timer.c 2 Mar 2003 10:44:12 -0000 1.32 +++ timer.c 2 Mar 2003 10:50:21 -0000 1.33 @@ -63,6 +63,7 @@ spinlock_t qlock; unsigned long last_resolution; unsigned int filter; + struct timespec tstamp; /* trigger tstamp */ wait_queue_head_t qchange_sleep; struct fasync_struct *fasync; } snd_timer_user_t; @@ -1072,7 +1073,9 @@ snd_timer_user_t *tu = snd_magic_cast(snd_timer_user_t, timeri->callback_data, return); snd_timer_tread_t r1; - if ((tu->filter & (1 << event)) == 0) + if (event >= SNDRV_TIMER_EVENT_START && event <= SNDRV_TIMER_EVENT_PAUSE) + tu->tstamp = *tstamp; + if ((tu->filter & (1 << event)) == 0 || !tu->tread) return; r1.event = event; r1.tstamp = *tstamp; @@ -1417,7 +1420,7 @@ tu->timeri->flags |= SNDRV_TIMER_IFLG_FAST; tu->timeri->callback = tu->tread ? snd_timer_user_tinterrupt : snd_timer_user_interrupt; - tu->timeri->ccallback = tu->tread ? snd_timer_user_ccallback : NULL; + tu->timeri->ccallback = snd_timer_user_ccallback; tu->timeri->callback_data = (void *)tu; return 0; } @@ -1525,6 +1528,7 @@ tu = snd_magic_cast(snd_timer_user_t, file->private_data, return -ENXIO); snd_assert(tu->timeri != NULL, return -ENXIO); memset(&status, 0, sizeof(status)); + status.tstamp = tu->tstamp; status.resolution = snd_timer_resolution(tu->timeri); status.lost = tu->timeri->lost; status.overrun = tu->overrun; ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog