Added events and map syscall

9 files changed, 67 insertions, 7 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 390d181..e36ec35 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -6,9 +6,10 @@ LD = ../cross/opt/bin/i686-elf-ld
 OC = ../cross/opt/bin/i686-elf-objcopy
 
 # Flags to make the binary smaller TODO: Remove after indirect pointer support!
-CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
+# TODO: Fix optimization flags (relocation of functions)
+CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -O0
 
-CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -ffunction-sections -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-emain -I../libc/inc/ -I../libgui/inc/ -Wl,-emain -fPIE -Duserspace
+CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -ffunction-sections -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-emain -I../libc/inc/ -I../libgui/inc/ -fPIE -Duserspace
 
 all: $(COBJS)
 
diff --git a/apps/wm.c b/apps/wm.c
index b9cae91..f4dac44 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -7,6 +7,11 @@
 #include <sys.h>
 #include <vesa.h>
 
+void onkey()
+{
+	printf("KEY EVENT\n");
+}
+
 void main(char **argv)
 {
 	struct vbe *vbe = (struct vbe *)argv[0];
@@ -20,6 +25,9 @@ void main(char **argv)
 	gui_init("/font/spleen-16x32.psfu");
 	gui_write(vbe, 50, 50, text, "hallo");
 
+	printf("onkey: %x\n", onkey);
+	map(EVENT_KEYBOARD, onkey);
+
 	while (1) {
 	};
 	exit();
diff --git a/kernel/Makefile b/kernel/Makefile
index 50e3ab8..e781141 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -10,7 +10,8 @@ COBJS = main.o \
 	features/load.o \
 	features/proc.o \
 	features/proc_asm.o \
-	features/syscall.o
+	features/syscall.o \
+	features/event.o
 CC = ../cross/opt/bin/i686-elf-gcc
 LD = ../cross/opt/bin/i686-elf-ld
 OC = ../cross/opt/bin/i686-elf-objcopy
diff --git a/kernel/drivers/keyboard.c b/kernel/drivers/keyboard.c
index 16809b6..6405018 100644
--- a/kernel/drivers/keyboard.c
+++ b/kernel/drivers/keyboard.c
@@ -2,11 +2,11 @@
 
 #include <cpu.h>
 #include <def.h>
+#include <event.h>
 #include <interrupts.h>
 
 char keymap[128];
 
-// TODO: Use keyboard as event and move logic to other file
 void keyboard_handler()
 {
 	u8 scan_code = inb(0x60);
@@ -15,7 +15,7 @@ void keyboard_handler()
 		return;
 
 	if ((scan_code & 0x80) == 0) { // PRESS
-		/* gui_term_write_char(keymap[scan_code]); */
+		event_trigger(EVENT_KEYBOARD, NULL);
 	}
 }
 
diff --git a/kernel/features/event.c b/kernel/features/event.c
new file mode 100644
index 0000000..e91dcab
--- /dev/null
+++ b/kernel/features/event.c
@@ -0,0 +1,32 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include <assert.h>
+#include <def.h>
+#include <sys.h>
+
+u32 (*event_table[])() = { [EVENT_KEYBOARD] = NULL, [EVENT_MOUSE] = NULL };
+
+u32 event_map(enum event id, u32 (*function)())
+{
+	printf("%x to %x\n", id, function);
+	if (id >= sizeof(event_table) / sizeof(*event_table))
+		return -1;
+
+	event_table[id] = function;
+	return 0;
+}
+
+u32 event_trigger(enum event id, u32 *data)
+{
+	assert(id < sizeof(event_table) / sizeof(*event_table));
+
+	u32 (*location)(u32 *) = event_table[id];
+	if (!location) {
+		printf("Event %d not mapped!\n", id);
+		return -1;
+	}
+
+	// TODO: Execute event function in ring3 with process stack, ...
+	location(data);
+	return 0;
+}
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index e6bcb83..2f2cbbb 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -1,6 +1,7 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 
 #include <cpu.h>
+#include <event.h>
 #include <fs.h>
 #include <interrupts.h>
 #include <load.h>
@@ -50,6 +51,10 @@ void syscall_handler(struct regs *r)
 		proc_exit();
 		break;
 	}
+	case SYS_MAP: {
+		event_map(r->ebx, (u32(*)())r->ecx);
+		break;
+	}
 	default: {
 		printf("Unknown syscall!\n");
 		loop();
diff --git a/kernel/inc/event.h b/kernel/inc/event.h
new file mode 100644
index 0000000..f4025b4
--- /dev/null
+++ b/kernel/inc/event.h
@@ -0,0 +1,12 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef EVENT_H
+#define EVENT_H
+
+#include <def.h>
+#include <sys.h>
+
+u32 event_map(enum event id, u32 (*function)());
+u32 event_trigger(enum event id, u32 *data);
+
+#endif
diff --git a/libc/inc/sys.h b/libc/inc/sys.h
index 0914bc4..99f5920 100644
--- a/libc/inc/sys.h
+++ b/libc/inc/sys.h
@@ -4,7 +4,8 @@
 #ifndef SYS_H
 #define SYS_H
 
-enum sys { SYS_LOOP, SYS_MALLOC, SYS_FREE, SYS_READ, SYS_WRITE, SYS_EXEC, SYS_EXIT };
+enum sys { SYS_LOOP, SYS_MALLOC, SYS_FREE, SYS_READ, SYS_WRITE, SYS_EXEC, SYS_EXIT, SYS_MAP };
+enum event { EVENT_KEYBOARD, EVENT_MOUSE };
 
 #if defined(userspace)
 
@@ -30,6 +31,7 @@ int sysv(enum sys num, ...);
 		while (1) {                                                                        \
 		}                                                                                  \
 	}
+#define map(id, func) sys2(SYS_MAP, (int)id, (int)func)
 
 #endif
 #endif
diff --git a/libc/sys.c b/libc/sys.c
index a2c789e..bfc7a22 100644
--- a/libc/sys.c
+++ b/libc/sys.c
@@ -57,7 +57,6 @@ int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5)
 	return a;
 }
 
-#include <print.h>
 int sysv(enum sys num, ...)
 {
 	va_list ap;