diff --git a/kernel/microkernel/idle.c b/kernel/microkernel/idle.c index 10e1e224a82..992875bfd3c 100644 --- a/kernel/microkernel/idle.c +++ b/kernel/microkernel/idle.c @@ -53,7 +53,7 @@ unsigned int _k_workload_ref_time = 0x0; unsigned int _k_workload_t0 = 0x0; unsigned int _k_workload_t1 = 0x0; volatile unsigned int _k_workload_n0 = 0x0; -volatile unsigned int WldN1 = 0x0; +volatile unsigned int _k_workload_n1 = 0x0; volatile unsigned int Wld_i = 0x0; volatile unsigned int Wld_i0 = 0x0; volatile unsigned int WldTDelta = 0x0; @@ -72,7 +72,7 @@ extern uint32_t K_wl_scale; * * Perform idle task "dummy work". * -* This routine increments Wld_i and checks it against WldN1. WldN1 is updated +* This routine increments Wld_i and checks it against _k_workload_n1. _k_workload_n1 is updated * by the system tick handler, and both are kept in close synchronization. * * RETURNS: N/A @@ -84,7 +84,7 @@ static void _WlLoop(void) volatile int x = 87654321; volatile int y = 4; - while (++Wld_i != WldN1) /* except for the calibration phase, + while (++Wld_i != _k_workload_n1) /* except for the calibration phase, * this while loop should always be true. */ { @@ -114,7 +114,7 @@ static void _WlLoop(void) void wlMonitorCalibrate(void) { _k_workload_n0 = Wld_i = 0; - WldN1 = 1000; + _k_workload_n1 = 1000; _k_workload_t0 = timer_read(); _WlLoop(); diff --git a/kernel/microkernel/include/kticks.h b/kernel/microkernel/include/kticks.h index 92d7afafe33..c2ca802ccc7 100644 --- a/kernel/microkernel/include/kticks.h +++ b/kernel/microkernel/include/kticks.h @@ -45,7 +45,7 @@ extern unsigned int _k_workload_ref_time; extern unsigned int _k_workload_t0; extern unsigned int _k_workload_t1; extern volatile unsigned int _k_workload_n0; -extern volatile unsigned int WldN1; +extern volatile unsigned int _k_workload_n1; extern volatile unsigned int Wld_i; extern volatile unsigned int Wld_i0; extern volatile unsigned int WldTDelta; diff --git a/kernel/microkernel/timer/ticker.c b/kernel/microkernel/timer/ticker.c index 60e6e92ff26..d0d7dc552aa 100644 --- a/kernel/microkernel/timer/ticker.c +++ b/kernel/microkernel/timer/ticker.c @@ -139,8 +139,8 @@ static inline void _WlMonitorUpdate(void) if (--_k_workload_ticks == 0) { _k_workload_t0 = _k_workload_t1; _k_workload_t1 = timer_read(); - _k_workload_n0 = WldN1; - WldN1 = Wld_i - 1; + _k_workload_n0 = _k_workload_n1; + _k_workload_n1 = Wld_i - 1; _k_workload_ticks = _k_workload_slice; } #else