From 75526aea5027d76b9f7cf07b8741cd7c8642f4ed Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Mon, 4 Jan 2021 12:40:30 +0100
Subject: Some vfs fixes

---
 kernel/features/fs.c | 12 +++++++-----
 kernel/inc/fs.h      |  6 +++++-
 kernel/main.c        |  2 ++
 3 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'kernel')

diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index 63a1f70..e168022 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -19,8 +19,10 @@ struct device *vfs_mounted(const char *path)
 {
 	struct node *iterator = mount_points->head;
 	while (iterator) {
-		if (!strcmp(iterator->data, path))
-			return iterator->data;
+		struct mount_info *m = iterator->data;
+		printf("Looping %s\n", m->path);
+		if (!strcmp(m->path, path))
+			return m->dev;
 		iterator = iterator->next;
 	}
 	return NULL;
@@ -39,7 +41,7 @@ u32 vfs_mount(struct device *dev, const char *path)
 	return 1;
 }
 
-void vfs_install()
+void vfs_install(void)
 {
 	mount_points = list_new();
 }
@@ -52,7 +54,7 @@ static struct list *devices = NULL;
 
 void device_add(struct device *dev)
 {
-	dev->id = rand();
+	dev->id = rand() + 1;
 	list_add(devices, dev);
 }
 
@@ -67,7 +69,7 @@ struct device *device_get(u32 id)
 	return NULL;
 }
 
-void device_install()
+void device_install(void)
 {
 	devices = list_new();
 
diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h
index 3cc39e6..8fd0707 100644
--- a/kernel/inc/fs.h
+++ b/kernel/inc/fs.h
@@ -18,13 +18,15 @@ struct device {
 	u8 (*write)(u8 *buf, u32 offset, u32 count, struct device *dev);
 };
 
+void device_install(void);
+
 /**
  * VFS
  */
 
 struct vfs {
 	const char *name;
-	u8 (*read)(char *, char *, struct device *, void *);
+	//u8 (*read)(char *, char *, struct device *, void *);
 	u8 (*mount)(struct device *, void *);
 };
 
@@ -33,6 +35,8 @@ struct mount_info {
 	struct device *dev;
 };
 
+void vfs_install(void);
+
 /**
  * EXT2
  */
diff --git a/kernel/main.c b/kernel/main.c
index 5e071a9..b0e1a15 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -27,6 +27,8 @@ void kernel_main(struct vid_info *vid_info)
 	cpu_print();
 
 	// Install drivers
+	vfs_install();
+	device_install();
 	pci_install();
 	interrupts_install();
 	timer_install();
-- 
cgit v1.2.3