Specific the directory for all hw and cfg module. Use double quote for cfg and hw...

[bertos.git] / bertos / cpu / attr.h

diff --git a/bertos/cpu/attr.h b/bertos/cpu/attr.h
index 4090abb9411bf38e7a6eedb925632174b064543c..3fd3b18fbde5d84f3a43a4dc02b764a9e012351a 100644 (file)
--- a/bertos/cpu/attr.h
+++ b/bertos/cpu/attr.h
@@ -42,10 +42,11 @@
 #define CPU_ATTR_H
 
 #include "detect.h"
-#include <cfg/compiler.h> /* for uintXX_t */
-#include <cfg/arch_config.h>  /* ARCH_EMUL */
 
-#include "appconfig.h" // CONFIG_FAST_MEM
+#include "cfg/cfg_attr.h"      /* CONFIG_FAST_MEM */
+#include <cfg/compiler.h>      /* for uintXX_t */
+#include "cfg/cfg_arch.h"   /* ARCH_EMUL */
+
 
 /**
  * \name Macros for determining CPU endianness.
@@ -219,19 +220,6 @@
         */
        #define CPU_REG_INIT_VALUE(reg) (reg == 0 ? 0x80 : 0)
 
-       #warning FIXME:This macro are empty for AVR target, implent it!
-       /**
-        * Function attribute for use with performance critical code.
-        */
-       #define FAST_FUNC /* */
-
-       /**
-        * Data attribute to move constant data to fast memory storage.
-        *
-        * \see FAST_FUNC
-        */
-       #define FAST_RODATA /* */
-
 #else
        #error No CPU_... defined.
 #endif
@@ -241,7 +229,6 @@
        #define CPU_REG_INIT_VALUE(reg)     0
 #endif
 
-
 #ifndef CPU_STACK_GROWS_UPWARD
        #error CPU_STACK_GROWS_UPWARD should have been defined to either 0 or 1
 #endif
@@ -250,6 +237,20 @@
        #error CPU_SP_ON_EMPTY_SLOT should have been defined to either 0 or 1
 #endif
 
+#ifndef FAST_FUNC
+       /**
+        * Function attribute for use with performance critical code.
+        */
+       #define FAST_FUNC /* */
+#endif
+
+#ifndef FAST_RODATA
+       /**
+        * Data attribute to move constant data to fast memory storage.
+        */
+       #define FAST_RODATA /* */
+#endif
+
 /*
  * Support stack handling peculiarities of a few CPUs.
  *