From 2d2586780c9dd3ab34f3fab8190a82f28eb1b554 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 11 Dec 2007 15:46:18 +0000 Subject: [PATCH] 2007-12-11 Joel Sherrill * clock/ckinit.c, include/bsp.h: Eliminate copies of the Configuration Table. Use the RTEMS provided accessor macros to obtain configuration fields. --- c/src/lib/libbsp/sparc/erc32/ChangeLog | 6 ++++++ c/src/lib/libbsp/sparc/erc32/clock/ckinit.c | 4 ++-- c/src/lib/libbsp/sparc/erc32/include/bsp.h | 2 -- c/src/lib/libbsp/sparc/leon2/ChangeLog | 6 ++++++ c/src/lib/libbsp/sparc/leon2/clock/ckinit.c | 2 +- c/src/lib/libbsp/sparc/leon2/include/bsp.h | 2 -- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog index d67626f2f4..8bfa69a0af 100644 --- a/c/src/lib/libbsp/sparc/erc32/ChangeLog +++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill + + * clock/ckinit.c, include/bsp.h: Eliminate copies of the Configuration + Table. Use the RTEMS provided accessor macros to obtain configuration + fields. + 2007-12-04 Joel Sherrill * include/bsp.h: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c b/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c index 30a2a3cd95..b97a834627 100644 --- a/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c +++ b/c/src/lib/libbsp/sparc/erc32/clock/ckinit.c @@ -52,7 +52,7 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void) clicks = ERC32_MEC.Real_Time_Clock_Counter; - return (uint32_t) (BSP_Configuration.microseconds_per_tick - clicks) * 1000; + return (uint32_t) (rtems_configuration_get_microseconds_per_tick() - clicks) * 1000; } #define Clock_driver_nanoseconds_since_last_tick \ @@ -63,7 +63,7 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void) /* approximately 1 us per countdown */ \ ERC32_MEC.Real_Time_Clock_Scalar = CLOCK_SPEED - 1; \ ERC32_MEC.Real_Time_Clock_Counter = \ - BSP_Configuration.microseconds_per_tick; \ + rtems_configuration_get_microseconds_per_tick(); \ \ ERC32_MEC_Set_Real_Time_Clock_Timer_Control( \ ERC32_MEC_TIMER_COUNTER_ENABLE_COUNTING | \ diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/c/src/lib/libbsp/sparc/erc32/include/bsp.h index 9f395acbec..eb9ea71fbd 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h +++ b/c/src/lib/libbsp/sparc/erc32/include/bsp.h @@ -107,8 +107,6 @@ void BSP_fatal_return( void ); void bsp_spurious_initialize( void ); -extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/sparc/leon2/ChangeLog b/c/src/lib/libbsp/sparc/leon2/ChangeLog index 9e69caf4d0..e55b588076 100644 --- a/c/src/lib/libbsp/sparc/leon2/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon2/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill + + * clock/ckinit.c, include/bsp.h: Eliminate copies of the Configuration + Table. Use the RTEMS provided accessor macros to obtain configuration + fields. + 2007-12-04 Joel Sherrill * include/bsp.h: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c index 5b63cdf366..5d128ebb3b 100644 --- a/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c +++ b/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c @@ -44,7 +44,7 @@ extern int CLOCK_SPEED; #define Clock_driver_support_initialize_hardware() \ do { \ - LEON_REG.Timer_Reload_1 = BSP_Configuration.microseconds_per_tick - 1; \ + LEON_REG.Timer_Reload_1 = rtems_configuration_get_microseconds_per_tick() - 1; \ \ LEON_REG.Timer_Control_1 = ( \ LEON_REG_TIMER_COUNTER_ENABLE_COUNTING | \ diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/c/src/lib/libbsp/sparc/leon2/include/bsp.h index 624000b585..c2689b9d15 100644 --- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h +++ b/c/src/lib/libbsp/sparc/leon2/include/bsp.h @@ -104,8 +104,6 @@ void BSP_fatal_return( void ); void bsp_spurious_initialize( void ); -extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ - #ifdef __cplusplus } #endif