X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/96e23fa3c6eabf8a6efebac24b740c5d4a2a1050..fa57b4a05aa12d594f40e0894e0ac6f810a7095c:/lunaix-os/kernel/device/devfs.c diff --git a/lunaix-os/kernel/device/devfs.c b/lunaix-os/kernel/device/devfs.c index 73abac7..012f919 100644 --- a/lunaix-os/kernel/device/devfs.c +++ b/lunaix-os/kernel/device/devfs.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -49,6 +50,18 @@ devfs_get_itype(struct device* dev) return itype; } +int +devfs_get_dtype(struct device* dev) +{ + switch (dev->dev_type & DEV_MSKIF) { + case DEV_IFCAT: + return DT_DIR; + + default: + return DT_FILE; + } +} + int devfs_mknod(struct v_dnode* dnode, struct device* dev) { @@ -74,7 +87,8 @@ devfs_mknod(struct v_dnode* dnode, struct device* dev) int devfs_dirlookup(struct v_inode* this, struct v_dnode* dnode) { - struct device* dev = device_getbyname(this->data, &dnode->name); + struct device* dev = + device_getbyhname((struct device*)this->data, &dnode->name); if (!dev) { return ENOENT; } @@ -84,12 +98,13 @@ devfs_dirlookup(struct v_inode* this, struct v_dnode* dnode) int devfs_readdir(struct v_file* file, struct dir_context* dctx) { - struct device* dev = device_getbyoffset(file->inode->data, dctx->index); + struct device* dev = + device_getbyoffset((struct device*)(file->inode->data), dctx->index); if (!dev) { return 0; } dctx->read_complete_callback( - dctx, dev->name.value, dev->name.len, devfs_get_itype(dev)); + dctx, dev->name.value, dev->name.len, devfs_get_dtype(dev)); return 1; }