RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2011-03-04 Joel Sherrill <joel.sherrilL@OARcorp.com>

Browse Source 
PR 1748/bsps
	* clock/ckinit.c, include/leon.h: When the clock tick generates an
	interrupt WHILE we have interrupts disabled doing a get TOD or
	uptime, the get nanoseconds handler was returning a bogusly large
	number.
This commit is contained in:
Joel Sherrill
2011-03-04 14:06:54 +00:00
parent d3210d0a11
commit b3559ee9f5
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/lib/libbsp/sparc/leon3/ChangeLog
View File

@@ -1,3 +1,11 @@
2011-03-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1748/bsps
* clock/ckinit.c, include/leon.h: When the clock tick generates an
interrupt WHILE we have interrupts disabled doing a get TOD or
uptime, the get nanoseconds handler was returning a bogusly large
number.
2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* amba/amba.c, include/tm27.h, shmsupp/lock.c, startup/bspstart.c, * amba/amba.c, include/tm27.h, shmsupp/lock.c, startup/bspstart.c,

15
c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
View File

@@ -97,16 +97,23 @@ static int clkirq;
uint32_t bsp_clock_nanoseconds_since_last_tick(void) uint32_t bsp_clock_nanoseconds_since_last_tick(void)
{ {
uint32_t clicks; uint32_t clicks;
uint32_t usecs;
if ( !LEON3_Timer_Regs ) if ( !LEON3_Timer_Regs )
return 0; return 0;
clicks = LEON3_Timer_Regs->timer[0].value; clicks = LEON3_Timer_Regs->timer[0].value;
/* Down counter */ if ( LEON_Is_interrupt_pending( clkirq ) ) {
return (uint32_t) clicks = LEON3_Timer_Regs->timer[0].value;
(rtems_configuration_get_microseconds_per_tick() - clicks) * 1000; usecs = (2*rtems_configuration_get_microseconds_per_tick() - clicks);
} else {
usecs = (rtems_configuration_get_microseconds_per_tick() - clicks);
}
return usecs * 1000;
} }
#define Clock_driver_nanoseconds_since_last_tick bsp_clock_nanoseconds_since_last_tick #define Clock_driver_nanoseconds_since_last_tick \
bsp_clock_nanoseconds_since_last_tick
#include "../../../shared/clockdrv_shell.h" #include "../../../shared/clockdrv_shell.h"

4
c/src/lib/libbsp/sparc/leon3/include/leon.h
View File

@@ -245,11 +245,11 @@ extern int LEON3_Cpu_Index;
} while (0) } while (0)
#define LEON_Is_interrupt_pending( _source ) \ #define LEON_Is_interrupt_pending( _source ) \
(LEON3_IrqCtrl_Regs.ipend & (1 << (_source))) (LEON3_IrqCtrl_Regs->ipend & (1 << (_source)))
#define LEON_Is_interrupt_masked( _source ) \ #define LEON_Is_interrupt_masked( _source ) \
do {\ do {\
(LEON3_IrqCtrl_Regs.mask[LEON3_Cpu_Index] & (1 << (_source))); \ (LEON3_IrqCtrl_Regs->mask[LEON3_Cpu_Index] & (1 << (_source))); \
} while (0) } while (0)