diff --git a/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h b/storage/blockdevice/COMPONENT_DATAFLASH/include/DataFlash/DataFlashBlockDevice.h similarity index 100% rename from storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h rename to storage/blockdevice/COMPONENT_DATAFLASH/include/DataFlash/DataFlashBlockDevice.h diff --git a/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp b/storage/blockdevice/COMPONENT_DATAFLASH/source/DataFlashBlockDevice.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp rename to storage/blockdevice/COMPONENT_DATAFLASH/source/DataFlashBlockDevice.cpp diff --git a/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h b/storage/blockdevice/COMPONENT_FLASHIAP/include/FlashIAP/FlashIAPBlockDevice.h similarity index 100% rename from storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h rename to storage/blockdevice/COMPONENT_FLASHIAP/include/FlashIAP/FlashIAPBlockDevice.h diff --git a/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp b/storage/blockdevice/COMPONENT_FLASHIAP/source/FlashIAPBlockDevice.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp rename to storage/blockdevice/COMPONENT_FLASHIAP/source/FlashIAPBlockDevice.cpp diff --git a/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_debug.h b/storage/blockdevice/COMPONENT_FLASHIAP/tests/TESTS/COMMON/fslittle_debug.h similarity index 100% rename from storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_debug.h rename to storage/blockdevice/COMPONENT_FLASHIAP/tests/TESTS/COMMON/fslittle_debug.h diff --git a/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c b/storage/blockdevice/COMPONENT_FLASHIAP/tests/TESTS/COMMON/fslittle_test.c similarity index 100% rename from storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c rename to storage/blockdevice/COMPONENT_FLASHIAP/tests/TESTS/COMMON/fslittle_test.c diff --git a/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h b/storage/blockdevice/COMPONENT_FLASHIAP/tests/TESTS/COMMON/fslittle_test.h similarity index 100% rename from storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h rename to storage/blockdevice/COMPONENT_FLASHIAP/tests/TESTS/COMMON/fslittle_test.h diff --git a/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h b/storage/blockdevice/COMPONENT_I2CEE/include/I2CEE/I2CEEBlockDevice.h similarity index 100% rename from storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h rename to storage/blockdevice/COMPONENT_I2CEE/include/I2CEE/I2CEEBlockDevice.h diff --git a/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp b/storage/blockdevice/COMPONENT_I2CEE/source/I2CEEBlockDevice.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp rename to storage/blockdevice/COMPONENT_I2CEE/source/I2CEEBlockDevice.cpp diff --git a/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp b/storage/blockdevice/COMPONENT_I2CEE/tests/TESTS/block_device/i2cee/main.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp rename to storage/blockdevice/COMPONENT_I2CEE/tests/TESTS/block_device/i2cee/main.cpp diff --git a/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h b/storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h similarity index 100% rename from storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h rename to storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h diff --git a/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp b/storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp rename to storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp diff --git a/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h b/storage/blockdevice/COMPONENT_SD/include/SD/SDBlockDevice.h similarity index 100% rename from storage/blockdevice/COMPONENT_SD/SDBlockDevice.h rename to storage/blockdevice/COMPONENT_SD/include/SD/SDBlockDevice.h diff --git a/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp b/storage/blockdevice/COMPONENT_SD/source/SDBlockDevice.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp rename to storage/blockdevice/COMPONENT_SD/source/SDBlockDevice.cpp diff --git a/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h b/storage/blockdevice/COMPONENT_SD/tests/TESTS/COMMON/fsfat_debug.h similarity index 100% rename from storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h rename to storage/blockdevice/COMPONENT_SD/tests/TESTS/COMMON/fsfat_debug.h diff --git a/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c b/storage/blockdevice/COMPONENT_SD/tests/TESTS/COMMON/fsfat_test.c similarity index 100% rename from storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c rename to storage/blockdevice/COMPONENT_SD/tests/TESTS/COMMON/fsfat_test.c diff --git a/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h b/storage/blockdevice/COMPONENT_SD/tests/TESTS/COMMON/fsfat_test.h similarity index 100% rename from storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h rename to storage/blockdevice/COMPONENT_SD/tests/TESTS/COMMON/fsfat_test.h diff --git a/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp b/storage/blockdevice/COMPONENT_SD/tests/TESTS/filesystem/dirs/main.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp rename to storage/blockdevice/COMPONENT_SD/tests/TESTS/filesystem/dirs/main.cpp diff --git a/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp b/storage/blockdevice/COMPONENT_SD/tests/TESTS/filesystem/files/main.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp rename to storage/blockdevice/COMPONENT_SD/tests/TESTS/filesystem/files/main.cpp diff --git a/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp b/storage/blockdevice/COMPONENT_SD/tests/TESTS/filesystem/fopen/fopen.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp rename to storage/blockdevice/COMPONENT_SD/tests/TESTS/filesystem/fopen/fopen.cpp diff --git a/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp b/storage/blockdevice/COMPONENT_SD/tests/TESTS/filesystem/parallel/main.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp rename to storage/blockdevice/COMPONENT_SD/tests/TESTS/filesystem/parallel/main.cpp diff --git a/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/seek/main.cpp b/storage/blockdevice/COMPONENT_SD/tests/TESTS/filesystem/seek/main.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_SD/TESTS/filesystem/seek/main.cpp rename to storage/blockdevice/COMPONENT_SD/tests/TESTS/filesystem/seek/main.cpp diff --git a/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h b/storage/blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h similarity index 100% rename from storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h rename to storage/blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h diff --git a/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp b/storage/blockdevice/COMPONENT_SPIF/source/SPIFBlockDevice.cpp similarity index 100% rename from storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp rename to storage/blockdevice/COMPONENT_SPIF/source/SPIFBlockDevice.cpp diff --git a/storage/kvstore/kv_config/source/kv_config.cpp b/storage/kvstore/kv_config/source/kv_config.cpp index 8114a68b05..b100df9dc6 100644 --- a/storage/kvstore/kv_config/source/kv_config.cpp +++ b/storage/kvstore/kv_config/source/kv_config.cpp @@ -32,23 +32,23 @@ #define TRACE_GROUP "KVCFG" #if COMPONENT_FLASHIAP -#include "storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h" +#include "FlashIAPBlockDevice.h" #endif #if COMPONENT_QSPIF -#include "storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h" +#include "QSPIFBlockDevice.h" #endif #if COMPONENT_SPIF -#include "storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h" +#include "SPIFBlockDevice.h" #endif #if COMPONENT_DATAFLASH -#include "storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h" +#include "DataFlashBlockDevice.h" #endif #if COMPONENT_SD -#include "storage/blockdevice/COMPONENT_SD/SDBlockDevice.h" +#include "SDBlockDevice.h" #if (STATIC_PINMAP_READY) const spi_pinmap_t static_spi_pinmap = get_spi_pinmap(MBED_CONF_SD_SPI_MOSI, MBED_CONF_SD_SPI_MISO, MBED_CONF_SD_SPI_CLK, NC); diff --git a/storage/platform/source/PlatformStorage.cpp b/storage/platform/source/PlatformStorage.cpp index f262c07d7c..eadc60e4e6 100644 --- a/storage/platform/source/PlatformStorage.cpp +++ b/storage/platform/source/PlatformStorage.cpp @@ -21,19 +21,19 @@ #if COMPONENT_SPIF -#include "storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h" +#include "SPIFBlockDevice.h" #endif #if COMPONENT_QSPIF -#include "storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h" +#include "QSPIFBlockDevice.h" #endif #if COMPONENT_DATAFLASH -#include "storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h" +#include "DataFlashBlockDevice.h" #endif #if COMPONENT_SD -#include "storage/blockdevice/COMPONENT_SD/SDBlockDevice.h" +#include "SDBlockDevice.h" #if (STATIC_PINMAP_READY) const spi_pinmap_t static_spi_pinmap = get_spi_pinmap(MBED_CONF_SD_SPI_MOSI, MBED_CONF_SD_SPI_MISO, MBED_CONF_SD_SPI_CLK, NC); @@ -41,7 +41,7 @@ const spi_pinmap_t static_spi_pinmap = get_spi_pinmap(MBED_CONF_SD_SPI_MOSI, MBE #endif #if COMPONENT_FLASHIAP -#include "storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h" +#include "FlashIAPBlockDevice.h" #endif using namespace mbed;