From d6f947ebc353319063e02fbd7e916bd3221ca1c1 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 7 Feb 2012 22:09:45 +0100 Subject: ARMv7-M Systick API change --- c/src/lib/libbsp/arm/lm3s69xx/clock/clock-config.c | 2 +- cpukit/score/cpu/arm/rtems/score/armv7m.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/c/src/lib/libbsp/arm/lm3s69xx/clock/clock-config.c b/c/src/lib/libbsp/arm/lm3s69xx/clock/clock-config.c index a1aeb62070..909fcee350 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/clock/clock-config.c +++ b/c/src/lib/libbsp/arm/lm3s69xx/clock/clock-config.c @@ -48,7 +48,7 @@ static void _ARMV7M_Systick_handler_install(void) static void _ARMV7M_Systick_initialize(void) { volatile ARMV7M_Systick *systick = _ARMV7M_Systick; - uint64_t frequency = ARMV7M_SYSTICK_CALIB_TENMS(systick->calib) * 100ULL; + uint64_t frequency = ARMV7M_SYSTICK_CALIB_TENMS_GET(systick->calib) * 100ULL; uint64_t us_per_tick = rtems_configuration_get_microseconds_per_tick(); uint64_t interval = (frequency * us_per_tick) / 1000000ULL; diff --git a/cpukit/score/cpu/arm/rtems/score/armv7m.h b/cpukit/score/cpu/arm/rtems/score/armv7m.h index 1005b23ae3..2e119240a9 100644 --- a/cpukit/score/cpu/arm/rtems/score/armv7m.h +++ b/cpukit/score/cpu/arm/rtems/score/armv7m.h @@ -84,7 +84,7 @@ typedef struct { #define ARMV7M_SYSTICK_CALIB_NOREF (1U << 31) #define ARMV7M_SYSTICK_CALIB_SKEW (1U << 30) -#define ARMV7M_SYSTICK_CALIB_TENMS(reg) ((reg) & 0xffffffU) +#define ARMV7M_SYSTICK_CALIB_TENMS_GET(reg) ((reg) & 0xffffffU) uint32_t calib; } ARMV7M_Systick; -- cgit v1.2.3