diff options
| author | Emu <89668582+EmulatedSeasons@users.noreply.github.com> | 2024-05-31 23:38:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 23:38:46 -0400 |
| commit | 27a44e0d79d1c6e01cd832feb8ad958d5999b5e3 (patch) | |
| tree | 3759eb02fcad7a609a064080d81b7c6f9dbec4c8 /kernel/kernel.cpp | |
| parent | 639240bbf498195912d8ceb6cb396b89391a5b1b (diff) | |
| parent | fd5a1699592ce0afafc42ebf22401596abcdfc28 (diff) | |
Merge pull request #1 from EmulatedSeasons/limineswitch
Limineswitch
Diffstat (limited to 'kernel/kernel.cpp')
| -rw-r--r-- | kernel/kernel.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/kernel.cpp b/kernel/kernel.cpp index a877be2..e72500e 100644 --- a/kernel/kernel.cpp +++ b/kernel/kernel.cpp @@ -1,25 +1,25 @@ #include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
+//#include <stddef.h>
+//#include <stdint.h>
+//#include <stdio.h>
-#include <arch/i386/tmtty.h>
-#include <arch/i386/ps2_controller.h>
-#include <dev/ps2kbd.h>
+//#include <arch/i386/tmtty.h>
+//#include <arch/i386/ps2_controller.h>
+//#include <dev/ps2kbd.h>
// linker symbols
unsigned int _kernel_begin;
unsigned int _kernel_end;
-extern "C" void kernel_main(void) {
+void kernel_main(void) {
// Initialize terminal
//terminal_initialize();
//initialize_ps2_controller();
//keyboard_init();
- printf("Hello world!\n");
- printf("a%db\n", 1);
- printf("_begin: %x, _end: %x", &_kernel_begin, &_kernel_end);
+ //printf("Hello world!\n");
+ //printf("a%db\n", 1);
+ //printf("_begin: %x, _end: %x", &_kernel_begin, &_kernel_end);
}
|
