phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM: */timer.c: fix spelling and vertical alignment 

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2010-05-21 23:13:18 +02:00
parent 3f786bb854
commit 92381c41c7
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/arm1136/mx31/timer.c
View File

@ -151,7 +151,7 @@ void set_timer (ulong t)
timestamp = time_to_tick(t); timestamp = time_to_tick(t);
} }
/* delay x useconds AND perserve advance timstamp value */ /* delay x useconds AND preserve advance timestamp value */
void __udelay (unsigned long usec) void __udelay (unsigned long usec)
{ {
unsigned long long tmp; unsigned long long tmp;

22
arch/arm/cpu/arm1136/omap24xx/timer.c
View File

@ -73,25 +73,25 @@ void set_timer (ulong t)
timestamp = t; timestamp = t;
} }
/* delay x useconds AND perserve advance timstamp value */ /* delay x useconds AND preserve advance timestamp value */
void __udelay (unsigned long usec) void __udelay (unsigned long usec)
{ {
ulong tmo, tmp; ulong tmo, tmp;
if (usec >= 1000) { /* if "big" number, spread normalization to seconds */ if (usec >= 1000) { /* if "big" number, spread normalization to seconds */
tmo = usec / 1000; /* start to normalize for usec to ticks per sec */ tmo = usec / 1000; /* start to normalize for usec to ticks per sec */
tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */ tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */
tmo /= 1000; /* finish normalize. */ tmo /= 1000; /* finish normalize. */
} else { /* else small number, don't kill it prior to HZ multiply */ } else { /* else small number, don't kill it prior to HZ multiply */
tmo = usec * CONFIG_SYS_HZ; tmo = usec * CONFIG_SYS_HZ;
tmo /= (1000*1000); tmo /= (1000*1000);
} }
tmp = get_timer (0); /* get current timestamp */ tmp = get_timer (0); /* get current timestamp */
if ( (tmo + tmp + 1) < tmp )/* if setting this forward will roll time stamp */ if ( (tmo + tmp + 1) < tmp ) /* if setting this forward will roll time stamp */
reset_timer_masked (); /* reset "advancing" timestamp to 0, set lastinc value */ reset_timer_masked (); /* reset "advancing" timestamp to 0, set lastinc value */
else else
tmo += tmp; /* else, set advancing stamp wake up time */ tmo += tmp; /* else, set advancing stamp wake up time */
while (get_timer_masked () < tmo)/* loop till event */ while (get_timer_masked () < tmo)/* loop till event */
/*NOP*/; /*NOP*/;
} }
@ -100,16 +100,16 @@ void reset_timer_masked (void)
{ {
/* reset time */ /* reset time */
lastinc = READ_TIMER; /* capture current incrementer value time */ lastinc = READ_TIMER; /* capture current incrementer value time */
timestamp = 0; /* start "advancing" time stamp from 0 */ timestamp = 0; /* start "advancing" time stamp from 0 */
} }
ulong get_timer_masked (void) ulong get_timer_masked (void)
{ {
ulong now = READ_TIMER; /* current tick value */ ulong now = READ_TIMER; /* current tick value */
if (now >= lastinc) /* normal mode (non roll) */ if (now >= lastinc) /* normal mode (non roll) */
timestamp += (now - lastinc); /* move stamp fordward with absoulte diff ticks */ timestamp += (now - lastinc); /* move stamp fordward with absoulte diff ticks */
else /* we have rollover of incrementer */ else /* we have rollover of incrementer */
timestamp += (0xFFFFFFFF - lastinc) + now; timestamp += (0xFFFFFFFF - lastinc) + now;
lastinc = now; lastinc = now;
return timestamp; return timestamp;

2
arch/arm/cpu/arm920t/a320/timer.c
View File

@ -155,7 +155,7 @@ void set_timer(ulong t)
timestamp = t; timestamp = t;
} }
/* delay x useconds AND perserve advance timstamp value */ /* delay x useconds AND preserve advance timestamp value */
void udelay(unsigned long usec) void udelay(unsigned long usec)
{ {
long tmo = usec * (TIMER_CLOCK / 1000) / 1000; long tmo = usec * (TIMER_CLOCK / 1000) / 1000;

4
arch/arm/cpu/arm926ejs/omap/timer.c
View File

@ -79,14 +79,14 @@ void set_timer (ulong t)
timestamp = t; timestamp = t;
} }
/* delay x useconds AND perserve advance timstamp value */ /* delay x useconds AND preserve advance timestamp value */
void __udelay (unsigned long usec) void __udelay (unsigned long usec)
{ {
ulong tmo, tmp; ulong tmo, tmp;
if(usec >= 1000){ /* if "big" number, spread normalization to seconds */ if(usec >= 1000){ /* if "big" number, spread normalization to seconds */
tmo = usec / 1000; /* start to normalize for usec to ticks per sec */ tmo = usec / 1000; /* start to normalize for usec to ticks per sec */
tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */ tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */
tmo /= 1000; /* finish normalize. */ tmo /= 1000; /* finish normalize. */
}else{ /* else small number, don't kill it prior to HZ multiply */ }else{ /* else small number, don't kill it prior to HZ multiply */
tmo = usec * CONFIG_SYS_HZ; tmo = usec * CONFIG_SYS_HZ;

4
arch/arm/cpu/arm926ejs/versatile/timer.c
View File

@ -108,14 +108,14 @@ void set_timer (ulong t)
timestamp = t; timestamp = t;
} }
/* delay x useconds AND perserve advance timstamp value */ /* delay x useconds AND preserve advance timestamp value */
void __udelay (unsigned long usec) void __udelay (unsigned long usec)
{ {
ulong tmo, tmp; ulong tmo, tmp;
if(usec >= 1000){ /* if "big" number, spread normalization to seconds */ if(usec >= 1000){ /* if "big" number, spread normalization to seconds */
tmo = usec / 1000; /* start to normalize for usec to ticks per sec */ tmo = usec / 1000; /* start to normalize for usec to ticks per sec */
tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */ tmo *= CONFIG_SYS_HZ; /* find number of "ticks" to wait to achieve target */
tmo /= 1000; /* finish normalize. */ tmo /= 1000; /* finish normalize. */
}else{ /* else small number, don't kill it prior to HZ multiply */ }else{ /* else small number, don't kill it prior to HZ multiply */
tmo = usec * CONFIG_SYS_HZ; tmo = usec * CONFIG_SYS_HZ;

2
arch/arm/cpu/arm_cortexa8/mx51/timer.c
View File

@ -102,7 +102,7 @@ void set_timer(ulong t)
timestamp = t; timestamp = t;
} }
/* delay x useconds AND perserve advance timstamp value */ /* delay x useconds AND preserve advance timestamp value */
void __udelay(unsigned long usec) void __udelay(unsigned long usec)
{ {
unsigned long now, start, tmo; unsigned long now, start, tmo;