Fix GD32 timer/FMC edge cases and cleanup

This change tightens low-level platform code and consistency across clib/config modules. It fixes GD32 timer IRQ mapping for F10X/F30X targets, makes FMC read bounds handling safer (exclusive end address and proper debug exit on early return), and standardizes time/gettimeofday signatures and naming. It also consolidates constants (e.g., 1 KiB), improves conditional-compilation readability, and adjusts debug logging placement in stack/configstore/flashcode paths.

Author: vanvught

common/include/common/utils/utils_units.h

@@ -36,6 +36,9 @@ inline constexpr uint32_t kUsPerSecond = 1'000'000U;
 inline constexpr uint32_t kNsPerUs = 1'000U;
 inline constexpr uint32_t kNsPerMs = 1'000'000U;
 inline constexpr uint32_t kNsPerSecond = 1'000'000'000U;
+
+inline constexpr uint32_t k1KiB = 1024;
+
 } // namespace common::units
 
 #endif // COMMON_UTILS_UTILS_UNITS_H_

common/include/firmware/debug/debug_stack.h

@@ -32,6 +32,7 @@
 
 #include "timing.h"
 #include "firmware/debug/debug_config.h"
+#include "common/utils/utils_units.h"
 
 extern unsigned char stack_low;
 extern unsigned char _sp; // NOLINT
@@ -78,11 +79,11 @@ inline void Print() {
             printf("\x1b[34m");
         }
 
