aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/include
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-03-11 15:05:09 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-03-11 15:05:09 +0000
commitfc2af0f5896de947b3c59a9251ac4eef91ed005c (patch)
treeca279f1743bf50839eede1f497380706ee9e0af0 /os/hal/include
parent18202523f8727dcebb27ed2f9f6d3060e6474c5a (diff)
downloadChibiOS-fc2af0f5896de947b3c59a9251ac4eef91ed005c.tar.gz
ChibiOS-fc2af0f5896de947b3c59a9251ac4eef91ed005c.tar.bz2
ChibiOS-fc2af0f5896de947b3c59a9251ac4eef91ed005c.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7759 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/include')
-rw-r--r--os/hal/include/hal_channels.h12
-rw-r--r--os/hal/include/hal_queues.h4
-rw-r--r--os/hal/include/serial.h10
3 files changed, 13 insertions, 13 deletions
diff --git a/os/hal/include/hal_channels.h b/os/hal/include/hal_channels.h
index 21d4834de..a57255b85 100644
--- a/os/hal/include/hal_channels.h
+++ b/os/hal/include/hal_channels.h
@@ -203,17 +203,17 @@ typedef struct {
* @{
*/
/** @brief No pending conditions.*/
-#define CHN_NO_ERROR 0
+#define CHN_NO_ERROR (eventflags_t)0
/** @brief Connection happened.*/
-#define CHN_CONNECTED 1
+#define CHN_CONNECTED (eventflags_t)1
/** @brief Disconnection happened.*/
-#define CHN_DISCONNECTED 2
+#define CHN_DISCONNECTED (eventflags_t)2
/** @brief Data available in the input queue.*/
-#define CHN_INPUT_AVAILABLE 4
+#define CHN_INPUT_AVAILABLE (eventflags_t)4
/** @brief Output queue empty.*/
-#define CHN_OUTPUT_EMPTY 8
+#define CHN_OUTPUT_EMPTY (eventflags_t)8
/** @brief Transmission end.*/
-#define CHN_TRANSMISSION_END 16
+#define CHN_TRANSMISSION_END (eventflags_t)16
/** @} */
/**
diff --git a/os/hal/include/hal_queues.h b/os/hal/include/hal_queues.h
index 62c08d11c..9e0d0d866 100644
--- a/os/hal/include/hal_queues.h
+++ b/os/hal/include/hal_queues.h
@@ -40,8 +40,8 @@
#define Q_OK MSG_OK /**< @brief Operation successful. */
#define Q_TIMEOUT MSG_TIMEOUT /**< @brief Timeout condition. */
#define Q_RESET MSG_RESET /**< @brief Queue has been reset. */
-#define Q_EMPTY -3 /**< @brief Queue empty. */
-#define Q_FULL -4 /**< @brief Queue full, */
+#define Q_EMPTY (msg_t)-3 /**< @brief Queue empty. */
+#define Q_FULL (msg_t)-4 /**< @brief Queue full, */
/** @} */
/**
diff --git a/os/hal/include/serial.h b/os/hal/include/serial.h
index 3e0d1263e..24b4bd802 100644
--- a/os/hal/include/serial.h
+++ b/os/hal/include/serial.h
@@ -38,11 +38,11 @@
* @name Serial status flags
* @{
*/
-#define SD_PARITY_ERROR 32 /**< @brief Parity error happened. */
-#define SD_FRAMING_ERROR 64 /**< @brief Framing error happened. */
-#define SD_OVERRUN_ERROR 128 /**< @brief Overflow happened. */
-#define SD_NOISE_ERROR 256 /**< @brief Noise on the line. */
-#define SD_BREAK_DETECTED 512 /**< @brief Break detected. */
+#define SD_PARITY_ERROR (eventflags_t)32 /**< @brief Parity. */
+#define SD_FRAMING_ERROR (eventflags_t)64 /**< @brief Framing. */
+#define SD_OVERRUN_ERROR (eventflags_t)128 /**< @brief Overflow. */
+#define SD_NOISE_ERROR (eventflags_t)256 /**< @brief Line noise. */
+#define SD_BREAK_DETECTED (eventflags_t)512 /**< @brief LIN Break. */
/** @} */
/*===========================================================================*/