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

	* mpc5xx/clock/clock.c, mpc5xx/timer/timer.c, mpc8260/clock/clock.c,
	mpc8260/cpm/brg.c, mpc8260/timer/timer.c, mpc8xx/clock/clock.c,
	mpc8xx/console-generic/console-generic.c, mpc8xx/timer/timer.c,
	new-exceptions/raw_exception.c, old-exceptions/cpu.c,
	ppc403/clock/clock.c, ppc403/console/console.c,
	ppc403/console/console.c.polled, ppc403/console/console405.c,
	ppc403/ictrl/ictrl.c, ppc403/irq/ictrl.c, ppc403/timer/timer.c,
	ppc403/tty_drv/tty_drv.c: Eliminate PowerPC specific elements from
	the CPU Table. They have been replaced with variables named bsp_XXX
	as needed.

3 files changed, 14 insertions, 32 deletions

diff --git a/c/src/lib/libcpu/powerpc/mpc8260/clock/clock.c b/c/src/lib/libcpu/powerpc/mpc8260/clock/clock.c
index 23f7ed51d0..82c1a74050 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/clock/clock.c
+++ b/c/src/lib/libcpu/powerpc/mpc8260/clock/clock.c
@@ -25,7 +25,7 @@
  *
  *  Derived from c/src/lib/libcpu/hppa1_1/clock/clock.c:
  *
- *  COPYRIGHT (c) 1989-1998.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -90,36 +90,17 @@ rtems_isr Clock_isr(rtems_vector_number vector)
 
 void clockOn(void* unused)
 {
+  extern uint32_t bsp_clicks_per_usec;
 
   decrementer_value = rtems_configuration_get_microseconds_per_tick() *
-                      rtems_cpu_configuration_get_clicks_per_usec() - 1;
+                      bsp_clicks_per_usec - 1;
 
   PPC_Set_decrementer( decrementer_value );
   Clock_driver_ticks = 0;
 
   ClockInitialised = 1;
-
-
-#if 0
-  unsigned desiredLevel;
-  uint32_t   pit_value;
-  
-  pit_value = (rtems_configuration_get_microseconds_per_tick() *
-               rtems_cpu_configuration_get_clicks_per_usec()) - 1 ;
-  
-  if (pit_value > 0xffff) {           /* pit is only 16 bits long */
-    rtems_fatal_error_occurred(-1);
-  }
-  m8260.sccr &= ~(1<<24);
-  m8260.pitc = pit_value;
-
-  desiredLevel = BSP_get_clock_irq_level();
-  /* set PIT irq level, enable PIT, PIT interrupts */
-  /*  and clear int. status */
-  m8260.piscr = /*M8260_PISCR_PIRQ(desiredLevel) |*/
-    M8260_PISCR_PTE | M8260_PISCR_PS | M8260_PISCR_PIE;
-#endif
 }
+
 /*
  * Called via atexit()
  * Remove the clock interrupt handler by setting handler to NULL
@@ -156,11 +137,12 @@ Clock_exit(void)
 
 void Install_clock(rtems_isr_entry clock_isr)
 {
-  Clock_driver_ticks = 0;
+  extern uint32_t bsp_clicks_per_usec;
 
+  Clock_driver_ticks = 0;
 
   decrementer_value = rtems_configuration_get_microseconds_per_tick() *
-                      rtems_cpu_configuration_get_clicks_per_usec() - 1;
+                      bsp_clicks_per_usec - 1;
 
   PPC_Set_decrementer( decrementer_value );
 
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c b/c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c
index 90e6a08ece..46434b6cfa 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c
+++ b/c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c
@@ -51,9 +51,6 @@ static unsigned int brg_use_count[NUM_BRGS];
 /* (initialised to zeros) */
 static unsigned int clk_use_count[NUM_BRGS];
 
-
-extern rtems_cpu_table Cpu_table;
-
 /*
  * Compute baud-rate-generator configuration register value
  */
@@ -62,8 +59,9 @@ m8xx_get_brg_cd (int baud)
 {
   int divisor;
   int div16 = 0;
+  extern uint32_t bsp_serial_per_sec;
 
-  divisor = ((Cpu_table.serial_per_sec) + (baud / 2)) / baud;
+  divisor = ((bsp_serial_per_sec) + (baud / 2)) / baud;
   if (divisor > 4096) {
     div16 = 1;
     divisor = (divisor + 8) / 16;
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c
index eec500fd12..7306342398 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c
@@ -37,7 +37,7 @@
  *
  *  Derived from c/src/lib/libcpu/hppa1_1/timer/timer.c:
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -84,6 +84,8 @@ int Read_timer(void)
 {
   uint32_t   clicks;
   uint32_t   total;
+  extern uint32_t bsp_timer_least_valid;
+  extern uint32_t bsp_timer_average_overhead;
 
   clicks = get_itimer();
 
@@ -93,10 +95,10 @@ int Read_timer(void)
     return total;          /* in XXX microsecond units */
 
   else {
-    if ( total < rtems_cpu_configuration_get_timer_least_valid() ) {
+    if ( total < bsp_timer_least_valid ) {
       return 0;            /* below timer resolution */
     }
-    return (total - rtems_cpu_configuration_get_timer_average_overhead());
+    return (total - bsp_timer_average_overhead);
   }
 }