New read parameters

4 files changed, 33 insertions, 63 deletions

diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index 1195cae..06a1d8c 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -35,7 +35,6 @@ struct device *vfs_find_dev(char *path)
 	while (iterator) {
 		struct mount_info *m = iterator->data;
 		if (!strcmp(m->path, fixed)) {
-			printf("Found: %s\n", m->dev->name);
 			free(fixed);
 			return m->dev;
 		}
@@ -94,12 +93,11 @@ void vfs_list_mounts()
 	}
 }
 
-void *vfs_read(char *path)
+u32 vfs_read(char *path, void *buf, u32 offset, u32 count)
 {
-	(void)path;
-	printf("NOT IMPLEMENTED!\n");
-	loop();
-	return NULL;
+	struct device *dev = vfs_find_dev(path);
+	assert(dev && dev->vfs && dev->vfs->read);
+	return dev->vfs->read(path, buf, offset, count, dev);
 }
 
 u32 vfs_stat(char *path)
@@ -155,6 +153,7 @@ void device_install(void)
 
 	vfs = malloc(sizeof(*vfs));
 	vfs->type = VFS_EXT2;
+	vfs->read = ext2_read;
 	dev = malloc(sizeof(*dev));
 	dev->name = "/dev/hda"; // TODO: Use actual disk device
 	dev->vfs = vfs;
@@ -211,22 +210,28 @@ u32 read_indirect(u32 indirect, u32 block_num)
 	return *(u32 *)((u32)data + block_num * sizeof(u32));
 }
 
-void *read_inode(struct ext2_inode *in)
+u32 read_inode(struct ext2_inode *in, void *buf, u32 offset, u32 count, struct device *dev)
 {
+	// TODO: Support all read parameters
+	(void)buf;
+	(void)offset;
+	(void)count;
+	(void)dev;
+
 	assert(in);
 	if (!in)
-		return NULL;
+		return 0;
 
 	u32 num_blocks = in->blocks / (BLOCK_SIZE / SECTOR_SIZE);
 
 	assert(num_blocks != 0);
 	if (!num_blocks)
-		return NULL;
+		return 0;
 
 	/* u32 sz = BLOCK_SIZE * num_blocks; */
-	u32 sz = in->size;
-	void *buf = malloc(sz);
-	printf("Loading %dKiB\n", sz >> 10);
+	/* u32 sz = in->size; */
+	/* void *buf = malloc(sz); */
+	/* printf("Loading %dKiB\n", sz >> 10); */
 	assert(buf != NULL);
 
 	u32 indirect = 0;
@@ -254,7 +259,7 @@ void *read_inode(struct ext2_inode *in)
 		/* printf("Loaded %d of %d\n", i + 1, num_blocks); */
 	}
 
-	return buf;
+	return count;
 }
 
 u32 find_inode(const char *name, u32 dir_inode)
@@ -323,13 +328,13 @@ struct ext2_inode *find_inode_by_path(char *path)
 	return get_inode(inode);
 }
 
-void *ext2_read(char *path)
+u32 ext2_read(char *path, void *buf, u32 offset, u32 count, struct device *dev)
 {
 	struct ext2_inode *in = find_inode_by_path(path);
 	if (in)
-		return read_inode(in);
+		return read_inode(in, buf, offset, count, dev);
 	else
-		return NULL;
+		return 0;
 }
 
 u32 ext2_stat(char *path)
diff --git a/kernel/features/load.c b/kernel/features/load.c
index b3d5828..e5b6903 100644
--- a/kernel/features/load.c
+++ b/kernel/features/load.c
@@ -11,7 +11,9 @@
 
 int bin_load(char *path, struct proc *proc)
 {
-	char *data = vfs_read(path);
+	// TODO: Remove hardcoded filesize
+	char *data = malloc(0xffff);
+	vfs_read(path, data, 0, 0xffff);
 
 	u32 stack = (u32)malloc(0x2000) + 0x1000;
 
@@ -22,42 +24,3 @@ int bin_load(char *path, struct proc *proc)
 
 	return data ? 0 : 1;
 }
-
-int elf_verify(struct elf_header *h)
-{
-	return h->ident[0] == ELF_MAG && (strncmp((char *)&h->ident[1], "ELF", 3) == 0) &&
-	       h->ident[4] == ELF_32 && h->ident[5] == ELF_LITTLE && h->ident[6] == ELF_CURRENT &&
-	       h->machine == ELF_386 && (h->type == ET_REL || h->type == ET_EXEC);
-}
-
-// TODO: Fix elf loading
-void elf_load(char *path, struct proc *proc)
-{
-	char *data = vfs_read(path);
-	struct elf_header *h = (struct elf_header *)data;
-
-	if (!elf_verify(h)) {
-		printf("File is not elf");
-		return;
-	}
-
-	if (h->type != ET_REL)
-		return;
-
-	struct elf_program_header *phdrs = (struct elf_program_header *)((u32 *)h + h->phoff);
-
-	for (int i = 0; i < h->phnum; i++) {
-		struct elf_program_header *phdr = &phdrs[i];
-		if (phdr->type != PT_LOAD)
-			continue;
-		memcpy((void *)phdr->vaddr, h + phdr->offset, phdr->filesz);
-		memset((void *)(phdr->vaddr + phdr->filesz), 0, phdr->memsz - phdr->filesz);
-	}
-
-	u32 stack = (u32)malloc(0x1000) + 0x1000;
-	proc->regs.ebp = (u32)stack;
-	proc->regs.esp = (u32)stack;
-	proc->regs.useresp = (u32)stack;
-	proc->regs.eip = (u32)h->entry;
-	strcpy(proc->name, path + 1);
-}
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index 8ede015..436db5a 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -38,7 +38,9 @@ void syscall_handler(struct regs *r)
 		break;
 	}
 	case SYS_READ: {
-		r->eax = (u32)vfs_read((char *)r->ebx);
+		printf("NOT IMPLEMENTED!\n");
+		loop();
+		//r->eax = (u32)vfs_read((char *)r->ebx);
 		break;
 	}
 	case SYS_WRITE: {
diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h
index 8af28c4..7831603 100644
--- a/kernel/inc/fs.h
+++ b/kernel/inc/fs.h
@@ -14,8 +14,8 @@ struct device {
 	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);
+	u32 (*read)(void *buf, u32 offset, u32 count, struct device *dev);
+	u32 (*write)(void *buf, u32 offset, u32 count, struct device *dev);
 };
 
 void device_install(void);
@@ -29,8 +29,8 @@ enum vfs_type { VFS_DEVFS, VFS_TMPFS, VFS_PROCFS, VFS_EXT2 };
 struct vfs {
 	enum vfs_type type;
 	int flags;
-	//u8 (*read)(char *, char *, struct device *, void *);
-	//u8 (*mount)(struct device *, void *);
+	u32 (*read)(char *path, void *buf, u32 offset, u32 count, struct device *dev);
+	u32 (*write)(char *path, void *buf, u32 offset, u32 count, struct device *dev);
 };
 
 struct mount_info {
@@ -40,7 +40,7 @@ struct mount_info {
 
 void vfs_install(void);
 
-void *vfs_read(char *path);
+u32 vfs_read(char *path, void *buf, u32 offset, u32 count);
 u32 vfs_stat(char *path);
 
 /**
@@ -134,7 +134,7 @@ struct ext2_file {
 	u32 curr_block_pos;
 };
 
-void *ext2_read(char *path);
+u32 ext2_read(char *path, void *buf, u32 offset, u32 count, struct device *dev);
 u32 ext2_stat(char *path);
 
 #endif