From 101e8dfa2a8b045c6655bf2b3d6fba8d378453cd Mon Sep 17 00:00:00 2001 From: wdenk Date: Mon, 4 Apr 2005 12:08:28 +0000 Subject: Fix timer code for ARM systems: make sure that udelay() does not reset timers so it's save to use udelay() in timeout code. --- cpu/pxa/interrupts.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'cpu/pxa') diff --git a/cpu/pxa/interrupts.c b/cpu/pxa/interrupts.c index b335a82a5e..0479a1048b 100644 --- a/cpu/pxa/interrupts.c +++ b/cpu/pxa/interrupts.c @@ -190,6 +190,8 @@ ulong get_timer_masked (void) void udelay_masked (unsigned long usec) { ulong tmo; + ulong endtime; + signed long diff; if (usec >= 1000) { tmo = usec / 1000; @@ -200,10 +202,12 @@ void udelay_masked (unsigned long usec) tmo /= (1000*1000); } - reset_timer_masked (); + endtime = get_timer_masked () + tmo; - while (tmo >= get_timer_masked ()) - /*NOP*/; + do { + ulong now = get_timer_masked (); + diff = endtime - now; + } while (diff >= 0); } /* -- cgit v1.2.1