From 5d861d51bb89f0fde992515bdce8f9a92e6e7220 Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Fri, 8 May 2015 17:12:54 -0500 Subject: [PATCH] Rename _IdleOrigTicks to idle_original_ticks Updating local variable's name to follow a consistent naming convention. The prefix underscore is removed due to it's a local variable. 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" -o -name "*.arch" \) \ ! -path "./host/src/genIdt/*" \ ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g'; Change-Id: I28cbf0d02600d31548393870e712e6da062048da Signed-off-by: Yonattan Louise --- arch/x86/timer/loApicTimer.c | 10 +++++----- drivers/timer/i8253.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/timer/loApicTimer.c b/arch/x86/timer/loApicTimer.c index 1d820c8ce67..76e5fee4d73 100644 --- a/arch/x86/timer/loApicTimer.c +++ b/arch/x86/timer/loApicTimer.c @@ -135,7 +135,7 @@ static uint32_t clock_accumulated_count = 0; #if defined(TIMER_SUPPORTS_TICKLESS) static uint32_t idle_original_count = 0; static uint32_t __noinit max_system_ticks; -static uint32_t _IdleOrigTicks = 0; +static uint32_t idle_original_ticks = 0; static uint32_t __noinit _MaxLoadValue; static uint32_t __noinit _TimerIdleSkew; static unsigned char _TimerMode = TIMER_MODE_PERIODIC; @@ -472,12 +472,12 @@ void _timer_idle_enter(int32_t ticks /* system ticks */ * is added. */ idle_original_count += _MaxLoadValue - counterLoadVal; - _IdleOrigTicks = max_system_ticks - 1; + idle_original_ticks = max_system_ticks - 1; } else { /* leave one tick of buffer to have to time react when coming * back ? */ - _IdleOrigTicks = ticks - 1; - idle_original_count += _IdleOrigTicks * counterLoadVal; + idle_original_ticks = ticks - 1; + idle_original_count += idle_original_ticks * counterLoadVal; } _TimerMode = TIMER_MODE_PERIODIC_ENT; @@ -519,7 +519,7 @@ void _timer_idle_exit(void) * mode */ _loApicTimerPeriodic(); _loApicTimerSetCount(counterLoadVal); - _sys_idle_elapsed_ticks = _IdleOrigTicks - 1; + _sys_idle_elapsed_ticks = idle_original_ticks - 1; _TimerMode = TIMER_MODE_PERIODIC; /* * Announce elapsed ticks to the microkernel. Note we are diff --git a/drivers/timer/i8253.c b/drivers/timer/i8253.c index e8d7c3a6a09..dae6349df6c 100644 --- a/drivers/timer/i8253.c +++ b/drivers/timer/i8253.c @@ -139,7 +139,7 @@ static uint16_t _currentLoadVal = 0; #if defined(TIMER_SUPPORTS_TICKLESS) static uint16_t idle_original_count = 0; -static uint16_t _IdleOrigTicks = 0; +static uint16_t idle_original_ticks = 0; static uint16_t __noinit max_system_ticks; static uint16_t __noinit _MaxLoadValue; static uint16_t __noinit _TimerIdleSkew; @@ -406,12 +406,12 @@ void _timer_idle_enter(int32_t ticks /* system ticks */ * is added. */ newCount += _MaxLoadValue - counterLoadVal; - _IdleOrigTicks = max_system_ticks - 1; + idle_original_ticks = max_system_ticks - 1; } else { /* leave one tick of buffer to have to time react when coming * back ? */ - _IdleOrigTicks = ticks - 1; - newCount += _IdleOrigTicks * counterLoadVal; + idle_original_ticks = ticks - 1; + newCount += idle_original_ticks * counterLoadVal; } idle_original_count = newCount - _TimerIdleSkew; @@ -456,7 +456,7 @@ void _timer_idle_exit(void) /* Timer expired. Place back in periodic mode */ _i8253CounterPeriodic(counterLoadVal); _TimerMode = TIMER_MODE_PERIODIC; - _sys_idle_elapsed_ticks = _IdleOrigTicks - 1; + _sys_idle_elapsed_ticks = idle_original_ticks - 1; /* * Announce elapsed ticks to the microkernel. Note we are * guaranteed