mirror of https://github.com/ARMmbed/mbed-os.git
Merge pull request #13300 from rajkan01/storage_fsdir_restructure
Restructure storage filesystem directorypull/13317/head
Martin Kojtal
GitHub
commit
3a8989a247
|
|
@ -114,7 +114,10 @@ set(unittest-includes-base
|
||||||
"${PROJECT_SOURCE_DIR}/../features"
|
"${PROJECT_SOURCE_DIR}/../features"
|
||||||
"${PROJECT_SOURCE_DIR}/../features/netsocket"
|
"${PROJECT_SOURCE_DIR}/../features/netsocket"
|
||||||
"${PROJECT_SOURCE_DIR}/../platform"
|
"${PROJECT_SOURCE_DIR}/../platform"
|
||||||
|
"${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include"
|
||||||
|
"${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
|
||||||
"${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
|
"${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
|
||||||
|
"${PROJECT_SOURCE_DIR}/../storage/filesystem/include"
|
||||||
"${PROJECT_SOURCE_DIR}/../drivers"
|
"${PROJECT_SOURCE_DIR}/../drivers"
|
||||||
"${PROJECT_SOURCE_DIR}/../hal"
|
"${PROJECT_SOURCE_DIR}/../hal"
|
||||||
"${PROJECT_SOURCE_DIR}/../events"
|
"${PROJECT_SOURCE_DIR}/../events"
|
||||||
|
|
|
||||||
|
|
@ -12,9 +12,6 @@ set(unittest-includes ${unittest-includes}
|
||||||
)
|
)
|
||||||
|
|
||||||
set(unittest-sources
|
set(unittest-sources
|
||||||
../storage/filesystem/Dir.cpp
|
|
||||||
../storage/filesystem/FileSystem.cpp
|
|
||||||
../storage/filesystem/File.cpp
|
|
||||||
../storage/kvstore/global_api/kvstore_global_api.cpp
|
../storage/kvstore/global_api/kvstore_global_api.cpp
|
||||||
../storage/kvstore/securestore/SecureStore.cpp
|
../storage/kvstore/securestore/SecureStore.cpp
|
||||||
../storage/kvstore/kv_map/KVMap.cpp
|
../storage/kvstore/kv_map/KVMap.cpp
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
#include "gtest/gtest.h"
|
#include "gtest/gtest.h"
|
||||||
#include "blockdevice/HeapBlockDevice.h"
|
#include "blockdevice/HeapBlockDevice.h"
|
||||||
#include "storage/kvstore/filesystemstore/FileSystemStore.h"
|
#include "storage/kvstore/filesystemstore/FileSystemStore.h"
|
||||||
#include "storage/filesystem/littlefs/LittleFileSystem.h"
|
#include "littlefs/LittleFileSystem.h"
|
||||||
#include "mbed_error.h"
|
#include "mbed_error.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,10 @@ set(unittest-includes ${unittest-includes}
|
||||||
set(unittest-sources
|
set(unittest-sources
|
||||||
../storage/blockdevice/source/HeapBlockDevice.cpp
|
../storage/blockdevice/source/HeapBlockDevice.cpp
|
||||||
../storage/kvstore/filesystemstore/FileSystemStore.cpp
|
../storage/kvstore/filesystemstore/FileSystemStore.cpp
|
||||||
../storage/filesystem/littlefs/LittleFileSystem.cpp
|
../storage/filesystem/littlefs/source/LittleFileSystem.cpp
|
||||||
../storage/filesystem/Dir.cpp
|
../storage/filesystem/source/Dir.cpp
|
||||||
../storage/filesystem/File.cpp
|
../storage/filesystem/source/File.cpp
|
||||||
../storage/filesystem/FileSystem.cpp
|
../storage/filesystem/source/FileSystem.cpp
|
||||||
../features/frameworks/mbed-trace/source/mbed_trace.c
|
../features/frameworks/mbed-trace/source/mbed_trace.c
|
||||||
../storage/filesystem/littlefs/littlefs/lfs_util.c
|
../storage/filesystem/littlefs/littlefs/lfs_util.c
|
||||||
../storage/filesystem/littlefs/littlefs/lfs.c
|
../storage/filesystem/littlefs/littlefs/lfs.c
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
#ifndef MBED_FATFILESYSTEM_H
|
#ifndef MBED_FATFILESYSTEM_H
|
||||||
#define MBED_FATFILESYSTEM_H
|
#define MBED_FATFILESYSTEM_H
|
||||||
|
|
||||||
#include "storage/filesystem/FileSystem.h"
|
#include "filesystem/FileSystem.h"
|
||||||
#include "blockdevice/BlockDevice.h"
|
#include "blockdevice/BlockDevice.h"
|
||||||
#include "FileHandle.h"
|
#include "FileHandle.h"
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
@ -19,12 +19,12 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
* SOFTWARE.
|
* SOFTWARE.
|
||||||
*/
|
*/
|
||||||
#include "storage/filesystem/fat/ChaN/diskio.h"
|
#include "fat/ChaN/diskio.h"
|
||||||
#include "storage/filesystem/fat/ChaN/ffconf.h"
|
#include "fat/ChaN/ffconf.h"
|
||||||
#include "storage/filesystem/fat/ChaN/ff.h"
|
#include "fat/ChaN/ff.h"
|
||||||
#include "platform/mbed_debug.h"
|
#include "platform/mbed_debug.h"
|
||||||
#include "platform/mbed_critical.h"
|
#include "platform/mbed_critical.h"
|
||||||
#include "storage/filesystem/mbed_filesystem.h"
|
#include "filesystem/mbed_filesystem.h"
|
||||||
#include "FATFileSystem.h"
|
#include "FATFileSystem.h"
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
#ifndef DIR_H
|
#ifndef DIR_H
|
||||||
#define DIR_H
|
#define DIR_H
|
||||||
|
|
||||||
#include "storage/filesystem/FileSystem.h"
|
#include "filesystem/FileSystem.h"
|
||||||
#include "platform/DirHandle.h"
|
#include "platform/DirHandle.h"
|
||||||
|
|
||||||
namespace mbed {
|
namespace mbed {
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
#ifndef FILE_H
|
#ifndef FILE_H
|
||||||
#define FILE_H
|
#define FILE_H
|
||||||
|
|
||||||
#include "storage/filesystem/FileSystem.h"
|
#include "filesystem/FileSystem.h"
|
||||||
#include "platform/FileHandle.h"
|
#include "platform/FileHandle.h"
|
||||||
|
|
||||||
namespace mbed {
|
namespace mbed {
|
||||||
|
|
@ -23,9 +23,9 @@
|
||||||
#include "platform/platform.h"
|
#include "platform/platform.h"
|
||||||
|
|
||||||
// FileSystem classes
|
// FileSystem classes
|
||||||
#include "storage/filesystem/FileSystem.h"
|
#include "filesystem/FileSystem.h"
|
||||||
#include "storage/filesystem/File.h"
|
#include "filesystem/File.h"
|
||||||
#include "storage/filesystem/Dir.h"
|
#include "filesystem/Dir.h"
|
||||||
|
|
||||||
// BlockDevice classes
|
// BlockDevice classes
|
||||||
#include "blockdevice/BlockDevice.h"
|
#include "blockdevice/BlockDevice.h"
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
#ifndef MBED_LFSFILESYSTEM_H
|
#ifndef MBED_LFSFILESYSTEM_H
|
||||||
#define MBED_LFSFILESYSTEM_H
|
#define MBED_LFSFILESYSTEM_H
|
||||||
|
|
||||||
#include "storage/filesystem/FileSystem.h"
|
#include "filesystem/FileSystem.h"
|
||||||
#include "blockdevice/BlockDevice.h"
|
#include "blockdevice/BlockDevice.h"
|
||||||
#include "platform/PlatformMutex.h"
|
#include "platform/PlatformMutex.h"
|
||||||
#include "storage/filesystem/littlefs/littlefs/lfs.h"
|
#include "storage/filesystem/littlefs/littlefs/lfs.h"
|
||||||
|
|
@ -13,8 +13,8 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
#include "storage/filesystem/mbed_filesystem.h"
|
#include "filesystem/mbed_filesystem.h"
|
||||||
#include "LittleFileSystem.h"
|
#include "littlefs/LittleFileSystem.h"
|
||||||
#include "errno.h"
|
#include "errno.h"
|
||||||
#include "storage/filesystem/littlefs/littlefs/lfs.h"
|
#include "storage/filesystem/littlefs/littlefs/lfs.h"
|
||||||
#include "storage/filesystem/littlefs/littlefs/lfs_util.h"
|
#include "storage/filesystem/littlefs/littlefs/lfs_util.h"
|
||||||
|
|
@ -100,4 +100,3 @@ class UnexpectedResetTest(BaseHostTest):
|
||||||
self.send_kv("exit", "pass")
|
self.send_kv("exit", "pass")
|
||||||
|
|
||||||
yield # No more events expected
|
yield # No more events expected
|
||||||
|
|
||||||
0
storage/filesystem/littlefs/TESTS/util/clean.sh → storage/filesystem/littlefs/tests/TESTS/util/clean.sh
Normal file → Executable file
0
storage/filesystem/littlefs/TESTS/util/clean.sh → storage/filesystem/littlefs/tests/TESTS/util/clean.sh
Normal file → Executable file
0
storage/filesystem/littlefs/TESTS/util/echo.py → storage/filesystem/littlefs/tests/TESTS/util/echo.py
Normal file → Executable file
0
storage/filesystem/littlefs/TESTS/util/echo.py → storage/filesystem/littlefs/tests/TESTS/util/echo.py
Normal file → Executable file
0
storage/filesystem/littlefs/TESTS/util/stats.py → storage/filesystem/littlefs/tests/TESTS/util/stats.py
Normal file → Executable file
0
storage/filesystem/littlefs/TESTS/util/stats.py → storage/filesystem/littlefs/tests/TESTS/util/stats.py
Normal file → Executable file
0
storage/filesystem/littlefs/TESTS/util/test.py → storage/filesystem/littlefs/tests/TESTS/util/test.py
Normal file → Executable file
0
storage/filesystem/littlefs/TESTS/util/test.py → storage/filesystem/littlefs/tests/TESTS/util/test.py
Normal file → Executable file
|
|
@ -100,4 +100,3 @@ class UnexpectedResetTest(BaseHostTest):
|
||||||
self.send_kv("exit", "pass")
|
self.send_kv("exit", "pass")
|
||||||
|
|
||||||
yield # No more events expected
|
yield # No more events expected
|
||||||
|
|
||||||
0
storage/filesystem/littlefsv2/TESTS/util/clean.sh → storage/filesystem/littlefsv2/tests/TESTS/util/clean.sh
Normal file → Executable file
0
storage/filesystem/littlefsv2/TESTS/util/clean.sh → storage/filesystem/littlefsv2/tests/TESTS/util/clean.sh
Normal file → Executable file
0
storage/filesystem/littlefsv2/TESTS/util/echo.py → storage/filesystem/littlefsv2/tests/TESTS/util/echo.py
Normal file → Executable file
0
storage/filesystem/littlefsv2/TESTS/util/echo.py → storage/filesystem/littlefsv2/tests/TESTS/util/echo.py
Normal file → Executable file
0
storage/filesystem/littlefsv2/TESTS/util/stats.py → storage/filesystem/littlefsv2/tests/TESTS/util/stats.py
Normal file → Executable file
0
storage/filesystem/littlefsv2/TESTS/util/stats.py → storage/filesystem/littlefsv2/tests/TESTS/util/stats.py
Normal file → Executable file
0
storage/filesystem/littlefsv2/TESTS/util/test.py → storage/filesystem/littlefsv2/tests/TESTS/util/test.py
Normal file → Executable file
0
storage/filesystem/littlefsv2/TESTS/util/test.py → storage/filesystem/littlefsv2/tests/TESTS/util/test.py
Normal file → Executable file
|
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "Dir.h"
|
#include "filesystem/Dir.h"
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
namespace mbed {
|
namespace mbed {
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "File.h"
|
#include "filesystem/File.h"
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
namespace mbed {
|
namespace mbed {
|
||||||
|
|
@ -14,9 +14,9 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "storage/filesystem/Dir.h"
|
#include "filesystem/Dir.h"
|
||||||
#include "storage/filesystem/File.h"
|
#include "filesystem/File.h"
|
||||||
#include "storage/filesystem/FileSystem.h"
|
#include "filesystem/FileSystem.h"
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
namespace mbed {
|
namespace mbed {
|
||||||
|
|
@ -2136,4 +2136,3 @@ int main()
|
||||||
{
|
{
|
||||||
return !Harness::run(specification);
|
return !Harness::run(specification);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -18,11 +18,11 @@
|
||||||
#include "storage/kvstore/include/KVStore.h"
|
#include "storage/kvstore/include/KVStore.h"
|
||||||
#include "storage/kvstore/kv_map/KVMap.h"
|
#include "storage/kvstore/kv_map/KVMap.h"
|
||||||
#include "blockdevice/BlockDevice.h"
|
#include "blockdevice/BlockDevice.h"
|
||||||
#include "storage/filesystem/FileSystem.h"
|
#include "filesystem/FileSystem.h"
|
||||||
#include "storage/kvstore/filesystemstore/FileSystemStore.h"
|
#include "storage/kvstore/filesystemstore/FileSystemStore.h"
|
||||||
#include "blockdevice/SlicingBlockDevice.h"
|
#include "blockdevice/SlicingBlockDevice.h"
|
||||||
#include "storage/filesystem/fat/FATFileSystem.h"
|
#include "fat/FATFileSystem.h"
|
||||||
#include "storage/filesystem/littlefs/LittleFileSystem.h"
|
#include "littlefs/LittleFileSystem.h"
|
||||||
#include "storage/kvstore/tdbstore/TDBStore.h"
|
#include "storage/kvstore/tdbstore/TDBStore.h"
|
||||||
#include "mbed_error.h"
|
#include "mbed_error.h"
|
||||||
#include "drivers/FlashIAP.h"
|
#include "drivers/FlashIAP.h"
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,8 @@
|
||||||
|
|
||||||
#include "FileSystemStore.h"
|
#include "FileSystemStore.h"
|
||||||
#include "storage/kvstore/conf/kv_config.h"
|
#include "storage/kvstore/conf/kv_config.h"
|
||||||
#include "storage/filesystem/Dir.h"
|
#include "filesystem/Dir.h"
|
||||||
#include "storage/filesystem/File.h"
|
#include "filesystem/File.h"
|
||||||
#include "blockdevice/BlockDevice.h"
|
#include "blockdevice/BlockDevice.h"
|
||||||
#include "mbed_error.h"
|
#include "mbed_error.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
#define MBED_FILE_SYSTEM_STORE_H
|
#define MBED_FILE_SYSTEM_STORE_H
|
||||||
|
|
||||||
#include "storage/kvstore/include/KVStore.h"
|
#include "storage/kvstore/include/KVStore.h"
|
||||||
#include "storage/filesystem/FileSystem.h"
|
#include "filesystem/FileSystem.h"
|
||||||
|
|
||||||
namespace mbed {
|
namespace mbed {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
#include "platform/PlatformMutex.h"
|
#include "platform/PlatformMutex.h"
|
||||||
#include "platform/SingletonPtr.h"
|
#include "platform/SingletonPtr.h"
|
||||||
#include "blockdevice/BlockDevice.h"
|
#include "blockdevice/BlockDevice.h"
|
||||||
#include "storage/filesystem/FileSystem.h"
|
#include "filesystem/FileSystem.h"
|
||||||
|
|
||||||
namespace mbed {
|
namespace mbed {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,9 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
#include "blockdevice/BlockDevice.h"
|
#include "blockdevice/BlockDevice.h"
|
||||||
#include "storage/filesystem/FileSystem.h"
|
#include "filesystem/FileSystem.h"
|
||||||
#include "storage/filesystem/fat/FATFileSystem.h"
|
#include "fat/FATFileSystem.h"
|
||||||
#include "storage/filesystem/littlefs/LittleFileSystem.h"
|
#include "littlefs/LittleFileSystem.h"
|
||||||
#include "mbed_error.h"
|
#include "mbed_error.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue