Fix declaring OSPIFBlockDevice and QSPIFBlockDevice as globals, fix some STM32U585 issues (ARMmbed#167)

* Attempt to fix declaring an OSPIFBlockDevice as a global object

* Astyle format

* Add B_U585_IOT02A upload method support and default OSPIF mappings.  Guard against incorrect case on upload method

* Also fix the same error in QSPIFBlockDevice

* Fix compile error for mbed-wifi

* Provide ScopedMutexLock for unittests mode

Author: Jamie Smith

connectivity/drivers/wifi/CMakeLists.txt

@@ -14,6 +14,7 @@ endif()
 add_subdirectory(esp8266-driver)
 
 target_link_libraries(mbed-wifi
-    INTERFACE
+    PUBLIC
+        mbed-rtos-flags
         mbed-netsocket-api
 )

rtos/tests/UNITTESTS/doubles/rtos/Mutex.h

@@ -20,9 +20,13 @@
 #include <inttypes.h>
 #include "rtos/mbed_rtos_types.h"
 #include "rtos/internal/mbed_rtos1_types.h"
+#include "ScopedLock.h"
 
 namespace rtos {
 
+class Mutex;
+typedef mbed::ScopedLock<Mutex> ScopedMutexLock;
+
 class Mutex {
 public:
     Mutex();

storage/blockdevice/COMPONENT_OSPIF/include/OSPIF/OSPIFBlockDevice.h

@@ -404,12 +404,8 @@ class OSPIFBlockDevice : public mbed::BlockDevice {
     // OSPI Driver Object
     mbed::OSPI _ospi;
 
-    // Static List of different OSPI based Flash devices csel that already exist
-    // Each OSPI Flash device csel can have only 1 OSPIFBlockDevice instance
-    // _devices_mutex is used to lock csel list - only one OSPIFBlockDevice instance per csel is allowed
-    static SingletonPtr<rtos::Mutex> _devices_mutex;
+    // Number of active OSPIFBlockDevice chip select pins
     static int _number_of_active_ospif_flash_csel;
-    static PinName *_active_ospif_flash_csel_arr;
 
     int _unique_device_status;
     PinName _csel;

storage/blockdevice/COMPONENT_OSPIF/mbed_lib.json

@@ -28,6 +28,19 @@
     "target_overrides": {
         "MX25LM51245G": {
             "OSPI_FREQ": "66000000"
+        },
+        "B_U585_IOT02A": {
+            "OSPI_IO0": "PF_0",
+            "OSPI_IO1": "PF_1",
+            "OSPI_IO2": "PF_2",
+            "OSPI_IO3": "PF_3",
+            "OSPI_IO4": "PH_9",
+            "OSPI_IO5": "PH_10",
+            "OSPI_IO6": "PH_11",
+            "OSPI_IO7": "PH_12",
+            "OSPI_SCK": "PF_4",
+            "OSPI_CSN": "PI_5",
+            "OSPI_DQS": "PF_12"
         }
     }
 }

storage/blockdevice/COMPONENT_OSPIF/source/OSPIFBlockDevice.cpp

@@ -178,13 +178,22 @@ static const uint8_t _sfdp_basic_param_table[64] = {0x30, 0xFF, 0xFB, 0xFF, 0xFF
 static const uint8_t _sfdp_4_byte_inst_table[8] = {0x7F, 0xEF, 0xFF, 0xFF, 0x21, 0x5C, 0xDC, 0x14};
 #endif
 
-/* Init function to initialize Different Devices CS static list */
-static PinName *generate_initialized_active_ospif_csel_arr();
-// Static Members for different devices csel
-// _devices_mutex is used to lock csel list - only one OSPIFBlockDevice instance per csel is allowed
-SingletonPtr<rtos::Mutex> OSPIFBlockDevice::_devices_mutex;
+/*
+ * Get the global mutex used to protect the chip select pin array (below).
+ * It will be initialized on first use.
+ */
+static rtos::Mutex &get_devices_mutex();
+
+/*
+ * Get the global array of active chip select pins.
+ * Each OSPI Flash device csel can have only 1 OSPIFBlockDevice instance.
+ *
+ * This function should be called with the devices mutex locked.
+ */
+static PinName *get_active_ospif_csel_arr();
+
+
 int OSPIFBlockDevice::_number_of_active_ospif_flash_csel = 0;
-PinName *OSPIFBlockDevice::_active_ospif_flash_csel_arr = generate_initialized_active_ospif_csel_arr();
 
 /********* Public API Functions *********/
 /****************************************/
@@ -859,63 +868,79 @@ int OSPIFBlockDevice::change_mode(int mode)
 /********************************/
 /*   Different Device Csel Mgmt */
 /********************************/
-static PinName *generate_initialized_active_ospif_csel_arr()
+
+static rtos::Mutex &get_devices_mutex()
 {
-    PinName *init_arr = new PinName[OSPIF_MAX_ACTIVE_FLASH_DEVICES];
-    for (int i_ind = 0; i_ind < OSPIF_MAX_ACTIVE_FLASH_DEVICES; i_ind++) {
-        init_arr[i_ind] = NC;
+    static rtos::Mutex devicesMutex;
+    return devicesMutex;
+}
+
+
+static PinName *get_active_ospif_csel_arr()
+{
+    // Declare the active csel array info as local static variables.
+    // This makes sure it's initialized on first use, so even if an OSPIFBlockDevice is declared
+    // globally and constructed before the globals in this file, things will still work correctly.
+    static bool active_csel_arr_initialized = false;
+    static PinName active_csel_arr[OSPIF_MAX_ACTIVE_FLASH_DEVICES];
+
+    if (!active_csel_arr_initialized) {
+        for (int i_ind = 0; i_ind < OSPIF_MAX_ACTIVE_FLASH_DEVICES; i_ind++) {
+            active_csel_arr[i_ind] = NC;
+        }
+        active_csel_arr_initialized = true;
     }
-    return init_arr;
+
+    return active_csel_arr;
 }
 
 int OSPIFBlockDevice::add_new_csel_instance(PinName csel)
 {
-    int status = 0;
-    _devices_mutex->lock();
+    rtos::ScopedMutexLock lock(get_devices_mutex());
+
+    PinName *active_ospif_flash_csel_arr = get_active_ospif_csel_arr();
+
     if (_number_of_active_ospif_flash_csel >= OSPIF_MAX_ACTIVE_FLASH_DEVICES) {
-        status = -2;
-        goto exit_point;
+        return -2;
     }
 
     // verify the device is unique(no identical csel already exists)
     for (int i_ind = 0; i_ind < OSPIF_MAX_ACTIVE_FLASH_DEVICES; i_ind++) {
-        if (_active_ospif_flash_csel_arr[i_ind] == csel) {
-            status = -1;
-            goto exit_point;
+        if (active_ospif_flash_csel_arr[i_ind] == csel) {
+            return -1;
         }
     }
 
     // Insert new csel into existing device list
     for (int i_ind = 0; i_ind < OSPIF_MAX_ACTIVE_FLASH_DEVICES; i_ind++) {
-        if (_active_ospif_flash_csel_arr[i_ind] == NC) {
-            _active_ospif_flash_csel_arr[i_ind] = csel;
+        if (active_ospif_flash_csel_arr[i_ind] == NC) {
+            active_ospif_flash_csel_arr[i_ind] = csel;
             break;
         }
     }
     _number_of_active_ospif_flash_csel++;
 
-exit_point:
-    _devices_mutex->unlock();
-    return status;
+    return 0;
 }
 
 int OSPIFBlockDevice::remove_csel_instance(PinName csel)
 {
-    int status = -1;
-    _devices_mutex->lock();
+    rtos::ScopedMutexLock lock(get_devices_mutex());
+
+    PinName *active_ospif_flash_csel_arr = get_active_ospif_csel_arr();
+
     // remove the csel from existing device list
     for (int i_ind = 0; i_ind < OSPIF_MAX_ACTIVE_FLASH_DEVICES; i_ind++) {
-        if (_active_ospif_flash_csel_arr[i_ind] == csel) {
-            _active_ospif_flash_csel_arr[i_ind] = NC;
+        if (active_ospif_flash_csel_arr[i_ind] == csel) {
+            active_ospif_flash_csel_arr[i_ind] = NC;
             if (_number_of_active_ospif_flash_csel > 0) {
                 _number_of_active_ospif_flash_csel--;
             }
-            status = 0;
-            break;
+            return 0;
         }
     }
-    _devices_mutex->unlock();
-    return status;
+
+    return -1;
 }
 
 /*********************************************************/

storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h

@@ -343,12 +343,8 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
     // QSPI Driver Object
     mbed::QSPI _qspi;
 
-    // Static List of different QSPI based Flash devices csel that already exist
-    // Each QSPI Flash device csel can have only 1 QSPIFBlockDevice instance
-    // _devices_mutex is used to lock csel list - only one QSPIFBlockDevice instance per csel is allowed
-    static SingletonPtr<rtos::Mutex> _devices_mutex;
+    // Number of active OSPIFBlockDevice chip select pins
     static int _number_of_active_qspif_flash_csel;
-    static PinName *_active_qspif_flash_csel_arr;
 
     int _unique_device_status;
     PinName _csel;

storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp

@@ -114,14 +114,21 @@ using namespace mbed;
 // Length of data returned from RDID instruction
 #define QSPI_RDID_DATA_LENGTH 3
 
+/*
+ * Get the global mutex used to protect the chip select pin array (below).
+ * It will be initialized on first use.
+ */
+static rtos::Mutex &get_devices_mutex();
+
+/*
+ * Get the global array of active chip select pins.
+ * Each OSPI Flash device csel can have only 1 OSPIFBlockDevice instance.
+ *
+ * This function should be called with the devices mutex locked.
+ */
+static PinName *get_active_qspif_csel_arr();
 
-/* Init function to initialize Different Devices CS static list */
-static PinName *generate_initialized_active_qspif_csel_arr();
-// Static Members for different devices csel
-// _devices_mutex is used to lock csel list - only one QSPIFBlockDevice instance per csel is allowed
-SingletonPtr<rtos::Mutex> QSPIFBlockDevice::_devices_mutex;
 int QSPIFBlockDevice::_number_of_active_qspif_flash_csel = 0;
-PinName *QSPIFBlockDevice::_active_qspif_flash_csel_arr = generate_initialized_active_qspif_csel_arr();
 
 /********* Public API Functions *********/
 /****************************************/
@@ -555,63 +562,76 @@ int QSPIFBlockDevice::get_erase_value() const
 /********************************/
 /*   Different Device Csel Mgmt */
 /********************************/
-static PinName *generate_initialized_active_qspif_csel_arr()
+static rtos::Mutex &get_devices_mutex()
 {
-    PinName *init_arr = new PinName[QSPIF_MAX_ACTIVE_FLASH_DEVICES];
-    for (int i_ind = 0; i_ind < QSPIF_MAX_ACTIVE_FLASH_DEVICES; i_ind++) {
-        init_arr[i_ind] = NC;
+    static rtos::Mutex devicesMutex;
+    return devicesMutex;
+}
+
+static PinName *get_active_qspif_csel_arr()
+{
+    // Declare the active csel array info as local static variables.
+    // This makes sure it's initialized on first use, so even if a QSPIFBlockDevice is declared
+    // globally and constructed before the globals in this file, things will still work correctly.
+    static bool active_csel_arr_initialized = false;
+    static PinName active_csel_arr[QSPIF_MAX_ACTIVE_FLASH_DEVICES];
+
+    if (!active_csel_arr_initialized) {
+        for (int i_ind = 0; i_ind < QSPIF_MAX_ACTIVE_FLASH_DEVICES; i_ind++) {
+            active_csel_arr[i_ind] = NC;
+        }
+        active_csel_arr_initialized = true;
     }
-    return init_arr;
+    return active_csel_arr;
 }
 
 int QSPIFBlockDevice::add_new_csel_instance(PinName csel)
 {
-    int status = 0;
-    _devices_mutex->lock();
+    rtos::ScopedMutexLock lock(get_devices_mutex());
+
+    PinName *active_qspif_flash_csel_arr = get_active_qspif_csel_arr();
+
     if (_number_of_active_qspif_flash_csel >= QSPIF_MAX_ACTIVE_FLASH_DEVICES) {
-        status = -2;
-        goto exit_point;
+        return -2;
     }
 
     // verify the device is unique(no identical csel already exists)
     for (int i_ind = 0; i_ind < QSPIF_MAX_ACTIVE_FLASH_DEVICES; i_ind++) {
-        if (_active_qspif_flash_csel_arr[i_ind] == csel) {
-            status = -1;
-            goto exit_point;
+        if (active_qspif_flash_csel_arr[i_ind] == csel) {
+            return -1;
         }
     }
 
     // Insert new csel into existing device list
     for (int i_ind = 0; i_ind < QSPIF_MAX_ACTIVE_FLASH_DEVICES; i_ind++) {
-        if (_active_qspif_flash_csel_arr[i_ind] == NC) {
-            _active_qspif_flash_csel_arr[i_ind] = csel;
+        if (active_qspif_flash_csel_arr[i_ind] == NC) {
+            active_qspif_flash_csel_arr[i_ind] = csel;
             break;
         }
     }
     _number_of_active_qspif_flash_csel++;
 
-exit_point:
-    _devices_mutex->unlock();
-    return status;
+    return 0;
 }
 
 int QSPIFBlockDevice::remove_csel_instance(PinName csel)
 {
-    int status = -1;
-    _devices_mutex->lock();
+    rtos::ScopedMutexLock lock(get_devices_mutex());
+
+    PinName *active_qspif_flash_csel_arr = get_active_qspif_csel_arr();
+
     // remove the csel from existing device list
     for (int i_ind = 0; i_ind < QSPIF_MAX_ACTIVE_FLASH_DEVICES; i_ind++) {
-        if (_active_qspif_flash_csel_arr[i_ind] == csel) {
-            _active_qspif_flash_csel_arr[i_ind] = NC;
+        if (active_qspif_flash_csel_arr[i_ind] == csel) {
+            active_qspif_flash_csel_arr[i_ind] = NC;
             if (_number_of_active_qspif_flash_csel > 0) {
                 _number_of_active_qspif_flash_csel--;
             }
-            status = 0;
-            break;
+            return 0;
         }
     }
-    _devices_mutex->unlock();
-    return status;
+
+    return -1;
 }
 
 /*********************************************************/

storage/platform/CMakeLists.txt

@@ -25,6 +25,10 @@ if("QSPIF" IN_LIST MBED_TARGET_LABELS)
     list(APPEND mbed-storage-libs mbed-storage-qspif)
 endif()
 
+if("OSPIF" IN_LIST MBED_TARGET_LABELS)
+    list(APPEND mbed-storage-libs mbed-storage-ospif)
+endif()
+
 if("SD" IN_LIST MBED_TARGET_LABELS)
     list(APPEND mbed-storage-libs mbed-storage-sd)
 endif()

targets/targets.json

@@ -4902,13 +4902,13 @@
             "MX25LM51245G"
         ],
         "components_add": [
-            "OSPIF"
+            "OSPIF",
+            "EMW3080B"
         ],
         "device_has_add": [
             "QSPI",
             "OSPI"
         ],
-        "components_add": ["EMW3080B"],
         "overrides": {
             "network-default-interface-type": "WIFI"
         },