Changeset 7fce2ca in rtems

Timestamp:

Mar 4, 2011, 2:07:08 PM (9 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10

Children:

302784e

Parents:

631a092

Message:

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

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.

Location:

c/src/lib/libbsp/sparc/leon3

Files:

• ChangeLog (modified) (1 diff)
• clock/ckinit.c (modified) (2 diffs)
• include/leon.h (modified) (1 diff)

c/src/lib/libbsp/sparc/leon3/ChangeLog

@@ +1 @@
+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-02      Ralf Corsépius <ralf.corsepius@rtems.org>
 

c/src/lib/libbsp/sparc/leon3/clock/ckinit.c

@@ -98 +98 @@
 {
   uint32_t clicks;
+  uint32_t usecs;
+
   if ( !LEON3_Timer_Regs )
     return 0;
@@ -103 +105 @@
   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"

c/src/lib/libbsp/sparc/leon3/include/leon.h

@@ -246 +246 @@
 
 #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)