diff options
| author | yuqingli05 <[email protected]> | 2025-01-02 08:02:50 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-01-01 19:02:50 -0500 |
| commit | d57b7cb40af7e41624eb7b31fc38446921a975bf (patch) | |
| tree | f47253c9f28566b34cd3c5d873c2daa9e2c2126c | |
| parent | 99577849e6434c76ba44891a2a934b00e0b00c71 (diff) | |
修复编译过程中的 DFS_V2报错、FAL警告
| -rw-r--r-- | components/dfs/dfs_v2/src/dfs_pcache.c | 9 | ||||
| -rw-r--r-- | components/drivers/core/device.c | 6 | ||||
| -rw-r--r-- | components/fal/src/fal_rtt.c | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/components/dfs/dfs_v2/src/dfs_pcache.c b/components/dfs/dfs_v2/src/dfs_pcache.c index 6868170b9c..2a68c268a4 100644 --- a/components/dfs/dfs_v2/src/dfs_pcache.c +++ b/components/dfs/dfs_v2/src/dfs_pcache.c @@ -16,15 +16,16 @@ #include <dfs_pcache.h> #include <dfs_dentry.h> #include <dfs_mnt.h> -#include <mm_page.h> -#include <mm_private.h> -#include <mmu.h> -#include <tlb.h> #include <rthw.h> #ifdef RT_USING_PAGECACHE +#include <mm_page.h> +#include <mm_private.h> +#include <mmu.h> +#include <tlb.h> + #ifndef RT_PAGECACHE_COUNT #define RT_PAGECACHE_COUNT 4096 #endif diff --git a/components/drivers/core/device.c b/components/drivers/core/device.c index 5dfd0c4653..751b662d4e 100644 --- a/components/drivers/core/device.c +++ b/components/drivers/core/device.c @@ -31,9 +31,9 @@ #include <rtdevice.h> /* for wqueue_init */ #endif /* RT_USING_POSIX_DEVIO */ -#ifdef RT_USING_DFS_V2 +#if defined (RT_USING_DFS_V2) && defined (RT_USING_DFS_DEVFS) #include <devfs.h> -#endif /* RT_USING_DFS_V2 */ +#endif /* RT_USING_DFS_V2 RT_USING_DFS_DEVFS */ #ifdef RT_USING_DEVICE @@ -84,7 +84,7 @@ rt_err_t rt_device_register(rt_device_t dev, rt_wqueue_init(&(dev->wait_queue)); #endif /* RT_USING_POSIX_DEVIO */ -#ifdef RT_USING_DFS_V2 +#if defined (RT_USING_DFS_V2) && defined (RT_USING_DFS_DEVFS) dfs_devfs_device_add(dev); #endif /* RT_USING_DFS_V2 */ diff --git a/components/fal/src/fal_rtt.c b/components/fal/src/fal_rtt.c index 9ef5be1440..9ae93ea679 100644 --- a/components/fal/src/fal_rtt.c +++ b/components/fal/src/fal_rtt.c @@ -10,6 +10,8 @@ */ #include <fal.h> +#include <string.h> +#include <stdlib.h> #include <rtdevice.h> #define DBG_TAG "FAL" @@ -50,7 +52,7 @@ static rt_err_t blk_dev_control(rt_device_t dev, rt_uint8_t cmd, void *args) return -RT_ERROR; } - memcpy(geometry, &part->geometry, sizeof(struct rt_device_blk_geometry)); + rt_memcpy(geometry, &part->geometry, sizeof(struct rt_device_blk_geometry)); } else if (cmd == RT_DEVICE_CTRL_BLK_ERASE) { |