2008-09-05 Joel Sherrill <joel.sherrill@OARcorp.com>

	* clock/ckinit.c: The Shared Memory Driver no longer requires the
	special IOCTL in Clock_control. This was a hack which has existed
	since before the Classic API Timer Manager was implemented. All
	implementations of and references to Clock_control were removed.

2 files changed, 7 insertions, 42 deletions

diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog
index 6554e1a057..0c7941a49e 100644
--- a/c/src/lib/libbsp/sh/simsh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-05	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* clock/ckinit.c: The Shared Memory Driver no longer requires the
+	special IOCTL in Clock_control. This was a hack which has existed
+	since before the Classic API Timer Manager was implemented. All
+	implementations of and references to Clock_control were removed.
+
 2008-08-31	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* timer/timer.c: Eliminate empty function from every benchmark timer
diff --git a/c/src/lib/libbsp/sh/simsh4/clock/ckinit.c b/c/src/lib/libbsp/sh/simsh4/clock/ckinit.c
index 4246e176a1..09ca322148 100644
--- a/c/src/lib/libbsp/sh/simsh4/clock/ckinit.c
+++ b/c/src/lib/libbsp/sh/simsh4/clock/ckinit.c
@@ -141,45 +141,3 @@ Clock_initialize(rtems_device_major_number major,
 
     return RTEMS_SUCCESSFUL;
 }
-
-/* Clock_control --
- *     I/O control (IOCTL) function for Clock driver. At this moment this
- *     just runs the interrupt handler or re-registers the interrupt handler
- *     on request.
- *
- * PARAMETERS:
- *     major - clock major device number
- *     minor - clock minor device number
- *     pargp - pointer to IOCTL arguments
- *
- * RETURNS:
- *     RTEMS status code
- */
-rtems_device_driver
-Clock_control(rtems_device_major_number major,
-              rtems_device_minor_number minor,
-              void *pargp)
-{
-    uint32_t         isrlevel;
-    rtems_libio_ioctl_args_t *args = pargp;
-
-    if (args)
-    {
-        rtems_isr_entry  old_isr;
-        /*
-         * 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 );
-            rtems_interrupt_catch(Clock_isr, CLOCK_VECTOR, &old_isr);
-            rtems_interrupt_enable( isrlevel );
-        }
-    }
-    return RTEMS_SUCCESSFUL;
-}