summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hellstrom <daniel@gaisler.com>2012-03-29 13:52:13 +0200
committerGedare Bloom <gedare@rtems.org>2012-03-29 15:08:26 -0400
commit4fa6be9779eca5718fd314c44610ccdf4c6ff4e7 (patch)
treeba88e355ea66ade03449cd8f20516eea09fefb74
parentSPARC: bsp_early_malloc() routine for startup memory allocation (diff)
downloadrtems-4fa6be9779eca5718fd314c44610ccdf4c6ff4e7.tar.bz2
LEON3: clock timer indexing should be consequent
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
-rw-r--r--c/src/lib/libbsp/sparc/leon3/clock/ckinit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
index 86a968fea8..932b8fd87b 100644
--- a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
+++ b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
@@ -54,7 +54,7 @@ static int clkirq;
} \
} while(0)
#else
- #define Adjust_clkirq_for_node()
+ #define Adjust_clkirq_for_node() do { clkirq += LEON3_CLOCK_INDEX; } while(0)
#endif
#define Clock_driver_support_find_timer() \
@@ -102,10 +102,10 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void)
if ( !LEON3_Timer_Regs )
return 0;
- clicks = LEON3_Timer_Regs->timer[0].value;
+ clicks = LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].value;
if ( LEON_Is_interrupt_pending( clkirq ) ) {
- clicks = LEON3_Timer_Regs->timer[0].value;
+ clicks = LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].value;
usecs = (2*rtems_configuration_get_microseconds_per_tick() - clicks);
} else {
usecs = (rtems_configuration_get_microseconds_per_tick() - clicks);