projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: coding style fixes (structure naming)
[bertos.git]
/
bertos
/
cpu
/
types.h
diff --git
a/bertos/cpu/types.h
b/bertos/cpu/types.h
index 252d77a9796764ce929bbcb46dd6b09d67b3f1a1..ebd341718c9efdc876f8cc67b4ca4d5e654941e9 100644
(file)
--- a/
bertos/cpu/types.h
+++ b/
bertos/cpu/types.h
@@
-77,13
+77,14
@@
#define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
#endif
#define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
#endif
-#elif CPU_ARM
+#elif CPU_ARM
|| CPU_CM3
typedef uint32_t cpu_flags_t;
typedef uint32_t cpu_atomic_t;
typedef uint32_t cpu_stack_t;
typedef uint32_t cpu_flags_t;
typedef uint32_t cpu_atomic_t;
typedef uint32_t cpu_stack_t;
- typedef uint64_t cpu_aligned_stack_t;
#define SIZEOF_CPUSTACK_T 4
#define SIZEOF_CPUSTACK_T 4
+
+ typedef uint64_t cpu_aligned_stack_t;
#define SIZEOF_CPUALIGNED_T 8
#elif CPU_PPC
#define SIZEOF_CPUALIGNED_T 8
#elif CPU_PPC
@@
-119,6
+120,14
@@
#define SIZEOF_CPUSTACK_T 1
#define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
#define SIZEOF_CPUSTACK_T 1
#define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
+#elif CPU_MSP430
+
+ typedef uint16_t cpu_flags_t;
+ typedef uint16_t cpu_stack_t;
+ typedef cpu_stack_t cpu_aligned_stack_t;
+ #define SIZEOF_CPUSTACK_T 2
+ #define SIZEOF_CPUALIGNED_T SIZEOF_CPUSTACK_T
+
#else
#error No CPU_... defined.
#endif
#else
#error No CPU_... defined.
#endif
@@
-207,6
+216,11
@@
/*\}*/
/*\}*/
+#ifndef INT_MAX
+ #define INT_MAX ((int)((unsigned int)~0 >> 1))
+ #define INT_MIN (-INT_MAX - 1)
+#endif
+
/* Sanity checks for the above definitions */
STATIC_ASSERT(sizeof(char) == SIZEOF_CHAR);
STATIC_ASSERT(sizeof(short) == SIZEOF_SHORT);
/* Sanity checks for the above definitions */
STATIC_ASSERT(sizeof(char) == SIZEOF_CHAR);
STATIC_ASSERT(sizeof(short) == SIZEOF_SHORT);
@@
-227,4
+241,14
@@
STATIC_ASSERT(sizeof(cpu_stack_t) == SIZEOF_CPUSTACK_T);
STATIC_ASSERT(sizeof(cpu_aligned_stack_t) == SIZEOF_CPUALIGNED_T);
STATIC_ASSERT(sizeof(size_t) == SIZEOF_SIZE_T);
STATIC_ASSERT(sizeof(cpu_aligned_stack_t) == SIZEOF_CPUALIGNED_T);
STATIC_ASSERT(sizeof(size_t) == SIZEOF_SIZE_T);
+
+/**
+ * Macros for hardware access, both direct and via the bit-band region.
+ */
+/*\{*/
+#define HWREG(x) (*((reg32_t *)(x)))
+#define HWREGH(x) (*((reg16_t *)(x)))
+#define HWREGB(x) (*((reg8_t *)(x)))
+/*\}*/
+
#endif /* CPU_TYPES_H */
#endif /* CPU_TYPES_H */