Started basic ioctl fb interface

3 files changed, 46 insertions, 14 deletions

diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index 687d7ad..4d19dde 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -131,7 +131,8 @@ s32 vfs_read(const char *path, void *buf, u32 offset, u32 count)
 		path++;
 
 	struct mount_info *m = vfs_find_mount_info(path);
-	assert(m && m->dev && m->dev->vfs && m->dev->vfs->read && m->dev->vfs->perm);
+	if (!(m && m->dev && m->dev->vfs && m->dev->vfs->read && m->dev->vfs->perm))
+		return -1;
 
 	u32 len = strlen(m->path);
 	if (len > 1)
@@ -156,7 +157,8 @@ s32 vfs_write(const char *path, void *buf, u32 offset, u32 count)
 		path++;
 
 	struct mount_info *m = vfs_find_mount_info(path);
-	assert(m && m->dev && m->dev->vfs && m->dev->vfs->write && m->dev->vfs->perm);
+	if (!(m && m->dev && m->dev->vfs && m->dev->vfs->write && m->dev->vfs->perm))
+		return -1;
 
 	u32 len = strlen(m->path);
 	if (len > 1)
@@ -168,6 +170,25 @@ s32 vfs_write(const char *path, void *buf, u32 offset, u32 count)
 	return m->dev->vfs->write(path, buf, offset, count, m->dev);
 }
 
+s32 vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3)
+{
+	while (*path == ' ')
+		path++;
+
+	struct mount_info *m = vfs_find_mount_info(path);
+	if (!(m && m->dev && m->dev->vfs && m->dev->vfs->ioctl && m->dev->vfs->perm))
+		return -1;
+
+	u32 len = strlen(m->path);
+	if (len > 1)
+		path += len;
+
+	if (!m->dev->vfs->perm(path, VFS_WRITE, m->dev) && !proc_super())
+		return -1;
+
+	return m->dev->vfs->ioctl(path, request, arg1, arg2, arg3, m->dev);
+}
+
 s32 vfs_stat(const char *path, struct stat *buf)
 {
 	while (*path == ' ')
@@ -177,12 +198,16 @@ s32 vfs_stat(const char *path, struct stat *buf)
 		return -1;
 
 	struct mount_info *m = vfs_find_mount_info(path);
-	assert(m && m->dev && m->dev->vfs && m->dev->vfs->stat);
+	if (!(m && m->dev && m->dev->vfs && m->dev->vfs->stat && m->dev->vfs->perm))
+		return -1;
 
 	u32 len = strlen(m->path);
 	if (len > 1)
 		path += len;
 
+	if (!m->dev->vfs->perm(path, VFS_WRITE, m->dev) && !proc_super())
+		return -1;
+
 	return m->dev->vfs->stat(path, buf, m->dev);
 }
 
@@ -192,7 +217,8 @@ s32 vfs_wait(const char *path, u32 func_ptr)
 		path++;
 
 	struct mount_info *m = vfs_find_mount_info(path);
-	assert(m && m->dev && m->dev->vfs);
+	if (!(m && m->dev && m->dev->vfs))
+		return -1;
 
 	// Default wait
 	if (!m->dev->vfs->wait) {
@@ -280,10 +306,19 @@ static s32 devfs_read(const char *path, void *buf, u32 offset, u32 count, struct
 {
 	struct device *target = device_get_by_name(path + 1);
 	if (!target || !target->read)
-		return 0;
+		return -1;
 	return target->read(buf, offset, count, dev);
 }
 
+static s32 devfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3,
+		       struct device *dev)
+{
+	struct device *target = device_get_by_name(path + 1);
+	if (!target || !target->ioctl)
+		return -1;
+	return target->ioctl(request, arg1, arg2, arg3, dev);
+}
+
 static u8 devfs_perm(const char *path, enum vfs_perm perm, struct device *dev)
 {
 	(void)path;
@@ -309,6 +344,7 @@ void device_install(void)
 	struct vfs *vfs = zalloc(sizeof(*vfs));
 	vfs->type = VFS_DEVFS;
 	vfs->read = devfs_read;
+	vfs->ioctl = devfs_ioctl;
 	vfs->perm = devfs_perm;
 	vfs->ready = devfs_ready;
 	struct device *dev = zalloc(sizeof(*dev));
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index db2291c..38d88f8 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -479,15 +479,6 @@ void proc_init(void)
 	_eip = ((struct proc *)new->data)->regs.eip;
 	_esp = ((struct proc *)new->data)->regs.useresp;
 
-	/* u32 argc = 2; */
-	/* char **argv = malloc(sizeof(*argv) * (argc + 1)); */
-	/* argv[0] = strdup("init"); */
-	/* argv[1] = (char *)boot_passed->vbe; */
-	/* argv[2] = NULL; */
-
-	/* ((u32 *)_esp)[0] = argc; // First argument (argc) */
-	/* ((u32 *)_esp)[-1] = (u32)argv; // Second argument (argv) */
-
 	printf("Jumping to userspace!\n");
 	memory_switch_dir(((struct proc *)new->data)->page_dir);
 	proc_jump_userspace();
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index b3e69e0..bac1738 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -52,6 +52,11 @@ static void syscall_handler(struct regs *r)
 		r->eax = (u32)vfs_write((char *)r->ebx, (void *)r->ecx, r->edx, r->esi);
 		break;
 	}
+	case SYS_IOCTL: {
+		r->eax = (u32)vfs_ioctl((char *)r->ebx, r->ecx, (void *)r->edx, (void *)r->esi,
+					(void *)r->edi);
+		break;
+	}
 	case SYS_POLL: {
 		s32 ret = vfs_poll((const char **)r->ebx);
 		if (ret == PROC_MAX_WAIT_IDS + 1)