From c314312ef239044cadc9edf56a655683d426d1e7 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 8 Dec 2008 12:16:58 +0100 Subject: [PATCH] --- yaml --- r: 120572 b: refs/heads/master c: 647808a6b932d85c3e85df6dcf0e34c1e53cc953 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/core/hrtimer.c | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 43f343c4eabd..253678c4b1e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e78a37bc7776955a142317b622818962c3ee75dd +refs/heads/master: 647808a6b932d85c3e85df6dcf0e34c1e53cc953 diff --git a/trunk/sound/core/hrtimer.c b/trunk/sound/core/hrtimer.c index b712d7f211ff..866c80c4499d 100644 --- a/trunk/sound/core/hrtimer.c +++ b/trunk/sound/core/hrtimer.c @@ -1,4 +1,21 @@ /* + * ALSA timer back-end using hrtimer + * Copyright (C) 2008 Takashi Iwai + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * */ #include @@ -26,7 +43,7 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt) { struct snd_hrtimer *stime = container_of(hrt, struct snd_hrtimer, hrt); struct snd_timer *t = stime->timer; - hrtimer_forward_now(hrt, ktime_set(0, t->sticks * resolution)); + hrtimer_forward_now(hrt, ns_to_ktime(t->sticks * resolution)); snd_timer_interrupt(stime->timer, t->sticks); return HRTIMER_RESTART; } @@ -62,7 +79,7 @@ static int snd_hrtimer_start(struct snd_timer *t) { struct snd_hrtimer *stime = t->private_data; - hrtimer_start(&stime->hrt, ktime_set(0, t->sticks * resolution), + hrtimer_start(&stime->hrt, ns_to_ktime(t->sticks * resolution), HRTIMER_MODE_REL); return 0; }