leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: remove prototype for get_timer_masked

Browse Source 
The interruption support had be removed for ARM architecture and
the function get_timer_masked() is no more used except in some
the timer.c files.

This patch clean each timer.c which implement this function and
remove the associated prototype in u-boot-arm.h

For timer.c, I don't verify if the weak version of get_timer
(in lib/time.c) can be used

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrick Delaunay
2018-10-05 11:33:52 +02:00
committed by Tom Rini
parent aa33fe8695
commit 6180ea7e66
17 changed files with 62 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
board/armltd/integrator/timer.c
View File

@@ -93,6 +93,30 @@ int timer_init (void)
/*
* timer without interrupts
*/
/* converts the timer reading to U-Boot ticks */
/* the timestamp is the number of ticks since reset */
static ulong get_timer_masked (void)
{
/* get current count */
unsigned long long now = READ_TIMER;
if(now > lastdec) {
/* Must have wrapped */
total_count += lastdec + TIMER_LOAD_VAL + 1 - now;
} else {
total_count += lastdec - now;
}
lastdec = now;
/* Reuse "now" */
now = total_count;
do_div(now, div_timer);
timestamp = now;
return timestamp;
}
ulong get_timer (ulong base_ticks)
{
return get_timer_masked () - base_ticks;
@@ -115,29 +139,6 @@ void __udelay (unsigned long usec)
}
}
/* converts the timer reading to U-Boot ticks */
/* the timestamp is the number of ticks since reset */
ulong get_timer_masked (void)
{
/* get current count */
unsigned long long now = READ_TIMER;
if(now > lastdec) {
/* Must have wrapped */
total_count += lastdec + TIMER_LOAD_VAL + 1 - now;
} else {
total_count += lastdec - now;
}
lastdec = now;
/* Reuse "now" */
now = total_count;
do_div(now, div_timer);
timestamp = now;
return timestamp;
}
/*
* This function is derived from PowerPC code (read timebase as long long).
* On ARM it just returns the timer value.