X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fattr.h;h=dae231ffa673a158e17dcfe4beb2beee1dc452e9;hb=85a0e5ef831385250d4855b1a19b1ae561f14f0c;hp=98ed7b2fe6b24cc562a83a63129d1386aa8b2f58;hpb=44e035f5243b746cf09dfaa4f9d2898ef24c9849;p=bertos.git

diff --git a/bertos/cpu/attr.h b/bertos/cpu/attr.h
index 98ed7b2f..dae231ff 100644
--- a/bertos/cpu/attr.h
+++ b/bertos/cpu/attr.h
@@ -42,6 +42,7 @@
 
 #include "detect.h"
 
+#include "cfg/cfg_proc.h"      /* CONFIG_KERN_PREEMPT */
 #include "cfg/cfg_attr.h"      /* CONFIG_FAST_MEM */
 
 
@@ -94,6 +95,8 @@
 
 	#ifdef __GNUC__
 		#define NOP         asm volatile ("nop")
+		/* This is a good thing to insert into busy-wait loops. */
+		#define PAUSE       asm volatile ("rep; nop" ::: "memory")
 		#define BREAKPOINT  asm volatile ("int3" ::)
 	#endif
 
@@ -106,6 +109,8 @@
 	/// Valid pointers should be >= than this value (used for debug)
 	#if CPU_ARM_AT91
 		#define CPU_RAM_START		0x00200000
+	#elif CPU_ARM_LM3S1968
+		#define CPU_RAM_START		0x20000000
 	#else
 		#warning Fix CPU_RAM_START address for your ARM, default value set to 0x200
 		#define CPU_RAM_START		0x200
@@ -153,10 +158,10 @@
 			#define FAST_FUNC /**/
 		#endif
 
-		/**
-		 * Function attribute to declare an interrupt service routine.
+		/*
+		 * Function attribute to move it into ram memory.
 		 */
-		#define ISR_FUNC __attribute__((interrupt))
+		#define RAM_FUNC __attribute__((section(".data")))
 
 	#endif /* !__IAR_SYSTEMS_ICC_ */
 
@@ -207,7 +212,7 @@
 	/// Valid pointers should be >= than this value (used for debug)
 	#if CPU_AVR_ATMEGA8 || CPU_AVR_ATMEGA32 || CPU_AVR_ATMEGA103
 		#define CPU_RAM_START       0x60
-	#elif CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA168
+	#elif CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA168 || CPU_AVR_ATMEGA328P
 		#define CPU_RAM_START       0x100
 	#elif CPU_AVR_ATMEGA1281
 		#define CPU_RAM_START       0x200
@@ -234,4 +239,9 @@
 	#define FAST_RODATA /* */
 #endif
 
+#ifndef PAUSE
+	/// Generic PAUSE implementation.
+	#define PAUSE	{NOP; MEMORY_BARRIER;}
+#endif
+
 #endif /* CPU_ATTR_H */