diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-02-26 14:50:16 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-02-26 14:50:16 +0000 |
commit | 9c56bcc138b4646e0e6777a3b53afe8e40c9823b (patch) | |
tree | 0e0931b1059eb4cd3d289de13221b5aea8ac327b /os/ports | |
parent | dedffdd99c7b04a7440f86b387a5d8c92eac413a (diff) | |
download | ChibiOS-9c56bcc138b4646e0e6777a3b53afe8e40c9823b.tar.gz ChibiOS-9c56bcc138b4646e0e6777a3b53afe8e40c9823b.tar.bz2 ChibiOS-9c56bcc138b4646e0e6777a3b53afe8e40c9823b.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5333 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports')
-rw-r--r-- | os/ports/GCC/ARM/chtypes.h | 9 | ||||
-rw-r--r-- | os/ports/GCC/ARMCMx/chtypes.h | 7 | ||||
-rw-r--r-- | os/ports/GCC/AVR/chtypes.h | 9 | ||||
-rw-r--r-- | os/ports/GCC/MSP430/chtypes.h | 9 | ||||
-rw-r--r-- | os/ports/GCC/PPC/chtypes.h | 8 | ||||
-rw-r--r-- | os/ports/GCC/SIMIA32/chtypes.h | 9 | ||||
-rw-r--r-- | os/ports/IAR/ARMCMx/chtypes.h | 7 | ||||
-rw-r--r-- | os/ports/IAR/STM8/chtypes.h | 8 | ||||
-rw-r--r-- | os/ports/RC/STM8/chtypes.h | 17 | ||||
-rw-r--r-- | os/ports/RVCT/ARMCMx/chtypes.h | 7 | ||||
-rw-r--r-- | os/ports/cosmic/STM8/chtypes.h | 17 |
11 files changed, 38 insertions, 69 deletions
diff --git a/os/ports/GCC/ARM/chtypes.h b/os/ports/GCC/ARM/chtypes.h index c87992bb9..36bebf14f 100644 --- a/os/ports/GCC/ARM/chtypes.h +++ b/os/ports/GCC/ARM/chtypes.h @@ -29,16 +29,11 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
-#define __need_ptrdiff_t
#include <stddef.h>
-
-#if !defined(_STDINT_H) && !defined(__STDINT_H_)
#include <stdint.h>
-#endif
+#include <stdbool.h>
-typedef int32_t bool_t; /**< Fast boolean type. */
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
diff --git a/os/ports/GCC/ARMCMx/chtypes.h b/os/ports/GCC/ARMCMx/chtypes.h index 035e135b5..a94ae24ae 100644 --- a/os/ports/GCC/ARMCMx/chtypes.h +++ b/os/ports/GCC/ARMCMx/chtypes.h @@ -29,14 +29,11 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
-#define __need_ptrdiff_t
#include <stddef.h>
-
#include <stdint.h>
+#include <stdbool.h>
-typedef int32_t bool_t; /**< Fast boolean type. */
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
diff --git a/os/ports/GCC/AVR/chtypes.h b/os/ports/GCC/AVR/chtypes.h index 5e257b0d0..59d896af4 100644 --- a/os/ports/GCC/AVR/chtypes.h +++ b/os/ports/GCC/AVR/chtypes.h @@ -29,16 +29,11 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
-#define __need_ptrdiff_t
#include <stddef.h>
-
-#if !defined(_STDINT_H) && !defined(__STDINT_H_)
#include <stdint.h>
-#endif
+#include <stdbool.h>
-typedef int8_t bool_t; /**< Fast boolean type. */
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
diff --git a/os/ports/GCC/MSP430/chtypes.h b/os/ports/GCC/MSP430/chtypes.h index 2480eb118..84ced2aaf 100644 --- a/os/ports/GCC/MSP430/chtypes.h +++ b/os/ports/GCC/MSP430/chtypes.h @@ -29,16 +29,11 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
-#define __need_ptrdiff_t
#include <stddef.h>
-
-#if !defined(_STDINT_H) && !defined(__STDINT_H_)
#include <stdint.h>
-#endif
+#include <stdbool.h>
-typedef int16_t bool_t; /**< Fast boolean type. */
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
diff --git a/os/ports/GCC/PPC/chtypes.h b/os/ports/GCC/PPC/chtypes.h index 6d22b7353..37f4419f6 100644 --- a/os/ports/GCC/PPC/chtypes.h +++ b/os/ports/GCC/PPC/chtypes.h @@ -29,13 +29,9 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
#include <stddef.h>
-
-#if !defined(_STDINT_H) && !defined(__STDINT_H_)
#include <stdint.h>
-#endif
+#include <stdbool.h>
/*
* Derived generic types.
@@ -50,7 +46,7 @@ typedef volatile uint32_t vuint32_t; /**< Volatile unsigned 32 bits. */ /*
* Kernel types.
*/
-typedef int32_t bool_t; /**< Fast boolean type. */
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
diff --git a/os/ports/GCC/SIMIA32/chtypes.h b/os/ports/GCC/SIMIA32/chtypes.h index 72cc1661b..b10eed325 100644 --- a/os/ports/GCC/SIMIA32/chtypes.h +++ b/os/ports/GCC/SIMIA32/chtypes.h @@ -21,16 +21,11 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
-#define __need_ptrdiff_t
#include <stddef.h>
-
-#if !defined(_STDINT_H) && !defined(__STDINT_H_)
#include <stdint.h>
-#endif
+#include <stdbool.h>
-typedef int32_t bool_t; /**< Fast boolean type. */
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
diff --git a/os/ports/IAR/ARMCMx/chtypes.h b/os/ports/IAR/ARMCMx/chtypes.h index b21fbc7b6..9855c4e00 100644 --- a/os/ports/IAR/ARMCMx/chtypes.h +++ b/os/ports/IAR/ARMCMx/chtypes.h @@ -29,14 +29,11 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
-#define __need_ptrdiff_t
#include <stddef.h>
-
#include <stdint.h>
+#include <stdbool.h>
-typedef int32_t bool_t; /**< Fast boolean type. */
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
diff --git a/os/ports/IAR/STM8/chtypes.h b/os/ports/IAR/STM8/chtypes.h index a2ad1f4a1..f418256e1 100644 --- a/os/ports/IAR/STM8/chtypes.h +++ b/os/ports/IAR/STM8/chtypes.h @@ -29,15 +29,11 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
#include <stddef.h>
-
-#if !defined(_STDINT_H) && !defined(__STDINT_H_)
#include <stdint.h>
-#endif
+#include <stdbool.h>
-typedef int8_t bool_t; /**< Fast boolean type. */
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
diff --git a/os/ports/RC/STM8/chtypes.h b/os/ports/RC/STM8/chtypes.h index cbe47e821..ffc972f14 100644 --- a/os/ports/RC/STM8/chtypes.h +++ b/os/ports/RC/STM8/chtypes.h @@ -29,14 +29,9 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
#include <stddef.h>
-//#if !defined(_STDINT_H) && !defined(__STDINT_H_)
-//#include <stdint.h>
-//#endif
-
+typedef unsigned char uint8t; /**< C99-style boolean. */
typedef unsigned char uint8_t; /**< C99-style 8 bits unsigned. */
typedef signed char int8_t; /**< C99-style 8 bits signed. */
typedef unsigned int uint16_t; /**< C99-style 16 bits unsigned. */
@@ -47,7 +42,15 @@ typedef uint8_t uint_fast8_t; /**< C99-style 8 bits unsigned. */ typedef uint16_t uint_fast16_t; /**< C99-style 16 bits unsigned. */
typedef uint32_t uint_fast32_t; /**< C99-style 32 bits unsigned. */
-typedef int8_t bool_t; /**< Fast boolean type. */
+#if !defined(false) || defined(__DOXYGEN__)
+#define false 0
+#endif
+
+#if !defined(true) || defined(__DOXYGEN__)
+#define true (!false)
+#endif
+
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
diff --git a/os/ports/RVCT/ARMCMx/chtypes.h b/os/ports/RVCT/ARMCMx/chtypes.h index 8dbda9d82..b3f19f674 100644 --- a/os/ports/RVCT/ARMCMx/chtypes.h +++ b/os/ports/RVCT/ARMCMx/chtypes.h @@ -29,14 +29,11 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
-#define __need_ptrdiff_t
#include <stddef.h>
-
#include <stdint.h>
+#include <stdbool.h>
-typedef int32_t bool_t; /**< Fast boolean type. */
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
diff --git a/os/ports/cosmic/STM8/chtypes.h b/os/ports/cosmic/STM8/chtypes.h index 87c70e270..efd25964e 100644 --- a/os/ports/cosmic/STM8/chtypes.h +++ b/os/ports/cosmic/STM8/chtypes.h @@ -29,14 +29,9 @@ #ifndef _CHTYPES_H_
#define _CHTYPES_H_
-#define __need_NULL
-#define __need_size_t
#include <stddef.h>
-//#if !defined(_STDINT_H) && !defined(__STDINT_H_)
-//#include <stdint.h>
-//#endif
-
+typedef unsigned char uint8t; /**< C99-style boolean. */
typedef unsigned char uint8_t; /**< C99-style 8 bits unsigned. */
typedef signed char int8_t; /**< C99-style 8 bits signed. */
typedef unsigned int uint16_t; /**< C99-style 16 bits unsigned. */
@@ -47,7 +42,15 @@ typedef uint8_t uint_fast8_t; /**< C99-style 8 bits unsigned. */ typedef uint16_t uint_fast16_t; /**< C99-style 16 bits unsigned. */
typedef uint32_t uint_fast32_t; /**< C99-style 32 bits unsigned. */
-typedef int8_t bool_t; /**< Fast boolean type. */
+#if !defined(false) || defined(__DOXYGEN__)
+#define false 0
+#endif
+
+#if !defined(true) || defined(__DOXYGEN__)
+#define true (!false)
+#endif
+
+typedef bool bool_t; /**< Fast boolean type. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
|