change log for rtems (2011-03-04)
rtems-vc at rtems.org
rtems-vc at rtems.org
Fri Mar 4 14:10:29 UTC 2011
*joel* (on branch rtems-4-10-branch):
2011-03-04 Joel Sherrill <joel.sherrilL at 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.
M 1.164 c/src/lib/libbsp/sparc/erc32/ChangeLog
M 1.123.2.4 c/src/lib/libbsp/sparc/erc32/ChangeLog
M 1.152.2.3 c/src/lib/libbsp/sparc/erc32/ChangeLog
M 1.18 c/src/lib/libbsp/sparc/erc32/clock/ckinit.c
M 1.15.2.1 c/src/lib/libbsp/sparc/erc32/clock/ckinit.c
M 1.17.2.1 c/src/lib/libbsp/sparc/erc32/clock/ckinit.c
M 1.80 c/src/lib/libbsp/sparc/leon2/ChangeLog
M 1.42.2.4 c/src/lib/libbsp/sparc/leon2/ChangeLog
M 1.71.2.2 c/src/lib/libbsp/sparc/leon2/ChangeLog
M 1.8 c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
M 1.5.2.1 c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
M 1.7.2.1 c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
diff -u rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.163 rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.164
--- rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.163 Thu Mar 3 08:03:40 2011
+++ rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog Fri Mar 4 08:06:47 2011
@@ -1,3 +1,10 @@
+2011-03-04 Joel Sherrill <joel.sherrilL at 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 at OARcorp.com>
PR 1750/bsps
diff -u rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.123.2.3 rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.123.2.4
--- rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.123.2.3 Mon Mar 9 11:53:38 2009
+++ rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog Fri Mar 4 08:07:15 2011
@@ -1,3 +1,10 @@
+2011-03-04 Joel Sherrill <joel.sherrilL at 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.
+
2009-03-09 Antoine Lacroix <antoine.lacroix at sodern.fr>
PR 1391/bsps
diff -u rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.152.2.2 rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.152.2.3
--- rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog:1.152.2.2 Thu Mar 3 08:03:48 2011
+++ rtems/c/src/lib/libbsp/sparc/erc32/ChangeLog Fri Mar 4 08:07:04 2011
@@ -1,3 +1,10 @@
+2011-03-04 Joel Sherrill <joel.sherrilL at 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 at OARcorp.com>
PR 1750/bsps
diff -u rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c:1.17 rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c:1.18
--- rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c:1.17 Sun Nov 29 09:33:26 2009
+++ rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c Fri Mar 4 08:06:47 2011
@@ -49,11 +49,17 @@
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 \
diff -u rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c:1.15 rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c:1.15.2.1
--- rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c:1.15 Wed May 7 12:39:48 2008
+++ rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c Fri Mar 4 08:07:15 2011
@@ -49,11 +49,17 @@
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 \
diff -u rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c:1.17 rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c:1.17.2.1
--- rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c:1.17 Sun Nov 29 09:33:26 2009
+++ rtems/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c Fri Mar 4 08:07:04 2011
@@ -49,11 +49,17 @@
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 \
diff -u rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog:1.79 rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog:1.80
--- rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog:1.79 Fri Feb 11 04:06:49 2011
+++ rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog Fri Mar 4 08:06:50 2011
@@ -1,3 +1,10 @@
+2011-03-04 Joel Sherrill <joel.sherrilL at 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 at rtems.org>
* cchip/cchip.c, include/tm27.h, startup/spurious.c:
diff -u rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog:1.42.2.3 rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog:1.42.2.4
--- rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog:1.42.2.3 Mon Mar 9 11:53:41 2009
+++ rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog Fri Mar 4 08:07:16 2011
@@ -1,3 +1,10 @@
+2011-03-04 Joel Sherrill <joel.sherrilL at 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.
+
2009-03-09 Antoine Lacroix <antoine.lacroix at sodern.fr>
PR 1391/bsps
diff -u rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog:1.71.2.1 rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog:1.71.2.2
--- rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog:1.71.2.1 Wed Feb 2 09:17:16 2011
+++ rtems/c/src/lib/libbsp/sparc/leon2/ChangeLog Fri Mar 4 08:07:06 2011
@@ -1,3 +1,10 @@
+2011-03-04 Joel Sherrill <joel.sherrilL at 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-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c:1.7 rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c:1.8
--- rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c:1.7 Sun Nov 29 09:33:26 2009
+++ rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c Fri Mar 4 08:06:50 2011
@@ -62,12 +62,15 @@
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
diff -u rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c:1.5 rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c:1.5.2.1
--- rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c:1.5 Wed May 7 12:39:50 2008
+++ rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c Fri Mar 4 08:07:17 2011
@@ -59,17 +59,22 @@
LEON_REG.Timer_Control_1 = 0; \
} while (0)
+
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
+#define Clock_driver_nanoseconds_since_last_tick \
+ bsp_clock_nanoseconds_since_last_tick
#include "../../../shared/clockdrv_shell.c"
diff -u rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c:1.7 rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c:1.7.2.1
--- rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c:1.7 Sun Nov 29 09:33:26 2009
+++ rtems/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c Fri Mar 4 08:07:06 2011
@@ -62,12 +62,15 @@
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
*joel* (on branch rtems-4-10-branch):
2011-03-04 Joel Sherrill <joel.sherrilL at 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.
M 1.102 c/src/lib/libbsp/sparc/leon3/ChangeLog
M 1.64.2.4 c/src/lib/libbsp/sparc/leon3/ChangeLog
M 1.95.2.2 c/src/lib/libbsp/sparc/leon3/ChangeLog
M 1.16 c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
M 1.13.2.1 c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
M 1.15.2.1 c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
M 1.9 c/src/lib/libbsp/sparc/leon3/include/leon.h
M 1.7.4.1 c/src/lib/libbsp/sparc/leon3/include/leon.h
M 1.8.2.1 c/src/lib/libbsp/sparc/leon3/include/leon.h
diff -u rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.101 rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.102
--- rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.101 Fri Feb 11 04:06:51 2011
+++ rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog Fri Mar 4 08:06:53 2011
@@ -1,3 +1,11 @@
+2011-03-04 Joel Sherrill <joel.sherrilL at 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 at rtems.org>
* amba/amba.c, include/tm27.h, shmsupp/lock.c, startup/bspstart.c,
diff -u rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.64.2.3 rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.64.2.4
--- rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.64.2.3 Mon Mar 9 11:53:43 2009
+++ rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog Fri Mar 4 08:07:19 2011
@@ -1,3 +1,11 @@
+2011-03-04 Joel Sherrill <joel.sherrilL at 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.
+
2009-03-09 Antoine Lacroix <antoine.lacroix at sodern.fr>
PR 1391/bsps
diff -u rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.95.2.1 rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.95.2.2
--- rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog:1.95.2.1 Wed Feb 2 09:17:19 2011
+++ rtems/c/src/lib/libbsp/sparc/leon3/ChangeLog Fri Mar 4 08:07:08 2011
@@ -1,3 +1,11 @@
+2011-03-04 Joel Sherrill <joel.sherrilL at 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-02 Ralf Corsépius <ralf.corsepius at rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff -u rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.15 rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.16
--- rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.15 Sun Nov 29 09:33:27 2009
+++ rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c Fri Mar 4 08:06:53 2011
@@ -97,16 +97,23 @@
uint32_t bsp_clock_nanoseconds_since_last_tick(void)
{
uint32_t clicks;
+ uint32_t usecs;
+
if ( !LEON3_Timer_Regs )
return 0;
clicks = LEON3_Timer_Regs->timer[0].value;
- /* Down counter */
- return (uint32_t)
- (rtems_configuration_get_microseconds_per_tick() - clicks) * 1000;
+ if ( LEON_Is_interrupt_pending( clkirq ) ) {
+ clicks = LEON3_Timer_Regs->timer[0].value;
+ 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"
diff -u rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.13 rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.13.2.1
--- rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.13 Wed May 7 12:40:52 2008
+++ rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c Fri Mar 4 08:07:19 2011
@@ -97,16 +97,18 @@
uint32_t bsp_clock_nanoseconds_since_last_tick(void)
{
uint32_t clicks;
- if ( !LEON3_Timer_Regs )
- return 0;
+ uint32_t usecs;
- clicks = LEON3_Timer_Regs->timer[0].value;
-
- /* 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
+#define Clock_driver_nanoseconds_since_last_tick \
+ bsp_clock_nanoseconds_since_last_tick
#include "../../../shared/clockdrv_shell.c"
diff -u rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.15 rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.15.2.1
--- rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c:1.15 Sun Nov 29 09:33:27 2009
+++ rtems/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c Fri Mar 4 08:07:08 2011
@@ -97,16 +97,24 @@
uint32_t bsp_clock_nanoseconds_since_last_tick(void)
{
uint32_t clicks;
+ uint32_t usecs;
+
if ( !LEON3_Timer_Regs )
return 0;
clicks = LEON3_Timer_Regs->timer[0].value;
- /* Down counter */
- return (uint32_t)
- (rtems_configuration_get_microseconds_per_tick() - clicks) * 1000;
+ if ( LEON_Is_interrupt_pending( clkirq ) ) {
+ clicks = LEON3_Timer_Regs->timer[0].value;
+ 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"
diff -u rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h:1.8 rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h:1.9
--- rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h:1.8 Sun Nov 29 09:33:27 2009
+++ rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h Fri Mar 4 08:06:54 2011
@@ -245,11 +245,11 @@
} while (0)
#define LEON_Is_interrupt_pending( _source ) \
- (LEON3_IrqCtrl_Regs.ipend & (1 << (_source)))
+ (LEON3_IrqCtrl_Regs->ipend & (1 << (_source)))
#define LEON_Is_interrupt_masked( _source ) \
do {\
- (LEON3_IrqCtrl_Regs.mask[LEON3_Cpu_Index] & (1 << (_source))); \
+ (LEON3_IrqCtrl_Regs->mask[LEON3_Cpu_Index] & (1 << (_source))); \
} while (0)
diff -u rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h:1.7 rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h:1.7.4.1
--- rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h:1.7 Wed Sep 5 19:01:30 2007
+++ rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h Fri Mar 4 08:07:19 2011
@@ -245,11 +245,11 @@
} while (0)
#define LEON_Is_interrupt_pending( _source ) \
- (LEON3_IrqCtrl_Regs.ipend & (1 << (_source)))
+ (LEON3_IrqCtrl_Regs->ipend & (1 << (_source)))
#define LEON_Is_interrupt_masked( _source ) \
do {\
- (LEON3_IrqCtrl_Regs.mask[LEON3_Cpu_Index] & (1 << (_source))); \
+ (LEON3_IrqCtrl_Regs->mask[LEON3_Cpu_Index] & (1 << (_source))); \
} while (0)
diff -u rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h:1.8 rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h:1.8.2.1
--- rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h:1.8 Sun Nov 29 09:33:27 2009
+++ rtems/c/src/lib/libbsp/sparc/leon3/include/leon.h Fri Mar 4 08:07:08 2011
@@ -245,11 +245,11 @@
} while (0)
#define LEON_Is_interrupt_pending( _source ) \
- (LEON3_IrqCtrl_Regs.ipend & (1 << (_source)))
+ (LEON3_IrqCtrl_Regs->ipend & (1 << (_source)))
#define LEON_Is_interrupt_masked( _source ) \
do {\
- (LEON3_IrqCtrl_Regs.mask[LEON3_Cpu_Index] & (1 << (_source))); \
+ (LEON3_IrqCtrl_Regs->mask[LEON3_Cpu_Index] & (1 << (_source))); \
} while (0)
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110304/3f2f555a/attachment.html>
More information about the vc
mailing list