Browse Source

change(init): move init decl. to kernel_main.c

greatbridf 2 năm trước cách đây
mục cha
commit
a68e15e75d
2 tập tin đã thay đổi với 5 bổ sung11 xóa
  1. 3 10
      include/kernel/process.hpp
  2. 2 1
      src/kernel_main.c

+ 3 - 10
include/kernel/process.hpp

@@ -1,12 +1,11 @@
 #pragma once
 
 #include <kernel/interrupt.h>
-#include <kernel/task.h>
-#include <types/types.h>
-
-#ifdef __cplusplus
 #include <kernel/mm.hpp>
+#include <kernel/task.h>
+#include <types/hash_map.hpp>
 #include <types/list.hpp>
+#include <types/types.h>
 
 typedef size_t pid_t;
 
@@ -65,9 +64,3 @@ void add_to_process_list(process&& proc);
 void add_to_ready_list(thread* thd);
 
 void k_new_thread(void (*func)(void*), void* data);
-
-#else
-
-void NORETURN init_scheduler();
-
-#endif

+ 2 - 1
src/kernel_main.c

@@ -1,5 +1,6 @@
 #include "kernel_main.h"
 
+#include <types/types.h>
 #include <asm/boot.h>
 #include <asm/port_io.h>
 #include <asm/sys.h>
@@ -9,7 +10,6 @@
 #include <kernel/hw/timer.h>
 #include <kernel/interrupt.h>
 #include <kernel/mem.h>
-#include <kernel/process.hpp>
 #include <kernel/stdio.h>
 #include <kernel/task.h>
 #include <kernel/tty.h>
@@ -144,6 +144,7 @@ void init_bss_section(void)
 static struct tty early_console;
 
 extern void init_vfs();
+extern void NORETURN init_scheduler();
 
 void NORETURN kernel_main(void)
 {