diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-24 14:54:26 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-24 14:54:26 +0000 |
| commit | 40f413d3c97a7694703938cd031ce15912b29ff7 (patch) | |
| tree | 67e9f3bdbefa23aba17e4b78ee92b91daa92197c /os/ports | |
| parent | fa64f08fc1ad45d0984828695697f6abde7e8ffd (diff) | |
| download | ChibiOS-40f413d3c97a7694703938cd031ce15912b29ff7.tar.gz ChibiOS-40f413d3c97a7694703938cd031ce15912b29ff7.tar.bz2 ChibiOS-40f413d3c97a7694703938cd031ce15912b29ff7.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6025 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports')
| -rw-r--r-- | os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c | 4 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCMx/chtypes.h | 24 |
2 files changed, 3 insertions, 25 deletions
diff --git a/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c b/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c index 78d2aaf06..9eba072c5 100644 --- a/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c +++ b/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c @@ -59,9 +59,9 @@ CH_IRQ_HANDLER(VectorB0) { STM32F3_TIM2->SR = 0;
- chSysLockFromIsr();
+ chSysLockFromISR();
chSysTimerHandlerI();
- chSysUnlockFromIsr();
+ chSysUnlockFromISR();
CH_IRQ_EPILOGUE();
}
diff --git a/os/ports/GCC/ARMCMx/chtypes.h b/os/ports/GCC/ARMCMx/chtypes.h index 2d61d0250..689b8c64d 100644 --- a/os/ports/GCC/ARMCMx/chtypes.h +++ b/os/ports/GCC/ARMCMx/chtypes.h @@ -34,6 +34,7 @@ #include <stdbool.h>
typedef bool bool_t; /**< Fast boolean type. */
+typedef uint32_t syssts_t; /**< System status word. */
typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
typedef uint8_t trefs_t; /**< Thread references counter. */
@@ -47,34 +48,11 @@ typedef uint32_t systime_t; /**< System time. */ typedef int32_t cnt_t; /**< Resources counter. */
/**
- * @brief Inline function modifier.
- */
-#define INLINE inline
-
-/**
* @brief ROM constant modifier.
* @note It is set to use the "const" keyword in this port.
*/
#define ROMCONST const
-/**
- * @brief Packed structure modifier (within).
- * @note It uses the "packed" GCC attribute.
- */
-#define PACK_STRUCT_STRUCT __attribute__((packed))
-
-/**
- * @brief Packed structure modifier (before).
- * @note Empty in this port.
- */
-#define PACK_STRUCT_BEGIN
-
-/**
- * @brief Packed structure modifier (after).
- * @note Empty in this port.
- */
-#define PACK_STRUCT_END
-
#endif /* _CHTYPES_H_ */
/** @} */
|