Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-23 12:15:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixup d1s (#8671)

Browse Source 
Signed-off-by: Shell <smokewood@qq.com>
This commit is contained in:
Shell
2024-03-25 20:29:56 +08:00
committed by GitHub
parent cb6d451564
commit 3237efd089
5 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/dfs/dfs_v1/include/dfs_file.h
+1
View File
@@ -63,6 +63,7 @@ struct dfs_file
struct dfs_vnode *vnode; /* file node struct */
void *data; /* Specific fd data */
};
#define DFS_FILE_POS(dfs_file) ((dfs_file)->pos)
#ifdef RT_USING_SMART
struct dfs_mmap2_args
components/dfs/dfs_v2/filesystems/devfs/devfs.c
+5 -15
View File
@@ -282,9 +282,7 @@ int dfs_devfs_ioctl(struct dfs_file *file, int cmd, void *args)
{
result = device->fops->ioctl(file, cmd, args);
}
else if (device->ops)
#else
if (device->ops)
else
#endif /* RT_USING_POSIX_DEVIO */
{
result = rt_device_control(device, cmd, args);
@@ -312,9 +310,7 @@ ssize_t dfs_devfs_read(struct dfs_file *file, void *buf, size_t count, off_t *po
{
result = device->fops->read(file, buf, count, pos);
}
else if (device->ops)
#else
if (device->ops)
else
#endif /* RT_USING_POSIX_DEVIO */
{
/* read device data */
@@ -344,9 +340,7 @@ ssize_t dfs_devfs_write(struct dfs_file *file, const void *buf, size_t count, of
{
result = device->fops->write(file, buf, count, pos);
}
else if (device->ops)
#else
if (device->ops)
else
#endif /* RT_USING_POSIX_DEVIO */
{
/* read device data */
@@ -375,9 +369,7 @@ int dfs_devfs_close(struct dfs_file *file)
{
result = device->fops->close(file);
}
else if (device->ops)
#else
if (device->ops)
else
#endif /* RT_USING_POSIX_DEVIO */
{
/* close device handler */
@@ -417,9 +409,7 @@ int dfs_devfs_open(struct dfs_file *file)
return RT_EOK;
}
}
else if (device->ops)
#else
if (device->ops)
else
#endif /* RT_USING_POSIX_DEVIO */
{
result = rt_device_open(device, RT_DEVICE_OFLAG_RDWR);
components/dfs/dfs_v2/include/dfs_file.h
+1
View File
@@ -101,6 +101,7 @@ struct dfs_file
void *data;
};
#define DFS_FILE_POS(dfs_file) ((dfs_file)->fpos)
/* file is open for reading */
#define FMODE_READ 0x1