[rtems commit] libcpu/m68k/mcf5206/clock/ckinit.c: Fix warnings
Joel Sherrill
joel at rtems.org
Mon Oct 13 16:27:40 UTC 2014
Module: rtems
Branch: master
Commit: 40716bf6fddd86041c28a85944dc1a064f056086
Changeset: http://git.rtems.org/rtems/commit/?id=40716bf6fddd86041c28a85944dc1a064f056086
Author: Joel Sherrill <joel.sherrill at oarcorp.com>
Date: Sun Oct 12 13:59:50 2014 -0500
libcpu/m68k/mcf5206/clock/ckinit.c: Fix warnings
---
c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c | 156 ++++++++------------------
1 files changed, 48 insertions(+), 108 deletions(-)
diff --git a/c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c b/c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c
index e3ff932..c28c541 100644
--- a/c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c
+++ b/c/src/lib/libcpu/m68k/mcf5206/clock/ckinit.c
@@ -3,7 +3,9 @@
*
* This driver initailizes timer1 on the MCF5206E as the
* main system clock
- *
+ */
+
+/*
* Author: Victor V. Vengerov <vvv at oktet.ru>
*
* Based on work:
@@ -29,27 +31,9 @@
*/
volatile uint32_t Clock_driver_ticks;
-
-/*
- * These are set by clock driver during its init
- */
-
-rtems_device_major_number rtems_clock_major = ~0;
-rtems_device_minor_number rtems_clock_minor;
-
rtems_isr (*rtems_clock_hook)(rtems_vector_number) = NULL;
-/* Clock_isr --
- * This handles the timer interrupt by clearing the timer's interrupt
- * flag and announcing the clock tick to the system.
- *
- * PARAMETERS:
- * vector - timer interrupt vector number
- *
- * RETURNS:
- * none
- */
-rtems_isr
+static rtems_isr
Clock_isr (rtems_vector_number vector)
{
/* Clear pending interrupt... */
@@ -62,111 +46,67 @@ Clock_isr (rtems_vector_number vector)
rtems_clock_hook(vector);
}
-
-/* Clock_exit --
- * This shuts down the timer if it was enabled and removes it
- * from the MCF5206E interrupt mask.
- *
- * PARAMETERS:
- * none
- *
- * RETURNS:
- * none
- */
void
Clock_exit(void)
{
- if (rtems_configuration_get_ticks_per_timeslice())
- {
- /* disable all timer1 interrupts */
- *MCF5206E_IMR(MBAR) |= MCF5206E_INTR_BIT(MCF5206E_INTR_TIMER_1);
+ /* disable all timer1 interrupts */
+ *MCF5206E_IMR(MBAR) |= MCF5206E_INTR_BIT(MCF5206E_INTR_TIMER_1);
- /* reset timer1 */
- *MCF5206E_TMR(MBAR,1) = MCF5206E_TMR_ICLK_STOP;
+ /* reset timer1 */
+ *MCF5206E_TMR(MBAR,1) = MCF5206E_TMR_ICLK_STOP;
- /* clear pending */
- *MCF5206E_TER(MBAR,1) = MCF5206E_TER_REF | MCF5206E_TER_CAP;
- }
+ /* clear pending */
+ *MCF5206E_TER(MBAR,1) = MCF5206E_TER_REF | MCF5206E_TER_CAP;
}
-/* Install_clock --
- * This initialises timer1 with the BSP timeslice config value
- * as a reference and sets up the interrupt handler for clock ticks.
- *
- * PARAMETERS:
- * clock_isr - clock interrupt handler routine
- *
- * RETURNS:
- * none.
- */
static void
Install_clock(rtems_isr_entry clock_isr)
{
- Clock_driver_ticks = 0;
- if (rtems_configuration_get_ticks_per_timeslice())
- {
- /* Configure timer1 interrupts */
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_TIMER_1) =
- MCF5206E_ICR_AVEC |
- ((BSP_INTLVL_TIMER1 << MCF5206E_ICR_IL_S) & MCF5206E_ICR_IL) |
- ((BSP_INTPRIO_TIMER1 << MCF5206E_ICR_IP_S) & MCF5206E_ICR_IP);
-
- /* Register the interrupt handler */
- set_vector(clock_isr, BSP_INTVEC_TIMER1, 1);
-
- /* Reset timer 1 */
- *MCF5206E_TMR(MBAR, 1) = MCF5206E_TMR_RST;
- *MCF5206E_TMR(MBAR, 1) = MCF5206E_TMR_ICLK_STOP;
- *MCF5206E_TMR(MBAR, 1) = MCF5206E_TMR_RST;
- *MCF5206E_TCN(MBAR, 1) = 0; /* Reset counter */
- *MCF5206E_TER(MBAR, 1) = MCF5206E_TER_REF | MCF5206E_TER_CAP;
-
- /* Set Timer 1 prescaler so that it counts in microseconds */
- *MCF5206E_TMR(MBAR, 1) =
- (((BSP_SYSTEM_FREQUENCY/1000000 - 1) << MCF5206E_TMR_PS_S) &
- MCF5206E_TMR_PS) |
- MCF5206E_TMR_CE_NONE | MCF5206E_TMR_ORI | MCF5206E_TMR_FRR |
- MCF5206E_TMR_RST;
-
- /* Set the timer timeout value from the BSP config */
- *MCF5206E_TRR(MBAR, 1) = rtems_configuration_get_microseconds_per_tick() - 1;
-
- /* Feed system frequency to the timer */
- *MCF5206E_TMR(MBAR, 1) |= MCF5206E_TMR_ICLK_MSCLK;
-
- /* Enable timer 1 interrupts */
- *MCF5206E_IMR(MBAR) &= ~MCF5206E_INTR_BIT(MCF5206E_INTR_TIMER_1);
-
- /* Register the driver exit procedure so we can shutdown */
- atexit(Clock_exit);
- }
+ Clock_driver_ticks = 0;
+
+ /* Configure timer1 interrupts */
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_TIMER_1) =
+ MCF5206E_ICR_AVEC |
+ ((BSP_INTLVL_TIMER1 << MCF5206E_ICR_IL_S) & MCF5206E_ICR_IL) |
+ ((BSP_INTPRIO_TIMER1 << MCF5206E_ICR_IP_S) & MCF5206E_ICR_IP);
+
+ /* Register the interrupt handler */
+ set_vector(clock_isr, BSP_INTVEC_TIMER1, 1);
+
+ /* Reset timer 1 */
+ *MCF5206E_TMR(MBAR, 1) = MCF5206E_TMR_RST;
+ *MCF5206E_TMR(MBAR, 1) = MCF5206E_TMR_ICLK_STOP;
+ *MCF5206E_TMR(MBAR, 1) = MCF5206E_TMR_RST;
+ *MCF5206E_TCN(MBAR, 1) = 0; /* Reset counter */
+ *MCF5206E_TER(MBAR, 1) = MCF5206E_TER_REF | MCF5206E_TER_CAP;
+
+ /* Set Timer 1 prescaler so that it counts in microseconds */
+ *MCF5206E_TMR(MBAR, 1) =
+ (((BSP_SYSTEM_FREQUENCY/1000000 - 1) << MCF5206E_TMR_PS_S) &
+ MCF5206E_TMR_PS) |
+ MCF5206E_TMR_CE_NONE | MCF5206E_TMR_ORI | MCF5206E_TMR_FRR |
+ MCF5206E_TMR_RST;
+
+ /* Set the timer timeout value from the BSP config */
+ *MCF5206E_TRR(MBAR, 1) = rtems_configuration_get_microseconds_per_tick() - 1;
+
+ /* Feed system frequency to the timer */
+ *MCF5206E_TMR(MBAR, 1) |= MCF5206E_TMR_ICLK_MSCLK;
+
+ /* Enable timer 1 interrupts */
+ *MCF5206E_IMR(MBAR) &= ~MCF5206E_INTR_BIT(MCF5206E_INTR_TIMER_1);
+
+ /* Register the driver exit procedure so we can shutdown */
+ atexit(Clock_exit);
}
-
-/* Clock_initialize --
- * This is called to setup the clock driver. It calls the hardware
- * setup function and make the driver major/minor values available
- * for other.
- *
- * PARAMETERS:
- * major - clock device major number
- * minor - clock device minor number
- * pargp - device driver initialization argument (not used)
- *
- * RETURNS:
- * RTEMS status code
- */
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;
+ Install_clock (Clock_isr);
- return RTEMS_SUCCESSFUL;
+ return RTEMS_SUCCESSFUL;
}
More information about the vc
mailing list