diff options
author | wdenk <wdenk> | 2005-04-04 12:08:28 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2005-04-04 12:08:28 +0000 |
commit | 101e8dfa2a8b045c6655bf2b3d6fba8d378453cd (patch) | |
tree | 1c39acefbaf435ddc2e9f42540eb64ea267cb530 /cpu/lh7a40x | |
parent | 50712ba16e7e469e90952a7f197efa46e2f8e311 (diff) | |
download | u-boot-101e8dfa2a8b045c6655bf2b3d6fba8d378453cd.zip u-boot-101e8dfa2a8b045c6655bf2b3d6fba8d378453cd.tar.gz u-boot-101e8dfa2a8b045c6655bf2b3d6fba8d378453cd.tar.bz2 |
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/lh7a40x')
-rw-r--r-- | cpu/lh7a40x/interrupts.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/cpu/lh7a40x/interrupts.c b/cpu/lh7a40x/interrupts.c index 3c2dc4f..23d8039 100644 --- a/cpu/lh7a40x/interrupts.c +++ b/cpu/lh7a40x/interrupts.c @@ -281,25 +281,29 @@ ulong get_timer_masked (void) void udelay_masked (unsigned long usec) { ulong tmo; + ulong endtime; + signed long diff; /* normalize */ if (usec >= 1000) { tmo = usec / 1000; tmo *= CFG_HZ; tmo /= 1000; - } - else { + } else { if (usec > 1) { tmo = usec * CFG_HZ; tmo /= (1000*1000); - } - else + } else { tmo = 1; + } } - reset_timer_masked (); + endtime = get_timer_masked () + tmo; - while (get_timer_masked () < tmo); + do { + ulong now = get_timer_masked (); + diff = endtime - now; + } while (diff >= 0); } /* |