From 9f77c3c997034ee1b750c0f4d19d84e346d5bdac Mon Sep 17 00:00:00 2001 From: Koen Zandberg Date: Fri, 17 Jul 2020 15:38:27 +0200 Subject: [PATCH] examples/filesystem: Cleanup filesystem/mtd check --- examples/filesystem/main.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/examples/filesystem/main.c b/examples/filesystem/main.c index e2c0de3770..ba1a28a9d8 100644 --- a/examples/filesystem/main.c +++ b/examples/filesystem/main.c @@ -130,6 +130,18 @@ static vfs_mount_t flash_mount = { }; #endif /* MTD_0 */ +/* Add simple macro to check if an MTD device together with a filesystem is + * compiled in */ +#if defined(MTD_0) && \ + (defined(MODULE_SPIFFS) || \ + defined(MODULE_LITTLEFS) || \ + defined(MODULE_LITTLEFS2) || \ + defined(MODULE_FATFS_VFS)) +#define FLASH_AND_FILESYSTEM_PRESENT 1 +#else +#define FLASH_AND_FILESYSTEM_PRESENT 0 +#endif + /* constfs example */ #include "fs/constfs.h" @@ -169,7 +181,7 @@ static int _mount(int argc, char **argv) { (void)argc; (void)argv; -#if defined(MTD_0) && (defined(MODULE_SPIFFS) || defined(MODULE_LITTLEFS) || defined(MODULE_LITTLEFS2) || defined(MODULE_FATFS_VFS)) +#if FLASH_AND_FILESYSTEM_PRESENT int res = vfs_mount(&flash_mount); if (res < 0) { printf("Error while mounting %s...try format\n", FLASH_MOUNT_POINT); @@ -188,7 +200,7 @@ static int _format(int argc, char **argv) { (void)argc; (void)argv; -#if defined(MTD_0) && (defined(MODULE_SPIFFS) || defined(MODULE_LITTLEFS) || defined(MODULE_LITTLEFS2) || defined(MODULE_FATFS_VFS)) +#if FLASH_AND_FILESYSTEM_PRESENT int res = vfs_format(&flash_mount); if (res < 0) { printf("Error while formatting %s\n", FLASH_MOUNT_POINT); @@ -207,7 +219,7 @@ static int _umount(int argc, char **argv) { (void)argc; (void)argv; -#if defined(MTD_0) && (defined(MODULE_SPIFFS) || defined(MODULE_LITTLEFS) || defined(MODULE_LITTLEFS2) || defined(MODULE_FATFS_VFS)) +#if FLASH_AND_FILESYSTEM_PRESENT int res = vfs_umount(&flash_mount); if (res < 0) { printf("Error while unmounting %s\n", FLASH_MOUNT_POINT);