Skip to content

Commit ab5af1e

Browse files
adbridgeadbridge
authored
Merge pull request #13244 from rajkan01/storage_restructure_initial
Move storage from features into mbed-os root directory
2 parents 29ca32e + 3f080df commit ab5af1e

File tree

282 files changed

+191
-190
lines changed

Some content is hidden

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

282 files changed

+191
-190
lines changed

‎.astyleignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
^features/netsocket/ppp/include
1515
^features/netsocket/ppp/polarssl
1616
^features/netsocket/ppp/source
17-
^features/storage/filesystem/fat/ChaN
18-
^features/storage/filesystem/littlefs/littlefs/
19-
^features/storage/filesystem/littlefsv2/littlefs/
17+
^storage/filesystem/fat/ChaN
18+
^storage/filesystem/littlefs/littlefs/
19+
^storage/filesystem/littlefsv2/littlefs/
2020
^features/unsupported/
2121
^hal/storage_abstraction
2222
^platform/cxxsupport

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ matrix:
271271
272272
- <<: *extended-vm
273273
name: "littlefs"
274-
env: NAME=littlefs LITTLEFS=features/storage/filesystem/littlefs
274+
env: NAME=littlefs LITTLEFS=storage/filesystem/littlefs
275275
install:
276276
# Install gcc
277277
- source_pkg gcc

‎LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Folders containing files under different permissive license than Apache 2.0 are
1414
- [features/lorawan](./features/lorawan) - Revised BSD
1515
- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
1616
- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
17-
- [features/storage](./features/storage) - BSD-style, MIT
1817
- [features/netsocket/emac-drivers](./features/netsocket/emac-drivers) - BSD-style
1918
- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
2019
- [features/unsupported](./features/unsupported) - MIT-style, BSD-style
20+
- [storage](./storage) - BSD-style, MIT
2121
- [rtos](./rtos) - MIT
2222
- [drivers](./drivers) - MIT
2323
- [TESTS/mbed_hal/trng/pithy](./TESTS/mbed_hal/trng/pithy) - BSD-3-Clause

‎UNITTESTS/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +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"
116117
"${PROJECT_SOURCE_DIR}/../drivers"
117118
"${PROJECT_SOURCE_DIR}/../hal"
118119
"${PROJECT_SOURCE_DIR}/../events"
@@ -144,7 +145,7 @@ set(unittest-includes-base
144145
"${PROJECT_SOURCE_DIR}/../features/lorawan/system"
145146
"${PROJECT_SOURCE_DIR}/../features/mbedtls"
146147
"${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
147-
"${PROJECT_SOURCE_DIR}/../features/storage/kvstore/conf"
148+
"${PROJECT_SOURCE_DIR}/../storage/kvstore/conf"
148149
)
149150

150151
# Create a list for test suites.

