git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
re-factored the makefile and improved qemu debug experience.
[lunaix-os.git]
/
lunaix-os
/
kernel
/
kernel.c
diff --git
a/lunaix-os/kernel/kernel.c
b/lunaix-os/kernel/kernel.c
index f9c7c4c5379d429186f4e5cff01e67dc468854e3..72f2f4e40b05cbaf7690dd5e9c1a144ab80ab531 100644
(file)
--- a/
lunaix-os/kernel/kernel.c
+++ b/
lunaix-os/kernel/kernel.c
@@
-1,10
+1,20
@@
#include <lunaix/tty/tty.h>
#include <lunaix/tty/tty.h>
+#include <lunaix/arch/gdt.h>
+#include <lunaix/arch/idt.h>
-void _kernel_init() {
+void
+_kernel_init()
+{
// TODO
// TODO
+ _init_gdt();
+ _init_idt();
}
}
-void _kernel_main(void* info_table) {
+void
+_kernel_main(void* info_table)
+{
+ // remove the warning
+ (void)info_table;
// TODO
tty_set_theme(VGA_COLOR_GREEN, VGA_COLOR_BLACK);
tty_put_str("Hello kernel world!\nThis is second line.");
// TODO
tty_set_theme(VGA_COLOR_GREEN, VGA_COLOR_BLACK);
tty_put_str("Hello kernel world!\nThis is second line.");