From a3ca595f1ab85c8b43bca39e29a74038de29958e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 11 Dec 2007 15:50:04 +0000 Subject: 2007-12-11 Joel Sherrill * clock/clock.c, include/bsp.h, startup/bspstart.c: Eliminate copies of the Configuration Table. Use the RTEMS provided accessor macros to obtain configuration fields. --- c/src/lib/libbsp/c4x/c4xsim/ChangeLog | 6 ++++++ c/src/lib/libbsp/c4x/c4xsim/clock/clock.c | 4 ++-- c/src/lib/libbsp/c4x/c4xsim/include/bsp.h | 4 ---- c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c | 12 ++---------- c/src/lib/libbsp/m68k/gen68360/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/gen68360/clock/clock.c | 2 +- c/src/lib/libbsp/m68k/gen68360/include/bsp.h | 2 -- c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c | 11 +---------- c/src/lib/libbsp/m68k/uC5282/ChangeLog | 6 ++++++ c/src/lib/libbsp/m68k/uC5282/clock/clock.c | 2 +- c/src/lib/libbsp/m68k/uC5282/include/bsp.h | 2 -- c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c | 10 +--------- c/src/lib/libbsp/nios2/nios2_iss/ChangeLog | 6 ++++++ c/src/lib/libbsp/nios2/nios2_iss/clock/clock.c | 2 +- c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h | 2 -- c/src/lib/libbsp/nios2/nios2_iss/startup/bspstart.c | 17 ++++------------- 16 files changed, 37 insertions(+), 57 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog index 766dd1ec79..4fbaffbba2 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog +++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill + + * clock/clock.c, include/bsp.h, startup/bspstart.c: Eliminate copies of + the Configuration Table. Use the RTEMS provided accessor macros to + obtain configuration fields. + 2007-12-04 Joel Sherrill * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/c4x/c4xsim/clock/clock.c b/c/src/lib/libbsp/c4x/c4xsim/clock/clock.c index ae6770c358..c181061012 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/clock/clock.c +++ b/c/src/lib/libbsp/c4x/c4xsim/clock/clock.c @@ -36,12 +36,12 @@ void Clock_driver_support_initialize_hardware() tmpi = ((int) &_ClockFrequency) * 1000000; /* ClockFrequency is in Mhz */ tmp = (float) tmpi / 2.0; - tmp = ((float) BSP_Configuration.microseconds_per_tick / 1000000.0) * (tmp); + tmp = ((float) rtems_configuration_get_microseconds_per_tick() / 1000000.0) * (tmp); Clock_counter_register_value = (unsigned int) tmp; #if 0 Clock_counter_register_value = - (uint32_t) ((float) BSP_Configuration.microseconds_per_tick / + (uint32_t) ((float) rtems_configuration_get_microseconds_per_tick() / ((float)_ClockFrequency / 2.0))); #endif c4x_timer_stop( C4X_TIMER_0 ); diff --git a/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h b/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h index eb27804579..9b0d162255 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h +++ b/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h @@ -64,10 +64,6 @@ void BSP_fatal_return( void ); void bsp_spurious_initialize( void ); -extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ - -extern uint32_t bsp_isr_level; - #endif /* ASM */ #ifdef __cplusplus diff --git a/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c b/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c index d15ce74ce2..8e497a91e2 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c +++ b/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c @@ -20,14 +20,6 @@ #include #include -/* - * The original table from the application and our copy of it with - * some changes. - */ - -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; - /* * Use the shared implementations of the following routines */ @@ -74,10 +66,10 @@ void bsp_start( void ) extern void *_WorkspaceBase; extern uint32_t _WorkspaceMax; - BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; + Configuration.work_space_start = (void *)&_WorkspaceBase; /* XXX check to see if satisfying small memory model */ - if ( BSP_Configuration.work_space_size > (int) &_WorkspaceMax ) + if ( rtems_configuration_get_work_space_size() > (int) &_WorkspaceMax ) rtems_fatal_error_occurred( 0x43218765 ); BSP_output_char = C4X_BSP_output_char; diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index fec20de52c..b8f87f029f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill + + * clock/clock.c, include/bsp.h, startup/bspstart.c: Eliminate copies of + the Configuration Table. Use the RTEMS provided accessor macros to + obtain configuration fields. + 2007-12-04 Joel Sherrill * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/m68k/gen68360/clock/clock.c b/c/src/lib/libbsp/m68k/gen68360/clock/clock.c index 8959821991..b48b641acd 100644 --- a/c/src/lib/libbsp/m68k/gen68360/clock/clock.c +++ b/c/src/lib/libbsp/m68k/gen68360/clock/clock.c @@ -87,7 +87,7 @@ static unsigned long nsec; extern int m360_clock_rate; \ unsigned long nsec_per_chip_tick = 1000000000 / m360_clock_rate; \ unsigned long nsec_per_pit_tick = 512 * nsec_per_chip_tick; \ - rtems_nsec_per_tick = BSP_Configuration.microseconds_per_tick * 1000; \ + rtems_nsec_per_tick = rtems_configuration_get_microseconds_per_tick() * 1000; \ divisor = rtems_nsec_per_tick / nsec_per_pit_tick; \ if (divisor > 255) \ divisor = 255; \ diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index 9486831ac2..7f84e5b26a 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -79,8 +79,6 @@ extern int rtems_scc1_driver_attach (struct rtems_bsdnet_ifconfig *config, int a /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - extern m68k_isr_entry M68Kvec[]; /* vector table address */ /* functions */ diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c index 3b505cf999..879215fe5d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c @@ -20,15 +20,6 @@ #include #include -/* - * The original table from the application and our copy of it with - * some changes. - */ - -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; -char *rtems_progname; - /* Amount of RAM on this board. Dynamically set in start.S */ unsigned long _M68K_RamSize; @@ -70,5 +61,5 @@ void bsp_start( void ) * not malloc'ed. It is just "pulled from the air". */ - BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; + Configuration.work_space_start = (void *)&_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index dbda2c3fac..ec48f1c3e0 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill + + * clock/clock.c, include/bsp.h, startup/bspstart.c: Eliminate copies of + the Configuration Table. Use the RTEMS provided accessor macros to + obtain configuration fields. + 2007-12-04 Joel Sherrill * Makefile.am, startup/bspstart.c: Move interrupt_stack_size field from diff --git a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c b/c/src/lib/libbsp/m68k/uC5282/clock/clock.c index 37e623ee34..663ab384a3 100644 --- a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c +++ b/c/src/lib/libbsp/m68k/uC5282/clock/clock.c @@ -102,7 +102,7 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void) MCF5282_PIT_PCSR_OVW | \ MCF5282_PIT_PCSR_PIE | \ MCF5282_PIT_PCSR_RLD; \ - MCF5282_PIT3_PMR = BSP_Configuration.microseconds_per_tick - 1; \ + MCF5282_PIT3_PMR = rtems_configuration_get_microseconds_per_tick() - 1; \ MCF5282_PIT3_PCSR = MCF5282_PIT_PCSR_PRE(preScaleCode) | \ MCF5282_PIT_PCSR_PIE | \ MCF5282_PIT_PCSR_RLD | \ diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h index 3aec736efd..cfd900624d 100644 --- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h +++ b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h @@ -56,8 +56,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c index 2064f03c84..597885b93a 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c @@ -26,14 +26,6 @@ #include #include -/* - * The original table from the application and our copy of it with - * some changes. - */ -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; -char *rtems_progname; - /* * Location of 'VME' access */ @@ -263,7 +255,7 @@ void bsp_start( void ) * not malloc'ed. It is just "pulled from the air". */ - BSP_Configuration.work_space_start = (void *)_WorkspaceBase; + Configuration.work_space_start = (void *)_WorkspaceBase; /* * Invalidate the cache and disable it diff --git a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog index f5419d4056..d3604bc696 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog +++ b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill + + * clock/clock.c, include/bsp.h, startup/bspstart.c: Eliminate copies of + the Configuration Table. Use the RTEMS provided accessor macros to + obtain configuration fields. + 2007-12-04 Joel Sherrill * console/console.c, include/bsp.h, startup/bspstart.c: Move diff --git a/c/src/lib/libbsp/nios2/nios2_iss/clock/clock.c b/c/src/lib/libbsp/nios2/nios2_iss/clock/clock.c index e676b7fa91..b1b999d732 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/clock/clock.c +++ b/c/src/lib/libbsp/nios2/nios2_iss/clock/clock.c @@ -39,7 +39,7 @@ void Clock_driver_support_initialize_hardware(void) CLOCK_REGS->control = ALTERA_AVALON_TIMER_CONTROL_STOP_MSK; - period = (CLOCK_FREQ/1000000L)*BSP_Configuration.microseconds_per_tick - 1; + period = (CLOCK_FREQ/1000000L)*rtems_configuration_get_microseconds_per_tick() - 1; CLOCK_REGS->period_hi = period >> 16; CLOCK_REGS->period_lo = period & 0xFFFF; diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h index 3680e0815d..2e90f82eac 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h +++ b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h @@ -132,8 +132,6 @@ altera_avalon_jtag_uart_regs; /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/bspstart.c b/c/src/lib/libbsp/nios2/nios2_iss/startup/bspstart.c index 6f55425f3f..0297a9136c 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/startup/bspstart.c +++ b/c/src/lib/libbsp/nios2/nios2_iss/startup/bspstart.c @@ -22,21 +22,12 @@ #include #include -/* - * The original table from the application and our copy of it with - * some changes. - */ - -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; - /* * Use the shared implementations of the following routines */ extern void bsp_postdriver_hook(void); extern void bsp_libc_init( void *, uint32_t, int ); -extern rtems_configuration_table BSP_Configuration; #if 0 extern char _RAMBase[]; @@ -69,8 +60,8 @@ void bsp_pretasking_hook(void) #endif unsigned long ramSpace; - heapStart = (unsigned long)BSP_Configuration.work_space_start - + BSP_Configuration.work_space_size; + heapStart = (unsigned long)Configuration.work_space_start + + rtems_configuration_get_work_space_size(); if (heapStart & (CPU_ALIGNMENT-1)) heapStart = (heapStart + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); @@ -121,9 +112,9 @@ void bsp_start( void ) */ #if 0 - BSP_Configuration.work_space_start = (void *)_WorkspaceBase; + Configuration.work_space_start = (void *)_WorkspaceBase; #else - BSP_Configuration.work_space_start = (void *)__alt_heap_start; + Configuration.work_space_start = (void *)__alt_heap_start; #endif } -- cgit v1.2.3