From d1347a37d27565f9db3bff0aaf42cc5ae4963655 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 12 Oct 2014 10:06:05 -0500 Subject: idp/clock/ckinit.c: Fix warnings --- c/src/lib/libbsp/m68k/idp/clock/ckinit.c | 58 +++++++++++--------------------- 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c index 8018ae5890..a2ee94022a 100644 --- a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c @@ -1,6 +1,4 @@ -/* Clock_init() - * - * +/* * This is modified by Doug McBride to get it to work for the MC68EC040 * IDP board. The below comments are kept to show that some prior work * was done in the area and the modifications performed was application @@ -8,11 +6,9 @@ * * This routine initializes the mc68230 on the MC68EC040 board. * The tick frequency is 40 milliseconds. - * - * Input parameters: NONE - * - * Output parameters: NONE - * + */ + +/* * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). * @@ -37,13 +33,6 @@ void Disable_clock(void); void Clock_exit( void ); -/* - * These are set by clock driver during its init - */ - -rtems_device_major_number rtems_clock_major = ~0; -rtems_device_minor_number rtems_clock_minor; - /* * ISR Handler * @@ -51,27 +40,27 @@ rtems_device_minor_number rtems_clock_minor; * ((1ms * 6.5 MHz) / 2^5) = 203.125) where 6.5 MHz is the clock rate of the * MC68230, 2^5 is the prescaler factor, and 1ms is the common interrupt * interval for the Clock_isr routine. + * * Therefore, 203 (decimal) is the number to program into the CPRH-L registers * of the MC68230 for countdown. However, I have found that 193 instead of * 203 provides greater accuracy -- why? The crystal should be more accurate * than that */ - -rtems_isr Clock_isr( +static rtems_isr Clock_isr( rtems_vector_number vector ) { Clock_driver_ticks += 1; /* acknowledge interrupt - MC68230_TSR = 1; */ + MC68230_TSR = 1; */ MC68230_WRITE (MC68230_TSR, 1); if ( Clock_isrs == 1 ) { rtems_clock_tick(); - /* Cast to an integer so that 68EC040 IDP which doesn't have an FPU doesn't - have a heart attack -- if you use newlib1.6 or greater and get - libgcc.a for gcc with software floating point support, this is not - a problem */ + /* Cast to an integer so that 68EC040 IDP which doesn't have an FPU doesn't + have a heart attack -- if you use newlib1.6 or greater and get + libgcc.a for gcc with software floating point support, this is not + a problem */ Clock_isrs = (int)(rtems_configuration_get_microseconds_per_tick() / 1000); } @@ -81,11 +70,11 @@ rtems_isr Clock_isr( void Disable_clock(void) { - /* Disable timer */ - MC68230_WRITE (MC68230_TCR, 0x00); + /* Disable timer */ + MC68230_WRITE (MC68230_TCR, 0x00); } -void Install_clock( +static void Install_clock( rtems_isr_entry clock_isr ) { Clock_driver_ticks = 0; @@ -104,15 +93,15 @@ void Install_clock( MC68230_WRITE (MC68230_TIVR, CLOCK_VECTOR); /* Set CPRH through CPRL to 193 (not 203) decimal for countdown--see ckisr.c - CPRH = 0x00; - CPRM = 0x00; - CPRL = 0xC1; */ + CPRH = 0x00; + CPRM = 0x00; + CPRL = 0xC1; */ MC68230_WRITE (MC68230_CPRH, 0x00); MC68230_WRITE (MC68230_CPRM, 0x00); MC68230_WRITE (MC68230_CPRL, 0xC1); /* Enable timer and use it as an external periodic interrupt generator - MC68230_TCR = 0xA1; */ + MC68230_TCR = 0xA1; */ /* led_putnum('a'); * for debugging purposes */ MC68230_WRITE (MC68230_TCR, 0xA1); @@ -128,8 +117,8 @@ void Clock_exit( void ) uint8_t data; /* disable timer - data = TCR; - TCR = (data & 0xFE); */ + data = TCR; + TCR = (data & 0xFE); */ MC68230_READ (MC68230_TCR, data); MC68230_WRITE (MC68230_TCR, (data & 0xFE)); @@ -144,12 +133,5 @@ rtems_device_driver Clock_initialize( { 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; } -- cgit v1.2.3