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

2 files changed, 35 insertions, 69 deletions

diff --git a/ports/ARM7-AT91SAM7X/chcore.c b/ports/ARM7-AT91SAM7X/chcore.c
deleted file mode 100644
index f404efce1..000000000
--- a/ports/ARM7-AT91SAM7X/chcore.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/RT is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @addtogroup ARM7_CORE

- * @{

- */

-

-#include <ch.h>

-

-#include "at91lib/AT91SAM7X256.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
- */

-__attribute__((weak))

-void sys_puts(char *msg) {

-}

-

-/**

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

- * when an interrupt becomes pending.

- */

-__attribute__((weak))

-void sys_wait_for_interrupt(void) {

-

-#if ENABLE_WFI_IDLE != 0

-  AT91C_BASE_SYS->PMC_SCDR = AT91C_PMC_PCK;

-#endif

-}

-

-/**

- * Halts the system. This function is invoked by the operating system when an

- * unrecoverable error is detected (as example because a programming error in

- * the application code that triggers an assertion while in debug mode).
- */

-__attribute__((weak))

-void sys_halt(void) {

-

-  sys_disable_all();

-  while (TRUE) {

-  }

-}

-

-/** @} */

diff --git a/ports/ARM7-AT91SAM7X/wfi.h b/ports/ARM7-AT91SAM7X/wfi.h
new file mode 100644
index 000000000..5e2da044d
--- /dev/null
+++ b/ports/ARM7-AT91SAM7X/wfi.h
@@ -0,0 +1,35 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+#ifndef _WFI_H_

+#define _WFI_H_

+

+#include "at91lib/AT91SAM7X256.h"

+

+#ifndef port_wait_for_interrupt

+#if ENABLE_WFI_IDLE != 0

+#define port_wait_for_interrupt() {                                     \

+  AT91C_BASE_SYS->PMC_SCDR = AT91C_PMC_PCK;                             \

+}

+#else

+#define port_wait_for_interrupt()

+#endif

+#endif

+

+#endif /* _WFI_H_ */