ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10755 from maciejbocianski/fix_qspi_hal_test_code 

hal_qspi_test: undo buggy code
pull/10769/head
Martin Kojtal 2019-06-05 11:43:23 +01:00 committed by GitHub
parent fbc489e6a5 90fbab0419
commit 2b354a40b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TESTS/mbed_hal/qspi/flash_configs/S25FL512S_config.h
View File

@ -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 }; \

33
TESTS/mbed_hal/qspi/qspi_test_utils.cpp
View File

@ -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));

1
TESTS/mbed_hal/qspi/qspi_test_utils.h
View File

@ -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);