diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-11 15:50:25 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-11 15:50:25 +0000 |
| commit | 4130d8e2e2312b72400403570b3d5f88f6f9d6db (patch) | |
| tree | 8ab81640f610440e061706416fe62c5f1954b87c /c/src/lib | |
| parent | 2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-4130d8e2e2312b72400403570b3d5f88f6f9d6db.tar.bz2 | |
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Eliminate copies of the
Configuration Table. Use the RTEMS provided accessor macros to obtain
configuration fields.
Diffstat (limited to 'c/src/lib')
84 files changed, 254 insertions, 397 deletions
diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog index e2b1f7fa4b..bf8185723b 100644 --- a/c/src/lib/libbsp/arm/csb336/ChangeLog +++ b/c/src/lib/libbsp/arm/csb336/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/arm/csb336/include/bsp.h b/c/src/lib/libbsp/arm/csb336/include/bsp.h index 67753012ad..78f0db3a63 100644 --- a/c/src/lib/libbsp/arm/csb336/include/bsp.h +++ b/c/src/lib/libbsp/arm/csb336/include/bsp.h @@ -34,8 +34,6 @@ extern "C" { /* How many serial ports? */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 -extern rtems_configuration_table BSP_Configuration; - int get_perclk1_freq(void); /* diff --git a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c index 66c1967206..0a635d98cd 100644 --- a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c @@ -27,10 +27,6 @@ extern void *_bss_free_start; unsigned long free_mem_start; unsigned long free_mem_end; -rtems_configuration_table BSP_Configuration; - -char *rtems_progname = "RTEMS"; - extern void rtems_irq_mngt_init(void); void bsp_libc_init( void *, uint32_t, int ); void bsp_postdriver_hook(void); @@ -112,10 +108,10 @@ void bsp_start_default( void ) MC9328MXL_AITC_NIMASK = 0x1f; /* Place RTEMS workspace at beginning of free memory. */ - BSP_Configuration.work_space_start = (void *)&_bss_free_start; + Configuration.work_space_start = (void *)&_bss_free_start; free_mem_start = ((uint32_t)&_bss_free_start + - BSP_Configuration.work_space_size); + rtems_configuration_get_work_space_size()); free_mem_end = ((uint32_t)&_sdram_base + (uint32_t)&_sdram_size); @@ -135,21 +131,15 @@ void bsp_start_default( void ) */ #if 0 printk( "work_space_size = 0x%x\n", - BSP_Configuration.work_space_size ); - printk( "maximum_extensions = 0x%x\n", - BSP_Configuration.maximum_extensions ); + rtems_configuration_get_work_space_size() ); printk( "microseconds_per_tick = 0x%x\n", - BSP_Configuration.microseconds_per_tick ); + rtems_configuration_get_microseconds_per_tick() ); printk( "ticks_per_timeslice = 0x%x\n", - BSP_Configuration.ticks_per_timeslice ); - printk( "number_of_device_drivers = 0x%x\n", - BSP_Configuration.number_of_device_drivers ); - printk( "Device_driver_table = 0x%x\n", - BSP_Configuration.Device_driver_table ); + rtems_configuration_get_ticks_per_timeslice() ); printk( "work_space_start = 0x%x\n", - BSP_Configuration.work_space_start ); + Configuration.work_space_start ); printk( "work_space_size = 0x%x\n", - BSP_Configuration.work_space_size ); + rtems_configuration_get_work_space_size() ); #endif } /* bsp_start */ diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog index 418d627876..15d811b590 100644 --- a/c/src/lib/libbsp/arm/csb337/ChangeLog +++ b/c/src/lib/libbsp/arm/csb337/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/arm/csb337/include/bsp.h b/c/src/lib/libbsp/arm/csb337/include/bsp.h index b6eac8a6c7..d06c2807a9 100644 --- a/c/src/lib/libbsp/arm/csb337/include/bsp.h +++ b/c/src/lib/libbsp/arm/csb337/include/bsp.h @@ -40,8 +40,6 @@ static inline int32_t BSP_get_baud(void) {return 38400;} /* How many serial ports? */ #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 1 -extern rtems_configuration_table BSP_Configuration; - #define ST_PIMR_PIV 33 /* 33 ticks of the 32.768Khz clock ~= 1msec */ /* diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c index d7f381fd07..68772f7e2a 100644 --- a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c @@ -29,9 +29,6 @@ extern void *_bss_free_start; unsigned long free_mem_start; unsigned long free_mem_end; -rtems_configuration_table BSP_Configuration; -char *rtems_progname = "RTEMS"; - /* Function prototypes */ extern void rtems_irq_mngt_init(void); void bsp_libc_init( void *, uint32_t, int ); @@ -100,10 +97,10 @@ void bsp_start_default( void ) fix_mac_addr(); /* Place RTEMS workspace at beginning of free memory. */ - BSP_Configuration.work_space_start = (void *)&_bss_free_start; + Configuration.work_space_start = (void *)&_bss_free_start; free_mem_start = ((uint32_t)&_bss_free_start + - BSP_Configuration.work_space_size); + rtems_configuration_get_work_space_size()); free_mem_end = ((uint32_t)&_sdram_base + (uint32_t)&_sdram_size); @@ -123,21 +120,13 @@ void bsp_start_default( void ) */ #if 0 printk( "work_space_size = 0x%x\n\r", - BSP_Configuration.work_space_size ); - printk( "maximum_extensions = 0x%x\n\r", - BSP_Configuration.maximum_extensions ); + rtems_configuration_get_work_space_size() ); printk( "microseconds_per_tick = 0x%x\n\r", - BSP_Configuration.microseconds_per_tick ); + rtems_configuration_get_microseconds_per_tick() ); printk( "ticks_per_timeslice = 0x%x\n\r", - BSP_Configuration.ticks_per_timeslice ); - printk( "number_of_device_drivers = 0x%x\n\r", - BSP_Configuration.number_of_device_drivers ); - printk( "Device_driver_table = 0x%x\n\r", - BSP_Configuration.Device_driver_table ); - printk( "work_space_start = 0x%x\n\r", - BSP_Configuration.work_space_start ); + rtems_configuration_get_ticks_per_timeslice() ); printk( "work_space_size = 0x%x\n\r", - BSP_Configuration.work_space_size ); + rtems_configuration_get_work_space_size() ); #endif } /* bsp_start */ diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog index 66ca618fbd..fbc3615f9d 100644 --- a/c/src/lib/libbsp/arm/gp32/ChangeLog +++ b/c/src/lib/libbsp/arm/gp32/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/arm/gp32/include/bsp.h b/c/src/lib/libbsp/arm/gp32/include/bsp.h index 2a9c7c15cc..73387b51a3 100644 --- a/c/src/lib/libbsp/arm/gp32/include/bsp.h +++ b/c/src/lib/libbsp/arm/gp32/include/bsp.h @@ -30,10 +30,9 @@ extern "C" { #include <rtems/clockdrv.h> #include <s3c2400.h> -extern rtems_configuration_table BSP_Configuration; - #define gp32_initButtons() {rPBCON=0x0;} -#define gp32_getButtons() ( (((~rPEDAT >> 6) & 0x3 )<<8) | (((~rPBDAT >> 8) & 0xFF)<<0) ) +#define gp32_getButtons() \ + ( (((~rPEDAT >> 6) & 0x3 )<<8) | (((~rPBDAT >> 8) & 0xFF)<<0) ) /*functions to get the differents s3c2400 clks*/ uint32_t get_FCLK(void); diff --git a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c index e92dbf8e41..4169e98b32 100644 --- a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c @@ -31,14 +31,6 @@ extern void *_bss_free_start; unsigned long free_mem_start; unsigned long free_mem_end; -/* The original BSP configuration 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 = "RTEMS"; /* Program name - from main(). */ - /*-------------------------------------------------------------------------+ | External Prototypes +--------------------------------------------------------------------------*/ @@ -137,9 +129,9 @@ void bsp_start_default( void ) rTCFG0=(cr | (0<<0)); /* Place RTEMS workspace at beginning of free memory. */ - BSP_Configuration.work_space_start = (void *)&_bss_free_start; + Configuration.work_space_start = (void *)&_bss_free_start; - free_mem_start = ((uint32_t)&_bss_free_start + BSP_Configuration.work_space_size); + free_mem_start = ((uint32_t)&_bss_free_start + rtems_configuration_get_work_space_size()); free_mem_end = ((uint32_t)&_sdram_base + (uint32_t)&_sdram_size); @@ -157,22 +149,18 @@ void bsp_start_default( void ) */ #if 0 - printk( "work_space_size = 0x%x\n", BSP_Configuration.work_space_size ); - printk( "maximum_extensions = 0x%x\n", BSP_Configuration.maximum_extensions ); + printk( "work_space_size = 0x%x\n", + rtems_configuration_get_work_space_size() ); printk( "microseconds_per_tick = 0x%x\n", - BSP_Configuration.microseconds_per_tick ); + rtems_configuration_get_microseconds_per_tick() ); printk( "ticks_per_timeslice = 0x%x\n", - BSP_Configuration.ticks_per_timeslice ); - printk( "number_of_device_drivers = 0x%x\n", - BSP_Configuration.number_of_device_drivers ); - printk( "Device_driver_table = 0x%x\n", - BSP_Configuration.Device_driver_table ); + rtems_configuration_get_ticks_per_timeslice() ); printk( "_heap_size = 0x%x\n", _heap_size ); /* printk( "_stack_size = 0x%x\n", _stack_size );*/ printk( "rtemsFreeMemStart = 0x%x\n", rtemsFreeMemStart ); - printk( "work_space_start = 0x%x\n", BSP_Configuration.work_space_start ); - printk( "work_space_size = 0x%x\n", BSP_Configuration.work_space_size ); + printk( "work_space_start = 0x%x\n", Configuration.work_space_start ); + printk( "work_space_size = 0x%x\n", rtems_configuration_get_work_space_size() ); #endif } diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog index 2f1ad8ca86..b94f96753a 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog +++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h index dd624d7384..ad471f6fda 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h +++ b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h @@ -127,8 +127,6 @@ int cs8900_driver_attach (struct rtems_bsdnet_ifconfig *config, #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 -extern rtems_configuration_table BSP_Configuration; - /* * Network driver configuration */ diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c index fad578de95..8e428e78e9 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c @@ -39,18 +39,9 @@ extern void *_bss_free_start; extern void *_bss_start_; extern void *_bss_end_; - unsigned long free_mem_start; unsigned long free_mem_end; -/* The original BSP configuration 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; /* Program name - from main(). */ - /*************************************************************/ /* Function prototypes */ /*************************************************************/ @@ -115,13 +106,12 @@ void bsp_pretasking_hook(void) /* This function also configures the CPU's memory protection unit. */ /* */ /* GLOBALS USED: */ -/* CPU_table */ -/* BSP_Configuration */ -/* free_mem_start */ -/* free_mem_end */ -/* free_mem_nocache_start */ -/* _bss_free_start */ -/* mpu_region_tbl */ +/* Configuration */ +/* free_mem_start */ +/* free_mem_end */ +/* free_mem_nocache_start */ +/* _bss_free_start */ +/* mpu_region_tbl */ /* */ /* */ /* */ @@ -184,10 +174,10 @@ void bsp_start_default( void ) VICProtection = 0; /* Place RTEMS workspace at beginning of free memory. */ - BSP_Configuration.work_space_start = (void *)&_bss_free_start; + Configuration.work_space_start = (void *)&_bss_free_start; free_mem_start = ((uint32_t)&_bss_free_start + - BSP_Configuration.work_space_size); + rtems_configuration_get_work_space_size()); free_mem_end = ((uint32_t)&_sdram_base + (uint32_t)&_sdram_size); @@ -217,20 +207,16 @@ void bsp_start_default( void ) */ #if 0 - printk( "work_space_size = 0x%x\n", BSP_Configuration.work_space_size ); - printk( "maximum_extensions = 0x%x\n", BSP_Configuration.maximum_extensions ); + printk( "work_space_size = 0x%x\n", + rtems_configuration_get_work_space_size() ); printk( "microseconds_per_tick = 0x%x\n", - BSP_Configuration.microseconds_per_tick ); + rtems_configuration_get_microseconds_per_tick() ); printk( "ticks_per_timeslice = 0x%x\n", - BSP_Configuration.ticks_per_timeslice ); - printk( "number_of_device_drivers = 0x%x\n", - BSP_Configuration.number_of_device_drivers ); - printk( "Device_driver_table = 0x%x\n", - BSP_Configuration.Device_driver_table ); + rtems_configuration_get_ticks_per_timeslice() ); /* printk( "_stack_size = 0x%x\n", _stack_size );*/ - printk( "work_space_start = 0x%x\n", BSP_Configuration.work_space_start ); - printk( "work_space_size = 0x%x\n", BSP_Configuration.work_space_size ); + printk( "work_space_start = 0x%x\n", Configuration.work_space_start ); + printk( "work_space_size = 0x%x\n", rtems_configuration_get_work_space_size() ); #endif } /* bsp_start */ diff --git a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog index 3a1011c3bd..5eaaf7b124 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog +++ b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h index ec34c37609..836b05953e 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h +++ b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h @@ -95,8 +95,6 @@ extern "C" { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c b/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c index 04e712498e..1f863ebb33 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c +++ b/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c @@ -25,18 +25,6 @@ #include <rtems/libcsupport.h> -/* - * 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; - - const unsigned int dcplbs_table[16][2] = { { 0xFFA00000, (PAGE_SIZE_1MB | CPLB_D_PAGE_MGMT | CPLB_WT) }, { 0xFF900000, (PAGE_SIZE_1MB | CPLB_D_PAGE_MGMT | CPLB_WT) }, /* L1 Data B */ @@ -155,7 +143,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; int i=0; for (i=5;i<16;i++) { diff --git a/c/src/lib/libbsp/h8300/h8sim/ChangeLog b/c/src/lib/libbsp/h8300/h8sim/ChangeLog index 61d7f78679..d167197b1b 100644 --- a/c/src/lib/libbsp/h8300/h8sim/ChangeLog +++ b/c/src/lib/libbsp/h8300/h8sim/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h b/c/src/lib/libbsp/h8300/h8sim/include/bsp.h index dc2f0d0125..005363da39 100644 --- a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h +++ b/c/src/lib/libbsp/h8300/h8sim/include/bsp.h @@ -48,8 +48,6 @@ extern "C" { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/h8300/h8sim/startup/bspstart.c b/c/src/lib/libbsp/h8300/h8sim/startup/bspstart.c index d1e06e252d..9c2ab3f5b1 100644 --- a/c/src/lib/libbsp/h8300/h8sim/startup/bspstart.c +++ b/c/src/lib/libbsp/h8300/h8sim/startup/bspstart.c @@ -21,17 +21,6 @@ #include <rtems/libcsupport.h> /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -59,7 +48,7 @@ void bsp_pretasking_hook(void) extern int WorkspaceBase; heapStart = (void *) - ((unsigned long)&WorkspaceBase + BSP_Configuration.work_space_size); + ((unsigned long)&WorkspaceBase + rtems_configuration_get_work_space_size()); if ( (unsigned long) heapStart > (256 * 1024) ) rtems_fatal_error_occurred (('H'<<24) | ('E'<<16) | ('A'<<8) | 'P'); heapSize = (256 * 1024) - (unsigned long)(heapStart); @@ -82,11 +71,11 @@ void bsp_start( void ) extern int WorkspaceBase; /* - if ( BSP_Configuration.work_space_size >(512*1024) ) + if ( rtems_configuration_get_work_space_size() >(512*1024) ) _sys_exit( 1 ); */ - BSP_Configuration.work_space_start = (void *) &WorkspaceBase; + Configuration.work_space_start = (void *) &WorkspaceBase; } void H8BD_Install_IRQ( diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog index 74f2a5ef44..7b89206951 100644 --- a/c/src/lib/libbsp/m68k/av5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/av5282/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/m68k/av5282/include/bsp.h b/c/src/lib/libbsp/m68k/av5282/include/bsp.h index 3a4705f2b6..911f4f3aa9 100644 --- a/c/src/lib/libbsp/m68k/av5282/include/bsp.h +++ b/c/src/lib/libbsp/m68k/av5282/include/bsp.h @@ -39,8 +39,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/av5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c index 412c6ba282..b7071f86fa 100644 --- a/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c @@ -27,14 +27,6 @@ #include <string.h> /* - * 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 */ #define VME_ONE_BASE 0x30000000 @@ -183,7 +175,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/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog index be5ea6e21e..5223b3d7ac 100644 --- a/c/src/lib/libbsp/m68k/csb360/ChangeLog +++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h index 3dd7adf417..e391b90ed5 100644 --- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h @@ -175,8 +175,6 @@ extern rtems_device_driver rtc_initialize( /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - extern m68k_isr_entry M68Kvec[]; /* vector table address */ extern rtems_isr (*rtems_clock_hook)(rtems_vector_number); diff --git a/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c b/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c index 36dfd25723..3398c8e1b2 100644 --- a/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c @@ -32,16 +32,7 @@ #include <string.h> -/* - * The original table from the application and our copy of it with - * some changes. - */ - -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; - extern unsigned int _RamSize; -char *rtems_progname; /* * Use the shared implementations of the following routines @@ -65,5 +56,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/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index aa212143ed..5630cdaec4 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h index 8c8605c679..08354f60cf 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h @@ -205,8 +205,6 @@ extern rtems_device_driver rtc_initialize( /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - extern m68k_isr_entry M68Kvec[]; /* vector table address */ extern rtems_isr (*rtems_clock_hook)(rtems_vector_number); diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c index ba1a4239f4..48ff867a6b 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c @@ -32,18 +32,8 @@ #include <string.h> -/* - * The original table from the application and our copy of it with - * some changes. - */ - -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; - unsigned long _RamSize; -char *rtems_progname; - /* * Use the shared implementations of the following routines */ @@ -65,5 +55,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/mcf5235/ChangeLog b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog index db4bebe3da..7979eec93d 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h index d5015692bb..311754dc23 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h @@ -39,8 +39,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/mcf5235/startup/bspstart.c b/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c index b3f9a03e61..5a9393e70b 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c @@ -27,14 +27,6 @@ #include <string.h> /* - * 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; - -/* * Cacheable areas */ #define SDRAM_BASE 0 @@ -175,7 +167,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/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index 474707ace2..c94e073aec 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h index 94b6d374d7..c22183d044 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h @@ -177,8 +177,6 @@ struct vme_gcsr_map { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - extern m68k_isr_entry M68Kvec[]; /* vector table address */ /* diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c index 6b1736b720..f05637b5ec 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c @@ -25,15 +25,6 @@ #include <rtems/libcsupport.h> /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -140,5 +131,5 @@ void bsp_start( void ) rtems_cache_enable_instruction(); rtems_cache_enable_data(); - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; + Configuration.work_space_start = (void *) &_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index cb868f823e..5c88e13ffa 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h index 7e73a3d5bb..e86f85422a 100644 --- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h +++ b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h @@ -52,8 +52,6 @@ extern "C" { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/m68k/sim68000/startup/bspstart.c b/c/src/lib/libbsp/m68k/sim68000/startup/bspstart.c index cb5d908aaf..dc66baaadf 100644 --- a/c/src/lib/libbsp/m68k/sim68000/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/sim68000/startup/bspstart.c @@ -21,15 +21,6 @@ #include <rtems/libcsupport.h> /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -63,11 +54,11 @@ void bsp_start( void ) */ /* XXX address shutdown - if ( BSP_Configuration.work_space_size >(128*1024) ) + if ( rtems_configuration_get_work_space_size() >(128*1024) ) _sys_exit( 1 ); */ - BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; + Configuration.work_space_start = (void *) &_WorkspaceBase; } #include <rtems/bspIo.h> diff --git a/c/src/lib/libbsp/mips/csb350/ChangeLog b/c/src/lib/libbsp/mips/csb350/ChangeLog index 4b6b6916ef..e72987a135 100644 --- a/c/src/lib/libbsp/mips/csb350/ChangeLog +++ b/c/src/lib/libbsp/mips/csb350/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/mips/csb350/include/bsp.h b/c/src/lib/libbsp/mips/csb350/include/bsp.h index cd2bebacf1..b6cd87a4ad 100644 --- a/c/src/lib/libbsp/mips/csb350/include/bsp.h +++ b/c/src/lib/libbsp/mips/csb350/include/bsp.h @@ -63,8 +63,6 @@ int negate_sw_irw(uint32_t irqnum); /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/mips/csb350/startup/bspstart.c b/c/src/lib/libbsp/mips/csb350/startup/bspstart.c index 239f40d69b..bf9761a9ef 100644 --- a/c/src/lib/libbsp/mips/csb350/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/csb350/startup/bspstart.c @@ -33,10 +33,6 @@ extern void *_bss_free_start; unsigned long free_mem_start; unsigned long free_mem_end; -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; -char *rtems_progname; - au1x00_uart_t *uart0 = (au1x00_uart_t *)AU1X00_UART0_ADDR; au1x00_uart_t *uart3 = (au1x00_uart_t *)AU1X00_UART3_ADDR; @@ -93,10 +89,10 @@ void bsp_start( void ) unsigned int compare = 0; /* Place RTEMS workspace at beginning of free memory. */ - BSP_Configuration.work_space_start = (void *)&_bss_free_start; + Configuration.work_space_start = (void *)&_bss_free_start; free_mem_start = ((uint32_t)&_bss_free_start + - BSP_Configuration.work_space_size); + rtems_configuration_get_work_space_size()); free_mem_end = ((uint32_t)&_sdram_base + (uint32_t)&_sdram_size); diff --git a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog index 56420fe49c..a643b3dc14 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog +++ b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h b/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h index e1a632ba21..7d4fa17f19 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h +++ b/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h @@ -54,8 +54,6 @@ extern void assertSoftwareInterrupt(uint32_t); /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/mips/genmongoosev/startup/bspstart.c b/c/src/lib/libbsp/mips/genmongoosev/startup/bspstart.c index 9d9179970b..7a87aa9e38 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/genmongoosev/startup/bspstart.c @@ -26,15 +26,6 @@ #include <libcpu/mongoose-v.h> /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -84,10 +75,10 @@ void bsp_start( void ) extern void mips_gdb_stub_install(void); /* HACK -- tied to value linkcmds */ - if ( BSP_Configuration.work_space_size > (4096*1024) ) + if ( rtems_configuration_get_work_space_size() > (4096*1024) ) _sys_exit( 1 ); - BSP_Configuration.work_space_start = (void *) &WorkspaceBase; + Configuration.work_space_start = (void *) &WorkspaceBase; /* mask off any interrupts */ MONGOOSEV_WRITE( MONGOOSEV_PERIPHERAL_FUNCTION_INTERRUPT_MASK_REGISTER, 0 ); diff --git a/c/src/lib/libbsp/mips/hurricane/ChangeLog b/c/src/lib/libbsp/mips/hurricane/ChangeLog index 16667f0aaa..087fcdbea7 100644 --- a/c/src/lib/libbsp/mips/hurricane/ChangeLog +++ b/c/src/lib/libbsp/mips/hurricane/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/mips/hurricane/include/bsp.h b/c/src/lib/libbsp/mips/hurricane/include/bsp.h index cb27172e0d..64070dace5 100644 --- a/c/src/lib/libbsp/mips/hurricane/include/bsp.h +++ b/c/src/lib/libbsp/mips/hurricane/include/bsp.h @@ -80,8 +80,6 @@ extern uint32_t mips_get_timer( void ); /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/mips/hurricane/startup/bspstart.c b/c/src/lib/libbsp/mips/hurricane/startup/bspstart.c index 93d2173d0d..085d02b24d 100644 --- a/c/src/lib/libbsp/mips/hurricane/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/hurricane/startup/bspstart.c @@ -23,15 +23,6 @@ uint32_t bsp_clicks_per_microsecond; /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -96,7 +87,7 @@ void bsp_start( void ) * not malloc'ed. It is just "pulled from the air". */ - BSP_Configuration.work_space_start = + Configuration.work_space_start = (void *)((uint64_t)((&end) + LIBC_HEAP_SIZE + 0x2000) & ~0x7); bsp_clicks_per_microsecond = CPU_CLOCK_RATE_MHZ; diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog index 6c58cf577a..1b12d06f0c 100644 --- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog +++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h index 1021927560..ef9c452e1b 100644 --- a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h +++ b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h @@ -32,8 +32,6 @@ extern "C" { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c b/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c index e3a11c46de..74400fea5d 100644 --- a/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c @@ -21,15 +21,6 @@ #include <rtems/libcsupport.h> /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -78,10 +69,10 @@ void bsp_start( void ) extern void mips_install_isr_entries(void); /* HACK -- tied to value linkcmds */ - if ( BSP_Configuration.work_space_size >(4096*1024) ) + if ( rtems_configuration_get_work_space_size() >(4096*1024) ) _sys_exit( 1 ); - BSP_Configuration.work_space_start = (void *) &WorkspaceBase; + Configuration.work_space_start = (void *) &WorkspaceBase; mips_set_sr( 0xff00 ); /* all interrupts unmasked but globally off */ /* depend on the IRC to take care of things */ diff --git a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog b/c/src/lib/libbsp/mips/rbtx4925/ChangeLog index 5595992f45..ed483eb3af 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog +++ b/c/src/lib/libbsp/mips/rbtx4925/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h b/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h index c08d390401..dc70a02834 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h +++ b/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h @@ -56,8 +56,6 @@ extern "C" { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/mips/rbtx4925/startup/bspstart.c b/c/src/lib/libbsp/mips/rbtx4925/startup/bspstart.c index e8b313921d..ffdfecfea9 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/rbtx4925/startup/bspstart.c @@ -25,15 +25,6 @@ extern int end; /* defined by linker */ /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -83,7 +74,7 @@ void bsp_start( void ) extern int WorkspaceBase; extern void mips_install_isr_entries(void); - BSP_Configuration.work_space_start = + Configuration.work_space_start = (void *)((uint64_t)((&end) + LIBC_HEAP_SIZE + 0x100) & ~0x7); mips_install_isr_entries(); /* Install generic MIPS exception handler */ diff --git a/c/src/lib/libbsp/mips/rbtx4938/ChangeLog b/c/src/lib/libbsp/mips/rbtx4938/ChangeLog index 4673ad6b14..9d94d88d03 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/ChangeLog +++ b/c/src/lib/libbsp/mips/rbtx4938/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h b/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h index 99158a9443..42710d29a9 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h +++ b/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h @@ -56,8 +56,6 @@ extern "C" { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/mips/rbtx4938/startup/bspstart.c b/c/src/lib/libbsp/mips/rbtx4938/startup/bspstart.c index e8b313921d..ffdfecfea9 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/rbtx4938/startup/bspstart.c @@ -25,15 +25,6 @@ extern int end; /* defined by linker */ /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -83,7 +74,7 @@ void bsp_start( void ) extern int WorkspaceBase; extern void mips_install_isr_entries(void); - BSP_Configuration.work_space_start = + Configuration.work_space_start = (void *)((uint64_t)((&end) + LIBC_HEAP_SIZE + 0x100) & ~0x7); mips_install_isr_entries(); /* Install generic MIPS exception handler */ diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog index 8076bf4e38..eff61f7c58 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Eliminate copies of the + Configuration Table. Use the RTEMS provided accessor macros to obtain + configuration fields. + 2007-12-08 Till Straumann <strauman@slac.stanford.edu> * Makefile.am: merged shared/vme/vme_universe.c and diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h index 2d9601819e..27f5d4a352 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h @@ -186,7 +186,6 @@ extern unsigned int BSP_time_base_divisor; #define Processor_Synchronize() \ asm(" eieio ") -extern rtems_configuration_table BSP_Configuration; extern void BSP_panic(char *s); extern void rtemsReboot(void); extern int BSP_disconnect_clock_handler (void); diff --git a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c index 6b8110b7ed..dff96c9cc8 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c @@ -124,15 +124,6 @@ void _BSP_Fatal_error(unsigned int v) __asm__ __volatile ("sc"); } -/* - * 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; - int BSP_FLASH_Disable_writes( uint32_t area ) @@ -206,7 +197,7 @@ void bsp_pretasking_hook(void) if (heap_start & (CPU_ALIGNMENT-1)) heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); - heap_size = (BSP_mem_size - heap_start) - BSP_Configuration.work_space_size; + heap_size = (BSP_mem_size - heap_start) - rtems_configuration_get_work_space_size(); heap_sbrk_spared=_bsp_sbrk_init(heap_start, &heap_size); @@ -446,10 +437,11 @@ ShowBATS(); #endif #ifdef SHOW_MORE_INIT_SETTINGS - printk("BSP_Configuration.work_space_size = %x\n", BSP_Configuration.work_space_size); + printk("rtems_configuration_get_work_space_size() = %x\n", + rtems_configuration_get_work_space_size()); #endif work_space_start = - (unsigned char *)BSP_mem_size - BSP_Configuration.work_space_size; + (unsigned char *)BSP_mem_size - rtems_configuration_get_work_space_size(); if ( work_space_start <= ((unsigned char *)__rtems_end) + INIT_STACK_SIZE + rtems_configuration_get_interrupt_stack_size()) { @@ -457,7 +449,7 @@ ShowBATS(); bsp_cleanup(); } - BSP_Configuration.work_space_start = work_space_start; + Configuration.work_space_start = work_space_start; /* * Initalize RTEMS IRQ system diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog index c30436d83a..5b51e344ee 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Eliminate copies of the + Configuration Table. Use the RTEMS provided accessor macros to obtain + configuration fields. + 2007-12-05 Till Straumann <strauman@slac.stanford.edu> * irq/ipic.c, irq/irq_init.c: diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h b/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h index 7b019d7eb6..28a5adb1b0 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h @@ -197,7 +197,6 @@ extern "C" { /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; /* * We need to decide how much memory will be non-cacheable. This * will mainly be memory that will be used in DMA (network and serial diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c index 81f2566b8e..e22c4aabbd 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c @@ -38,17 +38,8 @@ SPR_RW(SPRG0) SPR_RW(SPRG1) -/* - * The original table from the application (in ROM) and our copy of it with - * some changes. Configuration is defined in <confdefs.h>. Make sure that - * our configuration tables are uninitialized so that they get allocated in - * the .bss section (RAM). - */ -extern rtems_configuration_table Configuration; extern unsigned long intrStackPtr; -rtems_configuration_table BSP_Configuration; static char *BSP_heap_start, *BSP_heap_end; -char *rtems_progname; /* * constants for c_clock driver: @@ -156,10 +147,10 @@ void bsp_calc_mem_layout() * - Heap starts at end of workspace * - Heap ends at end of memory - reserved memory area */ - BSP_Configuration.work_space_start = _WorkspaceBase; + Configuration.work_space_start = _WorkspaceBase; - BSP_heap_start = ((char *)BSP_Configuration.work_space_start + - BSP_Configuration.work_space_size); + BSP_heap_start = ((char *)Configuration.work_space_start + + rtems_configuration_get_work_space_size()); #if defined(HAS_UBOOT) BSP_heap_end = (uboot_bdinfo_ptr->bi_memstart diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index e29f971bc9..2f0e415d82 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h index cd544d44f4..b9fa473314 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h @@ -63,7 +63,6 @@ extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config, int a /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; /* * We need to decide how much memory will be non-cacheable. This * will mainly be memory that will be used in DMA (network and serial diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c index 75fc84b728..118b46d874 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c @@ -60,16 +60,7 @@ SPR_RW(SPRG0) SPR_RW(SPRG1) -/* - * The original table from the application (in ROM) and our copy of it with - * some changes. Configuration is defined in <confdefs.h>. Make sure that - * our configuration tables are uninitialized so that they get allocated in - * the .bss section (RAM). - */ -extern rtems_configuration_table Configuration; extern unsigned long intrStackPtr; -rtems_configuration_table BSP_Configuration; -char *rtems_progname; /* * Driver configuration parameters @@ -289,7 +280,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; /* * initialize the device driver parameters @@ -324,7 +315,7 @@ void bsp_start(void) * Call this in case we use TERMIOS for console I/O */ - m8xx_uart_reserve_resources(&BSP_Configuration); + m8xx_uart_reserve_resources(&Configuration); /* rtems_termios_initialize(); diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index e5a58f1580..0c33e76b3f 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Eliminate copies of the + Configuration Table. Use the RTEMS provided accessor macros to obtain + configuration fields. + 2007-12-10 Till Straumann <strauman@slac.stanford.edu> * Makefile.am, start/preload.S: moved preload.S diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h index 06df360651..1ec58622b9 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h @@ -100,7 +100,6 @@ extern unsigned int BSP_time_base_divisor; #define BSP_Convert_decrementer( _value ) \ ((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value))) -extern rtems_configuration_table BSP_Configuration; extern void BSP_panic(char *s); extern void rtemsReboot(void); /* extern int printk(const char *, ...) __attribute__((format(printf, 1, 2))); */ diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c index d61a44e642..a09758ec24 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c @@ -144,15 +144,6 @@ void _BSP_Fatal_error(unsigned int v) } /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -403,12 +394,12 @@ void bsp_start( void ) bsp_clicks_per_usec = BSP_bus_frequency/(BSP_time_base_divisor * 1000); printk( - "BSP_Configuration.work_space_size = %x\n", - BSP_Configuration.work_space_size + "rtems_configuration_get_work_space_size() = %x\n", + rtems_configuration_get_work_space_size() ); work_space_start = - (unsigned char *)BSP_mem_size - BSP_Configuration.work_space_size; + (unsigned char *)BSP_mem_size - rtems_configuration_get_work_space_size(); if ( work_space_start <= ((unsigned char *)__rtems_end) + INIT_STACK_SIZE + rtems_configuration_get_interrupt_stack_size()) { @@ -416,7 +407,7 @@ void bsp_start( void ) bsp_cleanup(); } - BSP_Configuration.work_space_start = work_space_start; + Configuration.work_space_start = work_space_start; /* * Initalize RTEMS IRQ system diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 365d8b2c3c..216811b998 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * include/bsp.h, startup/bspstart.c: Eliminate copies of the + Configuration Table. Use the RTEMS provided accessor macros to obtain + configuration fields. + 2007-12-08 Till Straumann <strauman@slac.stanford.edu> * Makefile.am: merged shared/vme/vme_universe.c and diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h index 94d677ae72..04f6a31c7c 100644 --- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h @@ -220,9 +220,6 @@ unsigned int SCORE603e_FLASH_Enable_writes( #define Convert_Endian_16( _data ) \ ( ((_data&0x00ff)<<8) | ((_data&0xff00)>>8) ) -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/powerpc/score603e/startup/bspstart.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c index f042f07645..b3d2e1433b 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c @@ -42,15 +42,6 @@ unsigned int BSP_time_base_divisor = 1000; /* XXX - Just a guess */ */ uint32_t bsp_clicks_per_usec; -/* - * The original table from the application and our copy of it with - * some changes. - */ - -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; -uint32_t bsp_isr_level; - void BSP_panic(char *s) { printk("%s PANIC %s\n",_RTEMS_version, s); @@ -88,7 +79,7 @@ void bsp_pretasking_hook(void) if (heap_start & (CPU_ALIGNMENT-1)) heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); - heap_size = BSP_Configuration.work_space_start - (void *)&end; + heap_size = Configuration.work_space_start - (void *)&end; heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */ bsp_libc_init((void *) heap_start, heap_size, 0); @@ -295,14 +286,14 @@ void bsp_start( void ) */ work_space_start = - (unsigned char *)&RAM_END - BSP_Configuration.work_space_size; + (unsigned char *)&RAM_END - rtems_configuration_get_work_space_size(); if ( work_space_start <= (unsigned char *)&end ) { printk( "bspstart: Not enough RAM!!!\n" ); bsp_cleanup(); } - BSP_Configuration.work_space_start = work_space_start; + Configuration.work_space_start = work_space_start; /* * initialize the device driver parameters diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog index b863b6bf00..e5a8f0cec5 100644 --- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ss555/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to diff --git a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h index 75324c6545..eb6ad03be9 100644 --- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h @@ -77,8 +77,6 @@ extern volatile cpld_t cpld; /* defined in linkcmds */ /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - /* * Device Driver Table Entries */ diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c index 4fea0cf850..786ca22b12 100644 --- a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c @@ -39,16 +39,7 @@ SPR_RW(SPRG0) SPR_RW(SPRG1) -/* - * The original table from the application (in ROM) and our copy of it with - * some changes. Configuration is defined in <confdefs.h>. Make sure that - * our configuration tables are uninitialized so that they get allocated in - * the .bss section (RAM). - */ -extern rtems_configuration_table Configuration; extern unsigned long intrStackPtr; -rtems_configuration_table BSP_Configuration; -char *rtems_progname; /* * Driver configuration parameters @@ -104,8 +95,8 @@ void bsp_pretasking_hook(void) * independently of each other. */ uint8_t *_HeapStart = - (uint8_t *)BSP_Configuration.work_space_start - + BSP_Configuration.work_space_size; + (uint8_t *)Configuration.work_space_start + + rtems_configuration_get_work_space_size(); extern uint8_t _HeapEnd[]; bsp_libc_init( _HeapStart, _HeapEnd - _HeapStart, 0 ); @@ -174,7 +165,7 @@ void bsp_start(void) * In this case, the memory is not malloc'ed. It is just * "pulled from the air". */ - BSP_Configuration.work_space_start = _WorkspaceBase; + Configuration.work_space_start = _WorkspaceBase; /* * initialize the device driver parameters @@ -185,7 +176,7 @@ void bsp_start(void) /* * Call this in case we use TERMIOS for console I/O */ - m5xx_uart_reserve_resources( &BSP_Configuration ); + m5xx_uart_reserve_resources( &Configuration ); /* * Initalize RTEMS IRQ system diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index faf5dd1a97..10c563b61e 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h index 02e2e544a4..5c1659459e 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h @@ -70,8 +70,6 @@ extern void *CPU_Interrupt_stack_high ; /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - extern void bsp_cleanup( void ); /* diff --git a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c index 31989ccde8..0138d8b7d9 100644 --- a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c @@ -33,15 +33,6 @@ uint32_t bsp_clicks_per_second; /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -100,8 +91,8 @@ void bsp_start(void) * not malloc'ed. It is just "pulled from the air". */ - BSP_Configuration.work_space_start = (void *) &WorkSpaceStart ; - BSP_Configuration.work_space_size = + Configuration.work_space_start = (void *) &WorkSpaceStart ; + rtems_configuration_get_work_space_size() = (uint32_t) &WorkSpaceEnd - (uint32_t) &WorkSpaceStart ; diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog index de9260ab2e..3fefd91c32 100644 --- a/c/src/lib/libbsp/sh/gensh2/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/c/src/lib/libbsp/sh/gensh2/include/bsp.h index 72d5504d45..b0cb1cb9f3 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh2/include/bsp.h @@ -86,8 +86,6 @@ extern void *CPU_Interrupt_stack_high ; /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - extern void bsp_cleanup( void ); /* diff --git a/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c index dc64f5a43e..389c390888 100644 --- a/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c @@ -32,15 +32,7 @@ uint32_t bsp_clicks_per_second; -/* - * The original table from the application and our copy of it with - * some changes. - */ - extern void bsp_hw_init(void); -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; -char *rtems_progname; /* * Use the shared implementations of the following routines @@ -106,8 +98,8 @@ void bsp_start(void) * not malloc'ed. It is just "pulled from the air". */ - BSP_Configuration.work_space_start = (void *) &WorkSpaceStart ; - BSP_Configuration.work_space_size = + Configuration.work_space_start = (void *) &WorkSpaceStart ; + rtems_configuration_get_work_space_size() = &WorkSpaceEnd - &WorkSpaceStart ; /* diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog index 681b546bf5..e1ffda923e 100644 --- a/c/src/lib/libbsp/sh/gensh4/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/c/src/lib/libbsp/sh/gensh4/include/bsp.h index b8f0202052..c6c108602a 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh4/include/bsp.h @@ -82,8 +82,6 @@ extern uint32_t boot_mode; /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - extern void bsp_cleanup( void ); /* diff --git a/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c index c600c0338c..d1ea917aef 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c @@ -33,15 +33,7 @@ uint32_t bsp_clicks_per_second; -/* - * The original table from the application and our copy of it with - * some changes. - */ - extern void bsp_hw_init(void); -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; -char *rtems_progname; /* * Use the shared implementations of the following routines @@ -107,8 +99,8 @@ void bsp_start(void) * not malloc'ed. It is just "pulled from the air". */ - BSP_Configuration.work_space_start = (void *) &WorkSpaceStart ; - BSP_Configuration.work_space_size = + Configuration.work_space_start = (void *) &WorkSpaceStart ; + rtems_configuration_get_work_space_size() = (uint32_t) &WorkSpaceEnd - (uint32_t) &WorkSpaceStart ; diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog index 66de4cc265..56773e0b8a 100644 --- a/c/src/lib/libbsp/sh/shsim/ChangeLog +++ b/c/src/lib/libbsp/sh/shsim/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> + + * 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 <joel.sherrill@OARcorp.com> * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/c/src/lib/libbsp/sh/shsim/include/bsp.h index 8db58b7b77..5f95d4f465 100644 --- a/c/src/lib/libbsp/sh/shsim/include/bsp.h +++ b/c/src/lib/libbsp/sh/shsim/include/bsp.h @@ -66,8 +66,6 @@ extern void *CPU_Interrupt_stack_high ; /* miscellaneous stuff assumed to exist */ -extern rtems_configuration_table BSP_Configuration; - extern void bsp_cleanup( void ); /* diff --git a/c/src/lib/libbsp/sh/shsim/startup/bspstart.c b/c/src/lib/libbsp/sh/shsim/startup/bspstart.c index 89d9d6292b..4905981337 100644 --- a/c/src/lib/libbsp/sh/shsim/startup/bspstart.c +++ b/c/src/lib/libbsp/sh/shsim/startup/bspstart.c @@ -30,15 +30,6 @@ uint32_t bsp_clicks_per_second; /* - * 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; - -/* * Use the shared implementations of the following routines */ @@ -97,8 +88,8 @@ void bsp_start( void ) * not malloc'ed. It is just "pulled from the air". */ - BSP_Configuration.work_space_start = (void *) &WorkSpaceStart ; - BSP_Configuration.work_space_size = + Configuration.work_space_start = (void *) &WorkSpaceStart ; + rtems_configuration_get_work_space_size() = (uint32_t) &WorkSpaceEnd - (uint32_t) &WorkSpaceStart ; |