Added many syscalls to get better POSIX compliance

23 files changed, 198 insertions, 66 deletions

diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index 8213c12..c6c828b 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -5,6 +5,8 @@
 #include <kernel/lib/stdio.h>
 #include <kernel/memory/alloc.h>
 #include <kernel/memory/paging.h>
+#include <kernel/fs/dev.h>
+#include <kernel/fs/ext2.h>
 
 void vbe_error()
 {
@@ -81,6 +83,12 @@ struct vbe_mode_info *vbe_get_mode_info(uint16_t mode)
 	return ret;
 }
 
+uint32_t fb_write(struct fs_node *node, uint32_t offset, uint32_t size, uint8_t *buffer)
+{
+	log("FB WRITE!");
+	return 0;
+}
+
 void set_optimal_resolution()
 {
 	log("Switching to graphics mode");
@@ -170,6 +178,12 @@ void set_optimal_resolution()
 		paging_map_user(paging_root_directory, (uint32_t)fb + z, (uint32_t)fb + z);
 	}
 
+	dev_make("fb", NULL, (write)fb_write);
+	struct fs_node *node = (struct fs_node *)kmalloc(sizeof(struct fs_node));
+	strcpy(node->name, "/dev/fb");
+	ext2_root->open(node);
+	node->dev->block_size = 0;
+
 	if (vbe_height > 1440)
 		vesa_set_font(32);
 	else if (vbe_height > 720)
