diff options
author | Alex Shi <alex.shi@linaro.org> | 2014-07-29 13:55:15 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-07-29 13:55:15 +0800 |
commit | 7c18f677c1a7a94efc845ecedde2f1d1463d4359 (patch) | |
tree | e6841fbec6073f2c068fa6aec1f477964d34e198 /kernel/time | |
parent | 1df5f2728eb1ba0f7b783c00afe7575902996d39 (diff) | |
parent | 77917ecac9c37f9f02e7954b617df8f824894778 (diff) | |
download | juno-7c18f677c1a7a94efc845ecedde2f1d1463d4359.tar.gz |
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/alarmtimer.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index d41fcb46a40..28ef74529cb 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -577,9 +577,14 @@ static int alarm_timer_set(struct k_itimer *timr, int flags, struct itimerspec *new_setting, struct itimerspec *old_setting) { + ktime_t exp; + if (!rtcdev) return -ENOTSUPP; + if (flags & ~TIMER_ABSTIME) + return -EINVAL; + if (old_setting) alarm_timer_get(timr, old_setting); @@ -589,8 +594,16 @@ static int alarm_timer_set(struct k_itimer *timr, int flags, /* start the timer */ timr->it.alarm.interval = timespec_to_ktime(new_setting->it_interval); - alarm_start(&timr->it.alarm.alarmtimer, - timespec_to_ktime(new_setting->it_value)); + exp = timespec_to_ktime(new_setting->it_value); + /* Convert (if necessary) to absolute time */ + if (flags != TIMER_ABSTIME) { + ktime_t now; + + now = alarm_bases[timr->it.alarm.alarmtimer.type].gettime(); + exp = ktime_add(now, exp); + } + + alarm_start(&timr->it.alarm.alarmtimer, exp); return 0; } @@ -722,6 +735,9 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags, if (!alarmtimer_get_rtcdev()) return -ENOTSUPP; + if (flags & ~TIMER_ABSTIME) + return -EINVAL; + if (!capable(CAP_WAKE_ALARM)) return -EPERM; |