From e90329f399c33a99767324c43579dfa7da038433 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 26 Aug 2009 13:39:01 +0000 Subject: 2009-08-26 Joel Sherrill * Makefile.am, preinstall.am, include/bsp.h: Rename BSP specific idle thread to bsp_idle_thread. * misc/bspidle.c: New file. * include/idle.h, misc/idle.c: Removed. --- c/src/lib/libbsp/arm/lpc24xx/ChangeLog | 7 +++++ c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 3 +-- c/src/lib/libbsp/arm/lpc24xx/include/bsp.h | 7 +++++ c/src/lib/libbsp/arm/lpc24xx/include/idle.h | 41 ----------------------------- c/src/lib/libbsp/arm/lpc24xx/misc/bspidle.c | 38 ++++++++++++++++++++++++++ c/src/lib/libbsp/arm/lpc24xx/misc/idle.c | 38 -------------------------- c/src/lib/libbsp/arm/lpc24xx/preinstall.am | 4 --- 7 files changed, 53 insertions(+), 85 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/lpc24xx/include/idle.h create mode 100644 c/src/lib/libbsp/arm/lpc24xx/misc/bspidle.c delete mode 100644 c/src/lib/libbsp/arm/lpc24xx/misc/idle.c diff --git a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog index d85427c435..a301c5ad4e 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog @@ -1,3 +1,10 @@ +2009-08-26 Joel Sherrill + + * Makefile.am, preinstall.am, include/bsp.h: Rename BSP specific idle + thread to bsp_idle_thread. + * misc/bspidle.c: New file. + * include/idle.h, misc/idle.c: Removed. + 2009-08-06 Sebastian Huber * startup/linkcmds, startup/linkcmds.lpc2478, diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index 7d5e53320c..e3b4848c9e 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -40,7 +40,6 @@ include_bsp_HEADERS += include/lpc24xx.h include_bsp_HEADERS += include/system-clocks.h include_bsp_HEADERS += include/ssp.h include_bsp_HEADERS += include/dma.h -include_bsp_HEADERS += include/idle.h include_bsp_HEADERS += include/i2c.h include_bsp_HEADERS += include/io.h @@ -110,7 +109,7 @@ libbsp_a_SOURCES += ../../shared/timerstub.c # Misc libbsp_a_SOURCES += misc/system-clocks.c \ misc/dma.c \ - misc/idle.c \ + misc/bspidle.c \ misc/io.c # SSP diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h b/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h index 942bfd7ea2..bb156b01aa 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h +++ b/c/src/lib/libbsp/arm/lpc24xx/include/bsp.h @@ -48,6 +48,13 @@ int lpc24xx_eth_attach_detach( #define RTEMS_BSP_NETWORK_DRIVER_NAME "eth0" +/* + * BSP specific idle thread + */ +void *bsp_idle_thread( uint32_t ignored); + +#define BSP_IDLE_TASK_BODY bsp_idle_thread + #endif /* ASM */ #ifdef __cplusplus diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/idle.h b/c/src/lib/libbsp/arm/lpc24xx/include/idle.h deleted file mode 100644 index 116842b465..0000000000 --- a/c/src/lib/libbsp/arm/lpc24xx/include/idle.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file - * - * @author Sebastian Huber - * - * @ingroup lpc24xx - * - * @brief Idle task - */ - -/* - * Copyright (c) 2009 - * Embedded Brains GmbH - * Obere Lagerstr. 30 - * D-82178 Puchheim - * Germany - * rtems@embedded-brains.de - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - */ - -#ifndef LIBBSP_ARM_LPC24XX_IDLE_H -#define LIBBSP_ARM_LPC24XX_IDLE_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -Thread lpc24xx_idle( uint32_t ignored); - -#define BSP_IDLE_TASK_BODY lpc24xx_idle - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* LIBBSP_ARM_LPC24XX_IDLE_H */ diff --git a/c/src/lib/libbsp/arm/lpc24xx/misc/bspidle.c b/c/src/lib/libbsp/arm/lpc24xx/misc/bspidle.c new file mode 100644 index 0000000000..f52b70ce1d --- /dev/null +++ b/c/src/lib/libbsp/arm/lpc24xx/misc/bspidle.c @@ -0,0 +1,38 @@ +/** + * @file + * + * @author Sebastian Huber + * + * @ingroup lpc24xx + * + * @brief Idle task. + */ + +/* + * Copyright (c) 2008 + * Embedded Brains GmbH + * Obere Lagerstr. 30 + * D-82178 Puchheim + * Germany + * rtems@embedded-brains.de + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + */ + +#include +#include + +Thread bsp_idle_thread( uint32_t ignored) +{ + while (true) { + /* + * Set power mode to idle. Causes the processor clock to be stopped, while + * on-chip peripherals remain active. Any enabled interrupt from a + * peripheral or an external interrupt source will cause the processor to + * resume execution. + */ + PCON = 0x1; + } +} diff --git a/c/src/lib/libbsp/arm/lpc24xx/misc/idle.c b/c/src/lib/libbsp/arm/lpc24xx/misc/idle.c deleted file mode 100644 index 84d9a8c107..0000000000 --- a/c/src/lib/libbsp/arm/lpc24xx/misc/idle.c +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @file - * - * @author Sebastian Huber - * - * @ingroup lpc24xx - * - * @brief Idle task. - */ - -/* - * Copyright (c) 2008 - * Embedded Brains GmbH - * Obere Lagerstr. 30 - * D-82178 Puchheim - * Germany - * rtems@embedded-brains.de - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - */ - -#include -#include - -Thread lpc24xx_idle( uint32_t ignored) -{ - while (true) { - /* - * Set power mode to idle. Causes the processor clock to be stopped, while - * on-chip peripherals remain active. Any enabled interrupt from a - * peripheral or an external interrupt source will cause the processor to - * resume execution. - */ - PCON = 0x1; - } -} diff --git a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am index fa3180102a..d06abff813 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/preinstall.am +++ b/c/src/lib/libbsp/arm/lpc24xx/preinstall.am @@ -105,10 +105,6 @@ $(PROJECT_INCLUDE)/bsp/dma.h: include/dma.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/dma.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/dma.h -$(PROJECT_INCLUDE)/bsp/idle.h: include/idle.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/idle.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/idle.h - $(PROJECT_INCLUDE)/bsp/i2c.h: include/i2c.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/i2c.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/i2c.h -- cgit v1.2.3