Skip to content

修复编译过程中的 DFS_V2报错、FAL警告 #9826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mysterywolf merged 7 commits into from
Jan 2, 2025
Merged

修复编译过程中的 DFS_V2报错、FAL警告 #9826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4df01d8
[bug] When compiling dfs_v2 without defining RT-USING_SMART, an error…
yuqingli05 Dec 19, 2024
8874040
[bug] An error occurs when RT_USING_DFS_V2 is defined but RT-RT_USING…
yuqingli05 Dec 19, 2024
242badf
fal_rtt.c:53:9: warning: implicit declaration of function 'memcpy'
yuqingli05 Dec 19, 2024
1ed725d
fal_rtt.c:53:9: warning: implicit declaration of function 'memcpy'
yuqingli05 Dec 19, 2024
379f5a5
Merge branch 'master' of https://github.com/yuqingli05/rt-thread
yuqingli05 Dec 19, 2024
007896a
Update components/drivers/core/device.c
yuqingli05 Dec 20, 2024
6c90a7a
Update components/drivers/core/device.c
yuqingli05 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions components/dfs/dfs_v2/src/dfs_pcache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions components/drivers/core/device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 */

Expand Down
4 changes: 3 additions & 1 deletion components/fal/src/fal_rtt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
*/

#include <fal.h>
#include <string.h>
#include <stdlib.h>
#include <rtdevice.h>

#define DBG_TAG "FAL"
Expand Down Expand Up @@ -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)
{
Expand Down
Loading