Skip to content

Commit ca2f980

Browse files
adbridgeadbridge
authored
Merge pull request #13273 from rajkan01/storage_rb_dir_restructure
Restructure storage blockdevice directory
2 parents 63655e8 + 3bcb4eb commit ca2f980

File tree

76 files changed

+103
-126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+103
-126
lines changed

‎.astyleignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@
2828
^TESTS/mbed_hal/trng/pithy
2929
^tools
3030
^UNITTESTS
31+
^storage/blockdevice/tests/UNITTESTS

‎UNITTESTS/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ set(unittest-includes-base
113113
"${PROJECT_SOURCE_DIR}/../features"
114114
"${PROJECT_SOURCE_DIR}/../features/netsocket"
115115
"${PROJECT_SOURCE_DIR}/../platform"
116-
"${PROJECT_SOURCE_DIR}/../storage"
116+
"${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
117117
"${PROJECT_SOURCE_DIR}/../drivers"
118118
"${PROJECT_SOURCE_DIR}/../hal"
119119
"${PROJECT_SOURCE_DIR}/../events"

‎UNITTESTS/empty_baseline/unittest.cmake

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@ set(unittest-includes ${unittest-includes}
1212
)
1313

1414
set(unittest-sources
15-
../features/device_key/source/DeviceKey.cpp
16-
../storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
17-
../storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
18-
../storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
19-
../storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
20-
../storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
21-
../storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
2215
../storage/filesystem/Dir.cpp
2316
../storage/filesystem/FileSystem.cpp
2417
../storage/filesystem/File.cpp
@@ -30,16 +23,6 @@ set(unittest-sources
3023
../storage/kvstore/conf/kv_config.cpp
3124
../storage/kvstore/filesystemstore/FileSystemStore.cpp
3225
../storage/system_storage/SystemStorage.cpp
33-
../storage/blockdevice/ChainingBlockDevice.cpp
34-
../storage/blockdevice/ReadOnlyBlockDevice.cpp
35-
../storage/blockdevice/SlicingBlockDevice.cpp
36-
../storage/blockdevice/MBRBlockDevice.cpp
37-
../storage/blockdevice/HeapBlockDevice.cpp
38-
../storage/blockdevice/FlashSimBlockDevice.cpp
39-
../storage/blockdevice/ObservingBlockDevice.cpp
40-
../storage/blockdevice/ProfilingBlockDevice.cpp
41-
../storage/blockdevice/BufferedBlockDevice.cpp
42-
../storage/blockdevice/ExhaustibleBlockDevice.cpp
4326
)
4427

4528
set(unittest-test-sources

‎UNITTESTS/moduletests/storage/kvstore/FileSystemStore/moduletest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#include "gtest/gtest.h"
18-
#include "storage/blockdevice/HeapBlockDevice.h"
18+
#include "blockdevice/HeapBlockDevice.h"
1919
#include "storage/kvstore/filesystemstore/FileSystemStore.h"
2020
#include "storage/filesystem/littlefs/LittleFileSystem.h"
2121
#include "mbed_error.h"

‎UNITTESTS/moduletests/storage/kvstore/FileSystemStore/unittest.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
99
)
1010

1111
set(unittest-sources
12-
../storage/blockdevice/HeapBlockDevice.cpp
12+
../storage/blockdevice/source/HeapBlockDevice.cpp
1313
../storage/kvstore/filesystemstore/FileSystemStore.cpp
1414
../storage/filesystem/littlefs/LittleFileSystem.cpp
1515
../storage/filesystem/Dir.cpp

‎UNITTESTS/moduletests/storage/kvstore/TDBStore/moduletest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616

1717
#include "gtest/gtest.h"
18-
#include "storage/blockdevice/HeapBlockDevice.h"
19-
#include "storage/blockdevice/FlashSimBlockDevice.h"
18+
#include "blockdevice/HeapBlockDevice.h"
19+
#include "blockdevice/FlashSimBlockDevice.h"
2020
#include "storage/kvstore/tdbstore/TDBStore.h"
2121
#include <stdlib.h>
2222

‎UNITTESTS/moduletests/storage/kvstore/TDBStore/unittest.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ set(unittest-includes ${unittest-includes}
1010
)
1111

1212
set(unittest-sources
13-
../storage/blockdevice/FlashSimBlockDevice.cpp
14-
../storage/blockdevice/HeapBlockDevice.cpp
15-
../storage/blockdevice/BufferedBlockDevice.cpp
13+
../storage/blockdevice/source/FlashSimBlockDevice.cpp
14+
../storage/blockdevice/source/HeapBlockDevice.cpp
15+
../storage/blockdevice/source/BufferedBlockDevice.cpp
1616
../storage/kvstore/tdbstore/TDBStore.cpp
1717
../features/frameworks/mbed-trace/source/mbed_trace.c
1818
stubs/mbed_atomic_stub.c

‎UNITTESTS/storage/blockdevice/ChainingBlockDevice/unittest.cmake

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎UNITTESTS/stubs/BlockDevice_mock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "gtest/gtest.h"
2222
#include "gmock/gmock.h"
23-
#include "storage/blockdevice/BlockDevice.h"
23+
#include "blockdevice/BlockDevice.h"
2424

2525
class BlockDeviceMock : public BlockDevice {
2626
public:

‎UNITTESTS/stubs/EmulatedSD.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef EMULATEDSD_H
1818
#define EMULATEDSD_H
1919

20-
#include "storage/blockdevice/BlockDevice.h"
20+
#include "blockdevice/BlockDevice.h"
2121

2222
class EmulatedSD_Private;
2323

0 commit comments

Comments
 (0)