Generalize GD32 FMC and build system

This commit extracts the GD32 flash controller logic into the shared lib-gd32 layer, adds the new gd32_fmc API for blocking and state-machine access, and updates FlashCode to use it across GD32 families. It also removes the old H7xx-specific implementation, adds Makefile/GD32 rule plumbing for the new library layout, and includes a small GD32F10x soft UART timer update.

Author: vanvught

lib-flashcode/Makefile.GD32

@@ -1,18 +1,8 @@
 DEFINES =NDEBUG
 
-ifneq ($(MAKE_FLAGS),)
-	ifeq ($(findstring gd32f4xx,$(FAMILY)), gd32f4xx)
-		EXTRA_SRCDIR=src/gd32/f4xx
-	else
-		ifeq ($(findstring gd32h7xx,$(FAMILY)), gd32h7xx)
-			EXTRA_SRCDIR=src/gd32/h7xx
-		else
-			EXTRA_SRCDIR=src/gd32/fmc
-		endif
-	endif
-else
-	EXTRA_SRCDIR=src/gd32/fmc
-endif
+EXTRA_INCLUDES=../lib-gd32/include ../lib-gd32/src
+
+EXTRA_SRCDIR=src/spi/gd32
 
 include Rules.mk
 include ../firmware-template-gd32/lib/Rules.mk

lib-flashcode/src/gd32/flashcode.cpp

@@ -23,11 +23,19 @@
  * THE SOFTWARE.
  */
 
-#include <cstdio>
-#include <cassert>
+ #include <cstdint>
+ #include <cassert>
+ #include <span>
 
-#include "flashcode.h"
-#include "gd32.h"
+ #include "flashcode.h"
+ #include "gd32_fmc.h"
+ #include "gd32.h" // IWYU pragma: keep
+ 
+ namespace {
+ constexpr uint32_t k1KiB = 1024;
+ // Backwards compatibility with SPI FLASH
+ constexpr auto kFlashSectorSize = 4096;
+ } // namespace
 
 FlashCode::FlashCode() {
     FLASHCODE_DEBUG_ENTRY();
@@ -36,16 +44,38 @@ FlashCode::FlashCode() {
 
     detected_ = true;
 
-    printf("FMC: %s %u [%u]\n", GetName(), static_cast<unsigned int>(GetSize()), static_cast<unsigned int>(GetSize() / 1024U));
+    printf("FMC: %s %u [%u]\n", GetName(), static_cast<unsigned>(GetSize()), static_cast<unsigned>(GetSize() / k1KiB));
     FLASHCODE_DEBUG_EXIT();
 }
 
-FlashCode::~FlashCode() {
-    FLASHCODE_DEBUG_ENTRY();
+const char* FlashCode::GetName() const {
+    return GD32_MCU_NAME;
+}
 
-    FLASHCODE_DEBUG_EXIT();
+uint32_t FlashCode::GetSize() const {
+    return FMC_SIZE * k1KiB;
 }
 
-const char* FlashCode::GetName() const {
-    return GD32_MCU_NAME;
+uint32_t FlashCode::GetSectorSize() const {
+    return kFlashSectorSize;
+}
+
+bool FlashCode::Read(uint32_t offset, std::span<uint8_t> buffer, flashcode::Result& result) {
+    const auto kStatus = gd32::fmc::Read(offset, buffer); // Blocking
+    result = kStatus ? flashcode::Result::kOk : flashcode::Result::kError;
+    return true;
+}
+
+bool FlashCode::Erase(uint32_t offset, uint32_t length, flashcode::Result& result) {
+    gd32::fmc::Result fmc_result;
+    const auto kStatus = gd32::fmc::Erase(offset, length, fmc_result); // State-machine
+    result = (fmc_result == gd32::fmc::Result::kOk) ? flashcode::Result::kOk : flashcode::Result::kError;
+    return kStatus;
+}
+
+bool FlashCode::Write(uint32_t offset, std::span<const uint8_t> buffer, flashcode::Result& result) {
+    gd32::fmc::Result fmc_result;
+    const auto kStatus = gd32::fmc::Write(offset, buffer, fmc_result); // State-machine
+    result = (fmc_result == gd32::fmc::Result::kOk) ? flashcode::Result::kOk : flashcode::Result::kError;
+    return kStatus;
 }

lib-flashcode/src/gd32/h7xx/flashcode.cpp

@@ -1,9 +1,8 @@
-DEFINES=NDEBUG
+DEFINES =NDEBUG
 
-EXTRA_INCLUDES=
+EXTRA_INCLUDES=../lib-gd32/include ../lib-gd32/src
 
-EXTRA_SRCDIR=
+EXTRA_SRCDIR=src/spi/gd32
 
 include Rules.mk
 include ../firmware-template-gd32/lib/Rules.mk
-