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, 9 insertions, 15 deletions

diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
index bc76a38ab4..91f3da6065 100644
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/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/m68k/mrm332/clock/ckinit.c b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
index 6b43a81917..b60b721df6 100644
--- a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
@@ -44,7 +44,7 @@ rtems_isr Clock_isr(rtems_vector_number vector)
 
   if ( Clock_isrs == 1 ) {
     rtems_clock_tick();
-    Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
+    Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
   }
   else
     Clock_isrs -= 1;
@@ -55,7 +55,7 @@ void Install_clock(
 )
 {
   Clock_driver_ticks = 0;
-  Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
+  Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
 
   Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
index 0ac7b2dc0f..8b5649d143 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
@@ -91,12 +91,9 @@ extern char _copy_data_from_rom[];
 
 /* miscellaneous stuff assumed to exist */
 
-extern rtems_configuration_table BSP_Configuration;
-
 extern m68k_isr_entry M68Kvec[];   /* vector table address */
 
 extern int stack_size;
-
 extern int stack_start;
 
 /*
diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c b/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c
index b98009bd63..bdd2f49ac2 100644
--- a/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c
@@ -20,15 +20,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;
-
-/*
  *  Use the shared implementations of the following routines
  */
 
@@ -65,5 +56,5 @@ void bsp_start( void )
 
   m68k_get_vbr( vbr );
 
-  BSP_Configuration.work_space_start = (void *) &_WorkspaceBase;
+  Configuration.work_space_start = (void *) &_WorkspaceBase;
 }