-        if constexpr (!config::kAssertionsEnabled) {
-            printf("Stack: Size %uKB, [%p:%p:%p], Used: %u, Free: %u [%u]", static_cast<unsigned>(kSizeBytes / 1024U), reinterpret_cast<const void*>(start_address), reinterpret_cast<const void*>(ptr),
+        if constexpr (config::kAssertionsEnabled) {
+            printf("Stack: Size %uKB, [%p:%p:%p], Used: %u, Free: %u [%u]", static_cast<unsigned>(kSizeBytes / common::units::k1KiB), reinterpret_cast<const void*>(start_address), reinterpret_cast<const void*>(ptr),
                    reinterpret_cast<const void*>(end_address), static_cast<unsigned>(kUsedBytes), static_cast<unsigned>(kFreeBytes), static_cast<unsigned>(kFreePct));
         } else {
-            printf("Stack: Size %uKB, Used: %u, Free: %u", static_cast<unsigned>(kSizeBytes / 1024U), static_cast<unsigned>(kUsedBytes), static_cast<unsigned>(kFreeBytes));
+            printf("Stack: Size %uKB, Used: %u, Free: %u", static_cast<unsigned>(kSizeBytes / common::units::k1KiB), static_cast<unsigned>(kUsedBytes), static_cast<unsigned>(kFreeBytes));
         }
         printf("\x1b[39m\n");
     }
@@ -95,7 +96,7 @@ inline void Run() {
 
     static uint32_t s_millis_previous;
     const auto kMillis = timing::Millis();
-    if (kMillis - s_millis_previous >= 1000U) {
+    if (kMillis - s_millis_previous >= common::units::kMsPerSecond) {
         s_millis_previous = kMillis;
         Print();
     }

include/sys/time.h

@@ -2,7 +2,7 @@
  * @file time.h
  *
  */
-/* Copyright (C) 2020 by Arjan van Vught mailto:info@gd32-dmx.org
+/* Copyright (C) 2020-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
@@ -27,31 +27,31 @@
 #define SYS_TIME_H_
 
 #ifndef _TIME_T
-#define	_TIME_T
+#define _TIME_T
 typedef long time_t;
-#endif	/* _TIME_T */
+#endif /* _TIME_T */
 
-#ifndef	_SUSECONDS_T
-#define	_SUSECONDS_T
+#ifndef _SUSECONDS_T
+#define _SUSECONDS_T
 typedef long suseconds_t;
-#endif	/* _SUSECONDS_T */
+#endif /* _SUSECONDS_T */
 
-struct timeval {
-	time_t tv_sec; /* seconds */
-	suseconds_t tv_usec; /* microseconds */
+struct timeval {         // NOLINT
+    time_t tv_sec;       // seconds
+    suseconds_t tv_usec; // microseconds
 };
 
-struct timezone {
-	int tz_minuteswest; /* minutes west of Greenwich */
-	int tz_dsttime; /* type of DST correction */
+struct timezone {       // NOLINT
+    int tz_minuteswest; // minutes west of Greenwich
+    int tz_dsttime;     // type of DST correction
 };
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern int gettimeofday(struct timeval *tv, struct timezone *tz);
-extern int settimeofday(const struct timeval *tv, const struct timezone *tz);
+extern int gettimeofday(struct timeval* time_val, struct timezone* time_zone);             // NOLINT
+extern int settimeofday(const struct timeval* time_val, const struct timezone* time_zone); // NOLINT
 
 #ifdef __cplusplus
 }

include/time.h

@@ -59,7 +59,7 @@ typedef enum {
 extern "C" {
 #endif
 
-extern time_t time(time_t *t);
+extern time_t time(time_t *timer);
 extern time_t mktime(struct tm *tm);
 extern struct tm *gmtime(const time_t *timep);
 extern struct tm *localtime(const time_t *timep);

lib-clib/src/abort.cpp

@@ -4,7 +4,7 @@
 
 #ifdef NDEBUG
 #undef NDEBUG
-#endif
+#endif // NDEBUG
 
 #include <cassert>
 

lib-clib/src/c++/purecall.cpp

@@ -25,7 +25,7 @@
 
 #ifdef NDEBUG
 #undef NDEBUG
-#endif
+#endif // NDEBUG
 
 #include <cassert>
 

lib-clib/src/crc32/crc32.cpp

@@ -133,7 +133,7 @@ static void make_crc_table() {
 	}
 	crc_table_empty = 0;
 }
-#endif
+#endif // CONFIG_DYNAMIC_CRC_TABLE
 
 #define DO_CRC(x) crc = tab[(crc ^ (x)) & 255] ^ (crc >> 8)
 
@@ -146,7 +146,7 @@ uint32_t crc32(uint32_t crc, const uint8_t *buf, uint32_t len) {
 #ifdef CONFIG_DYNAMIC_CRC_TABLE
     if (crc_table_empty)
       make_crc_table();
-#endif
+#endif // CONFIG_DYNAMIC_CRC_TABLE
 	/* Align it */
 	if (((reinterpret_cast<long>(b)) & 3) && len) {
 		auto *p = reinterpret_cast<const uint8_t *>(b);

lib-clib/src/gd32/malloc.h

@@ -28,4 +28,4 @@
 
 static struct BlockBucket s_block_bucket[] __attribute__((aligned(4))) = {{0x10, 0}, {0x20, 0}, {0x40, 0}, {0x60, 0}, {0x80,0}, {0x100,0}, {0x140,0}, {0x180,0}, {0x200,0}, {0x300,0}, {0x400,0}, {0x500,0}, {0,0}};
 
-#endif  // GD32_MALLOC_H_
+#endif // GD32_MALLOC_H_

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

@@ -25,7 +25,7 @@
 
 #if !defined(CONFIG_NET_ENABLE_PTP)
 #error
-#endif
+#endif // CONFIG_NET_ENABLE_PTP
 
 #pragma GCC push_options
 #pragma GCC optimize("O2")
@@ -41,39 +41,39 @@
 #define enet_ptp_timestamp_function_config(x) enet_ptp_timestamp_function_config(ENETx, x)
 #define enet_ptp_timestamp_update_config(x, y, z) enet_ptp_timestamp_update_config(ENETx, x, y, z)
 #define enet_ptp_system_time_get(x) enet_ptp_system_time_get(ENETx, x)
-#endif
+#endif // GD32H7XX
 
 extern "C" {
 /*
  * number of seconds and microseconds since the Epoch,
  *     1970-01-01 00:00:00 +0000 (UTC).
  */
 
-int gettimeofday(struct timeval* tv, [[maybe_unused]] struct timezone* tz) {
-    assert(tv != 0);
+int gettimeofday(struct timeval* time_val, [[maybe_unused]] struct timezone* time_zone) { // NOLINT
+    assert(time_val != nullptr);
 
     enet_ptp_systime_struct systime;
     enet_ptp_system_time_get(&systime);
 
-    tv->tv_sec = static_cast<time_t>(systime.second);
+    time_val->tv_sec = static_cast<time_t>(systime.second);
 
-#if !defined(GD32F4XX)
+#ifndef GD32F4XX
     const auto kNanoSecond = systime.nanosecond;
 #else
     const auto kNanoSecond = gd32::PtpSubsecond2Nanosecond(systime.subsecond);
-#endif
+#endif // GD32F4XX
 
-    tv->tv_usec = static_cast<time_t>(kNanoSecond / 1000U);
+    time_val->tv_usec = static_cast<time_t>(kNanoSecond / 1000U);
 
     return 0;
 }
 
-int settimeofday(const struct timeval* tv, [[maybe_unused]] const struct timezone* tz) {
-    assert(tv != nullptr);
+int settimeofday(const struct timeval* time_val, [[maybe_unused]] const struct timezone* time_zone) { // NOLINT
+    assert(time_val != nullptr);
 
     const uint32_t kSign = ENET_PTP_ADD_TO_TIME;
-    const auto kSecond = static_cast<uint32_t>(tv->tv_sec);
-    const uint32_t kNanoSecond = static_cast<uint32_t>(tv->tv_usec) * 1000U;
+    const auto kSecond = static_cast<uint32_t>(time_val->tv_sec);
+    const uint32_t kNanoSecond = static_cast<uint32_t>(time_val->tv_usec) * 1000U;
     const auto kSubSecond = gd32::PtpNanosecond2Subsecond(kNanoSecond);
 
     enet_ptp_timestamp_update_config(kSign, kSecond, kSubSecond);
@@ -85,10 +85,8 @@ int settimeofday(const struct timeval* tv, [[maybe_unused]] const struct timezon
     return -1;
 }
 
-/*
- *  time() returns the time as the number of seconds since the Epoch,
-       1970-01-01 00:00:00 +0000 (UTC).
- */
+// time() returns the time as the number of seconds since the Epoch,
+//     1970-01-01 00:00:00 +0000 (UTC).
 time_t time(time_t* __timer) { // NOLINT
     struct timeval tv;
     gettimeofday(&tv, nullptr);

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

@@ -25,7 +25,7 @@
 
 #if defined(CONFIG_TIME_USE_TIMER) || defined(CONFIG_NET_ENABLE_PTP)
 #error
-#endif
+#endif // defined(CONFIG_TIME_USE_TIMER) || defined(CONFIG_NET_ENABLE_PTP)
 
 #pragma GCC push_options
 #pragma GCC optimize("O2")
@@ -40,13 +40,10 @@ static uint32_t previous_systick_millis;
 static struct timeval s_tv;
 
 extern "C" {
-/*
- * number of seconds and microseconds since the Epoch,
- *     1970-01-01 00:00:00 +0000 (UTC).
- */
-
-int gettimeofday(struct timeval* tv, [[maybe_unused]] struct timezone* tz) {
-    assert(tv != 0);
+// number of seconds and microseconds since the Epoch,
+//     1970-01-01 00:00:00 +0000 (UTC).
+int gettimeofday(struct timeval* time_val, [[maybe_unused]] struct timezone* time_zone) { // NOLINT
+    assert(time_val != nullptr);
 
     const auto kCurrentSysTickMillis = gv_systick_millis;
 
@@ -71,38 +68,33 @@ int gettimeofday(struct timeval* tv, [[maybe_unused]] struct timezone* tz) {
         s_tv.tv_usec -= 1000000;
     }
 
-    tv->tv_sec = s_tv.tv_sec;
-    tv->tv_usec = s_tv.tv_usec;
+    time_val->tv_sec = s_tv.tv_sec;
+    time_val->tv_usec = s_tv.tv_usec;
 
     return 0;
 }
 
-int settimeofday(const struct timeval* tv, [[maybe_unused]] const struct timezone* tz) {
-    assert(tv != 0);
-
-    struct timeval g;
-    gettimeofday(&g, nullptr);
+int settimeofday(const struct timeval* time_val, [[maybe_unused]] const struct timezone* time_zone) { // NOLINT
+    assert(time_val != nullptr);
 
     previous_systick_millis = gv_systick_millis;
 
-    s_tv.tv_sec = tv->tv_sec;
-    s_tv.tv_usec = tv->tv_usec;
+    s_tv.tv_sec = time_val->tv_sec;
+    s_tv.tv_usec = time_val->tv_usec;
 
     return 0;
 }
 
-/*
- *  time() returns the time as the number of seconds since the Epoch,
-       1970-01-01 00:00:00 +0000 (UTC).
- */
+//  time() returns the time as the number of seconds since the Epoch,
+//     1970-01-01 00:00:00 +0000 (UTC).
 time_t time(time_t* __timer) { // NOLINT
-    struct timeval tv;
-    gettimeofday(&tv, nullptr);
+    struct timeval time_val;
+    gettimeofday(&time_val, nullptr);
 
     if (__timer != nullptr) {
-        *__timer = tv.tv_sec;
+        *__timer = time_val.tv_sec;
     }
 
-    return tv.tv_sec;
+    return time_val.tv_sec;
 }
 }