diff --git a/drivers/internal/SFDP.h b/drivers/internal/SFDP.h index 28d1aa120d..9e3c759dfa 100644 --- a/drivers/internal/SFDP.h +++ b/drivers/internal/SFDP.h @@ -20,7 +20,7 @@ #include #include -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "platform/Callback.h" namespace mbed { diff --git a/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h b/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h index 31ec8ba774..215f8594c0 100644 --- a/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h +++ b/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h @@ -20,7 +20,7 @@ #include "platform/PlatformMutex.h" #include "PinNames.h" -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "drivers/SPI.h" #include "drivers/DigitalOut.h" diff --git a/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h b/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h index 02ee17357a..1ba0e986fe 100644 --- a/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h +++ b/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h @@ -21,7 +21,7 @@ #if DEVICE_FLASH #include "FlashIAP.h" -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "platform/mbed_toolchain.h" /** BlockDevice using the FlashIAP API diff --git a/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h b/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h index ca6c802ec8..8bc1368211 100644 --- a/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h +++ b/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h @@ -17,7 +17,7 @@ #ifndef MBED_I2CEEPROM_BLOCK_DEVICE_H #define MBED_I2CEEPROM_BLOCK_DEVICE_H -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "drivers/I2C.h" /** BlockDevice for I2C based flash device such as diff --git a/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h b/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h index 9011030969..c277633dc8 100644 --- a/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h +++ b/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h @@ -19,7 +19,7 @@ #include "drivers/QSPI.h" #include "drivers/internal/SFDP.h" -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "platform/Callback.h" #ifndef MBED_CONF_QSPIF_QSPI_IO0 diff --git a/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h b/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h index c395115f06..fef13f528a 100644 --- a/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h +++ b/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h @@ -21,7 +21,7 @@ /* If the target has no SPI support, then SD Card is not supported. */ #if DEVICE_SPI -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "drivers/SPI.h" #include "drivers/Timer.h" #include "drivers/MbedCRC.h" diff --git a/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h b/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h index c98cf03d93..445b4cd2c9 100644 --- a/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h +++ b/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h @@ -21,7 +21,7 @@ #include "drivers/SPI.h" #include "drivers/DigitalOut.h" #include "drivers/internal/SFDP.h" -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #ifndef MBED_CONF_SPIF_DRIVER_SPI_MOSI #define MBED_CONF_SPIF_DRIVER_SPI_MOSI NC diff --git a/storage/filesystem/FileSystem.h b/storage/filesystem/FileSystem.h index b0ec3e6eb2..a11fa9922d 100644 --- a/storage/filesystem/FileSystem.h +++ b/storage/filesystem/FileSystem.h @@ -23,7 +23,7 @@ #include "platform/FileHandle.h" #include "platform/DirHandle.h" #include "platform/FileSystemLike.h" -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" namespace mbed { /** \addtogroup file system */ diff --git a/storage/filesystem/fat/FATFileSystem.h b/storage/filesystem/fat/FATFileSystem.h index ed464f09b8..b151df1628 100644 --- a/storage/filesystem/fat/FATFileSystem.h +++ b/storage/filesystem/fat/FATFileSystem.h @@ -27,7 +27,7 @@ #define MBED_FATFILESYSTEM_H #include "storage/filesystem/FileSystem.h" -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "FileHandle.h" #include #include "PlatformMutex.h" diff --git a/storage/filesystem/littlefs/LittleFileSystem.h b/storage/filesystem/littlefs/LittleFileSystem.h index 2da3a49339..ab5badaf45 100644 --- a/storage/filesystem/littlefs/LittleFileSystem.h +++ b/storage/filesystem/littlefs/LittleFileSystem.h @@ -21,7 +21,7 @@ #define MBED_LFSFILESYSTEM_H #include "storage/filesystem/FileSystem.h" -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "platform/PlatformMutex.h" #include "storage/filesystem/littlefs/littlefs/lfs.h" diff --git a/storage/filesystem/mbed_filesystem.h b/storage/filesystem/mbed_filesystem.h index 4e8f631cfd..9a8acc5260 100644 --- a/storage/filesystem/mbed_filesystem.h +++ b/storage/filesystem/mbed_filesystem.h @@ -28,10 +28,10 @@ #include "storage/filesystem/Dir.h" // BlockDevice classes -#include "storage/blockdevice/BlockDevice.h" -#include "storage/blockdevice/ChainingBlockDevice.h" -#include "storage/blockdevice/SlicingBlockDevice.h" -#include "storage/blockdevice/HeapBlockDevice.h" +#include "blockdevice/BlockDevice.h" +#include "blockdevice/ChainingBlockDevice.h" +#include "blockdevice/SlicingBlockDevice.h" +#include "blockdevice/HeapBlockDevice.h" /** @}*/ #endif diff --git a/storage/kvstore/conf/kv_config.cpp b/storage/kvstore/conf/kv_config.cpp index a75db9925f..36acadee0e 100644 --- a/storage/kvstore/conf/kv_config.cpp +++ b/storage/kvstore/conf/kv_config.cpp @@ -17,16 +17,16 @@ #include "kv_config.h" #include "storage/kvstore/include/KVStore.h" #include "storage/kvstore/kv_map/KVMap.h" -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "storage/filesystem/FileSystem.h" #include "storage/kvstore/filesystemstore/FileSystemStore.h" -#include "storage/blockdevice/SlicingBlockDevice.h" +#include "blockdevice/SlicingBlockDevice.h" #include "storage/filesystem/fat/FATFileSystem.h" #include "storage/filesystem/littlefs/LittleFileSystem.h" #include "storage/kvstore/tdbstore/TDBStore.h" #include "mbed_error.h" #include "drivers/FlashIAP.h" -#include "storage/blockdevice/FlashSimBlockDevice.h" +#include "blockdevice/FlashSimBlockDevice.h" #include "mbed_trace.h" #include "storage/kvstore/securestore/SecureStore.h" #define TRACE_GROUP "KVCFG" diff --git a/storage/kvstore/conf/kv_config.h b/storage/kvstore/conf/kv_config.h index eb9471acdf..4aee616572 100644 --- a/storage/kvstore/conf/kv_config.h +++ b/storage/kvstore/conf/kv_config.h @@ -16,7 +16,7 @@ #ifndef _KV_CONFIG #define _KV_CONFIG -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #ifdef __cplusplus extern "C" { diff --git a/storage/kvstore/filesystemstore/FileSystemStore.cpp b/storage/kvstore/filesystemstore/FileSystemStore.cpp index 524ea2c979..fb5ef84d64 100644 --- a/storage/kvstore/filesystemstore/FileSystemStore.cpp +++ b/storage/kvstore/filesystemstore/FileSystemStore.cpp @@ -20,7 +20,7 @@ #include "storage/kvstore/conf/kv_config.h" #include "storage/filesystem/Dir.h" #include "storage/filesystem/File.h" -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "mbed_error.h" #include #include diff --git a/storage/kvstore/kv_map/KVMap.h b/storage/kvstore/kv_map/KVMap.h index 69f9f3d8c2..3cadba7058 100644 --- a/storage/kvstore/kv_map/KVMap.h +++ b/storage/kvstore/kv_map/KVMap.h @@ -19,7 +19,7 @@ #include "storage/kvstore/include/KVStore.h" #include "platform/PlatformMutex.h" #include "platform/SingletonPtr.h" -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "storage/filesystem/FileSystem.h" namespace mbed { diff --git a/storage/kvstore/tdbstore/TDBStore.h b/storage/kvstore/tdbstore/TDBStore.h index 917c6beab2..19844bb796 100644 --- a/storage/kvstore/tdbstore/TDBStore.h +++ b/storage/kvstore/tdbstore/TDBStore.h @@ -20,8 +20,8 @@ #include #include #include "storage/kvstore/include/KVStore.h" -#include "storage/blockdevice/BlockDevice.h" -#include "storage/blockdevice/BufferedBlockDevice.h" +#include "blockdevice/BlockDevice.h" +#include "blockdevice/BufferedBlockDevice.h" #include "PlatformMutex.h" #include "mbed_error.h" diff --git a/storage/system_storage/SystemStorage.cpp b/storage/system_storage/SystemStorage.cpp index f25400fe90..615209486d 100644 --- a/storage/system_storage/SystemStorage.cpp +++ b/storage/system_storage/SystemStorage.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "storage/blockdevice/BlockDevice.h" +#include "blockdevice/BlockDevice.h" #include "storage/filesystem/FileSystem.h" #include "storage/filesystem/fat/FATFileSystem.h" #include "storage/filesystem/littlefs/LittleFileSystem.h"