diff options
author | Neel Natu <neel@nahannisys.com> | 2016-03-25 16:57:39 -0700 |
---|---|---|
committer | Neel Natu <neel@nahannisys.com> | 2016-03-25 16:57:39 -0700 |
commit | 8e31a9e184d0ac97ba98c7a3264475b45da2c172 (patch) | |
tree | 57dcf0452e9792b2514a5b7d501a9e840dbbc289 | |
parent | 79e9e9ba132a1e3b27da781f5c4758252a60cd61 (diff) |
Remove 'resched' parameter to 'os_time_advance()' because 'os_callout_tick()'
calls it implicitly via 'os_eventq_put()'.
-rw-r--r-- | hw/bsp/nrf52pdk/src/os_bsp.c | 2 | ||||
-rw-r--r-- | libs/os/include/os/os_time.h | 2 | ||||
-rwxr-xr-x | libs/os/src/arch/cortex_m0/os_arch_arm.c | 2 | ||||
-rwxr-xr-x | libs/os/src/arch/cortex_m4/os_arch_arm.c | 2 | ||||
-rw-r--r-- | libs/os/src/arch/sim/os_arch_sim.c | 2 | ||||
-rw-r--r-- | libs/os/src/os_time.c | 6 |
6 files changed, 7 insertions, 9 deletions
diff --git a/hw/bsp/nrf52pdk/src/os_bsp.c b/hw/bsp/nrf52pdk/src/os_bsp.c index f26460f2..255f16ff 100644 --- a/hw/bsp/nrf52pdk/src/os_bsp.c +++ b/hw/bsp/nrf52pdk/src/os_bsp.c @@ -134,7 +134,7 @@ nrf52_timer_handler(void) OS_EXIT_CRITICAL(sr); - os_time_advance(ticks, true); + os_time_advance(ticks); } void diff --git a/libs/os/include/os/os_time.h b/libs/os/include/os/os_time.h index 59923745..c1871128 100644 --- a/libs/os/include/os/os_time.h +++ b/libs/os/include/os/os_time.h @@ -65,7 +65,7 @@ typedef uint32_t os_time_t; #define OS_TIMEOUT_NEVER (UINT32_MAX) os_time_t os_time_get(void); -void os_time_advance(int ticks, bool resched); +void os_time_advance(int ticks); void os_time_delay(int32_t osticks); #define OS_TIME_TICK_LT(__t1, __t2) ((int32_t) ((__t1) - (__t2)) < 0) diff --git a/libs/os/src/arch/cortex_m0/os_arch_arm.c b/libs/os/src/arch/cortex_m0/os_arch_arm.c index 7e6e4337..82603dae 100755 --- a/libs/os/src/arch/cortex_m0/os_arch_arm.c +++ b/libs/os/src/arch/cortex_m0/os_arch_arm.c @@ -104,7 +104,7 @@ uint32_t os_flags = OS_RUN_PRIV; void timer_handler(void) { - os_time_advance(1, true); + os_time_advance(1); } void diff --git a/libs/os/src/arch/cortex_m4/os_arch_arm.c b/libs/os/src/arch/cortex_m4/os_arch_arm.c index 72b9f45d..5c4ad882 100755 --- a/libs/os/src/arch/cortex_m4/os_arch_arm.c +++ b/libs/os/src/arch/cortex_m4/os_arch_arm.c @@ -93,7 +93,7 @@ uint32_t os_flags = OS_RUN_PRIV; void timer_handler(void) { - os_time_advance(1, true); + os_time_advance(1); } void diff --git a/libs/os/src/arch/sim/os_arch_sim.c b/libs/os/src/arch/sim/os_arch_sim.c index 68310940..cb36df85 100644 --- a/libs/os/src/arch/sim/os_arch_sim.c +++ b/libs/os/src/arch/sim/os_arch_sim.c @@ -302,7 +302,7 @@ timer_handler(int sig) time_diff.tv_usec %= OS_USEC_PER_TICK; timersub(&time_now, &time_diff, &time_last); - os_time_advance(ticks, true); + os_time_advance(ticks); } static void diff --git a/libs/os/src/os_time.c b/libs/os/src/os_time.c index 825fc139..7b2f3102 100644 --- a/libs/os/src/os_time.c +++ b/libs/os/src/os_time.c @@ -82,7 +82,7 @@ os_time_tick(int ticks) } void -os_time_advance(int ticks, bool resched) +os_time_advance(int ticks) { assert(ticks >= 0); @@ -90,9 +90,7 @@ os_time_advance(int ticks, bool resched) os_time_tick(ticks); os_callout_tick(); os_sched_os_timer_exp(); - if (resched) { - os_sched(NULL); - } + os_sched(NULL); } } |