Skip to content

Commit 3782f3d

Browse files
committed
gd32f4xx: can: Rename preprocessor
The GigaDevices CAN driver uses similar names defined in Zephyr. This add prefix '__' to solve the conflict. Signed-off-by: HaiLong Yang <[email protected]>
1 parent db8c7aa commit 3782f3d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

GD32F4XX/standard_peripheral/Include/gd32f4xx_can.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,10 @@ typedef enum
594594
#define CAN_STATE_PENDING ((uint32_t)0x00000000U) /*!< CAN pending */
595595

596596
/* CAN communication mode */
597-
#define CAN_NORMAL_MODE ((uint8_t)0x00U) /*!< normal communication mode */
598-
#define CAN_LOOPBACK_MODE ((uint8_t)0x01U) /*!< loopback communication mode */
599-
#define CAN_SILENT_MODE ((uint8_t)0x02U) /*!< silent communication mode */
600-
#define CAN_SILENT_LOOPBACK_MODE ((uint8_t)0x03U) /*!< loopback and silent communication mode */
597+
#define __CAN_NORMAL_MODE ((uint8_t)0x00U) /*!< normal communication mode */
598+
#define __CAN_LOOPBACK_MODE ((uint8_t)0x01U) /*!< loopback communication mode */
599+
#define __CAN_SILENT_MODE ((uint8_t)0x02U) /*!< silent communication mode */
600+
#define __CAN_SILENT_LOOPBACK_MODE ((uint8_t)0x03U) /*!< loopback and silent communication mode */
601601

602602
/* CAN resynchronisation jump width */
603603
#define CAN_BT_SJW_1TQ ((uint8_t)0x00U) /*!< 1 time quanta */
@@ -674,7 +674,7 @@ typedef enum
674674
#define CAN_FT_REMOTE ((uint32_t)0x00000002U) /*!< remote frame */
675675

676676
/* CAN timeout */
677-
#define CAN_TIMEOUT ((uint32_t)0x0000FFFFU) /*!< timeout value */
677+
#define __CAN_TIMEOUT ((uint32_t)0x0000FFFFU) /*!< timeout value */
678678

679679
/* interrupt enable bits */
680680
#define CAN_INT_TME CAN_INTEN_TMEIE /*!< transmit mailbox empty interrupt enable */

0 commit comments

Comments
 (0)