Harden GD32 time source selection and guards

Refines GD32 time backend wiring so only explicitly selected time implementations are built, and removes default SysTick inclusion when flags are present. Adds compile-time guards to enforce valid backend/PTP combinations, updates the SysTick millisecond symbol usage, and aligns timer-based time code with the shared timer interface (IRQ naming, startup entry point, and debug hooks). Also includes small type-safety/cleanup fixes in settimeofday paths.

Author: vanvught

lib-clib/Makefile.GD32

@@ -11,15 +11,12 @@ ifneq ($(MAKE_FLAGS),)
   	ifeq ($(findstring CONFIG_TIME_USE_TIMER,$(MAKE_FLAGS)), CONFIG_TIME_USE_TIMER)
   		EXTRA_SRCDIR+=src/gd32/time_timer
   	else
-  		EXTRA_SRCDIR+=src/gd32/time_systick
+  		ifeq ($(findstring CONFIG_TIME_USE_SYSTICK,$(MAKE_FLAGS)), CONFIG_TIME_USE_SYSTICK)
+  			EXTRA_SRCDIR+=src/gd32/time_systick
+  		endif
   	endif
   endif
-	ifeq ($(findstring CONFIG_HAVE_CRC32_HW,$(MAKE_FLAGS)), CONFIG_HAVE_CRC32_HW)
-		EXTRA_SRCDIR+=src/gd32/crc32
-	endif
 else
-  EXTRA_SRCDIR+=src/gd32/time_systick
-  
 	EXTRA_SRCDIR+=src/gd32/time_timer
 	DEFINES+=CONFIG_TIME_USE_TIMER
 endif

lib-clib/src/gd32/time_ptp/time.cpp

@@ -23,10 +23,14 @@
  * THE SOFTWARE.
  */
 
-#include <cstdint>
+#if !defined(CONFIG_NET_ENABLE_PTP)
+#error
+#endif
+
 #pragma GCC push_options
 #pragma GCC optimize("O2")
 
+#include <cstdint>
 #include <time.h>
 #include <sys/time.h>
 #include <cassert>
