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: 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:50 +00:00
parent 82299bbf41
commit d3210d0a11
4 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/sparc/erc32/ChangeLog
View File

@@ -1,3 +1,10 @@
2011-03-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1748/bsps
* clock/ckinit.c: 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-03-03 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1750/bsps

10
c/src/lib/libbsp/sparc/erc32/clock/ckinit.c
View File

@@ -49,11 +49,17 @@ extern int CLOCK_SPEED;
uint32_t bsp_clock_nanoseconds_since_last_tick(void)
{
uint32_t clicks;
uint32_t usecs;
clicks = ERC32_MEC.Real_Time_Clock_Counter;
return (uint32_t)
(rtems_configuration_get_microseconds_per_tick() - clicks) * 1000;
if ( ERC32_Is_interrupt_pending( ERC32_INTERRUPT_REAL_TIME_CLOCK ) ) {
clicks = ERC32_MEC.Real_Time_Clock_Counter;
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 \

7
c/src/lib/libbsp/sparc/leon2/ChangeLog
View File

@@ -1,3 +1,10 @@
2011-03-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1748/bsps
* clock/ckinit.c: 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>
* cchip/cchip.c, include/tm27.h, startup/spurious.c:

13
c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
View File

@@ -62,12 +62,15 @@ extern int CLOCK_SPEED;
uint32_t bsp_clock_nanoseconds_since_last_tick(void)
{
uint32_t clicks;
uint32_t usecs;
clicks = LEON_REG.Timer_Counter_1;
/* Down counter */
return (uint32_t)
(rtems_configuration_get_microseconds_per_tick() - clicks) * 1000;
if ( LEON_Is_interrupt_pending( LEON_INTERRUPT_TIMER1 ) ) {
clicks = LEON_REG.Timer_Counter_1;
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