michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename WldN1 to _k_workload_n1

Browse source 
Updating global variable's name to follow a consistent naming convention.

Change accomplished with the following script:

   #!/bin/bash
   echo "Searching for ${1} to replace with ${2}"
   find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" \) \
            ! -path "./host/src/genIdt/*" \
            ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g';

Change-Id: I20dca589df9253fb950aafa060eec1463f696f82
Signed-off-by: Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-04-27 10:28:32 -05:00 • committed by Anas Nashif
commit 26874aabd6
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/microkernel/idle.c
View file

@ -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();

2
kernel/microkernel/include/kticks.h
View file

@ -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;

4
kernel/microkernel/timer/ticker.c
View file

@ -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