hal_qspi_test: undo buggy code

Remove some buggy code introduced to hal_qspi_test by PR #10435 Added support for QSPI to Cypress Boards a8570ff
ARMmbed · Jul 11, 2019 · d9e2930 · d9e2930
1 parent 2b76a05
commit d9e2930
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 34 deletions.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/S25FL512S_config.h b/TESTS/mbed_hal/qspi/flash_configs/S25FL512S_config.h
@@ -113,7 +113,7 @@
 
 
 
-#define QUAD_IO_ENABLE()                                                    \
+#define EXTENDED_SPI_ENABLE()                                               \
                                                                             \
     const int32_t reg_size = QSPI_STATUS_REG_SIZE + QSPI_CONFIG_REG_0_SIZE; \
     uint8_t reg_data[reg_size] = { 0 };                                     \
@@ -150,7 +150,7 @@
 
 
 
-#define QUAD_IO_DISABLE()                                                   \
+#define EXTENDED_SPI_DISABLE()                                              \
                                                                             \
     const int32_t reg_size = QSPI_STATUS_REG_SIZE + QSPI_CONFIG_REG_0_SIZE; \
     uint8_t reg_data[reg_size] = { 0 };                                     \

diff --git a/TESTS/mbed_hal/qspi/qspi_test_utils.cpp b/TESTS/mbed_hal/qspi/qspi_test_utils.cpp
@@ -26,8 +26,6 @@
 #include "flash_configs/flash_configs.h"
 #include "mbed.h"
 
-static qspi_status_t quad_io_enable(Qspi &qspi);
-static qspi_status_t quad_io_disable(Qspi &qspi);
 static qspi_status_t extended_enable(Qspi &qspi);
 static qspi_status_t extended_disable(Qspi &qspi);
 static qspi_status_t dual_enable(Qspi &qspi);
@@ -203,9 +201,7 @@ qspi_status_t erase(uint32_t erase_cmd, uint32_t flash_addr, Qspi &qspi)
 
 qspi_status_t mode_enable(Qspi &qspi, qspi_bus_width_t inst_width, qspi_bus_width_t addr_width, qspi_bus_width_t data_width)
 {
-    if (is_quad_io_mode(inst_width, addr_width, data_width)) {
-        return quad_io_enable(qspi);
-    } else if (is_extended_mode(inst_width, addr_width, data_width)) {
+    if (is_extended_mode(inst_width, addr_width, data_width)) {
         return extended_enable(qspi);
     } else if (is_dual_mode(inst_width, addr_width, data_width)) {
         return dual_enable(qspi);
@@ -218,9 +214,7 @@ qspi_status_t mode_enable(Qspi &qspi, qspi_bus_width_t inst_width, qspi_bus_widt
 
 qspi_status_t mode_disable(Qspi &qspi, qspi_bus_width_t inst_width, qspi_bus_width_t addr_width, qspi_bus_width_t data_width)
 {
-    if (is_quad_io_mode(inst_width, addr_width, data_width)) {
-        return quad_io_disable(qspi);
-    } else if (is_extended_mode(inst_width, addr_width, data_width)) {
+    if (is_extended_mode(inst_width, addr_width, data_width)) {
         return extended_disable(qspi);
     } else if (is_dual_mode(inst_width, addr_width, data_width)) {
         return dual_disable(qspi);
@@ -231,24 +225,6 @@ qspi_status_t mode_disable(Qspi &qspi, qspi_bus_width_t inst_width, qspi_bus_wid
     }
 }
 
-static qspi_status_t quad_io_enable(Qspi &qspi)
-{
-#ifdef QUAD_IO_ENABLE
-    QUAD_IO_ENABLE();
-#else
-    return QSPI_STATUS_OK;
-#endif
-}
-
-static qspi_status_t quad_io_disable(Qspi &qspi)
-{
-#ifdef QUAD_IO_DISABLE
-    QUAD_IO_DISABLE();
-#else
-    return QSPI_STATUS_OK;
-#endif
-}
-
 static qspi_status_t extended_enable(Qspi &qspi)
 {
 #ifdef EXTENDED_SPI_ENABLE
@@ -322,11 +298,6 @@ qspi_status_t fast_mode_disable(Qspi &qspi)
 #endif
 }
 
-bool is_quad_io_mode(qspi_bus_width_t inst_width, qspi_bus_width_t addr_width, qspi_bus_width_t data_width)
-{
-    return (inst_width == QSPI_CFG_BUS_SINGLE) && ((addr_width == QSPI_CFG_BUS_QUAD) || (data_width == QSPI_CFG_BUS_QUAD));
-}
-
 bool is_extended_mode(qspi_bus_width_t inst_width, qspi_bus_width_t addr_width, qspi_bus_width_t data_width)
 {
     return (inst_width == QSPI_CFG_BUS_SINGLE) && ((addr_width != QSPI_CFG_BUS_SINGLE) || (data_width != QSPI_CFG_BUS_SINGLE));

diff --git a/TESTS/mbed_hal/qspi/qspi_test_utils.h b/TESTS/mbed_hal/qspi/qspi_test_utils.h
@@ -150,7 +150,6 @@ qspi_status_t fast_mode_disable(Qspi &qspi);
 
 qspi_status_t erase(uint32_t erase_cmd, uint32_t flash_addr, Qspi &qspi);
 
-bool is_quad_io_mode(qspi_bus_width_t inst_width, qspi_bus_width_t addr_width, qspi_bus_width_t data_width);
 bool is_extended_mode(qspi_bus_width_t inst_width, qspi_bus_width_t addr_width, qspi_bus_width_t data_width);
 bool is_dual_mode(qspi_bus_width_t inst_width, qspi_bus_width_t addr_width, qspi_bus_width_t data_width);
 bool is_quad_mode(qspi_bus_width_t inst_width, qspi_bus_width_t addr_width, qspi_bus_width_t data_width);