diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-03-18 08:04:23 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-03-18 08:04:23 +0000 |
| commit | a18251e55dfe905bc0d41844e9f0b011a6d59faa (patch) | |
| tree | c6b582f877ff7cc2d4a5529f1fbeb43eaddc8d15 /os/hal/ports | |
| parent | 8a2f2148361d318ff2991012b8ad9930d6cabf58 (diff) | |
| download | ChibiOS-a18251e55dfe905bc0d41844e9f0b011a6d59faa.tar.gz ChibiOS-a18251e55dfe905bc0d41844e9f0b011a6d59faa.tar.bz2 ChibiOS-a18251e55dfe905bc0d41844e9f0b011a6d59faa.zip | |
Fixed problems introduced in the CAN driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11810 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/hal/ports')
| -rw-r--r-- | os/hal/ports/STM32/LLD/CANv1/hal_can_lld.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/os/hal/ports/STM32/LLD/CANv1/hal_can_lld.h b/os/hal/ports/STM32/LLD/CANv1/hal_can_lld.h index 89050569d..4c95dfda0 100644 --- a/os/hal/ports/STM32/LLD/CANv1/hal_can_lld.h +++ b/os/hal/ports/STM32/LLD/CANv1/hal_can_lld.h @@ -198,7 +198,7 @@ typedef struct CANDriver CANDriver; */
typedef uint32_t canmbx_t;
-#if defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#if (CAN_ENFORCE_USE_CALLBACKS == TRUE) || defined(__DOXYGEN__)
/**
* @brief Type of a CAN notification callback.
*
@@ -342,7 +342,7 @@ struct CANDriver { * @brief Receive threads queue.
*/
threads_queue_t rxqueue;
-#if !defined(CAN_ENFORCE_USE_CALLBACKS)
+#if (CAN_ENFORCE_USE_CALLBACKS == FALSE) || defined(__DOXYGEN__)
/**
* @brief One or more frames become available.
* @note After broadcasting this event it will not be broadcasted again
@@ -382,7 +382,7 @@ struct CANDriver { */
event_source_t wakeup_event;
#endif /* CAN_USE_SLEEP_MODE */
-#else /* defined(CAN_ENFORCE_USE_CALLBACKS) */
+#else /* CAN_ENFORCE_USE_CALLBACKS == TRUE */
/**
* @brief One or more frames become available.
* @note After calling this function it will not be called again
|