Migrate SPI flash API to C++ namespace

Replace C-style `spi_flash_*` function calls with C++ namespace equivalents (`spi::flash::` and `spi::flash::cmd::`) in StoreDevice and scenes SPI implementations.

Author: vanvught

lib-configstore/device/spi/storedevice.cpp

@@ -37,11 +37,14 @@
 StoreDevice::StoreDevice() {
     CONFIGSTORE_DEBUG_ENTRY();
 
-    if (!spi_flash_probe()) {
+    if (!spi::flash::Probe()) {
         puts("StoreDevice: No SPI flash chip.");
     } else {
-        printf("StoreDevice: %s sector size %u total %u bytes [%u kB]\n", spi_flash_get_name(), static_cast<unsigned int>(spi_flash_get_sector_size()), static_cast<unsigned int>(spi_flash_get_size()),
-               static_cast<unsigned int>(spi_flash_get_size() / 1024U));
+        printf("StoreDevice: SPI flash %s sector size %u total %u bytes [%u kB]\n", 
+          spi::flash::Name(), 
+          static_cast<unsigned int>(spi::flash::SectorSize()), 
+          static_cast<unsigned int>(spi::flash::Size()),
+          static_cast<unsigned int>(spi::flash::Size() / 1024U));
         detected_ = true;
     }
 
@@ -54,17 +57,17 @@ StoreDevice::~StoreDevice() {
 }
 
 uint32_t StoreDevice::GetSize() const {
-    return spi_flash_get_size();
+    return spi::flash::Size();
 }
 
 uint32_t StoreDevice::GetSectorSize() const {
-    return spi_flash_get_sector_size();
+    return spi::flash::SectorSize();
 }
 
 bool StoreDevice::Read(uint32_t offset, uint32_t length, uint8_t* buffer, storedevice::Result& result) {
     CONFIGSTORE_DEBUG_ENTRY();
 
-    result = spi_flash_cmd_read_fast(offset, length, buffer) ? storedevice::Result::kOk : storedevice::Result::kError;
+    result = spi::flash::cmd::Read(offset, length, buffer) ? storedevice::Result::kOk : storedevice::Result::kError;
 
     CONFIGSTORE_DEBUG_PRINTF("result=%d", static_cast<int>(result));
     CONFIGSTORE_DEBUG_EXIT();
@@ -74,7 +77,7 @@ bool StoreDevice::Read(uint32_t offset, uint32_t length, uint8_t* buffer, stored
 bool StoreDevice::Erase(uint32_t offset, uint32_t length, storedevice::Result& result) {
     CONFIGSTORE_DEBUG_ENTRY();
 
-    result = spi_flash_cmd_erase(offset, length) ? storedevice::Result::kOk : storedevice::Result::kError;
+    result = spi::flash::cmd::Erase(offset, length) ? storedevice::Result::kOk : storedevice::Result::kError;
 
     CONFIGSTORE_DEBUG_PRINTF("result=%d", static_cast<int>(result));
     CONFIGSTORE_DEBUG_EXIT();
@@ -84,7 +87,7 @@ bool StoreDevice::Erase(uint32_t offset, uint32_t length, storedevice::Result& r
 bool StoreDevice::Write(uint32_t offset, uint32_t length, const uint8_t* buffer, storedevice::Result& result) {
     CONFIGSTORE_DEBUG_ENTRY();
 
-    result = spi_flash_cmd_write_multi(offset, length, buffer) ? storedevice::Result::kOk : storedevice::Result::kError;
+    result = spi::flash::cmd::Write(offset, length, buffer) ? storedevice::Result::kOk : storedevice::Result::kError;
 
     CONFIGSTORE_DEBUG_PRINTF("result=%d", static_cast<int>(result));
     CONFIGSTORE_DEBUG_EXIT();

lib-dmxnode/src/scenes/spi/scenes.cpp

@@ -39,20 +39,20 @@ static bool CheckHaveFlash() {
     DMXNODE_DEBUG_PRINTF("s_hasFlash=%d", s_has_flash);
 
     if (!s_has_flash) {
-        if (!spi_flash_probe()) {
+        if (!spi::flash::Probe()) {
             DMXNODE_DEBUG_EXIT();
             return false;
         }
 
-        const auto kEraseSize = spi_flash_get_sector_size();
+        const auto kEraseSize = spi::flash::SectorSize();
         assert(kEraseSize <= dmxnode::scenes::kBytesNeeded);
         const auto kPages = 1 + (dmxnode::scenes::kBytesNeeded / kEraseSize);
 
         DMXNODE_DEBUG_PRINTF("Bytes needed=%u, nEraseSize=%u, nPages=%u", dmxnode::scenes::kBytesNeeded, kEraseSize, kPages);
 
-        assert(((kPages + 1) * kEraseSize) <= spi_flash_get_size());
+        assert(((kPages + 1) * kEraseSize) <= spi::flash::get_size());
 
-        s_offset_base = spi_flash_get_size() - ((kPages + 1) * kEraseSize);
+        s_offset_base = spi::flash::Size() - ((kPages + 1) * kEraseSize);
 
         DMXNODE_DEBUG_PRINTF("nOffsetBase=%p", s_offset_base);
     }
@@ -70,7 +70,7 @@ void WriteStart() {
         return;
     }
 
-    s_has_flash = spi_flash_cmd_erase(s_offset_base, spi_flash_get_sector_size());
+    s_has_flash = spi::flash::cmd::Erase(s_offset_base, spi::flash::SectorSize());
 
     DMXNODE_DEBUG_PRINTF("s_hasFlash=%d", s_has_flash);
     DMXNODE_DEBUG_EXIT();
@@ -90,7 +90,7 @@ void Write(uint32_t port_index, const uint8_t* data) {
 
     DMXNODE_DEBUG_PRINTF("s_offset_base=%p, kOffset=%p", s_offset_base, kOffset);
 
-    spi_flash_cmd_write_multi(kOffset, dmxnode::kUniverseSize, data);
+    spi::flash::cmd::Write(kOffset, dmxnode::kUniverseSize, data);
 
     DMXNODE_DEBUG_EXIT();
 }
@@ -131,7 +131,7 @@ void Read(uint32_t port_index, uint8_t* data) {
 
     DMXNODE_DEBUG_PRINTF("s_offset_base=%p, kOffset=%u", reinterpret_cast<void*>(s_offset_base), static_cast<unsigned>(kOffset));
 
-    spi_flash_cmd_read_fast(kOffset, dmxnode::kUniverseSize, data);
+    spi::flash::cmd::Read(kOffset, dmxnode::kUniverseSize, data);
 
     DMXNODE_DEBUG_EXIT();
 }