Skip to content

Commit 223ccbf

Browse files
committed
can: Move preprocessor conflicts to src files
The GigaDevices CAN driver uses similar names defined in Zephyr. This moves conflicts to source files. Signed-off-by: Gerson Fernando Budke <[email protected]>
1 parent 170272e commit 223ccbf

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

GD32F403/standard_peripheral/Include/gd32f403_can.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -592,12 +592,6 @@ typedef enum
592592

593593
#define CAN_STATE_PENDING ((uint32_t)0x00000000U) /*!< CAN pending */
594594

595-
/* CAN communication mode */
596-
#define CAN_NORMAL_MODE ((uint8_t)0x00U) /*!< normal communication mode */
597-
#define CAN_LOOPBACK_MODE ((uint8_t)0x01U) /*!< loopback communication mode */
598-
#define CAN_SILENT_MODE ((uint8_t)0x02U) /*!< silent communication mode */
599-
#define CAN_SILENT_LOOPBACK_MODE ((uint8_t)0x03U) /*!< loopback and silent communication mode */
600-
601595
/* CAN resynchronisation jump width */
602596
#define CAN_BT_SJW_1TQ ((uint8_t)0x00U) /*!< 1 time quanta */
603597
#define CAN_BT_SJW_2TQ ((uint8_t)0x01U) /*!< 2 time quanta */
@@ -672,9 +666,6 @@ typedef enum
672666
#define CAN_FT_DATA ((uint32_t)0x00000000U) /*!< data frame */
673667
#define CAN_FT_REMOTE ((uint32_t)0x00000002U) /*!< remote frame */
674668

675-
/* CAN timeout */
676-
#define CAN_TIMEOUT ((uint32_t)0x0000FFFFU) /*!< timeout value */
677-
678669
/* interrupt enable bits */
679670
#define CAN_INT_TME CAN_INTEN_TMEIE /*!< transmit mailbox empty interrupt enable */
680671
#define CAN_INT_RFNE0 CAN_INTEN_RFNEIE0 /*!< receive FIFO0 not empty interrupt enable */

GD32F403/standard_peripheral/Source/gd32f403_can.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ OF SUCH DAMAGE.
3838

3939
#include "gd32f403_can.h"
4040

41+
/* CAN communication mode */
42+
#define CAN_NORMAL_MODE ((uint8_t)0x00U) /*!< normal communication mode */
43+
#define CAN_LOOPBACK_MODE ((uint8_t)0x01U) /*!< loopback communication mode */
44+
#define CAN_SILENT_MODE ((uint8_t)0x02U) /*!< silent communication mode */
45+
#define CAN_SILENT_LOOPBACK_MODE ((uint8_t)0x03U) /*!< loopback and silent communication mode */
46+
47+
/* CAN timeout */
48+
#define CAN_TIMEOUT ((uint32_t)0x0000FFFFU) /*!< timeout value */
49+
4150
#define CAN_ERROR_HANDLE(s) do{}while(1)
4251

4352
/*!

GD32VF103/standard_peripheral/Include/gd32vf103_can.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -592,12 +592,6 @@ typedef enum
592592

593593
#define CAN_STATE_PENDING ((uint32_t)0x00000000U) /*!< CAN pending */
594594

595-
/* CAN communication mode */
596-
#define CAN_NORMAL_MODE ((uint8_t)0x00U) /*!< normal communication mode */
597-
#define CAN_LOOPBACK_MODE ((uint8_t)0x01U) /*!< loopback communication mode */
598-
#define CAN_SILENT_MODE ((uint8_t)0x02U) /*!< silent communication mode */
599-
#define CAN_SILENT_LOOPBACK_MODE ((uint8_t)0x03U) /*!< loopback and silent communication mode */
600-
601595
/* CAN resynchronisation jump width */
602596
#define CAN_BT_SJW_1TQ ((uint8_t)0x00U) /*!< 1 time quanta */
603597
#define CAN_BT_SJW_2TQ ((uint8_t)0x01U) /*!< 2 time quanta */
@@ -672,9 +666,6 @@ typedef enum
672666
#define CAN_FT_DATA ((uint32_t)0x00000000U) /*!< data frame */
673667
#define CAN_FT_REMOTE ((uint32_t)0x00000002U) /*!< remote frame */
674668

675-
/* CAN timeout */
676-
#define CAN_TIMEOUT ((uint32_t)0x0000FFFFU) /*!< timeout value */
677-
678669
/* interrupt enable bits */
679670
#define CAN_INT_TME CAN_INTEN_TMEIE /*!< transmit mailbox empty interrupt enable */
680671
#define CAN_INT_RFNE0 CAN_INTEN_RFNEIE0 /*!< receive FIFO0 not empty interrupt enable */

GD32VF103/standard_peripheral/Source/gd32vf103_can.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ OF SUCH DAMAGE.
3838

3939
#include "gd32vf103_can.h"
4040

41+
/* CAN communication mode */
42+
#define CAN_NORMAL_MODE ((uint8_t)0x00U) /*!< normal communication mode */
43+
#define CAN_LOOPBACK_MODE ((uint8_t)0x01U) /*!< loopback communication mode */
44+
#define CAN_SILENT_MODE ((uint8_t)0x02U) /*!< silent communication mode */
45+
#define CAN_SILENT_LOOPBACK_MODE ((uint8_t)0x03U) /*!< loopback and silent communication mode */
46+
47+
/* CAN timeout */
48+
#define CAN_TIMEOUT ((uint32_t)0x0000FFFFU) /*!< timeout value */
49+
4150
#define CAN_ERROR_HANDLE(s) do{}while(1)
4251

4352
/*!

0 commit comments

Comments
 (0)