‎UNITTESTS/empty_baseline/unittest.cmake

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,33 @@ set(unittest-includes ${unittest-includes}
1313

1414
set(unittest-sources
1515
../features/device_key/source/DeviceKey.cpp
16-
../components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
17-
../components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
18-
../components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
19-
../components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
20-
../components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
21-
../components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
22-
../features/storage/filesystem/Dir.cpp
23-
../features/storage/filesystem/FileSystem.cpp
24-
../features/storage/filesystem/File.cpp
25-
../features/storage/kvstore/global_api/kvstore_global_api.cpp
26-
../features/storage/kvstore/securestore/SecureStore.cpp
27-
../features/storage/kvstore/kv_map/KVMap.cpp
28-
../features/storage/kvstore/tdbstore/TDBStore.cpp
29-
../features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
30-
../features/storage/kvstore/conf/kv_config.cpp
31-
../features/storage/kvstore/filesystemstore/FileSystemStore.cpp
32-
../features/storage/system_storage/SystemStorage.cpp
33-
../features/storage/blockdevice/ChainingBlockDevice.cpp
34-
../features/storage/blockdevice/ReadOnlyBlockDevice.cpp
35-
../features/storage/blockdevice/SlicingBlockDevice.cpp
36-
../features/storage/blockdevice/MBRBlockDevice.cpp
37-
../features/storage/blockdevice/HeapBlockDevice.cpp
38-
../features/storage/blockdevice/FlashSimBlockDevice.cpp
39-
../features/storage/blockdevice/ObservingBlockDevice.cpp
40-
../features/storage/blockdevice/ProfilingBlockDevice.cpp
41-
../features/storage/blockdevice/BufferedBlockDevice.cpp
42-
../features/storage/blockdevice/ExhaustibleBlockDevice.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
22+
../storage/filesystem/Dir.cpp
23+
../storage/filesystem/FileSystem.cpp
24+
../storage/filesystem/File.cpp
25+
../storage/kvstore/global_api/kvstore_global_api.cpp
26+
../storage/kvstore/securestore/SecureStore.cpp
27+
../storage/kvstore/kv_map/KVMap.cpp
28+
../storage/kvstore/tdbstore/TDBStore.cpp
29+
../storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
30+
../storage/kvstore/conf/kv_config.cpp
31+
../storage/kvstore/filesystemstore/FileSystemStore.cpp
32+
../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
4343
)
4444

4545
set(unittest-test-sources

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

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

‎UNITTESTS/moduletests/storage/blockdevice/SlicingBlockDevice/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 "features/storage/blockdevice/HeapBlockDevice.h"
19-
#include "features/storage/blockdevice/SlicingBlockDevice.h"
18+
#include "storage/blockdevice/HeapBlockDevice.h"
19+
#include "storage/blockdevice/SlicingBlockDevice.h"
2020

2121
#define BLOCK_SIZE (512)
2222
#define DEVICE_SIZE (BLOCK_SIZE*10)

‎UNITTESTS/moduletests/storage/blockdevice/SlicingBlockDevice/unittest.cmake

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

1111
set(unittest-sources
12-
../features/storage/blockdevice/SlicingBlockDevice.cpp
13-
../features/storage/blockdevice/HeapBlockDevice.cpp
12+
../storage/blockdevice/SlicingBlockDevice.cpp
13+
../storage/blockdevice/HeapBlockDevice.cpp
1414
stubs/mbed_atomic_stub.c
1515
stubs/mbed_assert_stub.cpp
1616
)

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

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

1717
#include "gtest/gtest.h"
18-
#include "features/storage/blockdevice/HeapBlockDevice.h"
19-
#include "features/storage/kvstore/filesystemstore/FileSystemStore.h"
20-
#include "features/storage/filesystem/littlefs/LittleFileSystem.h"
18+
#include "storage/blockdevice/HeapBlockDevice.h"
19+
#include "storage/kvstore/filesystemstore/FileSystemStore.h"
20+
#include "storage/filesystem/littlefs/LittleFileSystem.h"
2121
#include "mbed_error.h"
2222
#include <stdlib.h>
2323

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

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

1111
set(unittest-sources
12-
../features/storage/blockdevice/HeapBlockDevice.cpp
13-
../features/storage/kvstore/filesystemstore/FileSystemStore.cpp
14-
../features/storage/filesystem/littlefs/LittleFileSystem.cpp
15-
../features/storage/filesystem/Dir.cpp
16-
../features/storage/filesystem/File.cpp
17-
../features/storage/filesystem/FileSystem.cpp
12+
../storage/blockdevice/HeapBlockDevice.cpp
13+
../storage/kvstore/filesystemstore/FileSystemStore.cpp
14+
../storage/filesystem/littlefs/LittleFileSystem.cpp
15+
../storage/filesystem/Dir.cpp
16+
../storage/filesystem/File.cpp
17+
../storage/filesystem/FileSystem.cpp
1818
../features/frameworks/mbed-trace/source/mbed_trace.c
19-
../features/storage/filesystem/littlefs/littlefs/lfs_util.c
20-
../features/storage/filesystem/littlefs/littlefs/lfs.c
19+
../storage/filesystem/littlefs/littlefs/lfs_util.c
20+
../storage/filesystem/littlefs/littlefs/lfs.c
2121
../platform/source/FileBase.cpp
2222
../platform/source/FileSystemHandle.cpp
2323
../platform/source/FileHandle.cpp

0 commit comments

Comments
 (0)