2006-11-16 Joel Sherrill <joel@OARcorp.com>

	* shared/bspstart.c, shared/start.S: Use common clock driver template
	and eliminate all fast idle code specific to this BSP. This
	eliminates a fair amount of code in the BSP clock driver and
	bsp_startup. The LEON3 has to do a scan of the AMBA bus to find the
	timer so I added the new hook Clock_driver_support_find_timer to
	support this. In general, there was some clean up to the file headers
	of various files.

3 files changed, 18 insertions, 102 deletions

diff --git a/c/src/lib/libbsp/sparc/ChangeLog b/c/src/lib/libbsp/sparc/ChangeLog
index 4eca42e597..a5983afbc7 100644
--- a/c/src/lib/libbsp/sparc/ChangeLog
+++ b/c/src/lib/libbsp/sparc/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-16	Joel Sherrill <joel@OARcorp.com>
+
+	* shared/bspstart.c, shared/start.S: Use common clock driver template
+	and eliminate all fast idle code specific to this BSP. This
+	eliminates a fair amount of code in the BSP clock driver and
+	bsp_startup. The LEON3 has to do a scan of the AMBA bus to find the
+	timer so I added the new hook Clock_driver_support_find_timer to
+	support this. In general, there was some clean up to the file headers
+	of various files.
+
 2006-10-17	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Require autoconf-2.60. Require automake-1.10.
diff --git a/c/src/lib/libbsp/sparc/shared/bspstart.c b/c/src/lib/libbsp/sparc/shared/bspstart.c
index 91bca7d7ec..6c9ea2251a 100644
--- a/c/src/lib/libbsp/sparc/shared/bspstart.c
+++ b/c/src/lib/libbsp/sparc/shared/bspstart.c
@@ -4,7 +4,7 @@
  *  The generic CPU dependent initialization has been performed
  *  before any of these are invoked.
  *
- *  COPYRIGHT (c) 1989-2003.
+ *  COPYRIGHT (c) 1989-2006.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -47,55 +47,6 @@ rtems_cpu_table Cpu_table;
 extern uint32_t rdb_start;
 
 /*
- * Amount to increment itimer by each pass
- * It is a variable instead of a #define to allow the 'looptest'
- * script to bump it without recompiling rtems
- */
-
-uint32_t CPU_SPARC_CLICKS_PER_TICK;
-
-#if SIMSPARC_FAST_IDLE
-
-/*
- * Many of the tests are very slow on the simulator because they have
- * have 5 second delays hardwired in.
- *
- * Try to speed those tests up by speeding up the clock when in the idle task.
- *
- *  NOTE:  At the current setting, 5 second delays in the tests take
- *         approximately 5 seconds of wall time.
- */
-
-rtems_extension fast_idle_switch_hook(
-  rtems_tcb *current_task,
-  rtems_tcb *heir_task
-)
-{
-    static uint32_t normal_clock = ~0;
-    static uint32_t fast_clock;
-
-    /* init our params on first call */
-    if (normal_clock == ~0)
-    {
-        normal_clock = CPU_SPARC_CLICKS_PER_TICK;
-        fast_clock = CPU_SPARC_CLICKS_PER_TICK / 0x08;
-        if (fast_clock == 0)    /* handle pathological case */
-            fast_clock++;
-    }
-
-    /*
-     * Run the clock faster when idle is in place.
-     */
-
-    if (heir_task == _Thread_Idle)
-        CPU_SPARC_CLICKS_PER_TICK = fast_clock;
-    else if (current_task == _Thread_Idle)
-        CPU_SPARC_CLICKS_PER_TICK = normal_clock;
-}
-
-#endif
-
-/*
  *  Use the shared implementations of the following routines
  */
 
@@ -125,36 +76,6 @@ void bsp_pretasking_hook(void)
 
   bsp_libc_init((void *) heap_start, heap_size, 0);
 
-#if SIMSPARC_FAST_IDLE
-  /*
-   *  Install the fast idle task switch extension
-   *
-   *  On MP systems, might not want to do this; it confuses at least
-   *  one test (mp06) if the simulators are running too far from real time.
-   */
-
-#if 0
-  if (BSP_Configuration.User_multiprocessing_table == 0)
-#endif
-  {
-    rtems_extensions_table  fast_idle_extension;
-    rtems_id                extension_id;
-    rtems_status_code       rc;
-
-    memset(&fast_idle_extension, 0, sizeof(fast_idle_extension));
-
-    fast_idle_extension.thread_switch  = fast_idle_switch_hook;
-
-    rc = rtems_extension_create(
-      rtems_build_name('F', 'D', 'L', 'E'),
-      &fast_idle_extension,
-      &extension_id
-    );
-    if (rc != RTEMS_SUCCESSFUL)
-      rtems_fatal_error_occurred(rc);
-  }
-#endif
-
 #ifdef RTEMS_DEBUG
   rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
 #endif
@@ -203,26 +124,4 @@ void bsp_start( void )
   }
 
   BSP_Configuration.work_space_start = work_space_start;
-
-#if SIMSPARC_FAST_IDLE
-  /*
-   * Add 1 extension for fast idle
-   */
-
-  BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
-   * Add 1 extension for MPCI_fatal
-   */
-
-  if (BSP_Configuration.User_multiprocessing_table)
-    BSP_Configuration.maximum_extensions++;
-
-  /*
-   * Set the "clicks per tick" for the simulator
-   *  used by XXX/clock/clock.c to schedule interrupts
-   */
-
-  CPU_SPARC_CLICKS_PER_TICK = BSP_Configuration.microseconds_per_tick;
 }
diff --git a/c/src/lib/libbsp/sparc/shared/start.S b/c/src/lib/libbsp/sparc/shared/start.S
index 4a1f1adebc..7d78119840 100644
--- a/c/src/lib/libbsp/sparc/shared/start.S
+++ b/c/src/lib/libbsp/sparc/shared/start.S
@@ -7,6 +7,13 @@
  *  distribution of the SPARC Instruction Simulator (SIS) found
  *  at ftp://ftp.estec.esa.nl/pub/ws/wsd/erc32.
  *
+ *  COPYRIGHT (c) 1989-2006.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
  *  $Id$
  */