diff options
Diffstat (limited to 'c/src/lib/libcpu/sh')
-rw-r--r-- | c/src/lib/libcpu/sh/ChangeLog | 8 | ||||
-rw-r--r-- | c/src/lib/libcpu/sh/sh7032/clock/ckinit.c | 32 | ||||
-rw-r--r-- | c/src/lib/libcpu/sh/sh7045/clock/ckinit.c | 32 | ||||
-rw-r--r-- | c/src/lib/libcpu/sh/sh7750/clock/ckinit.c | 42 |
4 files changed, 8 insertions, 106 deletions
diff --git a/c/src/lib/libcpu/sh/ChangeLog b/c/src/lib/libcpu/sh/ChangeLog index dc7f074160..fabd8aa2f2 100644 --- a/c/src/lib/libcpu/sh/ChangeLog +++ b/c/src/lib/libcpu/sh/ChangeLog @@ -1,3 +1,11 @@ +2008-09-05 Joel Sherrill <joel.sherrill@OARcorp.com> + + * sh7032/clock/ckinit.c, sh7045/clock/ckinit.c, sh7750/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> * sh7032/timer/timer.c, sh7045/timer/timer.c, sh7750/timer/timer.c: diff --git a/c/src/lib/libcpu/sh/sh7032/clock/ckinit.c b/c/src/lib/libcpu/sh/sh7032/clock/ckinit.c index 7468d404a7..24159c4ffa 100644 --- a/c/src/lib/libcpu/sh/sh7032/clock/ckinit.c +++ b/c/src/lib/libcpu/sh/sh7032/clock/ckinit.c @@ -323,35 +323,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) - { - /* - * 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_isr_entry ignored ; - rtems_interrupt_disable( isrlevel ); - rtems_interrupt_catch( args->buffer, CLOCK_VECTOR, &ignored ); - - rtems_interrupt_enable( isrlevel ); - } - } - return RTEMS_SUCCESSFUL; -} diff --git a/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c b/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c index 6a43c5fc54..4eac63679f 100644 --- a/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c +++ b/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c @@ -266,35 +266,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) - { - /* - * 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_isr_entry ignored ; - rtems_interrupt_disable( isrlevel ); - rtems_interrupt_catch( args->buffer, CLOCK_VECTOR, &ignored ); - - rtems_interrupt_enable( isrlevel ); - } - } - return RTEMS_SUCCESSFUL; -} diff --git a/c/src/lib/libcpu/sh/sh7750/clock/ckinit.c b/c/src/lib/libcpu/sh/sh7750/clock/ckinit.c index 02c0de4262..a6872bec6f 100644 --- a/c/src/lib/libcpu/sh/sh7750/clock/ckinit.c +++ b/c/src/lib/libcpu/sh/sh7750/clock/ckinit.c @@ -280,45 +280,3 @@ Clock_initialize(rtems_device_major_number major, return RTEMS_SUCCESSFUL; } - -/* Clock_control -- - * Device driver entry point for clock driver IOCTL functions. - * - * PARAMETERS: - * major - clock major device number - * minor - clock minor device number - * pargp - driver ioctl primitive argument, not used - * - * RETURNS: - * 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) - { - /* - * 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_isr_entry ignored ; - rtems_interrupt_disable( isrlevel ); - rtems_interrupt_catch( args->buffer, CLOCK_VECTOR, &ignored ); - - rtems_interrupt_enable( isrlevel ); - } - } - return RTEMS_SUCCESSFUL; -} |