Skip to content

Commit 68df919

Browse files
ccli8ccli8
committed
Nuvoton: Remove DISABLE/ENABLE macro definitions in BSP
These are not used on Mbed OS. Remove them to avoid name conflict with other modules.
1 parent 0fa43ca commit 68df919

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

‎targets/TARGET_NUVOTON/TARGET_M2351/device/M2351.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ typedef volatile unsigned short vu16;
6262
#define TRUE (1L)
6363
#define FALSE (0L)
6464

65-
#define ENABLE 1
66-
#define DISABLE 0
65+
/* Not used on Mbed OS. Remove to get around name conflict */
66+
//#define ENABLE 1
67+
//#define DISABLE 0
6768

6869
/* Bit Mask Definitions */
6970
#define BIT0 0x00000001UL

‎targets/TARGET_NUVOTON/TARGET_M251/device/M251.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,8 +578,9 @@ typedef volatile unsigned short vu16;
578578
#define TRUE (1UL) ///< Boolean true, define to use in API parameters or return value
579579
#define FALSE (0UL) ///< Boolean false, define to use in API parameters or return value
580580

581-
#define ENABLE (1UL) ///< Enable, define to use in API parameters
582-
#define DISABLE (0UL) ///< Disable, define to use in API parameters
581+
/* Not used on Mbed OS. Remove to get around name conflict */
582+
//#define ENABLE (1UL) ///< Enable, define to use in API parameters
583+
//#define DISABLE (0UL) ///< Disable, define to use in API parameters
583584

584585
/* Define one bit mask */
585586
#define BIT0 (0x00000001UL) ///< Bit 0 mask of an 32 bit integer

‎targets/TARGET_NUVOTON/TARGET_M261/device/M261.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,9 @@ typedef volatile unsigned short vu16;
518518
#define TRUE (1L)
519519
#define FALSE (0L)
520520

521-
#define ENABLE 1
522-
#define DISABLE 0
521+
/* Not used on Mbed OS. Remove to get around name conflict */
522+
//#define ENABLE 1
523+
//#define DISABLE 0
523524

524525
/* Bit Mask Definitions */
525526
#define BIT0 0x00000001UL

‎targets/TARGET_NUVOTON/TARGET_M480/device/M480.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,9 @@ typedef volatile unsigned long vu32; ///< Define 32-bit unsigned volatile
608608
#define TRUE (1UL) ///< Boolean true, define to use in API parameters or return value
609609
#define FALSE (0UL) ///< Boolean false, define to use in API parameters or return value
610610

611-
#define ENABLE (1UL) ///< Enable, define to use in API parameters
612-
#define DISABLE (0UL) ///< Disable, define to use in API parameters
611+
/* Not used on Mbed OS. Remove to get around name conflict */
612+
//#define ENABLE (1UL) ///< Enable, define to use in API parameters
613+
//#define DISABLE (0UL) ///< Disable, define to use in API parameters
613614

614615
/* Define one bit mask */
615616
#define BIT0 (0x00000001UL) ///< Bit 0 mask of an 32 bit integer

‎targets/TARGET_NUVOTON/TARGET_NANO100/device/Nano100Series.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11838,8 +11838,9 @@ typedef volatile unsigned long vu32; ///< Define 32-bit unsigned volatile
1183811838
#define FALSE (0) ///< Boolean false, define to use in API parameters or return value
1183911839
#endif
1184011840

11841-
#define ENABLE (1) ///< Enable, define to use in API parameters
11842-
#define DISABLE (0) ///< Disable, define to use in API parameters
11841+
/* Not used on Mbed OS. Remove to get around name conflict */
11842+
//#define ENABLE (1) ///< Enable, define to use in API parameters
11843+
//#define DISABLE (0) ///< Disable, define to use in API parameters
1184311844

1184411845
/* Define one bit mask */
1184511846
#define BIT0 (0x00000001) ///< Bit 0 mask of an 32 bit integer

‎targets/TARGET_NUVOTON/TARGET_NUC472/device/NUC472_442.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32521,8 +32521,9 @@ typedef volatile unsigned long vu32; ///< Define 32-bit unsigned volatile
3252132521
#define FALSE (0) ///< Boolean false, define to use in API parameters or return value
3252232522
#endif
3252332523

32524-
#define ENABLE (1) ///< Enable, define to use in API parameters
32525-
#define DISABLE (0) ///< Disable, define to use in API parameters
32524+
/* Not used on Mbed OS. Remove to get around name conflict */
32525+
//#define ENABLE (1) ///< Enable, define to use in API parameters
32526+
//#define DISABLE (0) ///< Disable, define to use in API parameters
3252632527

3252732528
/* Define one bit mask */
3252832529
#define BIT0 (0x00000001) ///< Bit 0 mask of an 32 bit integer

0 commit comments

Comments
 (0)