summaryrefslogtreecommitdiff
path: root/kernel/src/main.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--kernel/src/main.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/kernel/src/main.c b/kernel/src/main.c
index 7c0f221..da5879a 100644
--- a/kernel/src/main.c
+++ b/kernel/src/main.c
@@ -12,12 +12,18 @@
#include <print.h>
#include <math.h>
+#include <stdint.h>
#include <stdlib.h>
#include <sys.h>
static double x = 0, y = 0;
-void kernel_main(void* boot_info) {
+void kernel_boot(void *boot_info) {
+ (void)boot_info;
+}
+
+
+void kernel_main(void) {
term_init();
cursor_enable();
@@ -28,16 +34,16 @@ void kernel_main(void* boot_info) {
idt_init();
pic_remap(PIC_REMAP_OFFSET);
- load_boot_info(boot_info);
- acpi_init();
+ // load_boot_info(boot_info);
+ // acpi_init();
- memory_init();
+ // memory_init();
ps2ctrl_init();
ps2kb_init();
ps2mouse_init();
- init_registers();
+ init_registers(FPU_REG | SSE_REG);
while(1) {
int_wait();