Explorar o código

rename to simply OPT_MCU_MSP432E4, add msp432e to ci

hathach %!s(int64=4) %!d(string=hai) anos
pai
achega
f65917f51a

+ 1 - 0
.github/workflows/build_arm.yml

@@ -45,6 +45,7 @@ jobs:
         - 'lpc54'
         - 'lpc55'
         - 'mm32'
+        - 'msp430e4'
         - 'nrf'
         - 'rp2040'
         - 'samd11'

+ 1 - 1
hw/bsp/board_mcu.h

@@ -98,7 +98,7 @@
 #elif CFG_TUSB_MCU == OPT_MCU_MSP430x5xx
   #include "msp430.h"
 
-#elif CFG_TUSB_MCU == OPT_MCU_MSP432E4xx
+#elif CFG_TUSB_MCU == OPT_MCU_MSP432E4
   #include "msp.h"
 
 #elif CFG_TUSB_MCU == OPT_MCU_VALENTYUSB_EPTRI

+ 1 - 1
hw/bsp/msp432e4/family.mk

@@ -9,7 +9,7 @@ CFLAGS += \
 	-mfloat-abi=hard \
 	-mfpu=fpv4-sp-d16 \
 	-D__MSP432E401Y__ \
-	-DCFG_TUSB_MCU=OPT_MCU_MSP432E4xx
+	-DCFG_TUSB_MCU=OPT_MCU_MSP432E4
 
 # mcu driver cause following warnings
 CFLAGS += -Wno-error=cast-qual -Wno-error=format=

+ 1 - 1
src/class/audio/audio_device.c

@@ -103,7 +103,7 @@
     CFG_TUSB_MCU == OPT_MCU_LPC18XX                               || \
     CFG_TUSB_MCU == OPT_MCU_LPC43XX                               || \
     CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX                            || \
-    CFG_TUSB_MCU == OPT_MCU_MSP432E4xx
+    CFG_TUSB_MCU == OPT_MCU_MSP432E4
 #if TUD_AUDIO_PREFER_RING_BUFFER
 #define  USE_LINEAR_BUFFER     0
 #else

+ 1 - 1
src/device/dcd_attr.h

@@ -146,7 +146,7 @@
 #elif TU_CHECK_MCU(OPT_MCU_MSP430x5xx)
   #define DCD_ATTR_ENDPOINT_MAX   8
 
-#elif TU_CHECK_MCU(OPT_MCU_MSP432E4xx, OPT_MCU_TM4C123, OPT_MCU_TM4C129)
+#elif TU_CHECK_MCU(OPT_MCU_MSP432E4, OPT_MCU_TM4C123, OPT_MCU_TM4C129)
   #define DCD_ATTR_ENDPOINT_MAX   8
 
 //------------- ValentyUSB -------------//

+ 2 - 2
src/portable/mentor/musb/dcd_musb.c

@@ -26,7 +26,7 @@
 
 #include "tusb_option.h"
 
-#if TU_CHECK_MCU(OPT_MCU_MSP432E4xx, OPT_MCU_TM4C123, OPT_MCU_TM4C129)
+#if TU_CHECK_MCU(OPT_MCU_MSP432E4, OPT_MCU_TM4C123, OPT_MCU_TM4C129)
 
 #if __GNUC__ > 8 && defined(__ARM_FEATURE_UNALIGNED)
 /* GCC warns that an address may be unaligned, even though
@@ -36,7 +36,7 @@ _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"");
 
 #include "device/dcd.h"
 
-#if TU_CHECK_MCU(OPT_MCU_MSP432E4xx)
+#if TU_CHECK_MCU(OPT_MCU_MSP432E4)
   #include "musb_msp432e.h"
 
 #elif TU_CHECK_MCU(OPT_MCU_TM4C123, OPT_MCU_TM4C129)

+ 2 - 2
src/tusb_option.h

@@ -84,9 +84,9 @@
 // Sony
 #define OPT_MCU_CXD56             400 ///< SONY CXD56
 
-// TI MSP430
+// TI
 #define OPT_MCU_MSP430x5xx        500 ///< TI MSP430x5xx
-#define OPT_MCU_MSP432E4xx        510 ///< TI MSP432E4xx
+#define OPT_MCU_MSP432E4          510 ///< TI MSP432E4xx
 #define OPT_MCU_TM4C123           511 ///< TI Tiva-C 123x
 #define OPT_MCU_TM4C129           512 ///< TI Tiva-C 129x