summaryrefslogtreecommitdiff
path: root/cpu/sa1100
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-04-04 12:08:28 +0000
committerwdenk <wdenk>2005-04-04 12:08:28 +0000
commit101e8dfa2a8b045c6655bf2b3d6fba8d378453cd (patch)
tree1c39acefbaf435ddc2e9f42540eb64ea267cb530 /cpu/sa1100
parent50712ba16e7e469e90952a7f197efa46e2f8e311 (diff)
Fix timer code for ARM systems: make sure that udelay() does not
reset timers so it's save to use udelay() in timeout code.
Diffstat (limited to 'cpu/sa1100')
-rw-r--r--cpu/sa1100/interrupts.c27
1 files changed, 18 insertions, 9 deletions
diff --git a/cpu/sa1100/interrupts.c b/cpu/sa1100/interrupts.c
index 93a78d707eb..b393e0d435e 100644
--- a/cpu/sa1100/interrupts.c
+++ b/cpu/sa1100/interrupts.c
@@ -206,15 +206,24 @@ ulong get_timer_masked (void)
void udelay_masked (unsigned long usec)
{
ulong tmo;
-
- tmo = usec / 1000;
- tmo *= CFG_HZ;
- tmo /= 1000;
-
- reset_timer_masked ();
-
- while (tmo >= get_timer_masked ())
- /*NOP*/;
+ ulong endtime;
+ signed long diff;
+
+ if (usec >= 1000) {
+ tmo = usec / 1000;
+ tmo *= CFG_HZ;
+ tmo /= 1000;
+ } else {
+ tmo = usec * CFG_HZ;
+ tmo /= (1000*1000);
+ }
+
+ endtime = get_timer_masked () + tmo;
+
+ do {
+ ulong now = get_timer_masked ();
+ diff = endtime - now;
+ } while (diff >= 0);
}
/*