Modernize GD32 code: casts, constexpr, includes

Replace raw memsets and C-style casts with explicit loops and reinterpret_casts in bootloader and vector setup; ensure reset vector and MSP are set with correct pointer casts. Convert several FMC/flash macros to inline constexpr (and keep FMC_SIZE as a macro) and fix sector_name types in fmc_operation to use integer types without redundant casts. Update include handling to prefer -isystem for CMSIS and library headers and add Gd32FirmwareOps.mk to set additional compiler warning flags. Adjust IRQ handler/IRQn defines for GD32F30X_XD variant and simplify TIMER_INTF writes by removing static_casts; remove outdated GCC diagnostic push/pop wrappers in gd32xxxx.h.

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-flashcode/src/gd32/f4xx/fmc_operation.cpp

@@ -53,7 +53,7 @@ fmc_sector_info_struct fmc_sector_info_get(uint32_t addr) {
             /* bank0 area */
             temp = (addr - FMC_BANK0_START_ADDRESS) / SIZE_16KB;
             if (4U > temp) {
-                sector_info.sector_name = (uint32_t)temp;
+                sector_info.sector_name = temp;
                 sector_info.sector_num = CTL_SN(temp);
                 sector_info.sector_size = SIZE_16KB;
                 sector_info.sector_start_addr = FMC_BANK0_START_ADDRESS + (SIZE_16KB * temp);
@@ -66,7 +66,7 @@ fmc_sector_info_struct fmc_sector_info_get(uint32_t addr) {
                 sector_info.sector_end_addr = 0x0801FFFFU;
             } else {
                 temp = (addr - FMC_BANK0_START_ADDRESS) / SIZE_128KB;
-                sector_info.sector_name = (uint32_t)(temp + 4);
+                sector_info.sector_name = (temp + 4);
                 sector_info.sector_num = CTL_SN(temp + 4);
                 sector_info.sector_size = SIZE_128KB;
                 sector_info.sector_start_addr = FMC_BANK0_START_ADDRESS + (SIZE_128KB * temp);
@@ -76,7 +76,7 @@ fmc_sector_info_struct fmc_sector_info_get(uint32_t addr) {
             /* bank1 area */
             temp = (addr - FMC_BANK1_START_ADDRESS) / SIZE_16KB;
             if (4U > temp) {
-                sector_info.sector_name = (uint32_t)(temp + 12);
+                sector_info.sector_name = (temp + 12);
                 sector_info.sector_num = CTL_SN(temp + 16);
                 sector_info.sector_size = SIZE_16KB;
                 sector_info.sector_start_addr = FMC_BANK0_START_ADDRESS + (SIZE_16KB * temp);
@@ -89,14 +89,14 @@ fmc_sector_info_struct fmc_sector_info_get(uint32_t addr) {
                 sector_info.sector_end_addr = 0x0811FFFFU;
             } else if (64U > temp) {
                 temp = (addr - FMC_BANK1_START_ADDRESS) / SIZE_128KB;
-                sector_info.sector_name = (uint32_t)(temp + 16);
+                sector_info.sector_name = (temp + 16);
                 sector_info.sector_num = CTL_SN(temp + 20);
                 sector_info.sector_size = SIZE_128KB;
                 sector_info.sector_start_addr = FMC_BANK1_START_ADDRESS + (SIZE_128KB * temp);
                 sector_info.sector_end_addr = sector_info.sector_start_addr + SIZE_128KB - 1;
             } else {
                 temp = (addr - FMC_BANK1_START_ADDRESS) / SIZE_256KB;
-                sector_info.sector_name = (uint32_t)(temp + 20);
+                sector_info.sector_name = (temp + 20);
                 sector_info.sector_num = CTL_SN(temp + 8);
                 sector_info.sector_size = SIZE_256KB;
                 sector_info.sector_start_addr = FMC_BANK1_START_ADDRESS + (SIZE_256KB * temp);

lib-flashcode/src/gd32/f4xx/fmc_operation.h

@@ -50,25 +50,25 @@ typedef struct {
     uint32_t sector_end_addr;   /*!< the end address of the sector */
 } fmc_sector_info_struct;
 
-/* sector size */
-#define SIZE_16KB               ((uint32_t)0x00004000U) /*!< size of 16KB*/
-#define SIZE_64KB               ((uint32_t)0x00010000U) /*!< size of 64KB*/
-#define SIZE_128KB              ((uint32_t)0x00020000U) /*!< size of 128KB*/
-#define SIZE_256KB              ((uint32_t)0x00040000U) /*!< size of 256KB*/
+// sector size
+inline constexpr uint32_t SIZE_16KB = 0x00004000U;  /*!< size of 16KB*/
+inline constexpr uint32_t SIZE_64KB = 0x00010000U;  /*!< size of 64KB*/
+inline constexpr uint32_t SIZE_128KB = 0x00020000U; /*!< size of 128KB*/
+inline constexpr uint32_t SIZE_256KB = 0x00040000U; /*!< size of 256KB*/
 
 /* FMC BANK address */
-#define FMC_START_ADDRESS       FLASH_BASE                            /*!< FMC start address */
-#define FMC_BANK0_START_ADDRESS FMC_START_ADDRESS                     /*!< FMC BANK0 start address */
-#define FMC_BANK1_START_ADDRESS ((uint32_t)0x08100000U)               /*!< FMC BANK1 start address */
-#define FMC_SIZE                (*(uint16_t*)0x1FFF7A22U)             /*!< FMC SIZE */
-#define FMC_END_ADDRESS         (FLASH_BASE + (FMC_SIZE * 1024) - 1)  /*!< FMC end address */
-#define FMC_MAX_END_ADDRESS     ((uint32_t)0x08300000U)               /*!< FMC maximum end address */
+inline constexpr uint32_t FMC_START_ADDRESS = FLASH_BASE;              /*!< FMC start address */
+inline constexpr uint32_t FMC_BANK0_START_ADDRESS = FMC_START_ADDRESS; /*!< FMC BANK0 start address */
+inline constexpr uint32_t FMC_BANK1_START_ADDRESS = 0x08100000U;       /*!< FMC BANK1 start address */
+#define FMC_SIZE          (*reinterpret_cast<uint16_t*>(0x1FFF7A22U))
+#define FMC_END_ADDRESS   (FLASH_BASE + (FMC_SIZE * 1024) - 1) /*!< FMC end address */
+inline constexpr uint32_t FMC_MAX_END_ADDRESS = 0x08300000U; /*!< FMC maximum end address */
 
 /* FMC error message */
-#define FMC_WRONG_SECTOR_NAME   ((uint32_t)0xFFFFFFFFU) /*!< wrong sector name*/
-#define FMC_WRONG_SECTOR_NUM    ((uint32_t)0xFFFFFFFFU) /*!< wrong sector number*/
-#define FMC_INVALID_SIZE        ((uint32_t)0xFFFFFFFFU) /*!< invalid sector size*/
-#define FMC_INVALID_ADDR        ((uint32_t)0xFFFFFFFFU) /*!< invalid sector address*/
+inline constexpr uint32_t FMC_WRONG_SECTOR_NAME = 0xFFFFFFFFU; /*!< wrong sector name*/
+inline constexpr uint32_t FMC_WRONG_SECTOR_NUM = 0xFFFFFFFFU;  /*!< wrong sector number*/
+inline constexpr uint32_t FMC_INVALID_SIZE = 0xFFFFFFFFU;      /*!< invalid sector size*/
+inline constexpr uint32_t FMC_INVALID_ADDR = 0xFFFFFFFFU;      /*!< invalid sector address*/
 
 /* get the sector number, size and range of the given address */
 fmc_sector_info_struct fmc_sector_info_get(uint32_t addr); // NOLINT

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
 }