From 4df01d8cb7b1ede2975b94bc73d8d9c146b2643f Mon Sep 17 00:00:00 2001 From: yuqingli Date: Fri, 20 Dec 2024 04:24:42 +0800 Subject: [PATCH 1/7] [bug] When compiling dfs_v2 without defining RT-USING_SMART, an error occurs --- components/dfs/dfs_v2/src/dfs_pcache.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components/dfs/dfs_v2/src/dfs_pcache.c b/components/dfs/dfs_v2/src/dfs_pcache.c index 6868170b9cb..2a68c268a4a 100644 --- a/components/dfs/dfs_v2/src/dfs_pcache.c +++ b/components/dfs/dfs_v2/src/dfs_pcache.c @@ -16,15 +16,16 @@ #include #include #include -#include -#include -#include -#include #include #ifdef RT_USING_PAGECACHE +#include +#include +#include +#include + #ifndef RT_PAGECACHE_COUNT #define RT_PAGECACHE_COUNT 4096 #endif From 887404083508d44dcf5eeac7edd24e7ac5bc84b5 Mon Sep 17 00:00:00 2001 From: yuqingli Date: Fri, 20 Dec 2024 04:26:44 +0800 Subject: [PATCH 2/7] [bug] An error occurs when RT_USING_DFS_V2 is defined but RT-RT_USING_DFS_DEVFS is not defined --- components/drivers/core/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/drivers/core/device.c b/components/drivers/core/device.c index 5dfd0c4653e..c9dec6e90d6 100644 --- a/components/drivers/core/device.c +++ b/components/drivers/core/device.c @@ -31,9 +31,9 @@ #include /* 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 -#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 */ From 242badff95d9312e1867c0c4c6410f8a03fdd925 Mon Sep 17 00:00:00 2001 From: yuqingli Date: Fri, 20 Dec 2024 04:27:50 +0800 Subject: [PATCH 3/7] fal_rtt.c:53:9: warning: implicit declaration of function 'memcpy' --- components/fal/src/fal_rtt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/fal/src/fal_rtt.c b/components/fal/src/fal_rtt.c index 9ef5be14401..7625dcd09fa 100644 --- a/components/fal/src/fal_rtt.c +++ b/components/fal/src/fal_rtt.c @@ -10,6 +10,8 @@ */ #include +#include +#include #include #define DBG_TAG "FAL" From 1ed725dac77659de98d769a7b5f9c8f25cb494c4 Mon Sep 17 00:00:00 2001 From: yuqingli Date: Fri, 20 Dec 2024 04:27:50 +0800 Subject: [PATCH 4/7] fal_rtt.c:53:9: warning: implicit declaration of function 'memcpy' --- components/fal/src/fal_rtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/fal/src/fal_rtt.c b/components/fal/src/fal_rtt.c index 7625dcd09fa..9ae93ea6793 100644 --- a/components/fal/src/fal_rtt.c +++ b/components/fal/src/fal_rtt.c @@ -52,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) { From 379f5a50b31b5b687cf5ce5281bec28739c4fa0e Mon Sep 17 00:00:00 2001 From: yuqingli Date: Fri, 20 Dec 2024 04:59:04 +0800 Subject: [PATCH 5/7] Merge branch 'master' of https://github.com/yuqingli05/rt-thread From 007896ab3b379eaa2e8306d4df60abac845fa80d Mon Sep 17 00:00:00 2001 From: yuqingli05 <106426122+yuqingli05@users.noreply.github.com> Date: Fri, 20 Dec 2024 10:01:22 +0800 Subject: [PATCH 6/7] Update components/drivers/core/device.c Co-authored-by: Meco Man <920369182@qq.com> --- components/drivers/core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/drivers/core/device.c b/components/drivers/core/device.c index c9dec6e90d6..ad5de629b21 100644 --- a/components/drivers/core/device.c +++ b/components/drivers/core/device.c @@ -31,7 +31,7 @@ #include /* for wqueue_init */ #endif /* RT_USING_POSIX_DEVIO */ -#if((defined RT_USING_DFS_V2) && (defined RT_USING_DFS_DEVFS)) +#if defined (RT_USING_DFS_V2) && defined (RT_USING_DFS_DEVFS) #include #endif /* RT_USING_DFS_V2 RT_USING_DFS_DEVFS */ From 6c90a7a9bfff814ab73cb716167328325b0533cb Mon Sep 17 00:00:00 2001 From: yuqingli05 <106426122+yuqingli05@users.noreply.github.com> Date: Fri, 20 Dec 2024 10:01:32 +0800 Subject: [PATCH 7/7] Update components/drivers/core/device.c Co-authored-by: Meco Man <920369182@qq.com> --- components/drivers/core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/drivers/core/device.c b/components/drivers/core/device.c index ad5de629b21..751b662d4ec 100644 --- a/components/drivers/core/device.c +++ b/components/drivers/core/device.c @@ -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 */ -#if((defined RT_USING_DFS_V2) && (defined RT_USING_DFS_DEVFS)) +#if defined (RT_USING_DFS_V2) && defined (RT_USING_DFS_DEVFS) dfs_devfs_device_add(dev); #endif /* RT_USING_DFS_V2 */