diff options
| author | Bernard Xiong <[email protected]> | 2021-12-05 13:16:39 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-05 13:16:39 +0800 |
| commit | 36d51542565800d503ad204d882e4b1dd3fcfe7d (patch) | |
| tree | debed47f95688577bcbde7846fd9892e9283668e /components/dfs | |
| parent | 04535363844d30971edca03f643fc92ba2cd40a7 (diff) | |
| parent | 1040f4a3479b3751a7ad5d5383b62d602fccabed (diff) | |
Merge pull request #5320 from mysterywolf/pse-master
[POSIX] move PSE branch to master
Diffstat (limited to 'components/dfs')
| -rw-r--r-- | components/dfs/filesystems/devfs/devfs.c | 4 | ||||
| -rw-r--r-- | components/dfs/src/dfs.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/components/dfs/filesystems/devfs/devfs.c b/components/dfs/filesystems/devfs/devfs.c index d615482452..d60f7ddc9b 100644 --- a/components/dfs/filesystems/devfs/devfs.c +++ b/components/dfs/filesystems/devfs/devfs.c @@ -173,7 +173,7 @@ int dfs_device_fs_open(struct dfs_fd *file) if (device == RT_NULL) return -ENODEV; -#ifdef RT_USING_POSIX +#ifdef RT_USING_POSIX_DEVIO if (device->fops) { /* use device fops */ @@ -192,7 +192,7 @@ int dfs_device_fs_open(struct dfs_fd *file) } } else -#endif +#endif /* RT_USING_POSIX_DEVIO */ { result = rt_device_open(device, RT_DEVICE_OFLAG_RDWR); if (result == RT_EOK || result == -RT_ENOSYS) diff --git a/components/dfs/src/dfs.c b/components/dfs/src/dfs.c index d3a859e287..95fcfc2df6 100644 --- a/components/dfs/src/dfs.c +++ b/components/dfs/src/dfs.c @@ -18,9 +18,9 @@ #include <lwp.h> #endif -#ifdef RT_USING_POSIX_STDIO +#ifdef RT_USING_POSIX_DEVIO #include <libc.h> -#endif /* RT_USING_POSIX_STDIO */ +#endif /* RT_USING_POSIX_DEVIO */ /* Global variables */ const struct dfs_filesystem_ops *filesystem_operation_table[DFS_FILESYSTEM_TYPES_MAX]; @@ -216,10 +216,10 @@ struct dfs_fd *fd_get(int fd) struct dfs_fd *d; struct dfs_fdtable *fdt; -#ifdef RT_USING_POSIX_STDIO +#ifdef RT_USING_POSIX_DEVIO if ((0 <= fd) && (fd <= 2)) fd = libc_stdio_get_console(); -#endif /* RT_USING_POSIX_STDIO */ +#endif /* RT_USING_POSIX_DEVIO */ fdt = dfs_fdtable_get(); fd = fd - DFS_FD_OFFSET; |
