X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Ftypes.h;h=8b8179387769e1a29a7506d2e9371dccec5ef560;hb=8d22a2e350167e155a798ae50844e49e8597eb96;hp=be9b5fd5db6188117d098e8c46bf4373d53aef30;hpb=345f93de1963f49bdb194d2b06c8c5d7ba0a3e5f;p=bertos.git

diff --git a/bertos/cpu/types.h b/bertos/cpu/types.h
index be9b5fd5..8b817938 100644
--- a/bertos/cpu/types.h
+++ b/bertos/cpu/types.h
@@ -34,7 +34,7 @@
  * \brief CPU-specific type definitions.
  *
  * \author Giovanni Bajo <rasky@develer.com>
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  * \author Francesco Sacchi <batt@develer.com>
  */
@@ -47,50 +47,62 @@
 
 #if CPU_I196
 
-	typedef uint16_t cpuflags_t; // FIXME
-	typedef unsigned int cpustack_t;
+	typedef uint16_t cpu_flags_t; // FIXME
+	typedef unsigned int cpu_stack_t;
+	typedef unsigned int cpu_atomic_t;
 	#warning Verify following constant
 	#define SIZEOF_CPUSTACK_T 2
 
 #elif CPU_X86
 
-	/* Get IRQ_* definitions from the hosting environment. */
+	/* Get cpu_flags_t definition from the hosting environment. */
 	#include <cfg/os.h>
 	#if OS_EMBEDDED
-		typedef uint32_t cpuflags_t; // FIXME
+		typedef uint32_t cpu_flags_t; // FIXME
 	#endif /* OS_EMBEDDED */
 
+	typedef uint32_t cpu_atomic_t;
+
 	#if CPU_X86_64
-		typedef uint64_t cpustack_t;
+		typedef uint64_t cpu_stack_t;
 		#define SIZEOF_CPUSTACK_T 8
 	#else
-		typedef uint32_t cpustack_t;
+		typedef uint32_t cpu_stack_t;
 		#define SIZEOF_CPUSTACK_T 4
 	#endif
 
 #elif CPU_ARM
 
-	typedef uint32_t cpuflags_t;
-	typedef uint32_t cpustack_t;
+	typedef uint32_t cpu_flags_t;
+	typedef uint32_t cpu_atomic_t;
+	typedef uint32_t cpu_stack_t;
 	#define SIZEOF_CPUSTACK_T 4
 
 #elif CPU_PPC
 
-	typedef uint32_t cpuflags_t; // FIXME
-	typedef uint32_t cpustack_t; // FIXME
+	/* Get cpu_flags_t definition from the hosting environment. */
+	#include <cfg/os.h>
+	#if OS_EMBEDDED
+		typedef uint32_t cpu_flags_t;
+	#endif
+
+	typedef uint32_t cpu_atomic_t;
+	typedef uint32_t cpu_stack_t;
 	#define SIZEOF_CPUSTACK_T 4
 
 #elif CPU_DSP56K
 
-	typedef uint16_t cpuflags_t;
-	typedef unsigned int cpustack_t;
+	typedef uint16_t cpu_flags_t;
+	typedef uint16_t cpu_atomic_t;
+	typedef unsigned int cpu_stack_t;
 	#warning Verify following costant
 	#define SIZEOF_CPUSTACK_T 2
 
 #elif CPU_AVR
 
-	typedef uint8_t cpuflags_t;
-	typedef uint8_t cpustack_t;
+	typedef uint8_t cpu_flags_t;
+	typedef uint8_t cpu_atomic_t;
+	typedef uint8_t cpu_stack_t;
 	#define SIZEOF_CPUSTACK_T 1
 
 #else
@@ -187,7 +199,7 @@ STATIC_ASSERT(sizeof(uint32_t) * CPU_BITS_PER_CHAR == 32);
 STATIC_ASSERT(sizeof(int64_t) * CPU_BITS_PER_CHAR == 64);
 STATIC_ASSERT(sizeof(uint64_t) * CPU_BITS_PER_CHAR == 64);
 #endif
-STATIC_ASSERT(sizeof(cpustack_t) == SIZEOF_CPUSTACK_T);
+STATIC_ASSERT(sizeof(cpu_stack_t) == SIZEOF_CPUSTACK_T);
 
 
 #endif /* CPU_TYPES_H */