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.

18 files changed, 45 insertions, 70 deletions

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