diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-01-21 16:50:25 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-01-21 16:50:25 +0000 |
| commit | f29aa73c33e2a38188221e01c00a8a32dd5be001 (patch) | |
| tree | d869135d5b47c3c5114af88c745d3fb340f04e7f /c | |
| parent | New. (diff) | |
| download | rtems-f29aa73c33e2a38188221e01c00a8a32dd5be001.tar.bz2 | |
2009-01-21 Eric Norum <norume@aps.anl.gov>
PR 1358/bsps
* clock/clock.c: Fix time-access bug in uc5282 BSP.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/clock/clock.c | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index 24ddf1fe27..7eb15b7e50 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,8 @@ +2009-01-21 Eric Norum <norume@aps.anl.gov> + + PR 1358/bsps + * clock/clock.c: Fix time-access bug in uc5282 BSP. + 2008-12-04 Joel Sherrill <joel.sherrill@oarcorp.com> * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c b/c/src/lib/libbsp/m68k/uC5282/clock/clock.c index 0678aa74a8..f850f044c7 100644 --- a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c +++ b/c/src/lib/libbsp/m68k/uC5282/clock/clock.c @@ -30,15 +30,15 @@ extern int __SRAMBASE[]; #define IDLE_COUNTER __SRAMBASE[0] #define FILTERED_IDLE __SRAMBASE[1] #define MAX_IDLE_COUNT __SRAMBASE[2] -#define PCNTR_AT_TICK (*(uint16 *)&__SRAMBASE[3]) +#define USEC_PER_TICK __SRAMBASE[3] #define FILTER_SHIFT 6 uint32_t bsp_clock_nanoseconds_since_last_tick(void) { int i = MCF5282_PIT3_PCNTR; if (MCF5282_PIT3_PCSR & MCF5282_PIT_PCSR_PIF) - i = MCF5282_PIT3_PCNTR + MCF5282_PIT3_PMR; - return (i - PCNTR_AT_TICK) * 1000; + i = MCF5282_PIT3_PCNTR - USEC_PER_TICK; + return (USEC_PER_TICK - i) * 1000; } #define Clock_driver_nanoseconds_since_last_tick bsp_clock_nanoseconds_since_last_tick @@ -53,7 +53,6 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void) if (idle > MAX_IDLE_COUNT) \ MAX_IDLE_COUNT = idle; \ FILTERED_IDLE = idle + FILTERED_IDLE - (FILTERED_IDLE>>FILTER_SHIFT);\ - PCNTR_AT_TICK = MCF5282_PIT3_PCNTR; \ MCF5282_PIT3_PCSR |= MCF5282_PIT_PCSR_PIF; \ } while (0) @@ -102,12 +101,12 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void) MCF5282_PIT_PCSR_OVW | \ MCF5282_PIT_PCSR_PIE | \ MCF5282_PIT_PCSR_RLD; \ - MCF5282_PIT3_PMR = rtems_configuration_get_microseconds_per_tick() - 1; \ + USEC_PER_TICK = rtems_configuration_get_microseconds_per_tick(); \ + MCF5282_PIT3_PMR = USEC_PER_TICK - 1; \ MCF5282_PIT3_PCSR = MCF5282_PIT_PCSR_PRE(preScaleCode) | \ MCF5282_PIT_PCSR_PIE | \ MCF5282_PIT_PCSR_RLD | \ MCF5282_PIT_PCSR_EN; \ - PCNTR_AT_TICK = MCF5282_PIT3_PCNTR; \ } while (0) /* |