2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>

	* clock/clockdrv.c, include/bsp.h, startup/bspstart.c: Eliminate copies
	of the Configuration Table. Use the RTEMS provided accessor macros to
	obtain configuration fields.

4 files changed, 22 insertions, 30 deletions

diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog
index 0533a63bbb..e963520c48 100644
--- a/c/src/lib/libbsp/arm/edb7312/ChangeLog
+++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-11	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* clock/clockdrv.c, include/bsp.h, startup/bspstart.c: Eliminate copies
+	of the Configuration Table. Use the RTEMS provided accessor macros to
+	obtain configuration fields.
+
 2007-12-04	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field
diff --git a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c
index 5e4d9557a5..d78b1efa48 100644
--- a/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c
+++ b/c/src/lib/libbsp/arm/edb7312/clock/clockdrv.c
@@ -48,7 +48,7 @@ rtems_irq_connect_data clock_isr_data = {BSP_TC1OI,
 #define Clock_driver_support_initialize_hardware()                            \
   do {                                                                        \
     *EP7312_SYSCON1 |= EP7312_SYSCON1_TC1_PRESCALE;                         \
-    *EP7312_TC1D =(BSP_Configuration.microseconds_per_tick * 2000)/1000000; \
+    *EP7312_TC1D =(rtems_configuration_get_microseconds_per_tick() * 2000)/1000000; \
     *EP7312_TC1EOI = 0xFFFFFFFF;                                            \
   } while (0)
 
diff --git a/c/src/lib/libbsp/arm/edb7312/include/bsp.h b/c/src/lib/libbsp/arm/edb7312/include/bsp.h
index b6df498c9e..9137868ec1 100644
--- a/c/src/lib/libbsp/arm/edb7312/include/bsp.h
+++ b/c/src/lib/libbsp/arm/edb7312/include/bsp.h
@@ -37,8 +37,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/edb7312/startup/bspstart.c b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c
index 9816bd3fff..ecd2066821 100644
--- a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c
@@ -38,14 +38,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;              /* Program name - from main(). */
-
 /*************************************************************/
 /* Function prototypes                                       */
 /*************************************************************/
@@ -107,13 +99,13 @@ 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                                               */
+/*    CPU_table                                                           */
+/*    Configuration                                                       */
+/*    free_mem_start                                                      */
+/*    free_mem_end                                                        */
+/*    free_mem_nocache_start                                              */
+/*    _bss_free_start                                                     */
+/*    mpu_region_tbl                                                      */
 /*                                                                        */
 /*                                                                        */
 /*                                                                        */
@@ -129,10 +121,10 @@ void bsp_start_default( void )
     *EP7312_INTMR2 = 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);
 
@@ -150,20 +142,16 @@ void bsp_start_default( void )
      *  The following information is very useful when debugging.
      */
 #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 */