2008-09-25 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am: Now runs using fake clock ticker.
	* clock/clockdrv.c: Removed.

3 files changed, 6 insertions, 48 deletions

diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog
index 9e8bf59e39..2064bc9f24 100644
--- a/c/src/lib/libbsp/sh/shsim/ChangeLog
+++ b/c/src/lib/libbsp/sh/shsim/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-25	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am: Now runs using fake clock ticker.
+	* clock/clockdrv.c: Removed.
+
 2008-09-24	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* clock/clockdrv.c: Fix comment.
diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index 2afc7168ad..9a5c65eb74 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -39,7 +39,7 @@ startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \
     ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/bootcard.c \
     ../../shared/gnatinstallhandler.c ../shared/bsphwinit.c
-clock_SOURCES = clock/clockdrv.c
+clock_SOURCES = ../../shared/clock_driver_simidle.c
 
 trap34_SOURCES = trap34/console-io.c trap34/console-support.S \
     ../../shared/dummy_printk_support.c
diff --git a/c/src/lib/libbsp/sh/shsim/clock/clockdrv.c b/c/src/lib/libbsp/sh/shsim/clock/clockdrv.c
deleted file mode 100644
index 2397b0efc6..0000000000
--- a/c/src/lib/libbsp/sh/shsim/clock/clockdrv.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Instantiate the clock driver shell.
- *
- *  Since there is no clock source on the simulator, we fake
- *  it with a special IDLE task.
- *
- *  $Id$
- */
-
-#include <rtems.h>
-
-#define CLOCK_VECTOR 0
-
-#define Clock_driver_support_at_tick()
-
-#define Clock_driver_support_install_isr( _new, _old ) \
-  do { _old = 0; } while(0)
-
-volatile bool clock_driver_enabled;
-
-#define Clock_driver_support_initialize_hardware() \
-  do { \
-    clock_driver_enabled = true; \
-  } while (0)
-
-#define Clock_driver_support_shutdown_hardware() \
-  do { \
-    clock_driver_enabled = false; \
-  } while (0)
-
-#include "../../../shared/clockdrv_shell.c"
-
-/*
- *  Since there is no interrupt on this simulator, let's just
- *  fake time passing.  This will not let preemption from an
- *  interrupt work but is enough for many tests.
- */
-Thread clock_driver_sim_idle_body(
-  uintptr_t   ignored
-)
-{
-  for( ; ; ) {
-    if ( clock_driver_enabled )
-      rtems_clock_tick();
-  }
-  return 0;   /* to avoid warning */
-}