Fixing the order of component if more than one is included for a target.

Revert deprecation of FlashIAPBlockDevice 2 argument constructor has this was a breaking change. This follows a similar change in the external flashiap-driver repo.

Author: Yossi Levy

components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp

@@ -42,8 +42,8 @@ FlashIAPBlockDevice::FlashIAPBlockDevice()
     DEBUG_PRINTF("FlashIAPBlockDevice: %" PRIX32 " %" PRIX32 "\r\n", address, size);
 }
 
-FlashIAPBlockDevice::FlashIAPBlockDevice(uint32_t address, uint32_t)
-    : _flash(), _base(0), _size(0), _is_initialized(false), _init_ref_count(0)
+FlashIAPBlockDevice::FlashIAPBlockDevice(uint32_t address, uint32_t size)
+    : _flash(), _base(address), _size(size), _is_initialized(false), _init_ref_count(0)
 {
 
 }
@@ -70,11 +70,27 @@ int FlashIAPBlockDevice::init()
     int ret = _flash.init();
 
     if (ret) {
+        core_util_atomic_decr_u32(&_init_ref_count, 1);
         return ret;
     }
 
-    _base = _flash.get_flash_start();
-    _size = _flash.get_flash_size();
+    if (_size + _base > _flash.get_flash_size() + _flash.get_flash_start()) {
+        core_util_atomic_decr_u32(&_init_ref_count, 1);
+        return BD_ERROR_DEVICE_ERROR;
+    }
+
+    if (_base < _flash.get_flash_start()) {
+        core_util_atomic_decr_u32(&_init_ref_count, 1);
+        return BD_ERROR_DEVICE_ERROR;
+    }
+
+    if (!_base) {
+        _base = _flash.get_flash_start();
+    }
+
+    if (!_size) {
+        _size = _flash.get_flash_size() - (_base - _flash.get_flash_start());
+    }
 
     _is_initialized = true;
     return ret;

components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h

@@ -31,7 +31,11 @@ class FlashIAPBlockDevice : public BlockDevice {
     /** Creates a FlashIAPBlockDevice **/
     FlashIAPBlockDevice();
 
-    MBED_DEPRECATED("Please use default constructor instead")
+    /** Creates a FlashIAPBlockDevice
+     *
+     *  @param address  Physical address where the block device start
+     *  @param size     The block device size
+     */
     FlashIAPBlockDevice(uint32_t address, uint32_t size = 0);
 
     virtual ~FlashIAPBlockDevice();

features/storage/TESTS/filesystem/general_filesystem/main.cpp

@@ -24,6 +24,9 @@
 #elif COMPONENT_SD
 #include "SDBlockDevice.h"
 #include "FATFileSystem.h"
+#elif COMPONENT_FLASHIAP
+#include "FlashIAPBlockDevice.h"
+#include "LittleFileSystem.h"
 #else
 #error [NOT_SUPPORTED] storage test not supported on this platform
 #endif

features/storage/system_storage/SystemStorage.cpp

@@ -30,8 +30,23 @@
 #include "SDBlockDevice.h"
 #endif
 
+#if COMPONENT_FLASHIAP
+#include "nvstore.h"
+#include "FlashIAPBlockDevice.h"
+#endif
+
 using namespace mbed;
 
+// Align a value to a specified size.
+// Parameters :
+// val           - [IN]   Value.
+// size          - [IN]   Size.
+// Return        : Aligned value.
+static inline uint32_t align_up(uint32_t val, uint32_t size)
+{
+    return (((val - 1) / size) + 1) * size;
+}
+
 MBED_WEAK BlockDevice *BlockDevice::get_default_instance()
 {
 #if COMPONENT_SPIF
@@ -68,6 +83,32 @@ MBED_WEAK BlockDevice *BlockDevice::get_default_instance()
 
     return &default_bd;
 
+#elif COMPONENT_FLASHIAP
+
+    uint32_t top_address;
+    uint32_t bottom_address;
+    size_t area_size;
+    FlashIAP flash;
+    NVStore &nvstore = NVStore::get_instance();
+    nvstore.get_area_params(0, top_address, area_size); //Find where nvstore begins
+
+    int ret = flash.init();
+    if (ret != 0) {
+        return 0;
+    }
+
+    //Find the start of first sector after text area
+    bottom_address = align_up(FLASHIAP_ROM_END, flash.get_sector_size(FLASHIAP_ROM_END));
+
+    if (top_address <= bottom_address) {
+        return 0;
+    }
+
+    ret = flash.deinit();
+
+    static FlashIAPBlockDevice default_bd(bottom_address, top_address - bottom_address);
+
+    return &default_bd;
 #else
 
     return NULL;
@@ -92,6 +133,13 @@ MBED_WEAK FileSystem *FileSystem::get_default_instance()
 
     return &sdcard;
 
+#elif COMPONENT_FLASHIAP
+
+    static LittleFileSystem flash("flash", BlockDevice::get_default_instance());
+    flash.set_as_default();
+
+    return &flash;
+
 #else
 
     return NULL;

targets/targets.json

@@ -1739,6 +1739,7 @@
         "device_name": "STM32L486RG"
     },
     "MTB_ADV_WISE_1570": {
+        "components": ["FLASHIAP"],
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M4F",
         "extra_labels_add": ["STM32L4", "STM32L486RG", "STM32L486xG", "WISE_1570"],