Fix GD32 build warnings and IRQ handling

Replace NVIC memset calls with explicit register writes and tighten C++ casts (use reinterpret_cast) in bootloader to avoid UB and build warnings. Add Gd32FirmwareOps.mk to set compiler warning flags and reorganize Includes.mk to use -isystem for upstream headers and clean up include ordering. Update gd32xxxx.h to support GD32F30X_XD and remove intrusive diagnostic pragmas. Adjust TIMER IRQ names for GD32F30X_XD and remove unnecessary static_cast when clearing timer interrupt flags to silence warnings and simplify code.

Author: vanvught

bootloader-tftp/firmware/main.cpp

@@ -72,28 +72,32 @@ int main() {
         // 1. Disable interrupt response.
         __disable_irq();
         // 2. Disable all enabled interrupts in NVIC.
-        memset((uint32_t*)NVIC->ICER, 0xFF, sizeof(NVIC->ICER));
+                for (auto& reg : NVIC->ICER) {
+            reg = 0xFFFFFFFF;
+        }
         /* 3. Disable all enabled peripherals which might generate interrupt requests.
          *  Clear all pending interrupt flags in those peripherals.
          *  This part is device-dependent, and you can write it by referring to device datasheet.
          */
 
         /* Clear all pending interrupt requests in NVIC. */
-        memset((uint32_t*)NVIC->ICPR, 0xFF, sizeof(NVIC->ICPR));
+                for (auto& reg : NVIC->ICPR) {
+            reg = 0xFFFFFFFF;
+        }
         // 4. Disable SysTick and clear its exception pending bit.
         SysTick->CTRL = 0;
         SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
         // 5. Load the vector table address of user application code in to VTOR.
         SCB->VTOR = FLASH_BASE + OFFSET_UIMAGE;
         // 6. Use the MSP as the current SP.
         // Set the MSP with the value from the vector table used by the application.
-        __set_MSP(((unsigned int*)(SCB->VTOR))[0]);
+        __set_MSP((reinterpret_cast<unsigned int*>((SCB->VTOR))[0]));
         // In thread mode, enable privileged access and use the MSP as the current SP.
         __set_CONTROL(0);
         // 7. Enable interrupts.
         __enable_irq();
         // 8. Call the reset handler
-        const uint32_t* reset_p = (uint32_t*)(FLASH_BASE + OFFSET_UIMAGE + 4);
+        const uint32_t* reset_p = reinterpret_cast<uint32_t*>(FLASH_BASE + OFFSET_UIMAGE + 4);
         asm volatile("bx %0;" : : "r"(*reset_p));
     }
 

common/make/gd32/Gd32FirmwareOps.mk

@@ -0,0 +1,3 @@
+$(info "Gd32FirmwareOpts.mk")
+
+GD32FIRMWAREOPS=-Wno-error=unused-parameter -Wno-error=unused-but-set-variable -Wno-error=conversion -Wno-error=old-style-cast

common/make/gd32/Includes.mk

@@ -1,13 +1,14 @@
 $(info "Includes.mk")
 
-INCLUDES:=-I./include 
-INCLUDES+=-I../common/include -I../include 
-INCLUDES+=-I../firmware-template-gd32/include
-INCLUDES+=-I../CMSIS/Core/Include
-INCLUDES+=-I../lib-gd32/${FAMILY}/${FAMILY_UC}_standard_peripheral/Include
-INCLUDES+=-I../lib-gd32/${FAMILY}/CMSIS/GD/${FAMILY_UC}/Include
-INCLUDES+=-I../lib-gd32/include
+INCLUDES:=-I../include
+INCLUDES+=-isystem ../CMSIS/Core/Include
+INCLUDES+=-isystem ../lib-gd32/${FAMILY}/${FAMILY_UC}_standard_peripheral/Include
+INCLUDES+=-isystem ../lib-gd32/${FAMILY}/CMSIS/GD/${FAMILY_UC}/Include
+INCLUDES+=-isystem ../lib-gd32/include
+INCLUDES+=-isystem ../firmware-template-gd32/include
+INCLUDES+=-I../common/include
 INCLUDES+=-I../lib-hwclock/include
+INCLUDES+=-I./include
 
 INCLUDES+=$(addprefix -I,$(EXTRA_INCLUDES))
 
@@ -104,5 +105,5 @@ ifdef USB_HOST_MSC
 		INCLUDES+=-I../lib-fatfs
 endif
 
-INCLUDES:= $(strip -I../${PROJECT}/include $(sort $(INCLUDES)))
+#INCLUDES:= $(strip -I../${PROJECT}/include $(sort $(INCLUDES)))
 $(info $$INCLUDES [${INCLUDES}])

lib-gd32/include/gd32xxxx.h

@@ -26,26 +26,11 @@
 #ifndef GD32FXXX_H_
 #define GD32FXXX_H_
 
-// Needed for GD32 Firmware and CMSIS
-
-#ifdef __cplusplus
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuseless-cast"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wconversion"
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#if __cplusplus > 201402
-// error: compound assignment with 'volatile'-qualified left operand is
-// deprecated
-#pragma GCC diagnostic ignored "-Wvolatile"
-#endif
-#endif
-
 #if defined(GD32F10X_HD) || defined(GD32F10X_CL)
 #include "gd32f10x.h" // IWYU pragma: keep
 #elif defined(GD32F20X_CL)
 #include "gd32f20x.h" // IWYU pragma: keep
-#elif defined(GD32F30X_HD)
+#elif defined(GD32F30X_HD) || defined(GD32F30X_XD)
 #include "gd32f30x.h" // IWYU pragma: keep
 #elif defined(GD32F407) || defined(GD32F450) || defined(GD32F470)
 #include "gd32f4xx.h" // IWYU pragma: keep
@@ -56,8 +41,4 @@
 #error MCU is not supported
 #endif
 
-#ifdef __cplusplus
-#pragma GCC diagnostic pop
-#endif
-
 #endif // GD32FXXX_H_ */

lib-gd32/src/softuart0/uart0.cpp

@@ -35,8 +35,13 @@
 #elif defined(GD32F30X)
 #define TIMERx            TIMER7
 #define RCU_TIMERx        RCU_TIMER7
+#if defined (GD32F30X_XD)
+#define TIMERx_IRQHandler TIMER7_UP_TIMER12_IRQHandler
+#define TIMERx_IRQn       TIMER7_UP_TIMER12_IRQn
+#else
 #define TIMERx_IRQHandler TIMER7_UP_IRQHandler
 #define TIMERx_IRQn       TIMER7_UP_IRQn
+#endif
 #else
 #define TIMERx            TIMER9
 #define RCU_TIMERx        RCU_TIMER9
@@ -147,7 +152,7 @@ void TIMERx_IRQHandler() {
         }
     }
 
-    TIMER_INTF(TIMERx) = static_cast<uint32_t>(~kIntFlag);
+    TIMER_INTF(TIMERx) = ~kIntFlag;
 }
 #if defined(SOFTUART0_ENABLE_RX)
 void SOFTUART_RX_EXTIx_IRQHandler() {

lib-gd32/src/timer6.cpp

@@ -41,7 +41,7 @@ void TIMER6_IRQHandler() {
         gv_seconds.uptime = gv_seconds.uptime + 1;
     }
 
-    TIMER_INTF(TIMER6) = static_cast<uint32_t>(~kIntFlag);
+    TIMER_INTF(TIMER6) = ~kIntFlag;
 }
 #endif
 }