diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-11-04 09:40:51 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-11-04 09:40:51 +0000 |
| commit | efb5332373ccaa36b2d2e465b3bceb2b7f4b7655 (patch) | |
| tree | 58e3a6adbd48cfb42d6d4dfe4ae36d362b00fc44 /os/nil | |
| parent | 8b0021db47f08c7523609987d87be34176bbe9d4 (diff) | |
| download | ChibiOS-efb5332373ccaa36b2d2e465b3bceb2b7f4b7655.tar.gz ChibiOS-efb5332373ccaa36b2d2e465b3bceb2b7f4b7655.tar.bz2 ChibiOS-efb5332373ccaa36b2d2e465b3bceb2b7f4b7655.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7473 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/nil')
| -rw-r--r-- | os/nil/ports/ARMCMx/compilers/GCC/niltypes.h | 9 | ||||
| -rw-r--r-- | os/nil/ports/ARMCMx/nilcore.h | 9 | ||||
| -rw-r--r-- | os/nil/ports/AVR/compilers/GCC/niltypes.h | 9 | ||||
| -rw-r--r-- | os/nil/ports/e200/compilers/GCC/niltypes.h | 9 | ||||
| -rw-r--r-- | os/nil/ports/e200/nilcore.h | 9 | ||||
| -rw-r--r-- | os/nil/templates/nilcore.h | 9 | ||||
| -rw-r--r-- | os/nil/templates/niltypes.h | 9 |
7 files changed, 36 insertions, 27 deletions
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/niltypes.h b/os/nil/ports/ARMCMx/compilers/GCC/niltypes.h index 30750c31d..a594d8ad9 100644 --- a/os/nil/ports/ARMCMx/compilers/GCC/niltypes.h +++ b/os/nil/ports/ARMCMx/compilers/GCC/niltypes.h @@ -59,6 +59,15 @@ typedef int32_t cnt_t; /**< Generic signed counter. */ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */
/**
+ * @brief Type of system time.
+ */
+#if (NIL_CFG_ST_RESOLUTION == 32) || defined(__DOXYGEN__)
+typedef uint32_t systime_t;
+#else
+typedef uint16_t systime_t;
+#endif
+
+/**
* @brief ROM constant modifier.
* @note It is set to use the "const" keyword in this port.
*/
diff --git a/os/nil/ports/ARMCMx/nilcore.h b/os/nil/ports/ARMCMx/nilcore.h index eb6fc0f0c..8a9d98b8f 100644 --- a/os/nil/ports/ARMCMx/nilcore.h +++ b/os/nil/ports/ARMCMx/nilcore.h @@ -128,15 +128,6 @@ #if !defined(_FROM_ASM_)
/**
- * @brief Type of system time.
- */
-#if (NIL_CFG_ST_RESOLUTION == 32) || defined(__DOXYGEN__)
-typedef uint32_t systime_t;
-#else
-typedef uint16_t systime_t;
-#endif
-
-/**
* @brief Type of a generic ARM register.
*/
typedef void *regarm_t;
diff --git a/os/nil/ports/AVR/compilers/GCC/niltypes.h b/os/nil/ports/AVR/compilers/GCC/niltypes.h index 022ec9d56..a5a74d48f 100644 --- a/os/nil/ports/AVR/compilers/GCC/niltypes.h +++ b/os/nil/ports/AVR/compilers/GCC/niltypes.h @@ -59,6 +59,15 @@ typedef int8_t cnt_t; /**< Generic signed counter. */ typedef uint8_t ucnt_t; /**< Generic unsigned counter. */
/**
+ * @brief Type of system time.
+ */
+#if (NIL_CFG_ST_RESOLUTION == 32) || defined(__DOXYGEN__)
+typedef uint32_t systime_t;
+#else
+typedef uint16_t systime_t;
+#endif
+
+/**
* @brief ROM constant modifier.
* @note It is set to use the "const" keyword in this port.
*/
diff --git a/os/nil/ports/e200/compilers/GCC/niltypes.h b/os/nil/ports/e200/compilers/GCC/niltypes.h index 6ea0f76de..1b9267801 100644 --- a/os/nil/ports/e200/compilers/GCC/niltypes.h +++ b/os/nil/ports/e200/compilers/GCC/niltypes.h @@ -59,6 +59,15 @@ typedef int32_t cnt_t; /**< Generic signed counter. */ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */
/**
+ * @brief Type of system time.
+ */
+#if (NIL_CFG_ST_RESOLUTION == 32) || defined(__DOXYGEN__)
+typedef uint32_t systime_t;
+#else
+typedef uint16_t systime_t;
+#endif
+
+/**
* @brief ROM constant modifier.
* @note It is set to use the "const" keyword in this port.
*/
diff --git a/os/nil/ports/e200/nilcore.h b/os/nil/ports/e200/nilcore.h index 2fbfbf911..93ca1ea8e 100644 --- a/os/nil/ports/e200/nilcore.h +++ b/os/nil/ports/e200/nilcore.h @@ -151,15 +151,6 @@ #if !defined(_FROM_ASM_)
/**
- * @brief Type of system time.
- */
-#if (NIL_CFG_ST_RESOLUTION == 32) || defined(__DOXYGEN__)
-typedef uint32_t systime_t;
-#else
-typedef uint16_t systime_t;
-#endif
-
-/**
* @brief Type of stack and memory alignment enforcement.
*/
typedef uint64_t stkalign_t;
diff --git a/os/nil/templates/nilcore.h b/os/nil/templates/nilcore.h index a868e74d8..2317ee852 100644 --- a/os/nil/templates/nilcore.h +++ b/os/nil/templates/nilcore.h @@ -109,15 +109,6 @@ #if !defined(_FROM_ASM_)
/**
- * @brief Type of system time.
- */
-#if (NIL_CFG_ST_RESOLUTION == 32) || defined(__DOXYGEN__)
-typedef uint32_t systime_t;
-#else
-typedef uint16_t systime_t;
-#endif
-
-/**
* @brief Type of stack and memory alignment enforcement.
*/
typedef uint64_t stkalign_t;
diff --git a/os/nil/templates/niltypes.h b/os/nil/templates/niltypes.h index c7d535a1a..64ae606ee 100644 --- a/os/nil/templates/niltypes.h +++ b/os/nil/templates/niltypes.h @@ -59,6 +59,15 @@ typedef int32_t cnt_t; /**< Generic signed counter. */ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */
/**
+ * @brief Type of system time.
+ */
+#if (NIL_CFG_ST_RESOLUTION == 32) || defined(__DOXYGEN__)
+typedef uint32_t systime_t;
+#else
+typedef uint16_t systime_t;
+#endif
+
+/**
* @brief ROM constant modifier.
* @note It is set to use the "const" keyword in this port.
*/
|