diff options
Diffstat (limited to 'c/src/lib/libbsp/lm32')
-rw-r--r-- | c/src/lib/libbsp/lm32/lm32_evr/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/lm32/shared/clock/ckinit.c | 78 | ||||
-rw-r--r-- | c/src/lib/libbsp/lm32/shared/clock/clock.h | 55 | ||||
-rw-r--r-- | c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c | 2 |
4 files changed, 2 insertions, 135 deletions
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am index f0b47d8415..20102dac31 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am +++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am @@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c librtemsbsp_a_SOURCES += ../shared/startup/bspreset.c # clock -librtemsbsp_a_SOURCES += ../shared/clock/ckinit.c +librtemsbsp_a_SOURCES +=../../../../../../bsps/lm32/shared/clock/ckinit.c # console librtemsbsp_a_SOURCES += ../shared/console/console.c librtemsbsp_a_SOURCES += ../shared/console/uart.c diff --git a/c/src/lib/libbsp/lm32/shared/clock/ckinit.c b/c/src/lib/libbsp/lm32/shared/clock/ckinit.c deleted file mode 100644 index fd1c27437c..0000000000 --- a/c/src/lib/libbsp/lm32/shared/clock/ckinit.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Clock device driver for Lattice Mico32 (lm32). - */ - -/* - * COPYRIGHT (c) 1989-2009. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - * - * Jukka Pietarinen <jukka.pietarinen@mrf.fi>, 2008, - * Micro-Research Finland Oy - */ - -#include <bsp.h> -#include "../include/system_conf.h" -#include "clock.h" -#include "bspopts.h" - -#if LM32_ON_SIMULATOR -#define CLOCK_DRIVER_USE_FAST_IDLE 1 -#endif - -static inline int clockread(unsigned int reg) -{ - return *((int*)(TIMER0_BASE_ADDRESS + reg)); -} - -static inline void clockwrite(unsigned int reg, int value) -{ - *((int*)(TIMER0_BASE_ADDRESS + reg)) = value; -} - -/* - * The interrupt vector number associated with the clock tick device - * driver. - */ -#define CLOCK_VECTOR ( TIMER0_IRQ ) -#define CLOCK_IRQMASK ( 1 << CLOCK_VECTOR ) - -#define Clock_driver_support_at_tick() \ - do { \ - /* Clear overflow flag */ \ - clockwrite(LM32_CLOCK_SR, 0); \ - lm32_interrupt_ack(CLOCK_IRQMASK); \ - } while (0) - -#define Clock_driver_support_install_isr(_new ) \ - set_vector( _new, CLOCK_VECTOR, 1 ) - -static void Clock_driver_support_initialize_hardware(void) -{ - /* Set clock period */ - clockwrite(LM32_CLOCK_PERIOD, - (CPU_FREQUENCY / - (1000000 / rtems_configuration_get_microseconds_per_tick()))); - - /* Enable clock interrupts and start in continuous mode */ - clockwrite(LM32_CLOCK_CR, LM32_CLOCK_CR_ITO | - LM32_CLOCK_CR_CONT | - LM32_CLOCK_CR_START); - - lm32_interrupt_unmask(CLOCK_IRQMASK); -} - -#define Clock_driver_support_shutdown_hardware() \ - do { \ - /* Disable clock interrupts and stop */ \ - lm32_interrupt_unmask(CLOCK_IRQMASK); \ - clockwrite(LM32_CLOCK_CR, LM32_CLOCK_CR_STOP); \ - } while (0) - -#define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER - -#include "../../../shared/clockdrv_shell.h" - diff --git a/c/src/lib/libbsp/lm32/shared/clock/clock.h b/c/src/lib/libbsp/lm32/shared/clock/clock.h deleted file mode 100644 index 255585475a..0000000000 --- a/c/src/lib/libbsp/lm32/shared/clock/clock.h +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @file - * @ingroup lm32_clock - * @brief LatticeMico32 Timer (Clock) definitions - */ - -/* - * This file contains definitions for LatticeMico32 Timer (Clock) - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - * - * Jukka Pietarinen <jukka.pietarinen@mrf.fi>, 2008, - * Micro-Research Finland Oy - */ - -/** - * @defgroup lm32_clock LM32 Clock - * @ingroup lm32_shared - * @brief LatticeMico32 Timer (Clock) definitions. - * @{ - */ - -#ifndef _BSPCLOCK_H -#define _BSPCLOCK_H - -/** @brief Status Register */ - -#define LM32_CLOCK_SR (0x0000) -#define LM32_CLOCK_SR_TO (0x0001) -#define LM32_CLOCK_SR_RUN (0x0002) - -/** @brief Control Register */ - -#define LM32_CLOCK_CR (0x0004) -#define LM32_CLOCK_CR_ITO (0x0001) -#define LM32_CLOCK_CR_CONT (0x0002) -#define LM32_CLOCK_CR_START (0x0004) -#define LM32_CLOCK_CR_STOP (0x0008) - -/** @brief Period Register */ - -#define LM32_CLOCK_PERIOD (0x0008) - -/** @brief Snapshot Register */ - -#define LM32_CLOCK_SNAPSHOT (0x000C) - -#endif /* _BSPCLOCK_H */ - -/** @} */ diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c b/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c index bc9821d1bc..c138309982 100644 --- a/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c +++ b/c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c @@ -49,4 +49,4 @@ static void Clock_driver_support_initialize_hardware(void) #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER -#include "../../../shared/clockdrv_shell.h" +#include "../../../shared/dev/clock/clockimpl.h" |