summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Waters <justin@justin-linux.(none)>2008-01-21 16:37:35 -0500
committerJustin Waters <justin@justin-linux.(none)>2008-01-21 16:37:35 -0500
commit3c7ac4df9c9718e0bf11705a1a4d0e4b9dae700f (patch)
treefb58c325ae5ca76b15d806269cb2f89de8479a8e
parent584432a4e4bfea64e689e241d5be36f23fa2b781 (diff)
Fix timestamp value and udelay breakage.
The interrupts API has changed, so udelay doesn't work, nor does the timestamp. The timestamp no longer needs to be multiplied by CFG_HZ. Signed-off-by: Justin Waters <justin.waters@timesys.com>
-rw-r--r--cpu/arm926ejs/at91sam926x/interrupts.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/arm926ejs/at91sam926x/interrupts.c b/cpu/arm926ejs/at91sam926x/interrupts.c
index 85b33f2846..7383e06db7 100644
--- a/cpu/arm926ejs/at91sam926x/interrupts.c
+++ b/cpu/arm926ejs/at91sam926x/interrupts.c
@@ -54,7 +54,7 @@
ulong get_timer_masked (void);
-AT91PS_PITC p_pitc;
+volatile AT91PS_PITC p_pitc;
static ulong timestamp;
static ulong lastinc;
@@ -147,7 +147,7 @@ ulong get_timer_masked (void)
lastinc = now;
- return timestamp * CFG_HZ;
+ return timestamp;
}
/* waits specified delay value and resets timestamp */