18 files changed, 64 insertions, 301 deletions

diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
index dc9087af07..31ad2c2d7d 100644
--- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68302/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>
 
 	* console/console.c, timer/timer.c: Convert to "bool".
diff --git a/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c
index aa4af2c6d9..6bfe77692e 100644
--- a/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c
@@ -121,35 +121,3 @@ 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
-)
-{
-    uint32_t         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;
-}
diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index 8f66fbd17f..e8bf5e1924 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/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/m68k/gen68340/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
index 3c1bb27297..8dd27a0bb4 100644
--- a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
@@ -147,35 +147,3 @@ Clock_initialize(
 
 	return RTEMS_SUCCESSFUL;
 }
-
-/******************************************************
-  Name: Clock_control
-  Input parameters: major & minor number
-  Output parameters:
-  Description:
- *****************************************************/
-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) {
-		/*
-		 * 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 );
-		}
-	}
-	return RTEMS_SUCCESSFUL;
-}
diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog
index 4a1b4a748f..86c6579517 100644
--- a/c/src/lib/libbsp/m68k/idp/ChangeLog
+++ b/c/src/lib/libbsp/m68k/idp/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>
 
 	* console/console.c, timer/timer.c: Convert to "bool".
diff --git a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
index d6f522040d..932c541eb5 100644
--- a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
@@ -157,35 +157,3 @@ 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
-)
-{
-    uint32_t         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;
-}
diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
index 59caf77693..b2243ffaeb 100644
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/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/m68k/mrm332/clock/ckinit.c b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
index b60b721df6..9ed5a39c2f 100644
--- a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
@@ -94,35 +94,3 @@ 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
-)
-{
-    uint32_t         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;
-}
diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index 3acb9de8fb..ad25a50299 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/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>
 
 	* console/console.c, timer/timer.c: Convert to "bool".
diff --git a/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c
index bea1edec35..7e1e515c44 100644
--- a/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c
@@ -133,35 +133,3 @@ 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
-)
-{
-    uint32_t         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;
-}
diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
index e8fa07d112..ac826e2817 100644
--- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147/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>
 
 	* console/console.c, timer/timer.c: Convert to "bool".
diff --git a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
index 1e009829c1..d6d98b7c41 100644
--- a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
@@ -100,35 +100,3 @@ 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
-)
-{
-    uint32_t         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(TIMER_2_VECTOR);
-    }
-    else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
-    {
-      rtems_interrupt_disable( isrlevel );
-       (void) set_vector( args->buffer, TIMER_2_VECTOR, 1 );
-      rtems_interrupt_enable( isrlevel );
-    }
-
-done:
-    return RTEMS_SUCCESSFUL;
-}
diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index 5385d888df..f778c1e092 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/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>
 
 	* include/bsp.h, console/console.c, timer/timer.c: Convert to "bool".
diff --git a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
index dcf5164825..1106f381e9 100644
--- a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
@@ -106,35 +106,3 @@ 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
-)
-{
-    uint32_t         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;
-}
diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
index 545bd66833..7f65822404 100644
--- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme167/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>
 
 	* console/console.c, fatal/bspfatal.c, include/fatal.h,
diff --git a/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
index 0be6e1fffd..2afdfb1af4 100644
--- a/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
@@ -1,6 +1,6 @@
 /*  ckinit.c
  *
- *  Implementation of the Clock_control() and Clock_initialize() functions
+ *  Implementation of the Clock_initialize() functions
  *  prototyped in rtems/c/src/lib/include/clockdrv.h.
  *
  *  This port does not allow the application to select which timer on the
@@ -221,47 +221,3 @@ rtems_device_driver Clock_initialize(
 
   return RTEMS_SUCCESSFUL;
 }
-
-/*
- *  Clock_control().
- *  Prototyped in rtems/c/src/lib/include/clockdrv.h
- *
- *  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
- */
-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 == 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', ' ') )
-    {
-      VMEchip2_T2_isr( CLOCK_VECTOR );
-    }
-    else if ( args->command == rtems_build_name('N', 'E', 'W', ' ') )
-    {
-      rtems_interrupt_disable( isrlevel );
-      set_vector( args->buffer, CLOCK_VECTOR, 1 );
-      rtems_interrupt_enable( isrlevel );
-    }
-
-done:
-    return RTEMS_SUCCESSFUL;
-}
diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
index 6efd477834..30f0088a04 100644
--- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/ods68302/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>
 
 	* console/console.c, timer/timer.c: Convert to "bool".
diff --git a/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c b/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c
index e181297d87..890dc1005d 100644
--- a/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c
@@ -122,35 +122,3 @@ 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
-)
-{
-    uint32_t         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;
-}