diff --git a/src/kernel/syscall/actions/sys_exit.c b/src/kernel/syscall/actions/sys_exit.c
new file mode 100644
index 0000000..e2761fd
--- /dev/null
+++ b/src/kernel/syscall/actions/sys_exit.c
@@ -0,0 +1,8 @@
+#include <stdint.h>
+#include <kernel/tasks/process.h>
+
+uint32_t sys_exit(uint32_t code)
+{
+	current_proc->state = PROC_ASLEEP;
+	return code;
+}
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_fork.c b/src/kernel/syscall/actions/sys_fork.c
new file mode 100644
index 0000000..af64ff9
--- /dev/null
+++ b/src/kernel/syscall/actions/sys_fork.c
@@ -0,0 +1,19 @@
+#include <stdint.h>
+#include <kernel/interrupts/interrupts.h>
+#include <kernel/memory/paging.h>
+#include <kernel/tasks/process.h>
+#include <kernel/lib/lib.h>
+
+uint32_t sys_fork(struct regs *r)
+{
+	struct page_directory *dir = paging_copy_user_directory(current_proc->cr3);
+	struct process *proc = process_make_new();
+	proc->cr3 = dir;
+	memcpy(&proc->registers, r, sizeof(struct regs));
+	proc->registers.eax = proc->pid;
+	proc->pid = current_proc->pid;
+
+	process_spawn(proc);
+
+	return 0;
+}
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_get_pid.c b/src/kernel/syscall/actions/sys_get_pid.c
new file mode 100644
index 0000000..7631230
--- /dev/null
+++ b/src/kernel/syscall/actions/sys_get_pid.c
@@ -0,0 +1,7 @@
+#include <stdint.h>
+#include <kernel/tasks/process.h>
+
+uint32_t sys_get_pid()
+{
+	return current_proc->pid;
+}
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_pointers.c b/src/kernel/syscall/actions/sys_pointers.c
deleted file mode 100644
index 1a9a5cf..0000000
--- a/src/kernel/syscall/actions/sys_pointers.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <stdint.h>
-#include <kernel/graphics/vesa.h>
-#include <kernel/fs/load.h>
-#include <kernel/memory/alloc.h>
-#include <kernel/memory/paging.h>
-#include <kernel/tasks/process.h>
-
-struct pointers {
-	struct vbe_mode_info *current_mode_info;
-	struct font *font;
-};
-
-uint32_t sys_pointers()
-{
-	struct pointers *pointers = umalloc(sizeof(struct vbe_mode_info) + sizeof(struct font));
-	pointers->current_mode_info = current_mode_info;
-	pointers->font = font;
-
-	return pointers;
-}
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_putch.c b/src/kernel/syscall/actions/sys_putch.c
deleted file mode 100644
index beaa4a2..0000000
--- a/src/kernel/syscall/actions/sys_putch.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdint.h>
-#include <kernel/lib/stdio.h>
-#include <kernel/lib/string.h>
-
-uint32_t sys_putch(char ch)
-{
-	putch(ch);
-	return 0;
-}
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_read.c b/src/kernel/syscall/actions/sys_read.c
new file mode 100644
index 0000000..a954f56
--- /dev/null
+++ b/src/kernel/syscall/actions/sys_read.c
@@ -0,0 +1,22 @@
+#include <stdint.h>
+#include <kernel/fs/vfs.h>
+#include <kernel/fs/ext2.h>
+#include <kernel/lib/stdlib.h>
+#include <kernel/memory/alloc.h>
+
+uint32_t sys_read(char *path, uint32_t offset, uint32_t count, char *buf)
+{
+	struct fs_node *node = (struct fs_node *)umalloc(sizeof(struct fs_node));
+	strcpy(node->name, path);
+	ext2_root->open(node);
+	if (node->inode != 0) {
+		uint32_t size = ((struct ext2_file *)node->impl)->inode.size;
+		ext2_root->read(node, 0, size, buf);
+		buf[size - 1] = '\0';
+		ext2_root->close(node);
+		return size;
+	} else {
+		ext2_root->close(node);
+		return -1;
+	}
+}
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_scancode.c b/src/kernel/syscall/actions/sys_scancode.c
deleted file mode 100644
index 612326a..0000000
--- a/src/kernel/syscall/actions/sys_scancode.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdint.h>
-#include <kernel/input/input.h>
-#include <kernel/io/io.h>
-
-uint32_t sys_scancode()
-{
-	sti();
-	uint32_t key = wait_scancode();
-	cli();
-	return key;
-}
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_write.c b/src/kernel/syscall/actions/sys_write.c
new file mode 100644
index 0000000..d79ef37
--- /dev/null
+++ b/src/kernel/syscall/actions/sys_write.c
@@ -0,0 +1,22 @@
+#include <stdint.h>
+#include <kernel/fs/vfs.h>
+#include <kernel/fs/ext2.h>
+#include <kernel/lib/stdlib.h>
+#include <kernel/memory/alloc.h>
+
+uint32_t sys_write(char *path, uint32_t offset, uint32_t count, char *buf)
+{
+	struct fs_node *node = (struct fs_node *)umalloc(sizeof(struct fs_node));
+	strcpy(node->name, path);
+	ext2_root->open(node);
+	if (node->inode != 0) {
+		uint32_t size = ((struct ext2_file *)node->impl)->inode.size;
+		ext2_root->write(node, 0, size, buf);
+		buf[size - 1] = '\0';
+		ext2_root->close(node);
+		return size;
+	} else {
+		ext2_root->close(node);
+		return -1;
+	}
+}
\ No newline at end of file
diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c
index 7433799..d09ee33 100644
--- a/src/kernel/syscall/syscall.c
+++ b/src/kernel/syscall/syscall.c
@@ -9,12 +9,14 @@
 typedef uint32_t (*syscall_func)(uint32_t, ...);
 
 uint32_t (*syscalls[])() = { [0] = (uint32_t(*)())halt_loop, // DEBUG!
-			     [1] = sys_exec,
-			     [2] = (uint32_t(*)())sys_putch,
-			     [3] = sys_scancode,
-			     [4] = sys_malloc,
-			     [5] = sys_free,
-			     [6] = sys_pointers };
+			     [1] = sys_exit,
+			     [2] = sys_fork,
+			     [3] = sys_read,
+			     [4] = sys_write,
+			     [5] = sys_exec,
+			     [6] = sys_get_pid,
+			     [7] = sys_malloc,
+			     [8] = sys_free };
 
 void syscall_handler(struct regs *r)
 {
diff --git a/src/kernel/syscall/syscall.h b/src/kernel/syscall/syscall.h
index 502064b..322e551 100644
--- a/src/kernel/syscall/syscall.h
+++ b/src/kernel/syscall/syscall.h
@@ -2,21 +2,26 @@
 #define MELVIX_SYSCALL_H
 
 #include <stdint.h>
+#include <kernel/interrupts/interrupts.h>
 
 extern void idt_syscall();
 
 void syscalls_install();
 
-uint32_t sys_exec(char *path);
+uint32_t sys_exit(uint32_t code);
+
+uint32_t sys_fork(struct regs *r);
+
+uint32_t sys_read(char *path, uint32_t offset, uint32_t count, char *buf);
 
-uint32_t sys_putch(char ch);
+uint32_t sys_write(char *path, uint32_t offset, uint32_t count, char *buf);
 
-uint32_t sys_scancode();
+uint32_t sys_exec(char *path);
+
+uint32_t sys_get_pid();
 
 uint32_t sys_malloc(uint32_t count);
 
 uint32_t sys_free(uint32_t ptr);
 
-uint32_t sys_pointers();
-
 #endif
\ No newline at end of file
diff --git a/src/userspace/libc/stdio/getch.c b/src/userspace/libc/stdio/getch.c
index 93d3d00..5f9655a 100644
--- a/src/userspace/libc/stdio/getch.c
+++ b/src/userspace/libc/stdio/getch.c
@@ -65,7 +65,8 @@ char shift_keymap[128] = {
 char *getch()
 {
 	// TODO: Add shift support
-	u8 scancode = syscall_scancode();
+	// TODO: Implement keyboard dev driver
+	u8 scancode = 42; //syscall_scancode();
 	if ((scancode & 0x80) == 0) { // Press
 		return keymap[scancode];
 	} else { // Release
diff --git a/src/userspace/libc/stdio/putch.c b/src/userspace/libc/stdio/putch.c
index 3bc5a2e..f87680e 100644
--- a/src/userspace/libc/stdio/putch.c
+++ b/src/userspace/libc/stdio/putch.c
@@ -2,6 +2,7 @@
 
 void putch(char ch)
 {
-	if (ch != 0)
-		syscall_putch(ch);
+	// TODO: Implement framebuffer writing
+	//if (ch != 0)
+	//syscall_putch(ch);
 }
\ No newline at end of file
diff --git a/src/userspace/libc/syscall.c b/src/userspace/libc/syscall.c
index 1741376..f6761ac 100644
--- a/src/userspace/libc/syscall.c
+++ b/src/userspace/libc/syscall.c
@@ -5,14 +5,18 @@
  */
 DEFN_SYSCALL0(halt, 0);
 
-DEFN_SYSCALL1(exec, 1, char *);
+DEFN_SYSCALL1(exit, 1, u32);
 
-DEFN_SYSCALL1(putch, 2, char *);
+DEFN_SYSCALL0(fork, 2);
 
-DEFN_SYSCALL0(scancode, 3);
+DEFN_SYSCALL4(read, 3, char *, u32, u32, char *);
 
-DEFN_SYSCALL1(malloc, 4, u32);
+DEFN_SYSCALL4(write, 4, char *, u32, u32, char *);
 
-DEFN_SYSCALL1(free, 5, u32);
+DEFN_SYSCALL1(exec, 5, char *);
 
-DEFN_SYSCALL0(pointers, 6);
\ No newline at end of file
+DEFN_SYSCALL0(get_pid, 6);
+
+DEFN_SYSCALL1(malloc, 7, u32);
+
+DEFN_SYSCALL1(free, 8, u32);
\ No newline at end of file
diff --git a/src/userspace/libc/syscall.h b/src/userspace/libc/syscall.h
index e8ab95a..262e05a 100644
--- a/src/userspace/libc/syscall.h
+++ b/src/userspace/libc/syscall.h
@@ -70,16 +70,20 @@
  */
 DECL_SYSCALL0(halt);
 
-DECL_SYSCALL1(exec, char *);
+DECL_SYSCALL1(exit, u32);
+
+DECL_SYSCALL0(fork);
+
+DECL_SYSCALL4(read, char *, u32, u32, char *);
 
-DECL_SYSCALL1(putch, char *);
+DECL_SYSCALL4(write, char *, u32, u32, char *);
 
-DECL_SYSCALL0(scancode);
+DECL_SYSCALL1(exec, char *);
+
+DECL_SYSCALL0(get_pid);
 
 DECL_SYSCALL1(malloc, u32);
 
 DECL_SYSCALL1(free, u32);
 
-DECL_SYSCALL0(pointers);
-
 #endif
\ No newline at end of file
diff --git a/src/userspace/libc/unistd.h b/src/userspace/libc/unistd.h
new file mode 100644
index 0000000..e8b97be
--- /dev/null
+++ b/src/userspace/libc/unistd.h
@@ -0,0 +1,18 @@
+#ifndef MELVIX_UNISTD_H
+#define MELVIX_UNISTD_H
+
+#include <stdint.h>
+
+u32 exec(char *path);
+
+void exit(u32 code);
+
+u32 fork();
+
+u32 get_pid();
+
+u32 sys_read(char *path, u32 offset, u32 count, char *buf);
+
+u32 sys_write(char *path, u32 offset, u32 count, char *buf);
+
+#endif
\ No newline at end of file
diff --git a/src/userspace/libc/unistd/exec.c b/src/userspace/libc/unistd/exec.c
new file mode 100644
index 0000000..fd08d57
--- /dev/null
+++ b/src/userspace/libc/unistd/exec.c
@@ -0,0 +1,7 @@
+#include <stdint.h>
+#include <syscall.h>
+
+u32 exec(char *path)
+{
+	return syscall_exec(path);
+}
\ No newline at end of file
diff --git a/src/userspace/libc/unistd/exit.c b/src/userspace/libc/unistd/exit.c
new file mode 100644
index 0000000..03b54fe
--- /dev/null
+++ b/src/userspace/libc/unistd/exit.c
@@ -0,0 +1,9 @@
+#include <stdint.h>
+#include <syscall.h>
+
+void exit(u32 code)
+{
+	syscall_exit(code);
+	while (1) {
+	};
+}
\ No newline at end of file
diff --git a/src/userspace/libc/unistd/fork.c b/src/userspace/libc/unistd/fork.c
new file mode 100644
index 0000000..6ca054a
--- /dev/null
+++ b/src/userspace/libc/unistd/fork.c
@@ -0,0 +1,7 @@
+#include <stdint.h>
+#include <syscall.h>
+
+u32 fork()
+{
+	return syscall_fork();
+}
\ No newline at end of file
diff --git a/src/userspace/libc/unistd/get_pid.c b/src/userspace/libc/unistd/get_pid.c
new file mode 100644
index 0000000..c42f460
--- /dev/null
+++ b/src/userspace/libc/unistd/get_pid.c
@@ -0,0 +1,7 @@
+#include <stdint.h>
+#include <syscall.h>
+
+u32 get_pid()
+{
+	return syscall_get_pid();
+}
\ No newline at end of file
diff --git a/src/userspace/libc/unistd/read.c b/src/userspace/libc/unistd/read.c
new file mode 100644
index 0000000..c01baa7
--- /dev/null
+++ b/src/userspace/libc/unistd/read.c
@@ -0,0 +1,7 @@
+#include <stdint.h>
+#include <syscall.h>
+
+u32 sys_read(char *path, u32 offset, u32 count, char *buf)
+{
+	return syscall_read(path, offset, count, buf);
+}
\ No newline at end of file
diff --git a/src/userspace/libc/unistd/write.c b/src/userspace/libc/unistd/write.c
new file mode 100644
index 0000000..c3eec3d
--- /dev/null
+++ b/src/userspace/libc/unistd/write.c
@@ -0,0 +1,7 @@
+#include <stdint.h>
+#include <syscall.h>
+
+u32 sys_write(char *path, u32 offset, u32 count, char *buf)
+{
+	return syscall_write(path, offset, count, buf);
+}
\ No newline at end of file
diff --git a/src/userspace/libgui/init.c b/src/userspace/libgui/init.c
index ecc65d2..04d6b49 100644
--- a/src/userspace/libgui/init.c
+++ b/src/userspace/libgui/init.c
@@ -10,7 +10,8 @@ u32 terminal_background[3] = { 0x1d, 0x1f, 0x24 };
 
 void gui_init()
 {
-	pointers = syscall_pointers();
+	// TODO: Implement framebuffer device
+	// pointers = syscall_pointers();
 
 	vbe_width = pointers->mode_info->width;
 	vbe_height = pointers->mode_info->height;