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.

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

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);
 
 /*

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 );
+            rtems_configuration_get_work_space_size() );
-    printk( "maximum_extensions = 0x%x\n", 
-            BSP_Configuration.maximum_extensions );
     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 );
+            rtems_configuration_get_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 );
     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 */
 

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

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 */
   
 /*

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 );
+            rtems_configuration_get_work_space_size() );
-    printk( "maximum_extensions = 0x%x\n\r", 
-            BSP_Configuration.maximum_extensions );
     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 );
+            rtems_configuration_get_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 );
     printk( "work_space_size = 0x%x\n\r", 
-            BSP_Configuration.work_space_size );
+            rtems_configuration_get_work_space_size() );
 #endif
 } /* bsp_start */
 

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

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);

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( "work_space_size = 0x%x\n",
-    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 );
+            rtems_configuration_get_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 );
     
     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_start = 0x%x\n", Configuration.work_space_start );
-    printk( "work_space_size = 0x%x\n", BSP_Configuration.work_space_size );
+    printk( "work_space_size = 0x%x\n", rtems_configuration_get_work_space_size() );
 #endif
 
 }

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

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
  */

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,8 +106,7 @@ void bsp_pretasking_hook(void)
 /*   This function also configures the CPU's memory protection unit.      */
 /*                                                                        */
 /* GLOBALS USED:                                                          */
-/*    CPU_table                                                    */
+/*    Configuration                                                       */
-/*    BSP_Configuration                                            */
 /*    free_mem_start                                                      */
 /*    free_mem_end                                                        */
 /*    free_mem_nocache_start                                              */
@@ -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( "work_space_size = 0x%x\n",
-    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 );
+            rtems_configuration_get_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 );
 
     /*  printk( "_stack_size = 0x%x\n", _stack_size );*/
-    printk( "work_space_start = 0x%x\n", BSP_Configuration.work_space_start );
+    printk( "work_space_start = 0x%x\n", Configuration.work_space_start );
-    printk( "work_space_size = 0x%x\n", BSP_Configuration.work_space_size );
+    printk( "work_space_size = 0x%x\n", rtems_configuration_get_work_space_size() );
 #endif
 } /* bsp_start */
 

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

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
  */

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++) {

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

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
  */

c/src/lib/libbsp/h8300/h8sim/startup/bspstart.c

@@ -20,17 +20,6 @@
 #include <rtems/libio.h>
 #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(

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

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
  */

c/src/lib/libbsp/m68k/av5282/startup/bspstart.c

@@ -26,14 +26,6 @@
 #include <rtems/libcsupport.h>
 #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
  */
@@ -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

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

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);

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;
 }

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

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);

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;
 }

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

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
  */

c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c

@@ -26,14 +26,6 @@
 #include <rtems/libcsupport.h>
 #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
  */
@@ -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

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

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 */
 
 /*

c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c

@@ -24,15 +24,6 @@
 #include <rtems/libio.h>
 #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;
 }

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

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
  */

c/src/lib/libbsp/m68k/sim68000/startup/bspstart.c

@@ -20,15 +20,6 @@
 #include <rtems/libio.h>
 #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>

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

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
  */

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);
   

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

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
  */

c/src/lib/libbsp/mips/genmongoosev/startup/bspstart.c

@@ -25,15 +25,6 @@
 #include <rtems/libcsupport.h>
 #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 );

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

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
  */

c/src/lib/libbsp/mips/hurricane/startup/bspstart.c

@@ -22,15 +22,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;

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

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
  */

c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c

@@ -20,15 +20,6 @@
 #include <rtems/libio.h>
 #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 */

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

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
  */

c/src/lib/libbsp/mips/rbtx4925/startup/bspstart.c

@@ -24,15 +24,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 */

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

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
  */

c/src/lib/libbsp/mips/rbtx4938/startup/bspstart.c

@@ -24,15 +24,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 */

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

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);

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

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:

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

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_heap_start = ((char *)Configuration.work_space_start +
-                    BSP_Configuration.work_space_size);
+                    rtems_configuration_get_work_space_size());
 
 #if defined(HAS_UBOOT)
   BSP_heap_end = (uboot_bdinfo_ptr->bi_memstart 

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

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

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();

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

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))); */

c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c

@@ -143,15 +143,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;
-
 /*
  *  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",
+    "rtems_configuration_get_work_space_size() = %x\n",
-     BSP_Configuration.work_space_size
+     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

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

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

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

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

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
  */

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
+      (uint8_t *)Configuration.work_space_start
-           + BSP_Configuration.work_space_size;
+           + 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

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

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 );
 
 /*

c/src/lib/libbsp/sh/gensh1/startup/bspstart.c

@@ -32,15 +32,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 ;
+  Configuration.work_space_start = (void *) &WorkSpaceStart ;
-  BSP_Configuration.work_space_size  =
+  rtems_configuration_get_work_space_size()  =
     (uint32_t) &WorkSpaceEnd -
     (uint32_t) &WorkSpaceStart ;
 

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

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 );
 
 /*

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 ;
+  Configuration.work_space_start = (void *) &WorkSpaceStart ;
-  BSP_Configuration.work_space_size  =
+  rtems_configuration_get_work_space_size()  =
     &WorkSpaceEnd - &WorkSpaceStart ;
 
   /*

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

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 );
 
 /*

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 ;
+  Configuration.work_space_start = (void *) &WorkSpaceStart ;
-  BSP_Configuration.work_space_size  =
+  rtems_configuration_get_work_space_size()  =
     (uint32_t) &WorkSpaceEnd -
     (uint32_t) &WorkSpaceStart ;
 

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

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 );
 
 /*

c/src/lib/libbsp/sh/shsim/startup/bspstart.c

@@ -29,15 +29,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 ;
+  Configuration.work_space_start = (void *) &WorkSpaceStart ;
-  BSP_Configuration.work_space_size  =
+  rtems_configuration_get_work_space_size()  =
     (uint32_t) &WorkSpaceEnd -
     (uint32_t) &WorkSpaceStart ;