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

	* clock/ckinit.c: 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.

2 files changed, 46 insertions, 224 deletions

diff --git a/c/src/lib/libbsp/sparc/leon2/ChangeLog b/c/src/lib/libbsp/sparc/leon2/ChangeLog
index d8a1178998..2b14897432 100644
--- a/c/src/lib/libbsp/sparc/leon2/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon2/ChangeLog
@@ -1,3 +1,12 @@
+2006-11-16	Joel Sherrill <joel@OARcorp.com>
+
+	* clock/ckinit.c: 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-11-15	Joel Sherrill <joel@OARcorp.com>
 
 	* Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a
diff --git a/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
index 3ff92a7dba..5b63cdf366 100644
--- a/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
+++ b/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
@@ -6,244 +6,57 @@
  *  The tick frequency is directly programmed to the configured number of
  *  microseconds per tick.
  *
- *  COPYRIGHT (c) 1989-1998.
+ *  COPYRIGHT (c) 1989-2006.
  *  On-Line Applications Research Corporation (OAR).
  *
+ *  Modified for LEON BSP
+ *  COPYRIGHT (c) 2004.
+ *  Gaisler Research.
+ *
  *  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.
  *
- *  Ported to LEON implementation of the SPARC by On-Line Applications
- *  Research Corporation (OAR) under contract to the European Space 
- *  Agency (ESA).
- *
- *  LEON modifications of respective RTEMS file: COPYRIGHT (c) 1995. 
- *  European Space Agency.
- *
  *  $Id$
  */
 
-#include <stdlib.h>
-
 #include <bsp.h>
-#include <rtems/libio.h>
-
-/*
- *  The Real Time Clock Counter Timer uses this trap type.
- */
-
-#define CLOCK_VECTOR LEON_TRAP_TYPE( LEON_INTERRUPT_TIMER1 )
-
-/*
- *  Clock ticks since initialization
- */
-
-volatile rtems_unsigned32 Clock_driver_ticks;
-
-/*
- *  This is the value programmed into the count down timer.  It
- *  is artificially lowered when SIMSPARC_FAST_IDLE is defined to
- *  cut down how long we spend in the idle task while executing on
- *  the simulator.
- */
-
-extern rtems_unsigned32 CPU_SPARC_CLICKS_PER_TICK;
+#include <bspopts.h>
 
-rtems_isr_entry  Old_ticker;
-
-void Clock_exit( void );
- 
-/*
- * These are set by clock driver during its init
- */
- 
-rtems_device_major_number rtems_clock_major = ~0;
-rtems_device_minor_number rtems_clock_minor;
-
-/*
- *  Clock_isr
- *
- *  This is the clock tick interrupt handler.
- *
- *  Input parameters:
- *    vector - vector number
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- *
- */
-
-rtems_isr Clock_isr(
-  rtems_vector_number vector
-)
-{
-  /*
-   *  If we are in "fast idle" mode, then the value for clicks per tick
-   *  is lowered to decrease the amount of time spent executing the idle
-   *  task while using the SPARC Instruction Simulator.
-   */
-
-#if SIMSPARC_FAST_IDLE
-  LEON_REG.Real_Time_Clock_Counter = CPU_SPARC_CLICKS_PER_TICK;
-  LEON_REG_Set_Real_Time_Clock_Timer_Control(
-    LEON_REG_TIMER_COUNTER_ENABLE_COUNTING | 
-      LEON_REG_TIMER_COUNTER_LOAD_COUNTER
-  );
+#if SIMSPARC_FAST_IDLE==1
+#define CLOCK_DRIVER_USE_FAST_IDLE
 #endif
 
-  /*
-   *  The driver has seen another tick.
-   */
-
-  Clock_driver_ticks += 1;
-
-  /*
-   *  Real Time Clock counter/timer is set to automatically reload.
-   */
-
-  rtems_clock_tick();
-}
-
 /*
- *  Install_clock
- *
- *  This routine actually performs the hardware initialization for the clock.
- *
- *  Input parameters:
- *    clock_isr - clock interrupt service routine entry point
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- *
- */
-
-void Install_clock(
-  rtems_isr_entry clock_isr
-)
-{
-  Clock_driver_ticks = 0;
-
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
-
-    LEON_REG.Timer_Reload_1  = CPU_SPARC_CLICKS_PER_TICK - 1;
-
-    LEON_REG.Timer_Control_1 = (
-      LEON_REG_TIMER_COUNTER_ENABLE_COUNTING | 
-        LEON_REG_TIMER_COUNTER_RELOAD_AT_ZERO |
-        LEON_REG_TIMER_COUNTER_LOAD_COUNTER 
-    );
- 
-    atexit( Clock_exit );
-  }
-
-}
-
-/*
- *  Clock_exit
- *
- *  This routine allows the clock driver to exit by masking the interrupt and
- *  disabling the clock's counter.
- *
- *  Input parameters:   NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values:      NONE
- *
- */
-
-void Clock_exit( void )
-{
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    LEON_Mask_interrupt( LEON_INTERRUPT_TIMER1 );
-
-    LEON_REG.Timer_Control_1 = 0;
-
-    /* do not restore old vector */
-  }
-}
- 
-/*
- *  Clock_initialize
- *
- *  This routine initializes the clock driver.
- *
- *  Input parameters:
- *    major - clock device major number
- *    minor - clock device minor number
- *    parg  - pointer to optional device driver arguments
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- *    rtems_device_driver status code
+ *  The Real Time Clock Counter Timer uses this trap type.
  */
 
