From f4b73385582f468882abe2e49c02b8fd689b9f81 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 14 Sep 2012 08:00:26 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4655
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/ports/GCC/PPC/SPC563Mxx/ivor.s    | 8 +++++---
 os/ports/GCC/PPC/SPC563Mxx/vectors.s | 7 +++++++
 os/ports/GCC/PPC/chcore.h            | 4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'os/ports')

diff --git a/os/ports/GCC/PPC/SPC563Mxx/ivor.s b/os/ports/GCC/PPC/SPC563Mxx/ivor.s
index 34cfae43d..de937ef17 100644
--- a/os/ports/GCC/PPC/SPC563Mxx/ivor.s
+++ b/os/ports/GCC/PPC/SPC563Mxx/ivor.s
@@ -26,10 +26,12 @@
  * @{
  */
 
+/*
+ * Imports the PPC configuration headers.
+ */
+#define _FROM_ASM_
 #include "chconf.h"
-
-#define FALSE 0
-#define TRUE 1
+#include "chcore.h"
 
 #if !defined(__DOXYGEN__)
         /*
diff --git a/os/ports/GCC/PPC/SPC563Mxx/vectors.s b/os/ports/GCC/PPC/SPC563Mxx/vectors.s
index 32cf37942..c823244c8 100644
--- a/os/ports/GCC/PPC/SPC563Mxx/vectors.s
+++ b/os/ports/GCC/PPC/SPC563Mxx/vectors.s
@@ -26,6 +26,13 @@
  * @{
  */
 
+/*
+ * Imports the PPC configuration headers.
+ */
+#define _FROM_ASM_
+#include "chconf.h"
+#include "chcore.h"
+
 #if !defined(__DOXYGEN__)
 
         /* BAM info, SWT off, WTE off, VLE from settings.*/
diff --git a/os/ports/GCC/PPC/chcore.h b/os/ports/GCC/PPC/chcore.h
index b0bf57017..ffdc32fe3 100644
--- a/os/ports/GCC/PPC/chcore.h
+++ b/os/ports/GCC/PPC/chcore.h
@@ -359,8 +359,8 @@ struct context {
  * @details This port function is implemented as inlined code for performance
  *          reasons.
  */
-#if ENABLE_WFI_IDLE != 0
-#ifndef port_wait_for_interrupt
+#if PPC_ENABLE_WFI_IDLE
+#if !defined(port_wait_for_interrupt)
 #define port_wait_for_interrupt() {                                         \
   asm volatile ("wait" : : : "memory");                                     \
 }
-- 
cgit v1.2.3