@@ -65,10 +69,10 @@ int gettimeofday(struct timeval* tv, [[maybe_unused]] struct timezone* tz) {
 }
 
 int settimeofday(const struct timeval* tv, [[maybe_unused]] const struct timezone* tz) {
-    assert(tv != 0);
+    assert(tv != nullptr);
 
     const uint32_t kSign = ENET_PTP_ADD_TO_TIME;
-    const uint32_t kSecond = static_cast<uint32_t>(tv->tv_sec);
+    const auto kSecond = static_cast<uint32_t>(tv->tv_sec);
     const uint32_t kNanoSecond = static_cast<uint32_t>(tv->tv_usec) * 1000U;
     const auto kSubSecond = gd32::PtpNanosecond2Subsecond(kNanoSecond);
 

lib-clib/src/gd32/time_systick/time.cpp

@@ -23,14 +23,18 @@
  * THE SOFTWARE.
  */
 
+#if defined(CONFIG_TIME_USE_TIMER) || defined(CONFIG_NET_ENABLE_PTP)
+#error
+#endif
+
 #pragma GCC push_options
 #pragma GCC optimize("O2")
 
 #include <sys/time.h>
 #include <cstdint>
 #include <cassert>
 
-extern volatile uint32_t gv_nSysTickMillis;
+extern volatile uint32_t gv_systick_millis;
 
 static uint32_t previous_systick_millis;
 static struct timeval s_tv;
@@ -44,7 +48,7 @@ extern "C" {
 int gettimeofday(struct timeval* tv, __attribute__((unused)) struct timezone* tz) {
     assert(tv != 0);
 
-    const auto kCurrentSysTickMillis = gv_nSysTickMillis;
+    const auto kCurrentSysTickMillis = gv_systick_millis;
 
     uint32_t millis_elapsed;
 
@@ -79,7 +83,7 @@ int settimeofday(const struct timeval* tv, __attribute__((unused)) const struct
     struct timeval g;
     gettimeofday(&g, nullptr);
 
-    previous_systick_millis = gv_nSysTickMillis;
+    previous_systick_millis = gv_systick_millis;
 
     s_tv.tv_sec = tv->tv_sec;
     s_tv.tv_usec = tv->tv_usec;

lib-clib/src/gd32/time_timer/time.cpp

@@ -23,15 +23,21 @@
  * THE SOFTWARE.
  */
 
-#include <ctime>
+#if !defined(CONFIG_TIME_USE_TIMER)
+#error
+#endif
+
 #pragma GCC push_options
 #pragma GCC optimize("O2")
 
+#include <ctime>
 #include <sys/time.h>
 #include <cstdint>
 #include <cassert>
 
-#include "gd32.h"
+#include "gd32.h" // IWYU pragma: keep
+#include "gd32_timers.h"
+#include "gd32_debug.h"
 
 #if defined(GD32H7XX)
 #define TIMERx TIMER16
@@ -41,17 +47,14 @@
 #define TIMERx TIMER7
 #define RCU_TIMERx RCU_TIMER7
 #if defined(GD32F10X) || defined(GD32F30X)
-#define TIMERx_IRQn TIMER7_IRQn
+#define TIMERx_IRQn TIMER7_UP_IRQn
 #else
 #define TIMERx_IRQn TIMER7_UP_TIMER12_IRQn
 #endif
 #endif
 
-extern struct HwTimersSeconds gv_seconds;
-
 extern "C" {
-#if !defined(CONFIG_NET_ENABLE_PTP)
-#if defined(CONFIG_TIME_USE_TIMER)
+#if defined(CONFIG_TIME_USE_TIMER) // Include IRQ handler when used only
 #if defined(GD32H7XX)
 void TIMER16_IRQHandler() {
 #elif defined(GD32F10X) || defined(GD32F30X)
@@ -62,20 +65,18 @@ void TIMER7_UP_TIMER12_IRQHandler() {
     const auto nIntFlag = TIMER_INTF(TIMERx);
 
     if ((nIntFlag & TIMER_INT_FLAG_UP) == TIMER_INT_FLAG_UP) {
-        gv_seconds.timeval++;
+        gv_seconds.timeval = gv_seconds.timeval + 1;
     }
 
-    TIMER_INTF(TIMERx) = static_cast<uint32_t>(~nIntFlag);
+    TIMER_INTF(TIMERx) = ~nIntFlag;
 }
 #endif
-#endif
 }
 
-#if defined(GD32H7XX)
-void Timer16Config() {
-#else
-void Timer7Config() {
-#endif
+namespace gd32::timers::timer_time {
+void Start() {
+    GD32_TIMERS_DEBUG_ENTRY();
+
     gv_seconds.timeval = 0;
 
     rcu_periph_clock_enable(RCU_TIMERx);
@@ -98,7 +99,10 @@ void Timer7Config() {
     NVIC_EnableIRQ(TIMERx_IRQn);
 
     timer_enable(TIMERx);
+
+    GD32_TIMERS_DEBUG_EXIT();
 }
+} // namespace gd32::timers::timer_time
 
 extern "C" {
 /*
@@ -127,8 +131,8 @@ int settimeofday(const struct timeval* tv, __attribute__((unused)) const struct
     assert(tv != nullptr);
 
     // Disable the timer interrupt to prevent it from triggering while we adjust the counter
-    TIMER_DMAINTEN(TIMERx) &= static_cast<uint32_t>(~TIMER_INT_UP);
-    TIMER_CTL0(TIMERx) &= static_cast<uint32_t>(~TIMER_CTL0_CEN);
+    TIMER_DMAINTEN(TIMERx) &= (~TIMER_INT_UP);
+    TIMER_CTL0(TIMERx) &= (~TIMER_CTL0_CEN);
 
     gv_seconds.timeval = static_cast<uint32_t>(tv->tv_sec);
     TIMER_CNT(TIMERx) = (static_cast<uint32_t>(tv->tv_usec) / 100U) % 10000U;