- | Deleting some stuff in the filesystem, want to build IDE driver f…

…irst

filesystem/Makefile

@@ -3,8 +3,8 @@ MEM	= filesystem.a
 VFS_SRC = vfs/vfs.c 
 VFS_OBJ = vfs/vfs.o
 
-IRD_SRC = initrd/initrd.c 
-IRD_OBJ = initrd/initrd.o
+#IRD_SRC = initrd/initrd.c 
+#IRD_OBJ = initrd/initrd.o
 
 AR		= ../gcc_kfs/bin/i386-elf-ar rcs
 CC		= ../gcc_kfs/bin/i386-elf-gcc
@@ -16,7 +16,7 @@ FLAGS	= -ffreestanding	\
 
 all: $(MEM)
 
-$(MEM): $(VFS_OBJ) $(IRD_OBJ)
+$(MEM): $(VFS_OBJ) #$(IRD_OBJ)
 	$(AR) $@ $^
 
 vfs/%.o: vfs/%.c

filesystem/vfs/vfs.c

@@ -23,6 +23,6 @@ uint32_t	fs_close(PFILE node) {
 }
 
 dentry*		fs_readdir(PFILE node, uint32_t index) {
-	if ((node->type & FS_DIR) && node->node_operations.readdir) return node->readdir(node, index);
+	if ((node->type & FS_DIR) && node->node_operations.readdir) return node->node_operations.readdir(node, index);
 	return NULL;
 }

filesystem/vfs/vfs.h

@@ -6,7 +6,7 @@
 #include "../../lib/string/string.h"
 #include "../../memory/vmm/vmm.h"
 
-typedef enum node_type {
+enum node_type {
 	FS_FILE,
 	FS_DIR,
 	FS_CHARDEVICE,
@@ -16,7 +16,7 @@ typedef enum node_type {
 	FS_MOUNTPOINT
 };
 
-typedef enum open_flags {
+enum open_flags {
 	READ,
 	WRITE
 };
@@ -35,12 +35,12 @@ typedef struct _FILE {
 	uint32_t	inode;
 	uint32_t	length;
 	struct node_operations {
-		uint32_t	(*read)(struct FILE*,uint32_t,uint32_t,char*buffer);
-		uint32_t	(*write)(struct FILE*,uint32_t,uint32_t,char*buffer);
-		uint32_t	(*open)(struct FILE*, enum open_flags);
-		uint32_t	(*close)(struct FILE*);
-		dentry*		(*readdir)(struct FILE*,uint32_t);
-	};
+		uint32_t	(*read)(struct _FILE*,uint32_t,uint32_t,char*buffer);
+		uint32_t	(*write)(struct _FILE*,uint32_t,uint32_t,char*buffer);
+		uint32_t	(*open)(struct _FILE*, enum open_flags);
+		uint32_t	(*close)(struct _FILE*);
+		dentry*		(*readdir)(struct _FILE*,uint32_t);
+	} node_operations;
 } FILE, *PFILE;
 
 uint32_t	fs_close(PFILE);

isoroot/boot/grub/grub.cfg

@@ -3,6 +3,5 @@ set	default=0
 
 menuentry "KFS" {
 	multiboot /boot/kfs.elf
-	module /boot/initrd.img
 	boot
 }

kernel/kernel.c

@@ -31,8 +31,8 @@ void	kernel_main(uint32_t magic, uint32_t addr) {
     multiboot_info_t* mbi = (multiboot_info_t*)addr;
     struct multiboot_mmap_entry* region = (struct multiboot_mmap_entry*) mbi->mmap_addr;
     uint32_t mem_size = MAX_MEMORY_SIZE;
-//    uint32_t initrd_location = *(uint32_t*)(mbi->mods_addr);
-//    uint32_t initrd_end = *(uint32_t*)(mbi->mods_addr + 4);
+    uint32_t initrd_location = *(uint32_t*)(mbi->mods_addr);
+    uint32_t initrd_end = *(uint32_t*)(mbi->mods_addr + 4);
 
     init_current_screen(BLUE, WHITE);
     term_clear();
@@ -54,6 +54,8 @@ void	kernel_main(uint32_t magic, uint32_t addr) {
     asm volatile("mov %%cr0, %0" : "=r" (cr0));
     if (cr0 & 0x80000000) printf("Paging enabled: cr0 == %p\n", cr0);
     else printf("Paging disabled: cr0 == %p\n", cr0);
+    printf("addr: %p value: %d\n", initrd_location, *(uint32_t*)initrd_location);
+    printf("addr: %p value: %d\n", initrd_end, *(uint32_t*)initrd_end);
 //    if (!mbi->mods_count) printf("no mods added\n");
 //    fs_root = initialise_initrd(initrd_location);
 }

kernel/kernel.h

@@ -11,5 +11,5 @@
 #include "../multiboot/multiboot.h"
 #include "../memory/pmm/pmm.h"
 #include "../memory/vmm/vmm.h"
-#include "../filesystem/initrd/initrd.h"
+#include "../filesystem/ext2/fs.h"
 #endif