Reuse existing error for _qspi_configure_format

Use QSPIF_BD_ERROR_DEVICE_ERROR instead of introducing a new error code.
Add tr_error calls whenever _qspi_configure_format fails to aid in debugging.

Author: Kyle Kearney

components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp

@@ -248,7 +248,8 @@ int QSPIFBlockDevice::init()
     // Configure  BUS Mode to 1_1_1 for all commands other than Read
     if (QSPI_STATUS_OK != _qspi_configure_format(QSPI_CFG_BUS_SINGLE, QSPI_CFG_BUS_SINGLE, QSPI_CFG_ADDR_SIZE_24, QSPI_CFG_BUS_SINGLE,
                                                  QSPI_CFG_ALT_SIZE_8, QSPI_CFG_BUS_SINGLE, 0)) {
-        status = QSPIF_BD_ERROR_CONF_FORMAT_FAILED;
+        tr_error("_qspi_configure_format failed");
+        status = QSPIF_BD_ERROR_DEVICE_ERROR;
         goto exit_point;
     }
 
@@ -307,7 +308,8 @@ int QSPIFBlockDevice::read(void *buffer, bd_addr_t addr, bd_size_t size)
     // Configure Bus for Reading
     if (QSPI_STATUS_OK != _qspi_configure_format(_inst_width, _address_width, _address_size, QSPI_CFG_BUS_SINGLE,
                                                  QSPI_CFG_ALT_SIZE_8, _data_width, _dummy_and_mode_cycles)) {
-        return QSPIF_BD_ERROR_CONF_FORMAT_FAILED;
+        tr_error("_qspi_configure_format failed");
+        return QSPIF_BD_ERROR_DEVICE_ERROR;
     }
 
     if (QSPI_STATUS_OK != _qspi_send_read_command(_read_instruction, buffer, addr, size)) {
@@ -318,7 +320,8 @@ int QSPIFBlockDevice::read(void *buffer, bd_addr_t addr, bd_size_t size)
     // All commands other than Read use default 1-1-1 Bus mode (Program/Erase are constrained by flash memory performance less than that of the bus)
     if (QSPI_STATUS_OK != _qspi_configure_format(QSPI_CFG_BUS_SINGLE, QSPI_CFG_BUS_SINGLE, QSPI_CFG_ADDR_SIZE_24, QSPI_CFG_BUS_SINGLE,
                                                  QSPI_CFG_ALT_SIZE_8, QSPI_CFG_BUS_SINGLE, 0)) {
-        return QSPIF_BD_ERROR_CONF_FORMAT_FAILED;
+        tr_error("_qspi_configure_format failed");
+        return QSPIF_BD_ERROR_DEVICE_ERROR;
     }
 
     _mutex.unlock();
@@ -726,6 +729,7 @@ int QSPIFBlockDevice::_sfdp_parse_sfdp_headers(uint32_t &basic_table_addr, size_
     // Set 1-1-1 bus mode for SFDP header parsing
     if (QSPI_STATUS_OK != _qspi_configure_format(QSPI_CFG_BUS_SINGLE, QSPI_CFG_BUS_SINGLE, QSPI_CFG_ADDR_SIZE_24, QSPI_CFG_BUS_SINGLE,
                                                  QSPI_CFG_ALT_SIZE_8, QSPI_CFG_BUS_SINGLE, 8)) {
+        tr_error("_qspi_configure_format failed");
         return -1;
     }
 
@@ -895,6 +899,7 @@ int QSPIFBlockDevice::_sfdp_set_quad_enabled(uint8_t *basic_param_table_ptr)
     // Configure  BUS Mode to 1_1_1 for all commands other than Read
     if (QSPI_STATUS_OK != _qspi_configure_format(QSPI_CFG_BUS_SINGLE, QSPI_CFG_BUS_SINGLE, QSPI_CFG_ADDR_SIZE_24, QSPI_CFG_BUS_SINGLE,
                                                  QSPI_CFG_ALT_SIZE_8, QSPI_CFG_BUS_SINGLE, 0)) {
+        tr_error("_qspi_configure_format failed");
         return -1;
     }
 
@@ -1219,7 +1224,7 @@ int QSPIFBlockDevice::_enable_fast_mdoe()
     if (QSPI_STATUS_OK != _qspi_configure_format(QSPI_CFG_BUS_SINGLE, QSPI_CFG_BUS_SINGLE, QSPI_CFG_ADDR_SIZE_24, QSPI_CFG_BUS_SINGLE,
                                                  QSPI_CFG_ALT_SIZE_8, QSPI_CFG_BUS_SINGLE, 0)) {
         tr_error("_qspi_configure_format failed");
-        return QSPIF_BD_ERROR_CONF_FORMAT_FAILED;
+        return QSPIF_BD_ERROR_DEVICE_ERROR;
     }
 
     // Read Status Register

components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h

@@ -29,10 +29,9 @@ enum qspif_bd_error {
     QSPIF_BD_ERROR_PARSING_FAILED        = -4002, /* SFDP Parsing failed */
     QSPIF_BD_ERROR_READY_FAILED          = -4003, /* Wait for  Mem Ready failed */
     QSPIF_BD_ERROR_WREN_FAILED           = -4004, /* Write Enable Failed */
-    QSPIF_BD_ERROR_CONF_FORMAT_FAILED    = -4005, /* Configure format failed */
-    QSPIF_BD_ERROR_INVALID_ERASE_PARAMS  = -4006, /* Erase command not on sector aligned addresses or exceeds device size */
-    QSPIF_BD_ERROR_DEVICE_NOT_UNIQE      = -4007, /* Only one instance per csel is allowed */
-    QSPIF_BD_ERROR_DEVICE_MAX_EXCEED     = -4008 /* Max active QSPIF devices exceeded */
+    QSPIF_BD_ERROR_INVALID_ERASE_PARAMS  = -4005, /* Erase command not on sector aligned addresses or exceeds device size */
+    QSPIF_BD_ERROR_DEVICE_NOT_UNIQE      = -4006, /* Only one instance per csel is allowed */
+    QSPIF_BD_ERROR_DEVICE_MAX_EXCEED     = -4007 /* Max active QSPIF devices exceeded */
 };
 
 /** Enum qspif polarity mode