lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[dev][timer][cortex-a9] do not allow ticks of 0 to be set

Browse Source 
-Make sure tick values passed in are within valid range of hardware.
This commit is contained in:
Travis Geiselbrecht
2014-09-26 15:44:41 -07:00
parent 820bbfce0f
commit db17ccca0a
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dev/timer/arm_cortex_a9/arm_cortex_a9_timer.c
View File

@@ -110,6 +110,12 @@ status_t platform_set_periodic_timer(platform_timer_callback callback, void *arg
{
LTRACEF("callback %p, arg %p, interval %lu\n", callback, arg, interval);
uint64_t ticks = ((uint64_t)timer_freq_msec_conversion * interval);
if (unlikely(ticks == 0))
ticks = 1;
if (unlikely(ticks > 0xffffffff))
ticks = 0xffffffff;
enter_critical_section();
t_callback = callback;
@@ -119,7 +125,7 @@ status_t platform_set_periodic_timer(platform_timer_callback callback, void *arg
// disable timer
TIMREG(TIMER_CONTROL) = 0;
TIMREG(TIMER_LOAD) = ((uint64_t)timer_freq_msec_conversion * interval);
TIMREG(TIMER_LOAD) = ticks;
TIMREG(TIMER_CONTROL) = (1<<2) | (1<<1) | (1<<0); // irq enable, autoreload, enable
unmask_interrupt(CPU_PRIV_TIMER_INT);
@@ -133,6 +139,12 @@ status_t platform_set_oneshot_timer (platform_timer_callback callback, void *arg
{
LTRACEF("callback %p, arg %p, timeout %lu\n", callback, arg, interval);
uint64_t ticks = ((uint64_t)timer_freq_msec_conversion * interval);
if (unlikely(ticks == 0))
ticks = 1;
if (unlikely(ticks > 0xffffffff))
ticks = 0xffffffff;
enter_critical_section();
t_callback = callback;
@@ -141,7 +153,7 @@ status_t platform_set_oneshot_timer (platform_timer_callback callback, void *arg
// disable timer
TIMREG(TIMER_CONTROL) = 0;
TIMREG(TIMER_LOAD) = ((uint64_t)timer_freq_msec_conversion * interval);
TIMREG(TIMER_LOAD) = ticks;
TIMREG(TIMER_CONTROL) = (1<<2) | (1<<0) | (1<<0); // irq enable, oneshot, enable
unmask_interrupt(CPU_PRIV_TIMER_INT);