diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-10 10:40:37 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-10 10:40:37 +0000 |
| commit | 2fd2d1efb9a720b7e601123e5504730685e98557 (patch) | |
| tree | 3c95963e975c7d0af5c13d92d97a25290bcefaaa /os/rt/ports/ARMCMx/chcore_v6m.h | |
| parent | 014976ee109e90dec11591118a4ab0d88c00118f (diff) | |
| download | ChibiOS-2fd2d1efb9a720b7e601123e5504730685e98557.tar.gz ChibiOS-2fd2d1efb9a720b7e601123e5504730685e98557.tar.bz2 ChibiOS-2fd2d1efb9a720b7e601123e5504730685e98557.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7747 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/ports/ARMCMx/chcore_v6m.h')
| -rw-r--r-- | os/rt/ports/ARMCMx/chcore_v6m.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/os/rt/ports/ARMCMx/chcore_v6m.h b/os/rt/ports/ARMCMx/chcore_v6m.h index 3c28c0f54..3ac78b926 100644 --- a/os/rt/ports/ARMCMx/chcore_v6m.h +++ b/os/rt/ports/ARMCMx/chcore_v6m.h @@ -124,7 +124,7 @@ /**
* @brief Port-specific information string.
*/
-#if !CORTEX_ALTERNATE_SWITCH || defined(__DOXYGEN__)
+#if (CORTEX_ALTERNATE_SWITCH == FALSE) || defined(__DOXYGEN__)
#define PORT_INFO "Preemption through NMI"
#else
#define PORT_INFO "Preemption through PendSV"
@@ -134,7 +134,7 @@ /**
* @brief Maximum usable priority for normal ISRs.
*/
-#if CORTEX_ALTERNATE_SWITCH || defined(__DOXYGEN__)
+#if (CORTEX_ALTERNATE_SWITCH == TRUE) || defined(__DOXYGEN__)
#define CORTEX_MAX_KERNEL_PRIORITY 1
#else
#define CORTEX_MAX_KERNEL_PRIORITY 0
@@ -246,7 +246,7 @@ struct port_intctx { * @param[in] ntp the thread to be switched in
* @param[in] otp the thread to be switched out
*/
-#if !CH_DBG_ENABLE_STACK_CHECK || defined(__DOXYGEN__)
+#if (CH_DBG_ENABLE_STACK_CHECK == FALSE) || defined(__DOXYGEN__)
#define port_switch(ntp, otp) _port_switch(ntp, otp)
#else
#define port_switch(ntp, otp) { \
@@ -306,7 +306,7 @@ static inline syssts_t port_get_irq_status(void) { */
static inline bool port_irq_enabled(syssts_t sts) {
- return (sts & 1) == 0;
+ return (sts & (syssts_t)1) == (syssts_t)0;
}
/**
@@ -318,7 +318,7 @@ static inline bool port_irq_enabled(syssts_t sts) { */
static inline bool port_is_isr_context(void) {
- return (bool)((__get_IPSR() & 0x1FF) != 0);
+ return (bool)((__get_IPSR() & 0x1FFU) != 0U);
}
/**
@@ -393,7 +393,7 @@ static inline void port_enable(void) { */
static inline void port_wait_for_interrupt(void) {
-#if CORTEX_ENABLE_WFI_IDLE
+#if CORTEX_ENABLE_WFI_IDLE == TRUE
__WFI();
#endif
}
|