Refactor GD32 timers and platform glue

Introduce a unified `gd32_timers` module for DWT delays, millis/uptime, SysTick, and timer startup, replacing the old split timer/delay/millis sources and wiring board init to `gd32::timers::Start()`. Migrate users (USB, hwclock, EMAC, timing wrappers) to the new `gd32::DelayUs()` / `gd32::Millis()` API, add shared GPIO macro/types in `gd32_gpio_macros.h`, and centralize optional subsystem debug macros in `gd32_debug.h`. The change also includes broad conditional/format cleanup, updates to logic-analyzer/status LED behavior, and soft UART/GPIO configuration refinements to align platform code paths.

Author: vanvught

lib-board/src/gd32/board_init.cpp

@@ -23,8 +23,6 @@
  * THE SOFTWARE.
  */
 
-#include <cstddef>
-
 #if !defined(_TIME_STAMP_DAY_)
 #define _TIME_STAMP_DAY_ 0
 #endif
@@ -39,6 +37,11 @@
 #error
 #endif
 
+#if (defined(GD32F4XX) || defined(GD32H7XX)) && !defined(MCU_HAVE_GPIO_TG)
+#error
+#endif
+
+#include <cstddef>
 #include <cstring>
 #include <cstdio>
 #include <cassert>
@@ -65,31 +68,15 @@
 #include "board_statusled.h"
 #include "panelled.h"
 #include "logic_analyzer.h"
+#include "gd32_timers.h"
 
-#if defined(CONFIG_HAL_USE_SYSTICK)
-void SystickConfig();
-#endif
-
-void UdelayInit();
 void Gd32AdcInit();
 
 #if defined(GD32H7XX)
 void CacheEnable();
 void MpuConfig();
 #endif
 
-void Timer5Config();
-void Timer6Config();
-#if !defined(CONFIG_NET_ENABLE_PTP)
-#if defined(CONFIG_TIME_USE_TIMER)
-#if defined(GD32H7XX)
-void Timer16Config();
-#else
-void Timer7Config();
-#endif
-#endif
-#endif
-
 #if !defined(DISABLE_RTC)
 #include "hwclock.h"
 static HwClock hw_clock;
