git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@630 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 2 insertions, 23 deletions

diff --git a/demos/ARM7-LPC214x-GCC/Makefile b/demos/ARM7-LPC214x-GCC/Makefile
index 1eb4d602f..478e9a287 100644
--- a/demos/ARM7-LPC214x-GCC/Makefile
+++ b/demos/ARM7-LPC214x-GCC/Makefile
@@ -69,7 +69,7 @@ include ../../src/kernel.mk
 include ../../test/test.mk

 

 # List ARM-mode C source files here

-ASRC = ../../ports/ARM7-LPC214x/chcore.c \

+ASRC = ../../ports/ARM7/chcore.c \

        ../../ports/ARM7-LPC214x/vic.c  \

        ../../ports/ARM7-LPC214x/lpc214x_serial.c  \

        ../../ports/ARM7-LPC214x/lpc214x_ssp.c  \

diff --git a/ports/ARM7-LPC214x/chcore.c b/ports/ARM7/chcore.c
index 46f0bea04..d7d51c85b 100644
--- a/ports/ARM7-LPC214x/chcore.c
+++ b/ports/ARM7/chcore.c
@@ -24,15 +24,6 @@
 

 #include <ch.h>

 

-#include "lpc214x.h"

-

-/*

- * This file is a template of the system driver functions provided by a port.

- * Some of the following functions may be implemented as macros in chcore.h if

- * the implementer decides that there is an advantage in doing so, as example

- * because performance concerns.

- */

-

 /**

  * Prints a message on the system console.
  * @param msg pointer to the message
@@ -42,18 +33,6 @@ void port_puts(char *msg) {
 }

 

 /**

- * Enters an architecture-dependent halt mode. The function is meant to return

- * when an interrupt becomes pending.

- */

-__attribute__((weak))

-void port_wait_for_interrupt(void) {

-

-#if ENABLE_WFI_IDLE != 0

-  PCON = 1;

-#endif

-}

-

-/**

  * Halts the system.
  */

 __attribute__((weak))

diff --git a/ports/ARM7/chcore.h b/ports/ARM7/chcore.h
index 1a949ad79..cd6d40590 100644
--- a/ports/ARM7/chcore.h
+++ b/ports/ARM7/chcore.h
@@ -31,6 +31,7 @@
 #ifndef ENABLE_WFI_IDLE

 #define ENABLE_WFI_IDLE 0

 #endif

+#include <wfi.h>

 

 /**

  * Macro defining the ARM7 architecture.

@@ -265,7 +266,6 @@ typedef struct {
 extern "C" {

 #endif

   void port_puts(char *msg);

-  void port_wait_for_interrupt(void);

   void port_halt(void);

 #ifdef THUMB

   void _port_lock_thumb(void);