From 290da88f5a3e1908c2d9ab234199650308591a0e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 30 Sep 2008 16:27:16 +0000 Subject: 2008-09-30 Joel Sherrill * timer/timer.c: Eliminate uses of old benchmark timer names. --- c/src/lib/libcpu/mips/ChangeLog | 4 ++++ c/src/lib/libcpu/mips/timer/timer.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'c/src/lib/libcpu/mips') diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog index 7b1ee4692d..66812bb9dc 100644 --- a/c/src/lib/libcpu/mips/ChangeLog +++ b/c/src/lib/libcpu/mips/ChangeLog @@ -1,3 +1,7 @@ +2008-09-30 Joel Sherrill + + * timer/timer.c: Eliminate uses of old benchmark timer names. + 2008-09-05 Joel Sherrill * clock/ckinit.c: The Shared Memory Driver no longer requires the diff --git a/c/src/lib/libcpu/mips/timer/timer.c b/c/src/lib/libcpu/mips/timer/timer.c index cd5906ce59..a8a7aacc21 100644 --- a/c/src/lib/libcpu/mips/timer/timer.c +++ b/c/src/lib/libcpu/mips/timer/timer.c @@ -53,11 +53,11 @@ extern uint32_t mips_read_timer( void ); static bool benchmark_timer_find_average_overhead; -static uint32_t Timer_initial_value = 0; +static uint32_t benchmark_timer_initial_value = 0; void benchmark_timer_initialize( void ) { - Timer_initial_value = mips_read_timer(); + benchmark_timer_initial_value = mips_read_timer(); /* * Somehow start the timer */ @@ -90,11 +90,11 @@ int benchmark_timer_read( void ) */ clicks = mips_read_timer(); /* XXX: read some HW here */ - if (clicks < Timer_initial_value) + if (clicks < benchmark_timer_initial_value) { clicks += TIMER_MAX_VALUE; } - clicks -= Timer_initial_value; + clicks -= benchmark_timer_initial_value; /* * Total is calculated by taking into account the number of timer overflow -- cgit v1.2.3