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.

4 files changed, 14 insertions, 72 deletions

diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index b91c7e00df..c45154aa5b 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/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-09-05	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* timer/timer.c: Convert to "bool".
diff --git a/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c b/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c
index e47af32971..edff12b271 100644
--- a/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c
+++ b/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c
@@ -128,42 +128,6 @@ rtems_device_driver Clock_initialize(
   return RTEMS_SUCCESSFUL;
 }
 
-rtems_device_driver Clock_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-    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();
-    }
-    else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
-    {
-      if (!BSP_install_rtems_irq_handler (&clockIrqData)) {
-	printk("Error installing clock interrupt handler!\n");
-	rtems_fatal_error_occurred(1);
-      }
-#ifdef DEBUG
-      else
-	printk("Clock installed AGAIN\n");
-#endif
-    }
-
-done:
-    return RTEMS_SUCCESSFUL;
-}
-
 void Clock_exit()
 {
   ClockOff(&clockIrqData);
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index 1c4a355bd1..d949c52b2d 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/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-09-05	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* timer/timer.c: Convert to "bool".
diff --git a/c/src/lib/libbsp/i386/ts_386ex/clock/ckinit.c b/c/src/lib/libbsp/i386/ts_386ex/clock/ckinit.c
index 887112134b..5138c3f8d0 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/clock/ckinit.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/clock/ckinit.c
@@ -147,42 +147,6 @@ rtems_device_driver Clock_initialize(
   return RTEMS_SUCCESSFUL;
 }
 
-rtems_device_driver Clock_control(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp
-)
-{
-    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();
-    }
-    else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
-    {
-      if (!BSP_install_rtems_irq_handler (&clockIrqData)) {
-	printk("Error installing clock interrupt handler!\n");
-	rtems_fatal_error_occurred(1);
-      }
-#ifdef BSP_DEBUG
-      else
-	printk("Clock installed AGAIN\n");
-#endif
-    }
-
-done:
-    return RTEMS_SUCCESSFUL;
-}
-
 void Clock_exit()
 {
   ClockOff(&clockIrqData);