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

asyle issues

pull/9646/head
Amir Cohen 2019-01-31 14:40:33 +02:00 committed by adbridge
parent 523375865c
commit 273c0143dc
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
features/storage/TESTS/blockdevice/general_block_device/main.cpp
View File

@ -89,9 +89,8 @@ static inline uint32_t align_up(uint32_t val, uint32_t size)
static BlockDevice *get_bd_instance(uint8_t bd_type) static BlockDevice *get_bd_instance(uint8_t bd_type)
{ {
switch(bd_arr[bd_type]) { switch (bd_arr[bd_type]) {
case spif: case spif: {
{
#if COMPONENT_SPIF #if COMPONENT_SPIF
static SPIFBlockDevice default_bd( static SPIFBlockDevice default_bd(
MBED_CONF_SPIF_DRIVER_SPI_MOSI, MBED_CONF_SPIF_DRIVER_SPI_MOSI,
@ -104,8 +103,7 @@ static BlockDevice *get_bd_instance(uint8_t bd_type)
#endif #endif
break; break;
} }
case qspif: case qspif: {
{
#if COMPONENT_QSPIF #if COMPONENT_QSPIF
static QSPIFBlockDevice default_bd( static QSPIFBlockDevice default_bd(
MBED_CONF_QSPIF_QSPI_IO0, MBED_CONF_QSPIF_QSPI_IO0,
@ -121,8 +119,7 @@ static BlockDevice *get_bd_instance(uint8_t bd_type)
#endif #endif
break; break;
} }
case dataflash: case dataflash: {
{
#if COMPONENT_DATAFLASH #if COMPONENT_DATAFLASH
static DataFlashBlockDevice default_bd( static DataFlashBlockDevice default_bd(
MBED_CONF_DATAFLASH_SPI_MOSI, MBED_CONF_DATAFLASH_SPI_MOSI,
@ -134,8 +131,7 @@ static BlockDevice *get_bd_instance(uint8_t bd_type)
#endif #endif
break; break;
} }
case sd: case sd: {
{
#if COMPONENT_SD #if COMPONENT_SD
static SDBlockDevice default_bd( static SDBlockDevice default_bd(
MBED_CONF_SD_SPI_MOSI, MBED_CONF_SD_SPI_MOSI,
@ -147,8 +143,7 @@ static BlockDevice *get_bd_instance(uint8_t bd_type)
#endif #endif
break; break;
} }
case flashiap: case flashiap: {
{
#if COMPONENT_FLASHIAP #if COMPONENT_FLASHIAP
#if (MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE == 0) && (MBED_CONF_FLASHIAP_BLOCK_DEVICE_BASE_ADDRESS == 0xFFFFFFFF) #if (MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE == 0) && (MBED_CONF_FLASHIAP_BLOCK_DEVICE_BASE_ADDRESS == 0xFFFFFFFF)
@ -633,15 +628,15 @@ void test_get_type_functionality()
TEST_ASSERT_NOT_EQUAL(0, bd_type); TEST_ASSERT_NOT_EQUAL(0, bd_type);
#if COMPONENT_QSPIF #if COMPONENT_QSPIF
TEST_ASSERT_EQUAL(0, strcmp(bd_type, "QSPIF")); TEST_ASSERT_EQUAL(0, strcmp(bd_type, "QSPIF"));
#elif COMPONENT_SPIF #elif COMPONENT_SPIF
TEST_ASSERT_EQUAL(0, strcmp(bd_type, "SPIF")); TEST_ASSERT_EQUAL(0, strcmp(bd_type, "SPIF"));
#elif COMPONENT_DATAFLASH #elif COMPONENT_DATAFLASH
TEST_ASSERT_EQUAL(0, strcmp(bd_type, "DATAFLASH")); TEST_ASSERT_EQUAL(0, strcmp(bd_type, "DATAFLASH"));
#elif COMPONENT_SD #elif COMPONENT_SD
TEST_ASSERT_EQUAL(0, strcmp(bd_type, "SD")); TEST_ASSERT_EQUAL(0, strcmp(bd_type, "SD"));
#elif COMPONET_FLASHIAP #elif COMPONET_FLASHIAP
TEST_ASSERT_EQUAL(0, strcmp(bd_type, "FLASHIAP")); TEST_ASSERT_EQUAL(0, strcmp(bd_type, "FLASHIAP"));
#endif #endif
} }