Eliminating offset storage as a storage mechanism.

Author: aentinger

src/Arduino_Portenta_OTA.h

@@ -48,15 +48,12 @@
  ******************************************************************************/
 
 enum StorageTypePortenta {
-    INTERNAL_FLASH_OFFSET   = INTERNAL_FLASH_FLAG | RAW_FLAG,
     INTERNAL_FLASH_FATFS    = INTERNAL_FLASH_FLAG | FATFS_FLAG,
     INTERNAL_FLASH_LITTLEFS = INTERNAL_FLASH_FLAG | LITTLEFS_FLAG,
-    QSPI_FLASH_OFFSET       = QSPI_FLASH_FLAG | RAW_FLAG,
     QSPI_FLASH_FATFS        = QSPI_FLASH_FLAG | FATFS_FLAG,
     QSPI_FLASH_LITTLEFS     = QSPI_FLASH_FLAG | LITTLEFS_FLAG,
     QSPI_FLASH_FATFS_MBR    = QSPI_FLASH_FLAG | FATFS_FLAG | MBR_FLAG,
     QSPI_FLASH_LITTLEFS_MBR = QSPI_FLASH_FLAG | LITTLEFS_FLAG | MBR_FLAG,
-    SD_OFFSET               = SDCARD_FLAG | RAW_FLAG,
     SD_FATFS                = SDCARD_FLAG | FATFS_FLAG,
     SD_LITTLEFS             = SDCARD_FLAG | LITTLEFS_FLAG,
     SD_FATFS_MBR            = SDCARD_FLAG | FATFS_FLAG | MBR_FLAG,

src/Arduino_Portenta_OTA_InternalFlash.cpp

@@ -45,8 +45,7 @@ Arduino_Portenta_OTA_InternalFlash::Arduino_Portenta_OTA_InternalFlash(StorageTy
 , _littlefs_fs_flash("little_fs")
 , _update_size_internal_flash{0}
 {
-  assert(_storage_type == INTERNAL_FLASH_OFFSET ||
-         _storage_type == INTERNAL_FLASH_FATFS  ||
+  assert(_storage_type == INTERNAL_FLASH_FATFS  ||
          _storage_type == INTERNAL_FLASH_LITTLEFS);
 }
 
@@ -70,9 +69,6 @@ bool Arduino_Portenta_OTA_InternalFlash::init()
     return true;
   }
 
-  if (_storage_type == INTERNAL_FLASH_OFFSET)
-    return true;
-
   if (_storage_type == INTERNAL_FLASH_LITTLEFS)
   {
     int const err = _littlefs_fs_flash.mount(&bd);
@@ -114,12 +110,6 @@ bool Arduino_Portenta_OTA_InternalFlash::open()
     return false;
   }
 
-  if (_storage_type == INTERNAL_FLASH_OFFSET)
-  {
-    _update_size_internal_flash = 2 * 1024 * 1024;
-    return true;
-  }
-
   if (_storage_type == INTERNAL_FLASH_LITTLEFS)
   {
     if ((dir = opendir("/little_fs")) != NULL)

src/Arduino_Portenta_OTA_QSPI.cpp

@@ -44,8 +44,7 @@ Arduino_Portenta_OTA_QSPI::Arduino_Portenta_OTA_QSPI(StorageTypePortenta const s
 , _block_device_qspi(PD_11, PD_12, PF_7, PD_13,  PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000)
 , _update_size_qspi{0}
 {
-  assert(_storage_type == QSPI_FLASH_OFFSET    ||
-         _storage_type == QSPI_FLASH_FATFS     ||
+  assert(_storage_type == QSPI_FLASH_FATFS     ||
          _storage_type == QSPI_FLASH_LITTLEFS  ||
          _storage_type == QSPI_FLASH_FATFS_MBR ||
          _storage_type == QSPI_FLASH_LITTLEFS_MBR);
@@ -57,8 +56,8 @@ Arduino_Portenta_OTA_QSPI::Arduino_Portenta_OTA_QSPI(StorageTypePortenta const s
 
 bool Arduino_Portenta_OTA_QSPI::init()
 {
-  if(_storage_type == QSPI_FLASH_OFFSET)
-    return (_block_device_qspi.init() == QSPIF_BD_ERROR_OK);
+  if (_block_device_qspi.init() != QSPIF_BD_ERROR_OK)
+    return false;
 
   if(_storage_type == QSPI_FLASH_FATFS)
   {
@@ -91,12 +90,6 @@ bool Arduino_Portenta_OTA_QSPI::init()
 
 bool Arduino_Portenta_OTA_QSPI::open()
 {
-  if (_storage_type == QSPI_FLASH_OFFSET)
-  {
-    _update_size_qspi = _program_length;
-    return true;
-  }
-
   if(_storage_type == QSPI_FLASH_FATFS || _storage_type == QSPI_FLASH_FATFS_MBR)
   {
     DIR * dir = NULL;
@@ -125,8 +118,7 @@ bool Arduino_Portenta_OTA_QSPI::open()
 
 bool Arduino_Portenta_OTA_QSPI::write()
 {
-  if(_storage_type == QSPI_FLASH_OFFSET ||
-     _storage_type == QSPI_FLASH_FATFS  ||
+  if(_storage_type == QSPI_FLASH_FATFS  ||
      _storage_type == QSPI_FLASH_FATFS_MBR)
   {
     HAL_RTCEx_BKUPWrite(&RTCHandle, RTC_BKP_DR0, 0x07AA);

src/Arduino_Portenta_OTA_SD.cpp

@@ -52,8 +52,7 @@ Arduino_Portenta_OTA_SD::Arduino_Portenta_OTA_SD(StorageTypePortenta const stora
 , _fs_sd{NULL}
 , _update_size_sd{0}
 {
-  assert(_storage_type == SD_OFFSET    ||
-         _storage_type == SD_FATFS     ||
+  assert(_storage_type == SD_FATFS     ||
          _storage_type == SD_LITTLEFS  ||
          _storage_type == SD_FATFS_MBR ||
          _storage_type == SD_LITTLEFS_MBR);
@@ -65,17 +64,8 @@ Arduino_Portenta_OTA_SD::Arduino_Portenta_OTA_SD(StorageTypePortenta const stora
 
 bool Arduino_Portenta_OTA_SD::init()
 {
-  if (_storage_type == SD_OFFSET)
-  {
-    int const err = _block_device.init();
-    if (err)
-    {
-      Serial1.print("Error while _block_device.init() : ");
-      Serial1.println(err);
-      return false;
-    }
-    return true;
-  }
+  if (_block_device.init())
+    return false;
 
    if(_storage_type == SD_FATFS)
    {
@@ -108,9 +98,6 @@ bool Arduino_Portenta_OTA_SD::init()
 
 bool Arduino_Portenta_OTA_SD::open()
 {
-  if (_storage_type == SD_OFFSET)
-    return true;
-
   if (_storage_type == SD_FATFS || _storage_type == SD_FATFS_MBR)
   {
     DIR * dir = NULL;
@@ -140,18 +127,11 @@ bool Arduino_Portenta_OTA_SD::open()
 bool Arduino_Portenta_OTA_SD::write()
 {
   if (_storage_type == SD_FATFS  ||
-      _storage_type == SD_OFFSET ||
       _storage_type == SD_FATFS_MBR)
   {
     HAL_RTCEx_BKUPWrite(&RTCHandle, RTC_BKP_DR0, 0x07AA);
     HAL_RTCEx_BKUPWrite(&RTCHandle, RTC_BKP_DR1, _storage_type);
-
-    if(_storage_type == SD_OFFSET || _storage_type == SD_FATFS_MBR)
-    {
-      HAL_RTCEx_BKUPWrite(&RTCHandle, RTC_BKP_DR2, _data_offset);
-      _update_size_sd = _program_length;
-    }
-
+    HAL_RTCEx_BKUPWrite(&RTCHandle, RTC_BKP_DR2, _data_offset);
     HAL_RTCEx_BKUPWrite(&RTCHandle, RTC_BKP_DR3, _update_size_sd);
     return true;
   }