aboutsummaryrefslogtreecommitdiff
path: root/src/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/graphics/vesa.c14
-rw-r--r--src/kernel/syscall/actions/sys_exit.c8
-rw-r--r--src/kernel/syscall/actions/sys_fork.c19
-rw-r--r--src/kernel/syscall/actions/sys_get_pid.c7
-rw-r--r--src/kernel/syscall/actions/sys_pointers.c20
-rw-r--r--src/kernel/syscall/actions/sys_putch.c9
-rw-r--r--src/kernel/syscall/actions/sys_read.c22
-rw-r--r--src/kernel/syscall/actions/sys_scancode.c11
-rw-r--r--src/kernel/syscall/actions/sys_write.c22
-rw-r--r--src/kernel/syscall/syscall.c14
-rw-r--r--src/kernel/syscall/syscall.h15
11 files changed, 110 insertions, 51 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