use max32 cmsis, fix NVIC_GetEnableIRQ() not defined when using with CMISIS < 5

12 files changed, 55 insertions, 17 deletions

diff --git a/hw/bsp/max32650/family.c b/hw/bsp/max32650/family.c
index 16b5233b9..89a5db160 100644
--- a/hw/bsp/max32650/family.c
+++ b/hw/bsp/max32650/family.c
@@ -24,12 +24,24 @@
  * This file is part of the TinyUSB stack.
  */
 
-#include "board.h"
-#include "bsp/board_api.h"
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes" // _mxc_crit_get_state()
+#endif
+
 #include "gpio.h"
+#include "mxc_sys.h"
 #include "mxc_device.h"
 #include "uart.h"
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+#include "board.h"
+#include "bsp/board_api.h"
+
+
 //--------------------------------------------------------------------+
 // Forward USB interrupt events to TinyUSB IRQ Handler
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/max32650/family.cmake b/hw/bsp/max32650/family.cmake
index 92b68a1cd..8c4f286a2 100644
--- a/hw/bsp/max32650/family.cmake
+++ b/hw/bsp/max32650/family.cmake
@@ -74,7 +74,6 @@ function(add_board_target BOARD_TARGET)
     )
   target_include_directories(${BOARD_TARGET} PUBLIC
     ${CMAKE_CURRENT_FUNCTION_LIST_DIR}
-    ${CMSIS_5}/CMSIS/Core/Include
     ${MAX32_CMSIS}/Include
     ${MAX32_CMSIS}/Device/Maxim/MAX32650/Include
     ${MAX32_PERIPH}/Include/MAX32650
diff --git a/hw/bsp/max32650/family.mk b/hw/bsp/max32650/family.mk
index 359261216..d2fc293e4 100644
--- a/hw/bsp/max32650/family.mk
+++ b/hw/bsp/max32650/family.mk
@@ -82,14 +82,13 @@ SRC_C += \
 	$(PERIPH_SRC)/ICC/icc_reva.c \
 	$(PERIPH_SRC)/ICC/icc_common.c \
 	$(PERIPH_SRC)/TPU/tpu_me10.c \
-    $(PERIPH_SRC)/TPU/tpu_reva.c \
+	$(PERIPH_SRC)/TPU/tpu_reva.c \
 	$(PERIPH_SRC)/UART/uart_common.c \
 	$(PERIPH_SRC)/UART/uart_me10.c \
 	$(PERIPH_SRC)/UART/uart_reva.c \
 
 INC += \
 	$(TOP)/$(BOARD_PATH) \
-	$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
 	$(TOP)/$(MAX32_CMSIS)/Include \
 	$(TOP)/$(MAX32_CMSIS)/Device/Maxim/MAX32650/Include \
 	$(TOP)/$(MAX32_PERIPH)/Include/MAX32650 \
diff --git a/hw/bsp/max32666/family.c b/hw/bsp/max32666/family.c
index 1398e09ff..8ee4b6762 100644
--- a/hw/bsp/max32666/family.c
+++ b/hw/bsp/max32666/family.c
@@ -24,13 +24,24 @@
  * This file is part of the TinyUSB stack.
  */
 
-#include "board.h"
-#include "bsp/board_api.h"
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes" // _mxc_crit_get_state()
+#endif
+
 #include "gpio.h"
+#include "mxc_sys.h"
 #include "mcr_regs.h"
 #include "mxc_device.h"
 #include "uart.h"
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+#include "board.h"
+#include "bsp/board_api.h"
+
 //--------------------------------------------------------------------+
 // Forward USB interrupt events to TinyUSB IRQ Handler
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/max32666/family.cmake b/hw/bsp/max32666/family.cmake
index eb9d2175f..4a3f1a428 100644
--- a/hw/bsp/max32666/family.cmake
+++ b/hw/bsp/max32666/family.cmake
@@ -70,7 +70,6 @@ function(add_board_target BOARD_TARGET)
     )
   target_include_directories(${BOARD_TARGET} PUBLIC
     ${CMAKE_CURRENT_FUNCTION_LIST_DIR}
-    ${CMSIS_5}/CMSIS/Core/Include
     ${MAX32_CMSIS}/Include
     ${MAX32_CMSIS}/Device/Maxim/MAX32665/Include
     ${MAX32_PERIPH}/Include/MAX32665
diff --git a/hw/bsp/max32666/family.mk b/hw/bsp/max32666/family.mk
index 720d994ef..b4f7d1e57 100644
--- a/hw/bsp/max32666/family.mk
+++ b/hw/bsp/max32666/family.mk
@@ -82,7 +82,6 @@ SRC_C += \
 
 INC += \
 	$(TOP)/$(BOARD_PATH) \
-	$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
 	$(TOP)/$(MAX32_CMSIS)/Include \
 	$(TOP)/$(MAX32_CMSIS)/Device/Maxim/MAX32665/Include \
 	$(TOP)/$(MAX32_PERIPH)/Include/MAX32665 \
diff --git a/hw/bsp/max32690/family.c b/hw/bsp/max32690/family.c
index f4998bdbe..2418168d4 100644
--- a/hw/bsp/max32690/family.c
+++ b/hw/bsp/max32690/family.c
@@ -24,13 +24,25 @@
  * This file is part of the TinyUSB stack.
  */
 
-#include "board.h"
-#include "bsp/board_api.h"
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes" // _mxc_crit_get_state()
+#endif
+
 #include "gpio.h"
+#include "mxc_sys.h"
 #include "mcr_regs.h"
 #include "mxc_device.h"
 #include "uart.h"
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+#include "board.h"
+#include "bsp/board_api.h"
+
+
 //--------------------------------------------------------------------+
 // Forward USB interrupt events to TinyUSB IRQ Handler
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/max32690/family.cmake b/hw/bsp/max32690/family.cmake
index 2a9422dbe..58647e432 100644
--- a/hw/bsp/max32690/family.cmake
+++ b/hw/bsp/max32690/family.cmake
@@ -75,7 +75,6 @@ function(add_board_target BOARD_TARGET)
     )
   target_include_directories(${BOARD_TARGET} PUBLIC
     ${CMAKE_CURRENT_FUNCTION_LIST_DIR}
-    ${CMSIS_5}/CMSIS/Core/Include
     ${MAX32_CMSIS}/Include
     ${MAX32_CMSIS}/Device/Maxim/MAX32690/Include
     ${MAX32_PERIPH}/Include/MAX32690
diff --git a/hw/bsp/max32690/family.mk b/hw/bsp/max32690/family.mk
index c533cf4a4..d4df8ef2f 100644
--- a/hw/bsp/max32690/family.mk
+++ b/hw/bsp/max32690/family.mk
@@ -90,7 +90,6 @@ SRC_C += \
 
 INC += \
 	$(TOP)/$(BOARD_PATH) \
-	$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
 	$(TOP)/$(MAX32_CMSIS)/Include \
 	$(TOP)/$(MAX32_CMSIS)/Device/Maxim/MAX32690/Include \
 	$(TOP)/$(MAX32_PERIPH)/Include/MAX32690 \
diff --git a/hw/bsp/max78002/family.c b/hw/bsp/max78002/family.c
index 7758083a2..8d51f141c 100644
--- a/hw/bsp/max78002/family.c
+++ b/hw/bsp/max78002/family.c
@@ -24,13 +24,24 @@
  * This file is part of the TinyUSB stack.
  */
 
-#include "board.h"
-#include "bsp/board_api.h"
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes" // _mxc_crit_get_state()
+#endif
+
 #include "gpio.h"
+#include "mxc_sys.h"
 #include "mcr_regs.h"
 #include "mxc_device.h"
 #include "uart.h"
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+#include "board.h"
+#include "bsp/board_api.h"
+
 //--------------------------------------------------------------------+
 // Forward USB interrupt events to TinyUSB IRQ Handler
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/max78002/family.cmake b/hw/bsp/max78002/family.cmake
index 090f1da43..446930bd8 100644
--- a/hw/bsp/max78002/family.cmake
+++ b/hw/bsp/max78002/family.cmake
@@ -72,7 +72,6 @@ function(add_board_target BOARD_TARGET)
     )
   target_include_directories(${BOARD_TARGET} PUBLIC
     ${CMAKE_CURRENT_FUNCTION_LIST_DIR}
-    ${CMSIS_5}/CMSIS/Core/Include
     ${MAX32_CMSIS}/Include
     ${MAX32_CMSIS}/Device/Maxim/MAX78002/Include
     ${MAX32_PERIPH}/Include/MAX78002
diff --git a/hw/bsp/max78002/family.mk b/hw/bsp/max78002/family.mk
index 5297815de..997816261 100644
--- a/hw/bsp/max78002/family.mk
+++ b/hw/bsp/max78002/family.mk
@@ -87,7 +87,6 @@ SRC_C += \
 
 INC += \
 	$(TOP)/$(BOARD_PATH) \
-	$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
 	$(TOP)/$(MAX32_CMSIS)/Include \
 	$(TOP)/$(MAX32_CMSIS)/Device/Maxim/MAX78002/Include \
 	$(TOP)/$(MAX32_PERIPH)/Include/MAX78002 \