diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-05 22:06:49 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-05 22:06:49 +0000 |
commit | 1e6aed25b45b0e74ef2ad61059b8c6a17e4c6465 (patch) | |
tree | 29c9c6bf2f433b2e03d900ce62469af18968b0d9 /c/src/lib/libcpu | |
parent | 2008-09-05 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-1e6aed25b45b0e74ef2ad61059b8c6a17e4c6465.tar.bz2 |
2008-09-05 Joel Sherrill <joel.sherrill@OARcorp.com>
* mcf5206/clock/ckinit.c, mcf5272/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.
Diffstat (limited to 'c/src/lib/libcpu')
-rw-r--r-- | c/src/lib/libcpu/m68k/ChangeLog | 8 | ||||
-rw-r--r-- | c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c | 42 | ||||
-rw-r--r-- | c/src/lib/libcpu/m68k/mcf5272/clock/ckinit.c | 42 |
3 files changed, 8 insertions, 84 deletions
diff --git a/c/src/lib/libcpu/m68k/ChangeLog b/c/src/lib/libcpu/m68k/ChangeLog index 9ad0248d6e..5bc22de36e 100644 --- a/c/src/lib/libcpu/m68k/ChangeLog +++ b/c/src/lib/libcpu/m68k/ChangeLog @@ -1,3 +1,11 @@ +2008-09-05 Joel Sherrill <joel.sherrill@OARcorp.com> + + * mcf5206/clock/ckinit.c, mcf5272/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> * mcf5206/timer/timer.c, mcf5272/timer/timer.c: Convert to "bool". diff --git a/c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c b/c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c index 0724bc2908..462fac6fbb 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c +++ b/c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c @@ -173,45 +173,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) - { - /* - * 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(BSP_INTVEC_TIMER1); - } - else if (args->command == rtems_build_name('N', 'E', 'W', ' ')) - { - rtems_interrupt_disable( isrlevel ); - (void) set_vector( args->buffer, BSP_INTVEC_TIMER1, 1 ); - rtems_interrupt_enable( isrlevel ); - } - } - return RTEMS_SUCCESSFUL; -} diff --git a/c/src/lib/libcpu/m68k/mcf5272/clock/ckinit.c b/c/src/lib/libcpu/m68k/mcf5272/clock/ckinit.c index 69ef9258e0..0de4c75d97 100644 --- a/c/src/lib/libcpu/m68k/mcf5272/clock/ckinit.c +++ b/c/src/lib/libcpu/m68k/mcf5272/clock/ckinit.c @@ -181,45 +181,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) - { - /* - * 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(BSP_INTVEC_TMR1); - } - else if (args->command == rtems_build_name('N', 'E', 'W', ' ')) - { - rtems_interrupt_disable( isrlevel ); - (void) set_vector( args->buffer, BSP_INTVEC_TMR1, 1 ); - rtems_interrupt_enable( isrlevel ); - } - } - return RTEMS_SUCCESSFUL; -} |