2009-08-26 Joel Sherrill <joel.sherrill@oarcorp.com>

	* 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.

6 files changed, 16 insertions, 48 deletions

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 <joel.sherrill@oarcorp.com>
+
+	* 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 <sebastian.huber@embedded-brains.de>
 
 	* 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 <sebastian.huber@embedded-brains.de>
- *
- * @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 <rtems.h>
-
-#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/idle.c b/c/src/lib/libbsp/arm/lpc24xx/misc/bspidle.c
index 84d9a8c107..f52b70ce1d 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/misc/idle.c
+++ b/c/src/lib/libbsp/arm/lpc24xx/misc/bspidle.c
@@ -24,7 +24,7 @@
 #include <bsp/idle.h>
 #include <bsp/lpc24xx.h>
 
-Thread lpc24xx_idle( uint32_t ignored)
+Thread bsp_idle_thread( uint32_t ignored)
 {
   while (true) {
     /*
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