libcpu/m68k/mcf5272/clock/ckinit.c: Fix warnings

This commit is contained in:
Joel Sherrill
2014-10-12 14:00:00 -05:00
parent 40716bf6fd
commit 5105833c50

View File

@@ -3,7 +3,9 @@
* *
* This driver initailizes timer1 on the MCF5272 as the * This driver initailizes timer1 on the MCF5272 as the
* main system clock * main system clock
* */
/*
* Copyright 2004 Cogent Computer Systems * Copyright 2004 Cogent Computer Systems
* Author: Jay Monkman <jtm@lopingdog.com> * Author: Jay Monkman <jtm@lopingdog.com>
* *
@@ -33,27 +35,9 @@
*/ */
volatile uint32_t Clock_driver_ticks; 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; rtems_isr (*rtems_clock_hook)(rtems_vector_number) = NULL;
/* Clock_isr -- static rtems_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
Clock_isr (rtems_vector_number vector) Clock_isr (rtems_vector_number vector)
{ {
/* Clear pending interrupt... */ /* Clear pending interrupt... */
@@ -67,22 +51,11 @@ Clock_isr (rtems_vector_number 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 void
Clock_exit(void) Clock_exit(void)
{ {
if (rtems_configuration_get_ticks_per_timeslice()) {
uint32_t icr; uint32_t icr;
/* disable all timer1 interrupts */ /* disable all timer1 interrupts */
icr = g_intctrl_regs->icr1; icr = g_intctrl_regs->icr1;
icr = icr & ~(MCF5272_ICR1_TMR1_MASK | MCF5272_ICR1_TMR1_PI); icr = icr & ~(MCF5272_ICR1_TMR1_MASK | MCF5272_ICR1_TMR1_PI);
@@ -95,25 +68,13 @@ Clock_exit(void)
/* clear pending */ /* clear pending */
g_timer_regs->ter1 = MCF5272_TER_REF | MCF5272_TER_CAP; g_timer_regs->ter1 = MCF5272_TER_REF | MCF5272_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 static void
Install_clock(rtems_isr_entry clock_isr) Install_clock(rtems_isr_entry clock_isr)
{ {
uint32_t icr; uint32_t icr;
Clock_driver_ticks = 0; Clock_driver_ticks = 0;
if (rtems_configuration_get_ticks_per_timeslice()) {
/* Register the interrupt handler */ /* Register the interrupt handler */
set_vector(clock_isr, BSP_INTVEC_TMR1, 1); set_vector(clock_isr, BSP_INTVEC_TMR1, 1);
@@ -149,32 +110,15 @@ Install_clock(rtems_isr_entry clock_isr)
/* Register the driver exit procedure so we can shutdown */ /* Register the driver exit procedure so we can shutdown */
atexit(Clock_exit); 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 rtems_device_driver
Clock_initialize(rtems_device_major_number major, Clock_initialize(
rtems_device_major_number major,
rtems_device_minor_number minor, rtems_device_minor_number minor,
void *pargp) void *pargp
)
{ {
Install_clock (Clock_isr); 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; return RTEMS_SUCCESSFUL;
} }