diff options
72 files changed, 349 insertions, 90 deletions
diff --git a/bsp/bluetrum/ab32vg1-ab-prougen/applications/mnt.c b/bsp/bluetrum/ab32vg1-ab-prougen/applications/mnt.c index 50681e7bc6..317dd4c862 100644 --- a/bsp/bluetrum/ab32vg1-ab-prougen/applications/mnt.c +++ b/bsp/bluetrum/ab32vg1-ab-prougen/applications/mnt.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "drv_gpio.h" // #define DRV_DEBUG diff --git a/bsp/efm32/application.c b/bsp/efm32/application.c index 332dcc6ba8..5f2ad9866c 100644 --- a/bsp/efm32/application.c +++ b/bsp/efm32/application.c @@ -65,10 +65,18 @@ #include <rtgui/widgets/box.h> #include <rtgui/image.h> -#if defined(RTGUI_USING_DFS_FILERW) + #if defined(RTGUI_USING_DFS_FILERW) #include <dfs_posix.h> #define PATH_SEPARATOR '/' #endif +#if defined(RTGUI_USING_DFS_FILERW) +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> +#define PATH_SEPARATOR '/' +#endif #endif /* Private typedef -----------------------------------------------------------*/ diff --git a/bsp/ft2004/drivers/drv_sdcard.c b/bsp/ft2004/drivers/drv_sdcard.c index a6494089f6..753a70b606 100644 --- a/bsp/ft2004/drivers/drv_sdcard.c +++ b/bsp/ft2004/drivers/drv_sdcard.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "drv_sdctrl.h" #define DBG_TAG "app.card" diff --git a/bsp/lpc54114-lite/applications/mnt.c b/bsp/lpc54114-lite/applications/mnt.c index 49852b2025..f67c5c21ea 100644 --- a/bsp/lpc54114-lite/applications/mnt.c +++ b/bsp/lpc54114-lite/applications/mnt.c @@ -11,7 +11,10 @@ #if defined(RT_USING_DFS) #include <dfs_file.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif #define BSP_FLASH_MOUNT_PATH "/mnt/flash" diff --git a/bsp/mini4020/applications/application.c b/bsp/mini4020/applications/application.c index f5a77d8c60..722443ac7c 100644 --- a/bsp/mini4020/applications/application.c +++ b/bsp/mini4020/applications/application.c @@ -22,7 +22,11 @@ #include <dfs.h> #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif #ifdef RT_USING_RTGUI diff --git a/bsp/nrf5x/nrf52832/applications/mnt.c b/bsp/nrf5x/nrf52832/applications/mnt.c index c7e4d10235..d4af1d2b6c 100644 --- a/bsp/nrf5x/nrf52832/applications/mnt.c +++ b/bsp/nrf5x/nrf52832/applications/mnt.c @@ -35,7 +35,11 @@ #endif #include "fal.h" -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define LOG_TAG "drv.fs" #define DBG_LVL DBG_LOG diff --git a/bsp/nuvoton/libraries/m2354/rtt_port/drv_sdh.c b/bsp/nuvoton/libraries/m2354/rtt_port/drv_sdh.c index 708f653d36..38086cb2d5 100644 --- a/bsp/nuvoton/libraries/m2354/rtt_port/drv_sdh.c +++ b/bsp/nuvoton/libraries/m2354/rtt_port/drv_sdh.c @@ -20,8 +20,12 @@ #include <string.h> #if defined(RT_USING_DFS) - #include <dfs_fs.h> - #include <dfs_posix.h> +#include <dfs_fs.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif /* Private define ---------------------------------------------------------------*/ diff --git a/bsp/nuvoton/libraries/m480/rtt_port/drv_sdh.c b/bsp/nuvoton/libraries/m480/rtt_port/drv_sdh.c index 7c92743bd3..7c5aa68697 100644 --- a/bsp/nuvoton/libraries/m480/rtt_port/drv_sdh.c +++ b/bsp/nuvoton/libraries/m480/rtt_port/drv_sdh.c @@ -20,8 +20,12 @@ #include <string.h> #if defined(RT_USING_DFS) - #include <dfs_fs.h> - #include <dfs_posix.h> +#include <dfs_fs.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif /* Private define ---------------------------------------------------------------*/ diff --git a/bsp/nuvoton/libraries/n9h30/rtt_port/drv_sdh.c b/bsp/nuvoton/libraries/n9h30/rtt_port/drv_sdh.c index 499311c752..955fe6a645 100644 --- a/bsp/nuvoton/libraries/n9h30/rtt_port/drv_sdh.c +++ b/bsp/nuvoton/libraries/n9h30/rtt_port/drv_sdh.c @@ -20,8 +20,12 @@ #include <drv_sys.h> #if defined(RT_USING_DFS) - #include <dfs_fs.h> - #include <dfs_posix.h> +#include <dfs_fs.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif /* Private define ---------------------------------------------------------------*/ diff --git a/bsp/nuvoton/libraries/nu_packages/AudioCodec/audio_test.c b/bsp/nuvoton/libraries/nu_packages/AudioCodec/audio_test.c index d978fa4ded..6a805b3ba7 100644 --- a/bsp/nuvoton/libraries/nu_packages/AudioCodec/audio_test.c +++ b/bsp/nuvoton/libraries/nu_packages/AudioCodec/audio_test.c @@ -16,7 +16,11 @@ #include "wavrecorder.h" #include "wavplayer.h" -#include "dfs_posix.h" +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> /* The routine just for test automatically. diff --git a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_sdh.c b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_sdh.c index 6990ce215c..4b81a01f52 100644 --- a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_sdh.c +++ b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_sdh.c @@ -21,8 +21,12 @@ #include <drv_sys.h> #if defined(RT_USING_DFS) - #include <dfs_fs.h> - #include <dfs_posix.h> +#include <dfs_fs.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif /* Private define ---------------------------------------------------------------*/ diff --git a/bsp/nuvoton/nk-980iot/applications/mnt.c b/bsp/nuvoton/nk-980iot/applications/mnt.c index 4ff5b1f252..803e4b751b 100644 --- a/bsp/nuvoton/nk-980iot/applications/mnt.c +++ b/bsp/nuvoton/nk-980iot/applications/mnt.c @@ -22,8 +22,12 @@ #include <rtdbg.h> #if defined(RT_USING_DFS) - #include <dfs_fs.h> - #include <dfs_posix.h> +#include <dfs_fs.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif #if defined(PKG_USING_FAL) diff --git a/bsp/nuvoton/nk-n9h30/applications/mnt.c b/bsp/nuvoton/nk-n9h30/applications/mnt.c index 03e7481242..f4e7cf5bf3 100644 --- a/bsp/nuvoton/nk-n9h30/applications/mnt.c +++ b/bsp/nuvoton/nk-n9h30/applications/mnt.c @@ -22,8 +22,12 @@ #include <rtdbg.h> #if defined(RT_USING_DFS) - #include <dfs_fs.h> - #include <dfs_posix.h> +#include <dfs_fs.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif #if defined(PKG_USING_FAL) diff --git a/bsp/nuvoton/nk-rtu980/applications/mnt.c b/bsp/nuvoton/nk-rtu980/applications/mnt.c index ecfc390243..f99fcb0134 100644 --- a/bsp/nuvoton/nk-rtu980/applications/mnt.c +++ b/bsp/nuvoton/nk-rtu980/applications/mnt.c @@ -22,8 +22,12 @@ #include <rtdbg.h> #if defined(RT_USING_DFS) - #include <dfs_fs.h> - #include <dfs_posix.h> +#include <dfs_fs.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif #if defined(PKG_USING_FAL) diff --git a/bsp/nuvoton/numaker-iot-m487/applications/mnt.c b/bsp/nuvoton/numaker-iot-m487/applications/mnt.c index d7e657d852..c0cec18978 100644 --- a/bsp/nuvoton/numaker-iot-m487/applications/mnt.c +++ b/bsp/nuvoton/numaker-iot-m487/applications/mnt.c @@ -13,8 +13,12 @@ #include <rtthread.h> #if defined(RT_USING_DFS) - #include <dfs_fs.h> - #include <dfs_posix.h> +#include <dfs_fs.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif #if defined(PKG_USING_FAL) diff --git a/bsp/nuvoton/numaker-m032ki/applications/mnt.c b/bsp/nuvoton/numaker-m032ki/applications/mnt.c index 914fa657f6..00f0f91499 100644 --- a/bsp/nuvoton/numaker-m032ki/applications/mnt.c +++ b/bsp/nuvoton/numaker-m032ki/applications/mnt.c @@ -13,8 +13,12 @@ #include <rtthread.h> #if defined(RT_USING_DFS) - #include <dfs_fs.h> - #include <dfs_posix.h> +#include <dfs_fs.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif #if defined(PKG_USING_FAL) diff --git a/bsp/nuvoton/numaker-pfm-m487/applications/mnt.c b/bsp/nuvoton/numaker-pfm-m487/applications/mnt.c index 6e7a9ff5de..844ab9960d 100644 --- a/bsp/nuvoton/numaker-pfm-m487/applications/mnt.c +++ b/bsp/nuvoton/numaker-pfm-m487/applications/mnt.c @@ -13,8 +13,12 @@ #include <rtthread.h> #if defined(RT_USING_DFS) - #include <dfs_fs.h> - #include <dfs_posix.h> +#include <dfs_fs.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif #if defined(PKG_USING_FAL) diff --git a/bsp/simulator/drivers/module_win32.c b/bsp/simulator/drivers/module_win32.c index 81a98eca87..0f07576964 100644 --- a/bsp/simulator/drivers/module_win32.c +++ b/bsp/simulator/drivers/module_win32.c @@ -193,7 +193,11 @@ RTM_EXPORT(rt_module_find); #ifdef RT_USING_DFS #include <windows.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> extern char * dfs_win32_dirdup(char * path); static char* _module_name(const char *path) { diff --git a/bsp/stm32/stm32f103-atk-warshipv3/board/ports/sdcard_port.c b/bsp/stm32/stm32f103-atk-warshipv3/board/ports/sdcard_port.c index d56fb039d4..df2614c080 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32f103-atk-warshipv3/board/ports/sdcard_port.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define DBG_TAG "app.card" #define DBG_LVL DBG_INFO diff --git a/bsp/stm32/stm32f103-dofly-M3S/board/ports/drv_sdcard.c b/bsp/stm32/stm32f103-dofly-M3S/board/ports/drv_sdcard.c index 13d235b694..d717da27dd 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/board/ports/drv_sdcard.c +++ b/bsp/stm32/stm32f103-dofly-M3S/board/ports/drv_sdcard.c @@ -14,7 +14,11 @@ #if defined BSP_USING_SDIO_SDCARD || defined BSP_USING_SPI_SDCARD #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "drv_gpio.h" #define DBG_TAG "app.card" diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/ports/sdcard_port.c b/bsp/stm32/stm32f103-fire-arbitrary/board/ports/sdcard_port.c index 55baa2c263..c0575f01b2 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/ports/sdcard_port.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define DBG_TAG "app.card" #define DBG_LVL DBG_INFO diff --git a/bsp/stm32/stm32f407-armfly-v5/board/ports/sdcard_port.c b/bsp/stm32/stm32f407-armfly-v5/board/ports/sdcard_port.c index f5427ef265..2b6e48ba3f 100644 --- a/bsp/stm32/stm32f407-armfly-v5/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32f407-armfly-v5/board/ports/sdcard_port.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define DBG_TAG "app.card" #define DBG_LVL DBG_INFO diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_filesystem.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_filesystem.c index 6635c43128..cafb45b107 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_filesystem.c +++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_filesystem.c @@ -15,7 +15,11 @@ #ifdef BSP_USING_FS #include <dfs_romfs.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #if DFS_FILESYSTEMS_MAX < 4 #error "Please define DFS_FILESYSTEMS_MAX more than 4" diff --git a/bsp/stm32/stm32f427-robomaster-a/board/ports/sdcard_port.c b/bsp/stm32/stm32f427-robomaster-a/board/ports/sdcard_port.c index 6a79c83523..376089ef9e 100644 --- a/bsp/stm32/stm32f427-robomaster-a/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32f427-robomaster-a/board/ports/sdcard_port.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define DBG_TAG "app.card" #define DBG_LVL DBG_INFO diff --git a/bsp/stm32/stm32f429-armfly-v6/board/ports/sdcard_port.c b/bsp/stm32/stm32f429-armfly-v6/board/ports/sdcard_port.c index 6a79c83523..376089ef9e 100644 --- a/bsp/stm32/stm32f429-armfly-v6/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32f429-armfly-v6/board/ports/sdcard_port.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define DBG_TAG "app.card" #define DBG_LVL DBG_INFO diff --git a/bsp/stm32/stm32f429-atk-apollo/board/ports/sdcard_port.c b/bsp/stm32/stm32f429-atk-apollo/board/ports/sdcard_port.c index fe2595fa4b..058a948a8a 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32f429-atk-apollo/board/ports/sdcard_port.c @@ -15,7 +15,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define DBG_TAG "app.card" #define DBG_LVL DBG_INFO diff --git a/bsp/stm32/stm32f429-fire-challenger/board/ports/sdcard_port.c b/bsp/stm32/stm32f429-fire-challenger/board/ports/sdcard_port.c index 01111ab4d3..93702aed13 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32f429-fire-challenger/board/ports/sdcard_port.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "drv_gpio.h" #define DBG_TAG "app.card" diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/drv_sdcard.c b/bsp/stm32/stm32f469-st-disco/board/ports/drv_sdcard.c index 9fd2d11fd4..986a562cdd 100644 --- a/bsp/stm32/stm32f469-st-disco/board/ports/drv_sdcard.c +++ b/bsp/stm32/stm32f469-st-disco/board/ports/drv_sdcard.c @@ -15,7 +15,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "drv_gpio.h" #include "drv_sdio.h" diff --git a/bsp/stm32/stm32f746-st-disco/board/ports/sdcard_port.c b/bsp/stm32/stm32f746-st-disco/board/ports/sdcard_port.c index 66e8dfefab..bcb8a33308 100644 --- a/bsp/stm32/stm32f746-st-disco/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32f746-st-disco/board/ports/sdcard_port.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define DBG_TAG "app.card" #define DBG_LVL DBG_INFO diff --git a/bsp/stm32/stm32f767-atk-apollo/board/ports/sdcard_port.c b/bsp/stm32/stm32f767-atk-apollo/board/ports/sdcard_port.c index bc7e8b676e..9180edcc7e 100644 --- a/bsp/stm32/stm32f767-atk-apollo/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32f767-atk-apollo/board/ports/sdcard_port.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define DBG_TAG "app.card" #define DBG_LVL DBG_INFO diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/board/ports/sdcard_port.c b/bsp/stm32/stm32f767-fire-challenger-v1/board/ports/sdcard_port.c index f1a7b8c27f..edbb295da5 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32f767-fire-challenger-v1/board/ports/sdcard_port.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "drv_gpio.h" #define DBG_TAG "app.card" diff --git a/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_ov2640.c b/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_ov2640.c index 95e5784654..83058e352c 100644 --- a/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_ov2640.c +++ b/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_ov2640.c @@ -12,7 +12,11 @@ #if defined(BSP_USING_OV2640) -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <drv_ov2640.h> #include <drv_dcmi.h> #include "pcf8574.h" diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_sdcard.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_sdcard.c index 2bed0ef415..ba253aacfa 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_sdcard.c +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_sdcard.c @@ -15,7 +15,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "drv_spi.h" #include "spi_msd.h" diff --git a/bsp/stm32/stm32l496-ali-developer/board/ports/sdcard_port.c b/bsp/stm32/stm32l496-ali-developer/board/ports/sdcard_port.c index 6abc52c3ba..3016f583d3 100644 --- a/bsp/stm32/stm32l496-ali-developer/board/ports/sdcard_port.c +++ b/bsp/stm32/stm32l496-ali-developer/board/ports/sdcard_port.c @@ -14,7 +14,11 @@ #include <dfs_elm.h> #include <dfs_fs.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define DBG_TAG "app.card" #define DBG_LVL DBG_INFO diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/audio_play.c b/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/audio_play.c index 2e045b016b..1f463d99bf 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/audio_play.c +++ b/bsp/stm32/stm32mp157a-st-discovery/board/ports/audio/audio_play.c @@ -10,7 +10,11 @@ #include <rtthread.h> #include <rtdevice.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #if defined(BSP_USING_AUDIO) && defined(BSP_USING_SDMMC) #define BUFSZ 1024 diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c index 69af85e27b..303a78fc1d 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_ov5640.c @@ -13,7 +13,11 @@ #if defined(BSP_USING_DCMI) #include "drv_mfx.h" -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "drv_ov5640.h" //#define DRV_DEBUG diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c index b9e76a0703..93acea9c1d 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_sound.c @@ -13,7 +13,11 @@ #ifdef BSP_USING_AUDIO #include "drv_wm8994.h" -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define DRV_DEBUG #define LOG_TAG "drv.sound" diff --git a/bsp/swm320-lq100/applications/main.c b/bsp/swm320-lq100/applications/main.c index 5685bf6745..ecc86347c2 100644 --- a/bsp/swm320-lq100/applications/main.c +++ b/bsp/swm320-lq100/applications/main.c @@ -260,7 +260,11 @@ MSH_CMD_EXPORT(wdt_sample, wdt sample); #include "drv_spi.h" #include "spi_flash_sfud.h" -#include "dfs_posix.h" +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> static int rt_hw_spi_flash_init(void) { @@ -380,7 +384,11 @@ MSH_CMD_EXPORT(spi_w25q_sample, spi w25q sample); //#define SDCARD_NAME "sd0" //#include "drv_spi.h" -//#include "dfs_posix.h" +// #include <dfs_file.h> +// #include <unistd.h> +// #include <stdio.h> +// #include <sys/stat.h> +// #include <sys/statfs.h> //#include "spi_msd.h" //static int rt_hw_spi1_tfcard(void) @@ -437,7 +445,11 @@ MSH_CMD_EXPORT(spi_w25q_sample, spi w25q sample); #ifdef RT_USING_SDIO #define SDCARD_NAME "sd0" -#include "dfs_posix.h" +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> static void sdio_elmfat_sample(void) { diff --git a/bsp/swm320/applications/main.c b/bsp/swm320/applications/main.c index 0ebd6663f6..f34a421727 100644 --- a/bsp/swm320/applications/main.c +++ b/bsp/swm320/applications/main.c @@ -260,7 +260,11 @@ MSH_CMD_EXPORT(wdt_sample, wdt sample); #include "drv_spi.h" #include "spi_flash_sfud.h" -#include "dfs_posix.h" +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> static int rt_hw_spi_flash_init(void) { @@ -380,7 +384,11 @@ MSH_CMD_EXPORT(spi_w25q_sample, spi w25q sample); //#define SDCARD_NAME "sd0" //#include "drv_spi.h" -//#include "dfs_posix.h" +// #include <dfs_file.h> +// #include <unistd.h> +// #include <stdio.h> +// #include <sys/stat.h> +// #include <sys/statfs.h> //#include "spi_msd.h" //static int rt_hw_spi1_tfcard(void) @@ -437,7 +445,11 @@ MSH_CMD_EXPORT(spi_w25q_sample, spi w25q sample); #ifdef RT_USING_SDIO #define SDCARD_NAME "sd0" -#include "dfs_posix.h" +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> static void sdio_elmfat_sample(void) { diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index da330b5e9c..7182e23c37 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -37,7 +37,10 @@ #include <rtdbg.h> #ifdef RT_USING_POSIX_STDIO -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <poll.h> #include <sys/ioctl.h> diff --git a/components/drivers/serial/serial_v2.c b/components/drivers/serial/serial_v2.c index 16d376eeb9..738afcb081 100644 --- a/components/drivers/serial/serial_v2.c +++ b/components/drivers/serial/serial_v2.c @@ -17,7 +17,9 @@ #include <rtdbg.h> #ifdef RT_USING_POSIX_STDIO -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <poll.h> #include <sys/ioctl.h> diff --git a/components/drivers/src/pipe.c b/components/drivers/src/pipe.c index 7e1f569b62..2bc0a10083 100644 --- a/components/drivers/src/pipe.c +++ b/components/drivers/src/pipe.c @@ -14,8 +14,9 @@ #include <sys/errno.h> #if defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_POSIX_PIPE) -#include <dfs_file.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <poll.h> #include <sys/ioctl.h> diff --git a/components/finsh/msh.c b/components/finsh/msh.c index acb5445ad1..abf82e992c 100644 --- a/components/finsh/msh.c +++ b/components/finsh/msh.c @@ -21,7 +21,10 @@ #include "msh.h" #include "shell.h" #ifdef DFS_USING_POSIX -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif /* DFS_USING_POSIX */ #ifdef RT_USING_MODULE #include <dlmodule.h> diff --git a/components/finsh/msh_file.c b/components/finsh/msh_file.c index 8022b176fc..28f8d4803f 100644 --- a/components/finsh/msh_file.c +++ b/components/finsh/msh_file.c @@ -15,7 +15,10 @@ #include <finsh.h> #include "msh.h" -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> static int msh_readline(int fd, char *line_buf, int size) { diff --git a/components/finsh/shell.c b/components/finsh/shell.c index 5398db5370..a326ba1978 100644 --- a/components/finsh/shell.c +++ b/components/finsh/shell.c @@ -28,7 +28,9 @@ #include "msh.h" #ifdef DFS_USING_POSIX -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif /* DFS_USING_POSIX */ /* finsh thread */ diff --git a/components/dfs/include/dfs_posix.h b/components/legacy/dfs/dfs_posix.h index ee62cdde82..ee62cdde82 100644 --- a/components/dfs/include/dfs_posix.h +++ b/components/legacy/dfs/dfs_posix.h diff --git a/components/libc/compilers/common/sys/ioctl.h b/components/libc/compilers/common/sys/ioctl.h index d93c79115a..49c294eb8d 100644 --- a/components/libc/compilers/common/sys/ioctl.h +++ b/components/libc/compilers/common/sys/ioctl.h @@ -12,7 +12,9 @@ #define __SYS_IOCTL_H__ #include <rtconfig.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #ifdef _WIN32 #include <winsock.h> diff --git a/components/libc/libdl/dlmodule.c b/components/libc/libdl/dlmodule.c index 044c05a994..32d6b6b7e7 100644 --- a/components/libc/libdl/dlmodule.c +++ b/components/libc/libdl/dlmodule.c @@ -15,7 +15,9 @@ #include "dlelf.h" #if defined(RT_USING_POSIX) -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif #define DBG_TAG "DLMD" diff --git a/components/libc/posix/io/aio/aio.c b/components/libc/posix/io/aio/aio.c index 08ef4c634a..bf188728f0 100644 --- a/components/libc/posix/io/aio/aio.c +++ b/components/libc/posix/io/aio/aio.c @@ -10,7 +10,10 @@ #include <stdint.h> #include <rthw.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <dfs_file.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "aio.h" struct rt_workqueue* aio_queue = NULL; diff --git a/components/libc/posix/io/mman/mman.c b/components/libc/posix/io/mman/mman.c index 827f2cbb14..d484b3ed7b 100644 --- a/components/libc/posix/io/mman/mman.c +++ b/components/libc/posix/io/mman/mman.c @@ -12,7 +12,9 @@ #include <stdio.h> #include <rtthread.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "sys/mman.h" diff --git a/components/libc/posix/io/termios/termios.c b/components/libc/posix/io/termios/termios.c index 44e0e80853..14d85e9f0c 100644 --- a/components/libc/posix/io/termios/termios.c +++ b/components/libc/posix/io/termios/termios.c @@ -10,7 +10,9 @@ #include <stdlib.h> #include <string.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <sys/errno.h> #include "termios.h" diff --git a/components/lwp/lwp.c b/components/lwp/lwp.c index 9789595ee7..4b91538b68 100644 --- a/components/lwp/lwp.c +++ b/components/lwp/lwp.c @@ -11,7 +11,10 @@ #include <rtthread.h> #include <rthw.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #ifndef RT_USING_DFS #error "lwp need file system(RT_USING_DFS)" diff --git a/components/lwp/lwp_syscall.h b/components/lwp/lwp_syscall.h index 02599f4317..749406c1ca 100644 --- a/components/lwp/lwp_syscall.h +++ b/components/lwp/lwp_syscall.h @@ -13,7 +13,10 @@ #include <stdint.h> #include <rtthread.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <sys/time.h> #include <sys/types.h> #include <sys/ioctl.h> diff --git a/components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c b/components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c index 59e64c7a3b..38221ac580 100644 --- a/components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c +++ b/components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c @@ -10,7 +10,9 @@ #include <rtthread.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <lwip/apps/tftp_server.h> static struct tftp_context ctx; diff --git a/components/net/lwip-2.0.3/src/apps/tftp/tftp_port.c b/components/net/lwip-2.0.3/src/apps/tftp/tftp_port.c index 59e64c7a3b..38221ac580 100644 --- a/components/net/lwip-2.0.3/src/apps/tftp/tftp_port.c +++ b/components/net/lwip-2.0.3/src/apps/tftp/tftp_port.c @@ -10,7 +10,9 @@ #include <rtthread.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <lwip/apps/tftp_server.h> static struct tftp_context ctx; diff --git a/components/net/lwip-2.1.2/src/apps/tftp/tftp_port.c b/components/net/lwip-2.1.2/src/apps/tftp/tftp_port.c index 59e64c7a3b..38221ac580 100644 --- a/components/net/lwip-2.1.2/src/apps/tftp/tftp_port.c +++ b/components/net/lwip-2.1.2/src/apps/tftp/tftp_port.c @@ -10,7 +10,9 @@ #include <rtthread.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <lwip/apps/tftp_server.h> static struct tftp_context ctx; diff --git a/components/net/sal_socket/impl/proto_mbedtls.c b/components/net/sal_socket/impl/proto_mbedtls.c index 79fbdcc5d4..338792c948 100644 --- a/components/net/sal_socket/impl/proto_mbedtls.c +++ b/components/net/sal_socket/impl/proto_mbedtls.c @@ -11,7 +11,9 @@ #include <rtthread.h> #ifdef RT_USING_DFS -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #endif #ifdef SAL_USING_TLS diff --git a/components/utilities/rt-link/src/rtlink_dev.c b/components/utilities/rt-link/src/rtlink_dev.c index e91736251d..702aed32da 100644 --- a/components/utilities/rt-link/src/rtlink_dev.c +++ b/components/utilities/rt-link/src/rtlink_dev.c @@ -20,7 +20,9 @@ #define RTLINK_SERV(dev) (((struct rt_link_device*)dev)->service) #ifdef RT_USING_POSIX_DEVIO -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <poll.h> int rtlink_fops_open(struct dfs_fd *fd) diff --git a/components/utilities/ymodem/ry_sy.c b/components/utilities/ymodem/ry_sy.c index 3f3b022d7e..b77bd7abc2 100644 --- a/components/utilities/ymodem/ry_sy.c +++ b/components/utilities/ymodem/ry_sy.c @@ -11,7 +11,10 @@ #include <rtthread.h> #include <ymodem.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <stdio.h> #include <stdlib.h> diff --git a/components/utilities/zmodem/rz.c b/components/utilities/zmodem/rz.c index 224d8f95a8..f4fa4bde6c 100644 --- a/components/utilities/zmodem/rz.c +++ b/components/utilities/zmodem/rz.c @@ -13,8 +13,9 @@ #include <shell.h> #include <rtdef.h> #include <dfs.h> -#include <dfs_file.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <stdio.h> #include "zdef.h" diff --git a/components/utilities/zmodem/sz.c b/components/utilities/zmodem/sz.c index e6096756b1..bda5d939d4 100644 --- a/components/utilities/zmodem/sz.c +++ b/components/utilities/zmodem/sz.c @@ -12,8 +12,9 @@ #include <shell.h> #include <rtdef.h> #include <dfs.h> -#include <dfs_file.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "zdef.h" diff --git a/components/utilities/zmodem/zcore.c b/components/utilities/zmodem/zcore.c index 75d9647348..b4e23b585a 100644 --- a/components/utilities/zmodem/zcore.c +++ b/components/utilities/zmodem/zcore.c @@ -11,8 +11,9 @@ #include <shell.h> #include <rtdef.h> #include <dfs.h> -#include <dfs_file.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <stdio.h> #include "zdef.h" diff --git a/components/utilities/zmodem/zdevice.c b/components/utilities/zmodem/zdevice.c index 3a144e79de..980a15f4f8 100644 --- a/components/utilities/zmodem/zdevice.c +++ b/components/utilities/zmodem/zdevice.c @@ -11,8 +11,9 @@ #include <shell.h> #include <rtdef.h> #include <dfs.h> -#include <dfs_file.h> -#include <dfs_posix.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include "zdef.h" diff --git a/examples/file/listdir.c b/examples/file/listdir.c index 9649347734..d858a00bff 100644 --- a/examples/file/listdir.c +++ b/examples/file/listdir.c @@ -9,7 +9,11 @@ * 2020-04-12 Jianjia Ma add msh cmd */ #include <rtthread.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> void list_dir(const char* path) { diff --git a/examples/file/readspeed.c b/examples/file/readspeed.c index 5f4cad3190..dfa68ceb32 100644 --- a/examples/file/readspeed.c +++ b/examples/file/readspeed.c @@ -10,7 +10,11 @@ */ #include <rtthread.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> void readspeed(const char* filename, int block_size) { diff --git a/examples/file/readwrite.c b/examples/file/readwrite.c index d1dd5bc038..5d0defeaa9 100644 --- a/examples/file/readwrite.c +++ b/examples/file/readwrite.c @@ -10,7 +10,11 @@ */ #include <rtthread.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #define TEST_DATA_LEN 120 diff --git a/examples/file/seekdir.c b/examples/file/seekdir.c index efadd3a1c8..5198a8056b 100644 --- a/examples/file/seekdir.c +++ b/examples/file/seekdir.c @@ -8,7 +8,11 @@ * 2011-06-02 Bernard first version * 2020-04-12 Jianjia Ma add msh cmd */ -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> void seekdir_test(void) { diff --git a/examples/file/writespeed.c b/examples/file/writespeed.c index f76027d28b..87a4c329bd 100644 --- a/examples/file/writespeed.c +++ b/examples/file/writespeed.c @@ -9,7 +9,11 @@ * 2020-04-12 Jianjia Ma add msh cmd */ #include <rtthread.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> void writespeed(const char* filename, int total_length, int block_size) { diff --git a/examples/network/chargen.c b/examples/network/chargen.c index 3b4feaca9e..69a6b13a5d 100644 --- a/examples/network/chargen.c +++ b/examples/network/chargen.c @@ -12,7 +12,11 @@ #ifdef SAL_USING_POSIX #include <sys/select.h> // only dfs_net -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #else #define read lwip_read #define write lwip_write diff --git a/examples/rt-link/rtlink_dev_example.c b/examples/rt-link/rtlink_dev_example.c index 51b6432d9f..027292769d 100644 --- a/examples/rt-link/rtlink_dev_example.c +++ b/examples/rt-link/rtlink_dev_example.c @@ -46,7 +46,11 @@ static rt_err_t rtlink_dev_tx_done(rt_device_t dev, void *buffer) } #ifdef RT_USING_POSIX_DEVIO -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <poll.h> #include <sys/select.h> diff --git a/examples/test/fs_test.c b/examples/test/fs_test.c index a86bbd6ac2..7fd70284cf 100644 --- a/examples/test/fs_test.c +++ b/examples/test/fs_test.c @@ -11,7 +11,11 @@ */ #include <rtthread.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> static rt_uint32_t stop_flag = 0; static rt_thread_t fsrw1_thread = RT_NULL; diff --git a/examples/ymodem/tofile.c b/examples/ymodem/tofile.c index 35dca2f2c1..8fb2d0c06b 100644 --- a/examples/ymodem/tofile.c +++ b/examples/ymodem/tofile.c @@ -9,7 +9,11 @@ #include <rtthread.h> #include <ymodem.h> -#include <dfs_posix.h> +#include <dfs_file.h> +#include <unistd.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/statfs.h> #include <stdlib.h> #include <board.h> |