-rtems_device_driver Clock_initialize(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-  Install_clock( Clock_isr );
- 
-  /*
-   * make major/minor avail to others such as shared memory driver
-   */
- 
-  rtems_clock_major = major;
-  rtems_clock_minor = minor;
- 
-  return RTEMS_SUCCESSFUL;
-}
- 
-/*
- *  Clock_control
- *
- *  This routine is the clock device driver control entry point.
- *
- *  Input parameters:
- *    major - clock device major number
- *    minor - clock device minor number
- *    parg  - pointer to optional device driver arguments
- *
- *  Output parameters:  NONE
- *
- *  Return values:
- *    rtems_device_driver status code
- */
+#define CLOCK_VECTOR LEON_TRAP_TYPE( LEON_INTERRUPT_TIMER1 )
 
-rtems_device_driver Clock_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-    rtems_unsigned32 isrlevel;
-    rtems_libio_ioctl_args_t *args = pargp;
- 
-    if (args == 0)
-        goto done;
- 
-    /*
-     * This is hokey, but until we get a defined interface
-     * to do this, it will just be this simple...
-     */
- 
-    if (args->command == rtems_build_name('I', 'S', 'R', ' '))
-    {
-        Clock_isr(CLOCK_VECTOR);
-    }
-    else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
-    {
-      rtems_interrupt_disable( isrlevel );
-       (void) set_vector( args->buffer, CLOCK_VECTOR, 1 );
-      rtems_interrupt_enable( isrlevel );
-    }
- 
-done:
-    return RTEMS_SUCCESSFUL;
-}
+#define Clock_driver_support_at_tick()
+
+#define Clock_driver_support_install_isr( _new, _old ) \
+  do { \
+    _old = set_vector( _new, CLOCK_VECTOR, 1 ); \
+  } while(0)
+
+extern int CLOCK_SPEED;
+
+#define Clock_driver_support_initialize_hardware() \
+  do { \
+    LEON_REG.Timer_Reload_1 = BSP_Configuration.microseconds_per_tick - 1; \
+    \
+    LEON_REG.Timer_Control_1 = ( \
+      LEON_REG_TIMER_COUNTER_ENABLE_COUNTING |  \
+        LEON_REG_TIMER_COUNTER_RELOAD_AT_ZERO | \
+        LEON_REG_TIMER_COUNTER_LOAD_COUNTER  \
+    ); \
+  } while (0)
+
+#define Clock_driver_support_shutdown_hardware() \
+  do { \
+    LEON_Mask_interrupt( LEON_INTERRUPT_TIMER1 ); \
+    LEON_REG.Timer_Control_1 = 0; \
+  } while (0)
+
+#include "../../../shared/clockdrv_shell.c"