RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

lpc22xx shared: Clock driver clean up and ISR Handler Prototype Correction.

Browse Source
This commit is contained in:
Joel Sherrill
2012-04-19 13:15:49 -05:00
parent 14010768ed
commit 029ced28e2
1 changed files with 53 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
c/src/lib/libcpu/arm/lpc22xx/clock/clockdrv.c
View File

@@ -1,6 +1,6 @@
/* /*
* LPC22XX/LPC21xx clock specific using the System Timer * LPC22XX/LPC21xx clock specific using the System Timer
* Copyright (c) 2006 by Ray <rayx.cn@gmail.com> * Copyright (c) 2006 by Ray <rayx.cn@gmail.com>
* Set the Time0 to generate click for RTEMS * Set the Time0 to generate click for RTEMS
* *
* This is hardware specific part of the clock driver. At the end of this * This is hardware specific part of the clock driver. At the end of this
@@ -8,38 +8,29 @@
* *
* The license and distribution terms for this file may be * The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at * found in the file LICENSE in this distribution or at
*
* http://www.rtems.com/license/LICENSE. * http://www.rtems.com/license/LICENSE.
* */
*
* $Id$
*/
#include <rtems.h> #include <rtems.h>
#include <bsp.h> #include <bsp.h>
#include <bsp/irq.h> #include <bsp/irq.h>
#include <lpc22xx.h> #include <lpc22xx.h>
#include <rtems/bspIo.h> /* for printk */ #include <rtems/bspIo.h> /* for printk */
/* this is defined in ../../../shared/clockdrv_shell.h */ void Clock_isr(rtems_irq_hdl_param arg);
rtems_isr Clock_isr(rtems_vector_number vector);
static void clock_isr_on(const rtems_irq_connect_data *unused); static void clock_isr_on(const rtems_irq_connect_data *unused);
static void clock_isr_off(const rtems_irq_connect_data *unused); static void clock_isr_off(const rtems_irq_connect_data *unused);
static int clock_isr_is_on(const rtems_irq_connect_data *irq); static int clock_isr_is_on(const rtems_irq_connect_data *irq);
/* Replace the first value with the clock's interrupt name. */ /* Replace the first value with the clock's interrupt name. */
rtems_irq_connect_data clock_isr_data = {LPC22xx_INTERRUPT_TIMER0, rtems_irq_connect_data clock_isr_data = {
(rtems_irq_hdl)Clock_isr, .name = LPC22xx_INTERRUPT_TIMER0,
NULL, .hdl = Clock_isr,
clock_isr_on, .handle = NULL,
clock_isr_off, .on = clock_isr_on,
clock_isr_is_on}; .off = clock_isr_off,
.isOn = clock_isr_is_on,
/* If you follow the code, this is never used, so any value };
* should work
*/
#define CLOCK_VECTOR 0
/* use the /shared/clockdrv_shell.h code template */ /* use the /shared/clockdrv_shell.h code template */
@@ -49,10 +40,11 @@ rtems_irq_connect_data clock_isr_data = {LPC22xx_INTERRUPT_TIMER0,
* - restart the timer? * - restart the timer?
*/ */
#define Clock_driver_support_at_tick() \ #define Clock_driver_support_at_tick() \
do { \ do { \
if (!(T0IR & 0x01)) return; \ if (!(T0IR & 0x01)) \
T0IR = 0x01; \ return; \
VICVectAddr = 0x00;\ T0IR = 0x01; \
VICVectAddr = 0x00; \
} while(0) } while(0)
/** /**
@@ -60,11 +52,10 @@ rtems_irq_connect_data clock_isr_data = {LPC22xx_INTERRUPT_TIMER0,
*/ */
#define Clock_driver_support_install_isr( _new, _old ) \ #define Clock_driver_support_install_isr( _new, _old ) \
do { \ do { \
(_old) = NULL; \ (_old) = NULL; \
BSP_install_rtems_irq_handler(&clock_isr_data); \ BSP_install_rtems_irq_handler(&clock_isr_data); \
} while(0) } while(0)
/** /**
* Initialize the hardware for the clock * Initialize the hardware for the clock
* - Set the frequency * - Set the frequency
@@ -75,23 +66,29 @@ rtems_irq_connect_data clock_isr_data = {LPC22xx_INTERRUPT_TIMER0,
* enable interrupts here. If you do so, the clock_isr_on(), * enable interrupts here. If you do so, the clock_isr_on(),
* clock_isr_off(), and clock_isr_is_on() functions can be * clock_isr_off(), and clock_isr_is_on() functions can be
* NOPs. * NOPs.
*
* set timer to generate interrupt every
* rtems_configuration_get_microseconds_per_tick()
* MR0/(LPC22xx_Fpclk/(PR0+1)) = 10/1000 = 0.01s
*/ */
/* set timer to generate interrupt every rtems_configuration_get_microseconds_per_tick()
* MR0/(LPC22xx_Fpclk/(PR0+1)) = 10/1000 = 0.01s
*/
#define Clock_driver_support_initialize_hardware() \ #define Clock_driver_support_initialize_hardware() \
do { \ do { \
T0TCR &= 0; /* disable and clear timer 0, set to */ \ /* disable and clear timer 0, set to */ \
T0PC = 0; /* TC is incrementet on every pclk.*/ \ T0TCR &= 0; \
T0MR0 = ((LPC22xx_Fpclk/1000* rtems_configuration_get_microseconds_per_tick()) / 1000); /* initialize the timer period and prescaler */ \ /* TC is incrementet on every pclk.*/ \
/*T0PR = (((LPC22xx_Fpclk / 1000) * rtems_configuration_get_microseconds_per_tick()) / 1000-1); \ */ \ T0PC = 0; \
T0MCR |= 0x03; /* generate interrupt when T0MR0 match T0TC and Reset Timer Count*/ \ /* initialize the timer period and prescaler */ \
T0EMR = 0; /*No external match*/ \ T0MR0 = ((LPC22xx_Fpclk/1000 * \
T0TCR = 1; /*enable timer0*/ \ rtems_configuration_get_microseconds_per_tick()) / 1000); \
T0IR|=0x01;/*enable interrupt, skyeye will check this*/\ /* generate interrupt when T0MR0 match T0TC and Reset Timer Count*/ \
} while (0) T0MCR |= 0x03; \
/* No external match */ \
T0EMR = 0; \
/* enable timer0 */ \
T0TCR = 1; \
/* enable interrupt, skyeye will check this*/ \
T0IR |= 0x01; \
} while (0)
/** /**
* Do whatever you need to shut the clock down and remove the * Do whatever you need to shut the clock down and remove the
@@ -101,23 +98,24 @@ rtems_irq_connect_data clock_isr_data = {LPC22xx_INTERRUPT_TIMER0,
*/ */
#define Clock_driver_support_shutdown_hardware() \ #define Clock_driver_support_shutdown_hardware() \
do { \ do { \
/* Disable timer */ \ /* Disable timer */ \
T0TCR&=~0x02; \ T0TCR&=~0x02; \
BSP_remove_rtems_irq_handler(&clock_isr_data); \ BSP_remove_rtems_irq_handler(&clock_isr_data); \
} while (0) } while (0)
uint32_t bsp_clock_nanoseconds_since_last_tick(void) uint32_t bsp_clock_nanoseconds_since_last_tick(void)
{ {
uint32_t clicks; uint32_t clicks;
uint32_t microseconds;
clicks = T0TC; /*T0TC is the 32bit time counter 0*/ clicks = T0TC; /* T0TC is the 32bit time counter 0 */
return (uint32_t) (rtems_configuration_get_microseconds_per_tick() - clicks) * 1000; microseconds = (rtems_configuration_get_microseconds_per_tick() - clicks);
return microseconds * 1000;
} }
#define Clock_driver_nanoseconds_since_last_tick bsp_clock_nanoseconds_since_last_tick #define Clock_driver_nanoseconds_since_last_tick \
bsp_clock_nanoseconds_since_last_tick
/** /**
* Enables clock interrupt. * Enables clock interrupt.
@@ -126,8 +124,7 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void)
*/ */
static void clock_isr_on(const rtems_irq_connect_data *unused) static void clock_isr_on(const rtems_irq_connect_data *unused)
{ {
T0IR&=0x01; T0IR&=0x01;
//return;
} }
/** /**
@@ -137,8 +134,7 @@ static void clock_isr_on(const rtems_irq_connect_data *unused)
*/ */
static void clock_isr_off(const rtems_irq_connect_data *unused) static void clock_isr_off(const rtems_irq_connect_data *unused)
{ {
T0IR=0x00; T0IR=0x00;
//return;
} }
/** /**
@@ -149,10 +145,9 @@ static void clock_isr_off(const rtems_irq_connect_data *unused)
*/ */
static int clock_isr_is_on(const rtems_irq_connect_data *irq) static int clock_isr_is_on(const rtems_irq_connect_data *irq)
{ {
return T0IR & 0x01; /*MR0 mask*/ return T0IR & 0x01; /* MR0 mask */
} }
/* Make sure to include this, and only at the end of the file */ /* Make sure to include this, and only at the end of the file */
#include "../../../../libbsp/shared/clockdrv_shell.h" #include "../../../../libbsp/shared/clockdrv_shell.h"