1 files changed, 88 insertions, 20 deletions

diff --git a/c/src/lib/libbsp/i386/force386/clock/ckinit.c b/c/src/lib/libbsp/i386/force386/clock/ckinit.c
index 45400dbd49..45a64f6f14 100644
--- a/c/src/lib/libbsp/i386/force386/clock/ckinit.c
+++ b/c/src/lib/libbsp/i386/force386/clock/ckinit.c
@@ -19,33 +19,44 @@
  */
 
 #include <bsp.h>
-#include <clockdrv.h>
+
+#include <rtems/libio.h>
+
 #include <stdlib.h>
 
-volatile rtems_unsigned32 Clock_driver_ticks;
+#define CLOCK_VECTOR  0x38
+
 rtems_unsigned32 Clock_isrs;              /* ISRs until next tick */
+
+volatile rtems_unsigned32 Clock_driver_ticks;
+
 rtems_isr_entry  Old_ticker;
 
-rtems_device_driver Clock_initialize(
-  rtems_device_major_number major,
-  rtems_device_minor_number minor,
-  void *pargp,
-  rtems_id tid,
-  rtems_unsigned32 *rval
-)
-{
-  Install_clock( Clock_isr );
-}
+void Clock_exit( void );
+ 
+/*
+ * These are set by clock driver during its init
+ */
+ 
+rtems_device_major_number rtems_clock_major = ~0;
+rtems_device_major_number rtems_clock_minor = 0;
 
-void ReInstall_clock(
-  rtems_isr_entry clock_isr
+/*
+ *  This is the ISR handler.
+ */
+
+rtems_isr Clock_isr(
+  rtems_vector_number vector
 )
 {
-  rtems_unsigned32 isrlevel = 0;
-
-  rtems_interrupt_disable( isrlevel );
-   (void) set_vector( clock_isr, 0x38, 1 );
-  rtems_interrupt_enable( isrlevel );
+  /* enable_tracing(); */
+  Clock_driver_ticks += 1;
+  if ( Clock_isrs == 1 ) {
+    rtems_clock_tick();
+    Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
+  }
+  else
+    Clock_isrs -= 1;
 }
 
 void Install_clock(
@@ -56,7 +67,7 @@ void Install_clock(
   Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
 
   if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = ( rtems_isr_entry ) set_vector( clock_isr, 0x38, 1 );
+    Old_ticker = ( rtems_isr_entry ) set_vector( clock_isr, CLOCK_VECTOR, 1 );
     outport_byte( TBCR, 0x14 );  /* reset it, delay mode, 50X */
     outport_byte( TBDR, 0x50 );  /* 1 millisecond */
     outport_byte( IERA, 0x41 );  /* enable interrupt for B */
@@ -64,6 +75,17 @@ void Install_clock(
   atexit( Clock_exit );
 }
 
+void ReInstall_clock(
+  rtems_isr_entry clock_isr
+)
+{
+  rtems_unsigned32 isrlevel = 0;
+
+  rtems_interrupt_disable( isrlevel );
+   (void) set_vector( clock_isr, CLOCK_VECTOR, 1 );
+  rtems_interrupt_enable( isrlevel );
+}
+
 void Clock_exit( void )
 {
   if ( BSP_Configuration.ticks_per_timeslice ) {
@@ -73,3 +95,49 @@ void Clock_exit( void )
   }
 }
 
+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;
+}
+ 
+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(CLOCK_VECTOR);
+    }
+    else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
+    {
+        ReInstall_clock(args->buffer);
+    }
+ 
+done:
+    return RTEMS_SUCCESSFUL;
+}