2 files changed, 100 insertions, 60 deletions

diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index 00aa152..63a1f70 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -6,9 +6,81 @@
 #include <ide.h>
 #include <mem.h>
 #include <print.h>
+#include <random.h>
 #include <str.h>
 
 /**
+ * VFS
+ */
+
+static struct list *mount_points = NULL;
+
+struct device *vfs_mounted(const char *path)
+{
+	struct node *iterator = mount_points->head;
+	while (iterator) {
+		if (!strcmp(iterator->data, path))
+			return iterator->data;
+		iterator = iterator->next;
+	}
+	return NULL;
+}
+
+u32 vfs_mount(struct device *dev, const char *path)
+{
+	if (!dev || !dev->id || vfs_mounted(path))
+		return 0;
+
+	struct mount_info *m = malloc(sizeof(*m));
+	m->path = strdup(path);
+	m->dev = dev;
+	list_add(mount_points, m);
+
+	return 1;
+}
+
+void vfs_install()
+{
+	mount_points = list_new();
+}
+
+/**
+ * Device
+ */
+
+static struct list *devices = NULL;
+
+void device_add(struct device *dev)
+{
+	dev->id = rand();
+	list_add(devices, dev);
+}
+
+struct device *device_get(u32 id)
+{
+	struct node *iterator = devices->head;
+	while (iterator) {
+		if (((struct device *)iterator->data)->id == id)
+			return iterator->data;
+		iterator = iterator->next;
+	}
+	return NULL;
+}
+
+void device_install()
+{
+	devices = list_new();
+
+	struct vfs *vfs = malloc(sizeof(*vfs));
+	vfs->name = strdup("devfs");
+	struct device *dev = malloc(sizeof(*dev));
+	dev->name = "dev";
+	dev->vfs = vfs;
+	device_add(dev);
+	vfs_mount(dev, "/dev/");
+}
+
+/**
  * EXT2
  */
 
@@ -183,38 +255,3 @@ u32 file_stat(char *path)
 
 	return in->size;
 }
-
-/**
- * VFS
- */
-
-static struct list *mount_points = NULL;
-
-struct device *vfs_mounted(const char *path)
-{
-	struct node *iterator = mount_points->head;
-	while (iterator) {
-		if (!strcmp(iterator->data, path))
-			return iterator->data;
-		iterator = iterator->next;
-	}
-	return NULL;
-}
-
-u32 vfs_mount(struct device *dev, const char *path)
-{
-	if (!dev || !dev->id || vfs_mounted(path))
-		return 0;
-
-	struct mount_info *m = malloc(sizeof(*m));
-	m->path = strdup(path);
-	m->dev = dev;
-	list_add(mount_points, m);
-
-	return 1;
-}
-
-void vfs_install()
-{
-	mount_points = list_new();
-}
diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h
index 7336a72..3cc39e6 100644
--- a/kernel/inc/fs.h
+++ b/kernel/inc/fs.h
@@ -6,6 +6,34 @@
 #include <def.h>
 
 /**
+ * Device
+ */
+
+struct device {
+	u32 id;
+	const char *name;
+	int type; // TODO: Block, char device
+	struct vfs *vfs;
+	u8 (*read)(u8 *buf, u32 offset, u32 count, struct device *dev);
+	u8 (*write)(u8 *buf, u32 offset, u32 count, struct device *dev);
+};
+
+/**
+ * VFS
+ */
+
+struct vfs {
+	const char *name;
+	u8 (*read)(char *, char *, struct device *, void *);
+	u8 (*mount)(struct device *, void *);
+};
+
+struct mount_info {
+	const char *path;
+	struct device *dev;
+};
+
+/**
  * EXT2
  */
 
@@ -99,29 +127,4 @@ struct file {
 void *file_read(char *path);
 u32 file_stat(char *path);
 
-/**
- * VFS
- */
-
-struct device {
-	u32 id;
-	const char *name;
-	int type; // TODO: Block, char device
-	struct vfs *vfs;
-	u8 (*read)(u8 *buf, u32 offset, u32 count, struct device *dev);
-	u8 (*write)(u8 *buf, u32 offset, u32 count, struct device *dev);
-};
-
-struct vfs {
-	const char *name;
-	u8 (*probe)(struct device *);
-	u8 (*read)(char *, char *, struct device *, void *);
-	u8 (*mount)(struct device *, void *);
-};
-
-struct mount_info {
-	const char *path;
-	struct device *dev;
-};
-
 #endif