Renamed QSPI Pins

Author: Offir Kochalsky

QSPIFBlockDevice.h

@@ -30,7 +30,7 @@ enum qspif_bd_error {
     QSPIF_BD_ERROR_OK                 = 0,     /*!< no error */
     QSPIF_BD_ERROR_DEVICE_ERROR       = BD_ERROR_DEVICE_ERROR, /*!< device specific error -4001 */
     QSPIF_BD_ERROR_PARSING_FAILED     = -4002, /* SFDP Parsing failed */
-    QSPIF_BD_ERROR_READY_FAILED		  = -4003, /* Wait for  Mem Ready failed */
+    QSPIF_BD_ERROR_READY_FAILED       = -4003, /* Wait for  Mem Ready failed */
     QSPIF_BD_ERROR_WREN_FAILED        = -4004, /* Write Enable Failed */
     QSPIF_BD_ERROR_DEVICE_NOT_UNIQE   = -4005, /* Only one instance per csel is allowed */
     QSPIF_BD_ERROR_DEVICE_MAX_EXCEED  = -4006 /* Max active QSPIF devices exceeded */

TESTS/block_device/qspif/main.cpp

@@ -92,9 +92,8 @@ void test_qspif_random_program_read_erase()
 {
     utest_printf("\nTest Random Program Read Erase Starts..\n");
 
-    QSPIFBlockDevice blockD(MBED_CONF_QSPIF_QSPI_IO0, MBED_CONF_QSPIF_QSPI_IO1, MBED_CONF_QSPIF_QSPI_IO2,
-                            MBED_CONF_QSPIF_QSPI_IO3, MBED_CONF_QSPIF_QSPI_CLK, MBED_CONF_QSPIF_QSPI_CS, QSPIF_POLARITY_MODE_0,
-                            MBED_CONF_QSPIF_QSPI_FREQ);
+    QSPIFBlockDevice blockD(QSPI_FLASH1_IO0, QSPI_FLASH1_IO1, QSPI_FLASH1_IO2, QSPI_FLASH1_IO3,
+                            QSPI_FLASH1_SCK, QSPI_FLASH1_CSN, QSPIF_POLARITY_MODE_0, MBED_CONF_QSPIF_QSPI_FREQ);
 
     int err = blockD.init();
     TEST_ASSERT_EQUAL(0, err);
@@ -138,9 +137,8 @@ void test_qspif_unaligned_program()
 
     utest_printf("\nTest Unaligned Program Starts..\n");
 
-    QSPIFBlockDevice blockD(MBED_CONF_QSPIF_QSPI_IO0, MBED_CONF_QSPIF_QSPI_IO1, MBED_CONF_QSPIF_QSPI_IO2,
-                            MBED_CONF_QSPIF_QSPI_IO3, MBED_CONF_QSPIF_QSPI_CLK, MBED_CONF_QSPIF_QSPI_CS, QSPIF_POLARITY_MODE_0,
-                            MBED_CONF_QSPIF_QSPI_FREQ);
+    QSPIFBlockDevice blockD(QSPI_FLASH1_IO0, QSPI_FLASH1_IO1, QSPI_FLASH1_IO2, QSPI_FLASH1_IO3,
+                            QSPI_FLASH1_SCK, QSPI_FLASH1_CSN, QSPIF_POLARITY_MODE_0, MBED_CONF_QSPIF_QSPI_FREQ);
 
     int err = blockD.init();
     TEST_ASSERT_EQUAL(0, err);
@@ -239,9 +237,8 @@ void test_qspif_multi_threads()
 
     utest_printf("\nTest Multi Threaded Erase/Program/Read Starts..\n");
 
-    QSPIFBlockDevice blockD(MBED_CONF_QSPIF_QSPI_IO0, MBED_CONF_QSPIF_QSPI_IO1, MBED_CONF_QSPIF_QSPI_IO2,
-                            MBED_CONF_QSPIF_QSPI_IO3, MBED_CONF_QSPIF_QSPI_CLK, MBED_CONF_QSPIF_QSPI_CS, QSPIF_POLARITY_MODE_0,
-                            MBED_CONF_QSPIF_QSPI_FREQ);
+    QSPIFBlockDevice blockD(QSPI_FLASH1_IO0, QSPI_FLASH1_IO1, QSPI_FLASH1_IO2, QSPI_FLASH1_IO3,
+                            QSPI_FLASH1_SCK, QSPI_FLASH1_CSN, QSPIF_POLARITY_MODE_0, MBED_CONF_QSPIF_QSPI_FREQ);
 
     int err = blockD.init();
     TEST_ASSERT_EQUAL(0, err);

mbed_lib.json

@@ -1,49 +1,19 @@
 {
 "name": "qspif",
     "config": {
-        "QSPI_IO0": "NC",
-        "QSPI_IO1": "NC",
-        "QSPI_IO2": "NC",
-        "QSPI_IO3": "NC",
-        "QSPI_CLK":  "NC",
-        "QSPI_CS":   "NC",
         "QSPI_FREQ": "40000000"
     },
     "target_overrides": {
         "DISCO_F413ZH": {
-             "QSPI_IO0": "PF_8",
-             "QSPI_IO1": "PF_9",
-             "QSPI_IO2": "PE_2",
-             "QSPI_IO3": "PD_13",
-             "QSPI_CLK":  "PB_2",
-             "QSPI_CS":   "PG_6",
              "QSPI_FREQ": "80000000"
         },
        "DISCO_L475VG": {
-             "QSPI_IO0": "PE_12",
-             "QSPI_IO1": "PE_13",
-             "QSPI_IO2": "PE_14",
-             "QSPI_IO3": "PE_15",
-             "QSPI_CLK":  "PE_10",
-             "QSPI_CS":   "PE_11",
              "QSPI_FREQ": "8000000"
         },
        "DISCO_L476VG": {
-             "QSPI_IO0": "PE_12",
-             "QSPI_IO1": "PE_13",
-             "QSPI_IO2": "PE_14",
-             "QSPI_IO3": "PE_15",
-             "QSPI_CLK":  "PE_10",
-             "QSPI_CS":   "PE_11",
              "QSPI_FREQ": "80000000"
         },
        "DISCO_F469NI": {
-             "QSPI_IO0": "PF_8",
-             "QSPI_IO1": "PF_9",
-             "QSPI_IO2": "PF_7",
-             "QSPI_IO3": "PF_6",
-             "QSPI_CLK":  "PF_10",
-             "QSPI_CS":   "PB_6",
              "QSPI_FREQ": "80000000"
         }
     }