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

	* clock/ckinit.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, 13 insertions, 19 deletions

diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index e137640ed1..5539710662 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-11	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* clock/ckinit.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/i386/i386ex/clock/ckinit.c b/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c
index 5619c26503..e47af32971 100644
--- a/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c
+++ b/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c
@@ -55,7 +55,7 @@ void Clock_isr()
   Clock_driver_ticks += 1;
   if ( Clock_isrs == 1 ) {
     rtems_clock_tick();
-    Clock_isrs = Clock_initial_isr_value; /* BSP_Configuration.microseconds_per_tick / 1000;*/
+    Clock_isrs = Clock_initial_isr_value; /* rtems_configuration_get_microseconds_per_tick() / 1000;*/
   }
   else
     Clock_isrs -= 1;
@@ -96,7 +96,7 @@ rtems_device_driver Clock_initialize(
 
   Clock_isrs =
     Clock_initial_isr_value =
-    BSP_Configuration.microseconds_per_tick / 1000; /* ticks per clock_isr */
+    rtems_configuration_get_microseconds_per_tick() / 1000; /* ticks per clock_isr */
 
   /*
    * configure the counter timer ( should be based on microsecs/tick )
@@ -105,7 +105,7 @@ rtems_device_driver Clock_initialize(
    */
   ClockOff      ( &clockIrqData );
 
-  timer_counter_init_value  =  BSP_Configuration.microseconds_per_tick / Clock_isrs;
+  timer_counter_init_value  =  rtems_configuration_get_microseconds_per_tick() / Clock_isrs;
   clock_lsb = (unsigned char)timer_counter_init_value;
   clock_msb = timer_counter_init_value >> 8;
 
diff --git a/c/src/lib/libbsp/i386/i386ex/include/bsp.h b/c/src/lib/libbsp/i386/i386ex/include/bsp.h
index 743fec4bea..ad51abe9f9 100644
--- a/c/src/lib/libbsp/i386/i386ex/include/bsp.h
+++ b/c/src/lib/libbsp/i386/i386ex/include/bsp.h
@@ -88,10 +88,6 @@ extern "C" {
  * NOTE: Use the standard Clock driver entry
  */
 
-/* miscellaneous stuff assumed to exist */
-
-extern rtems_configuration_table BSP_Configuration;
-
 #define IDT_SIZE 256
 #define GDT_SIZE 8192
 
diff --git a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
index 2783762b8e..b89ee9f36b 100644
--- a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
@@ -28,14 +28,6 @@ void bsp_clean_up(void);
 #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;
-
-/*
  *  Tells us where to put the workspace in case remote debugger is present.
  */
 
@@ -72,7 +64,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 *) heap_start ;
+    heap_size = Configuration.work_space_start -(void *) heap_start ;
     heap_size &= 0xfffffff0;  /* keep it as a multiple of 16 bytes */
 
     heap_size &= 0xfffffff0;  /* keep it as a multiple of 16 bytes */
@@ -93,10 +85,10 @@ void bsp_start( void )
 {
   void rtems_irq_mngt_init();
 
-  BSP_Configuration.work_space_start = (void *)
-     RAM_END - BSP_Configuration.work_space_size;
+  Configuration.work_space_start = (void *)
+     RAM_END - rtems_configuration_get_work_space_size();
 #ifdef DEBUG
-  printk("workspace size = 0x%x\nstart = 0x%x, RAM_END = 0x%x\n",BSP_Configuration.work_space_size,  BSP_Configuration.work_space_start, RAM_END );
+  printk("workspace size = 0x%x\nstart = 0x%x, RAM_END = 0x%x\n",rtems_configuration_get_work_space_size(),  Configuration.work_space_start, RAM_END );
 #endif
 
   /*