Skip to content

[FIX][fal]char设备类型补充缺失的入参，适配DFSv2框架 #11112

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
Rbb666 merged 3 commits into from
Jan 6, 2026
+28 −14
Merged

[FIX][fal]char设备类型补充缺失的入参，适配DFSv2框架 #11112

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac3f6cc
[FIX][fal]补充缺失的入参，适配DFSv2框架
AngryProton Dec 31, 2025
b196f4d
[FIX][fal]正确声明入参的数据类型
AngryProton Dec 31, 2025
c77e11a
[chg]按审查建议修改变量类型和代码格式。
AngryProton Jan 5, 2026
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
42 changes: 28 additions & 14 deletions components/fal/src/fal_rtt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,42 +435,56 @@ static int char_dev_fopen(struct dfs_file *fd)
return RT_EOK;
}

static int char_dev_fread(struct dfs_file *fd, void *buf, rt_size_t count)
#ifdef RT_USING_DFS_V2
static rt_ssize_t char_dev_fread(struct dfs_file *fd, void *buf, size_t count, off_t *pos)
#else
static rt_ssize_t char_dev_fread(struct dfs_file *fd, void *buf, size_t count)
#endif
{
int ret = 0;
rt_ssize_t ret = 0;
struct fal_char_device *part = (struct fal_char_device *) fd->vnode->data;
#ifndef RT_USING_DFS_V2
off_t *pos = &(fd->pos);
#endif

RT_ASSERT(part != RT_NULL);

if (DFS_FILE_POS(fd) + count > part->fal_part->len)
count = part->fal_part->len - DFS_FILE_POS(fd);
if (*pos + count > part->fal_part->len)
count = part->fal_part->len - *pos;

ret = fal_partition_read(part->fal_part, DFS_FILE_POS(fd), buf, count);
ret = fal_partition_read(part->fal_part, *pos, buf, count);

if (ret != (int)(count))
if (ret != (rt_ssize_t)(count))
return 0;

DFS_FILE_POS(fd) += ret;
*pos += ret;

return ret;
}

static int char_dev_fwrite(struct dfs_file *fd, const void *buf, rt_size_t count)
#ifdef RT_USING_DFS_V2
static rt_ssize_t char_dev_fwrite(struct dfs_file *fd, const void *buf, size_t count, off_t *pos)
#else
static rt_ssize_t char_dev_fwrite(struct dfs_file *fd, const void *buf, size_t count)
#endif
{
int ret = 0;
rt_ssize_t ret = 0;
struct fal_char_device *part = (struct fal_char_device *) fd->vnode->data;
#ifndef RT_USING_DFS_V2
off_t *pos = &(fd->pos);
#endif

RT_ASSERT(part != RT_NULL);

if (DFS_FILE_POS(fd) + count > part->fal_part->len)
count = part->fal_part->len - DFS_FILE_POS(fd);
if (*pos + count > part->fal_part->len)
count = part->fal_part->len - *pos;

ret = fal_partition_write(part->fal_part, DFS_FILE_POS(fd), buf, count);
ret = fal_partition_write(part->fal_part, *pos, buf, count);

if (ret != (int) count)
if (ret != (rt_ssize_t) count)
return 0;

DFS_FILE_POS(fd) += ret;
*pos += ret;

return ret;
}
Expand Down
Loading