@@ -116,7 +103,7 @@ void Init() {
     uart0::Init();
 #endif
     // From here we console output
-#if defined (BOARD_DEBUG)
+#if defined(BOARD_DEBUG)
     putchar('\n');
 #endif
 
@@ -128,7 +115,7 @@ void Init() {
         // Clear section .dmx
         const auto kSize = static_cast<size_t>(&_edmx - &_sdmx);
         memset(&_sdmx, 0, kSize);
-#if defined (BOARD_DEBUG)
+#if defined(BOARD_DEBUG)
         printf("Cleared .dmx at %p, size %u\n", &_sdmx, kSize);
 #endif
     }
@@ -138,7 +125,7 @@ void Init() {
         // Clear section .lightset
         const auto kSize = static_cast<size_t>(&_elightset - &_slightset);
         memset(&_slightset, 0, kSize);
-#if defined (BOARD_DEBUG)
+#if defined(BOARD_DEBUG)
         printf("Cleared .lightset at %p, size %u\n", &_slightset, kSize);
 #endif
     }
@@ -147,7 +134,7 @@ void Init() {
         // Clear section .network
         const auto kSize = static_cast<size_t>(&_enetwork - &_snetwork);
         memset(&_snetwork, 0, kSize);
-#if defined (BOARD_DEBUG)
+#if defined(BOARD_DEBUG)
         printf("Cleared .network at %p, size %u\n", &_snetwork, kSize);
 #endif
     }
@@ -156,7 +143,7 @@ void Init() {
         // Clear section .pixel
         const auto kSize = static_cast<size_t>(&_epixel - &_spixel);
         memset(&_spixel, 0, kSize);
-#if defined (BOARD_DEBUG)
+#if defined(BOARD_DEBUG)
         printf("Cleared .pixel at %p, size %u\n", &_spixel, kSize);
 #endif
     }
@@ -168,76 +155,35 @@ void Init() {
         // clear section .network
         const auto kSize = static_cast<size_t>(&_enetwork - &_snetwork);
         memset(&_snetwork, 0, kSize);
-#if defined (BOARD_DEBUG)
+#if defined(BOARD_DEBUG)
         printf("Cleared .network at %p, size %u\n", &_snetwork, kSize);
 #endif
     }
 #endif
 #endif
 
-#if defined (BOARD_DEBUG)
+#if defined(BOARD_DEBUG)
     // Show the AHB and APBx busses frequency
     const auto kSys = rcu_clock_freq_get(CK_SYS);
     const auto kAhb = rcu_clock_freq_get(CK_AHB);
     const auto kApb1 = rcu_clock_freq_get(CK_APB1);
     const auto kApb2 = rcu_clock_freq_get(CK_APB2);
-    printf("CK_SYS=%u\nCK_AHB=%u\nCK_APB1=%u\nCK_APB2=%u\n", kSys, kAhb, kApb1, kApb2);
+    printf("CK_SYS=%u\nCK_AHB=%u\nCK_APB1=%u\nCK_APB2=%u\n", static_cast<unsigned>(kSys), static_cast<unsigned>(kAhb), static_cast<unsigned>(kApb1), static_cast<unsigned>(kApb2));
     assert(kSys == MCU_CLOCK_FREQ);
     assert(kAhb == AHB_CLOCK_FREQ);
     assert(kApb1 == APB1_CLOCK_FREQ);
     assert(kApb2 == APB2_CLOCK_FREQ);
 #if defined(GD32H7XX)
     const auto kApb3 = rcu_clock_freq_get(CK_APB3);
     const auto kApb4 = rcu_clock_freq_get(CK_APB4);
-    printf("nCK_APB3=%u\nCK_APB4=%u\n", nAPB3, nAPB4);
+    printf("nCK_APB3=%u\nCK_APB4=%u\n", static_cast<unsigned>(nAPB3), static_cast<unsigned>(nAPB4));
     assert(kApb3 == APB3_CLOCK_FREQ);
     assert(kApb4 == APB4_CLOCK_FREQ);
 #endif
 #endif
 
-    /*
-     * Setup the TIMERx
-     */
-
-#if defined(GD32H7XX)
-#elif defined(GD32F4XX)
-    /*
-     * AHB = SYSCLK = 240 MHz (GD32F470), others = 200 MHz
-     * APB1 = AHB / 4 =   50 MHz => APB1PSC = 0b101
-     * APB2 = AHB / 2  = 100 MHz => APB2PSC = 0b100
-     */
-
-    rcu_timer_clock_prescaler_config(RCU_TIMER_PSC_MUL4);
-
-    /*
-     * If APB1PSC/APB2PSC in RCU_CFG0 register is 0b0xx(CK_APBx = CK_AHB),
-     * 0b100(CK_APBx = CK_AHB/2), or 0b101(CK_APBx = CK_AHB/4), the TIMER
-     * clock is equal to CK_AHB(CK_TIMERx = CK_AHB).
-     */
-
-    /*
-     * TIMER in APB1 domain: CK_TIMERx = AHB = 200 MHz => 240 MHz (GD32F470).
-     * TIMER in APB2 domain: CK_TIMERx = AHB = 200 MHz => 240 MHz (GD32F470).
-     */
-#else
-#endif
-
-    Timer5Config();
-    Timer6Config();
-#if defined(CONFIG_HAL_USE_SYSTICK)
-    SystickConfig();
-#endif
-#if !defined(CONFIG_NET_ENABLE_PTP)
-#if defined(CONFIG_TIME_USE_TIMER)
-#if defined(GD32H7XX)
-    Timer16Config();
-#else
-    Timer7Config();
-#endif
-#endif
-#endif
+    gd32::timers::Start();
 
-    UdelayInit();
     Gd32AdcInit();
     Gd32I2cBegin();
 #if defined(CONFIG_ENABLE_I2C1)
@@ -261,16 +207,7 @@ void Init() {
 #endif
     bkp_data_write(BKP_DATA_1, 0x0);
 
-#if defined(CONFIG_HAVE_CRC32_HW)
-    rcu_periph_clock_enable(RCU_CRC);
-    crc_data_register_reset();
-#endif
-
-    /*
-     * Initialize status led, 74hc595 and panel led
-     */
-
-#if !defined(CONFIG_LEDBLINK_USE_PANELLED)
+    // Initialize status led
     rcu_periph_clock_enable(LED_BLINK_GPIO_CLK);
 #if defined(GPIO_INIT)
     gpio_init(LED_BLINK_GPIO_PORT, GPIO_MODE_OUT_PP, GPIO_OSPEED_50MHZ, LED_BLINK_PIN);
@@ -279,7 +216,6 @@ void Init() {
     gpio_output_options_set(LED_BLINK_GPIO_PORT, GPIO_OTYPE_PP, GPIO_OSPEED, LED_BLINK_PIN);
 #endif
     GPIO_BOP(LED_BLINK_GPIO_PORT) = LED_BLINK_PIN;
-#endif
 
 #if defined(PANELLED_595_CS_GPIOx)
     rcu_periph_clock_enable(PANELLED_595_CS_RCU_GPIOx);
@@ -301,17 +237,19 @@ void Init() {
     logic_analyzer::Init();
 
 #if !defined(CONFIG_NET_ENABLE_PTP)
+#if defined(CONFIG_TIME_USE_TIMER) || defined(CONFIG_TIME_USE_SYSTICK)
     struct tm tmbuf;
     memset(&tmbuf, 0, sizeof(struct tm));
     tmbuf.tm_mday = _TIME_STAMP_DAY_;         // The day of the month, in the range 1 to 31.
     tmbuf.tm_mon = _TIME_STAMP_MONTH_ - 1;    // The number of months since January, in the range 0 to 11.
     tmbuf.tm_year = _TIME_STAMP_YEAR_ - 1900; // The number of years since 1900.
 
     const auto kSeconds = mktime(&tmbuf);
-    const struct timeval kTv = {kSeconds, 0};
+    const struct timeval kTv = {.tv_sec = kSeconds, .tv_usec = 0};
 
     settimeofday(&kTv, nullptr);
 #endif
+#endif
 
 #if !defined(DISABLE_RTC)
     HwClock::Get()->RtcProbe();

lib-board/src/gd32/board_statusled.cpp

@@ -2,7 +2,7 @@
  * @file board_statusled.cpp
  *
  */
-/* Copyright (C) 2025 by Arjan van Vught mailto:info@gd32-dmx.org
+/* Copyright (C) 2025-2026 by Arjan van Vught mailto:info@gd32-dmx.org
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,82 +26,70 @@
 #include <cstdint>
 
 #include "board_statusled.h"
+#include "common/utils/utils_units.h"
 #include "softwaretimers.h"
 #include "board_debug.h"
 #include "gd32.h" // IWYU pragma: keep
 
-static TimerHandle_t s_timer_id = kTimerIdNone;
+namespace {
+TimerHandle_t s_timer_id = kTimerIdNone;
 
-#if !defined(HAL_HAVE_PORT_BIT_TOGGLE)
-static int32_t s_toggle_led = 1;
+#if !defined(MCU_HAVE_GPIO_TG)
+int32_t s_toggle_led = 1;
 #endif
 
-static void Ledblink([[maybe_unused]] TimerHandle_t handle) {
-#if defined(HAL_HAVE_PORT_BIT_TOGGLE)
+void Ledblink([[maybe_unused]] TimerHandle_t handle) {
+#if defined(MCU_HAVE_GPIO_TG)
     GPIO_TG(LED_BLINK_GPIO_PORT) = LED_BLINK_PIN;
 #else
     s_toggle_led = -s_toggle_led;
 
     if (s_toggle_led > 0) {
-#if defined(CONFIG_LEDBLINK_USE_PANELLED)
-        hal::PanelLedOn(panelled::ACTIVITY);
-#else
         GPIO_BOP(LED_BLINK_GPIO_PORT) = LED_BLINK_PIN;
-#endif
     } else {
-#if defined(CONFIG_LEDBLINK_USE_PANELLED)
-        hal::PanelLedOff(panelled::ACTIVITY);
-#else
         GPIO_BC(LED_BLINK_GPIO_PORT) = LED_BLINK_PIN;
-#endif
     }
 #endif
 }
+} // namespace
 
 namespace board::statusled {
 void SetFrequency(uint32_t frequency_hz) {
     BOARD_DEBUG_ENTRY();
     BOARD_DEBUG_PRINTF("s_timer_id=%d, frequency_hz=%u", static_cast<int>(s_timer_id), static_cast<unsigned>(frequency_hz));
 
     if (s_timer_id == kTimerIdNone) {
-        s_timer_id = SoftwareTimerAdd((1000U / frequency_hz), Ledblink);
+        s_timer_id = SoftwareTimerAdd((common::units::kMsPerSecond / frequency_hz), Ledblink);
         BOARD_DEBUG_EXIT();
         return;
     }
 
     switch (frequency_hz) {
         case 0:
             SoftwareTimerDelete(s_timer_id);
-#if defined(CONFIG_LEDBLINK_USE_PANELLED)
-            hal::PanelLedOff(panelled::ACTIVITY);
-#else
+
             GPIO_BC(LED_BLINK_GPIO_PORT) = LED_BLINK_PIN;
-#endif
             break;
 #if !defined(CONFIG_HAL_USE_MINIMUM)
         case 1:
-            SoftwareTimerChange(s_timer_id, (1000U / 1));
+            SoftwareTimerChange(s_timer_id, (common::units::kMsPerSecond / 1));
             break;
         case 3:
-            SoftwareTimerChange(s_timer_id, (1000U / 3));
+            SoftwareTimerChange(s_timer_id, (common::units::kMsPerSecond / 3));
             break;
         case 5:
-            SoftwareTimerChange(s_timer_id, (1000U / 5));
+            SoftwareTimerChange(s_timer_id, (common::units::kMsPerSecond / 5));
             break;
         case 8:
-            SoftwareTimerChange(s_timer_id, (1000U / 8));
+            SoftwareTimerChange(s_timer_id, (common::units::kMsPerSecond / 8));
             break;
 #endif
         case 255:
             SoftwareTimerDelete(s_timer_id);
-#if defined(CONFIG_LEDBLINK_USE_PANELLED)
-            hal::PanelLedOn(panelled::ACTIVITY);
-#else
             GPIO_BOP(LED_BLINK_GPIO_PORT) = LED_BLINK_PIN;
-#endif
             break;
         default:
-            SoftwareTimerChange(s_timer_id, (1000U / frequency_hz));
+            SoftwareTimerChange(s_timer_id, (common::units::kMsPerSecond / frequency_hz));
             break;
     }
 

lib-gd32/device/enet/f/enet_gpio_config.cpp

@@ -25,15 +25,15 @@
 
 #if defined(DEBUG_ENET)
 #undef NDEBUG
-#endif
+#endif // DEBUG_ENET
 
 #include "gd32.h" // IWYU pragma: keep
 #include "firmware/debug/debug_debug.h"
 
 // Needed for older GD32F firmware
 #if !defined(GPIO_OSPEED_MAX)
 #define GPIO_OSPEED_MAX GPIO_OSPEED_200MHZ
-#endif
+#endif // GPIO_OSPEED_MAX
 
 void EnetGpioConfig() {
     DEBUG_ENTRY();
@@ -53,7 +53,7 @@ void EnetGpioConfig() {
     rcu_ckout0_config(RCU_CKOUT0SRC_CKPLL2);
 #else
     rcu_ckout0_config(RCU_CKOUT0SRC_CKPLL2, RCU_CKOUT0_DIV1);
-#endif
+#endif // GD32F10X_CL
     gpio_ethernet_phy_select(GPIO_ENET_PHY_RMII);
 
     /* PA1: ETH_RMII_REF_CLK */
@@ -137,6 +137,6 @@ void EnetGpioConfig() {
     gpio_af_set(GPIOC, GPIO_AF_11, GPIO_PIN_1);
     gpio_af_set(GPIOC, GPIO_AF_11, GPIO_PIN_4);
     gpio_af_set(GPIOC, GPIO_AF_11, GPIO_PIN_5);
-#endif
+#endif // defined(GD32F10X) || defined(GD32F20X)
     DEBUG_EXIT();
 }