Skip to content

Commit 3893176

Browse files
authored
Merge pull request #3931 from enkiller/0926
[add] DFS file system supports device types
2 parents 8ffe242 + 50dc414 commit 3893176

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

components/dfs/filesystems/devfs/devfs.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ int dfs_device_fs_open(struct dfs_fd *file)
186186
result = file->fops->open(file);
187187
if (result == RT_EOK || result == -RT_ENOSYS)
188188
{
189+
file->type = FT_DEVICE;
189190
return 0;
190191
}
191192
}
@@ -197,6 +198,7 @@ int dfs_device_fs_open(struct dfs_fd *file)
197198
if (result == RT_EOK || result == -RT_ENOSYS)
198199
{
199200
file->data = device;
201+
file->type = FT_DEVICE;
200202
return RT_EOK;
201203
}
202204
}

components/dfs/include/dfs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#define FT_SOCKET 1 /* socket file */
5656
#define FT_DIRECTORY 2 /* directory */
5757
#define FT_USER 3 /* user defined */
58+
#define FT_DEVICE 4 /* device */
5859

5960
/* File flags */
6061
#define DFS_F_OPEN 0x01000000

components/dfs/src/dfs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ int list_fd(void)
542542
else if (fd->type == FT_REGULAR) rt_kprintf("%-7.7s ", "file");
543543
else if (fd->type == FT_SOCKET) rt_kprintf("%-7.7s ", "socket");
544544
else if (fd->type == FT_USER) rt_kprintf("%-7.7s ", "user");
545+
else if (fd->type == FT_DEVICE) rt_kprintf("%-7.7s ", "device");
545546
else rt_kprintf("%-8.8s ", "unknown");
546547
rt_kprintf("%3d ", fd->ref_count);
547548
rt_kprintf("%04x ", fd->magic);

0 commit comments

Comments
 (0)