diff options
Diffstat (limited to 'src/kernel.cc')
| -rw-r--r-- | src/kernel.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/kernel.cc b/src/kernel.cc index ff95d16..4337edb 100644 --- a/src/kernel.cc +++ b/src/kernel.cc @@ -32,28 +32,29 @@ void dump_gdt(); void kernel_main([[maybe_unused]] uint32_t mb_magic, [[maybe_unused]] uint32_t mb_addr) { #ifdef HAS_SERIAL0 - if (serial0.self_check()) Console::set(&serial0); + if constexpr (serial0_console) + if (serial0.self_check()) Console::set(&serial0); #endif #ifdef HAS_VIDEO0 - Console::set(&video0); + if constexpr (video0_console) Console::set(&video0); #endif - printk("Hello, kernel World!\n"); + // printk("Hello, kernel World!\n"); - dump_multiboot(mb_magic, mb_addr); - dump_gdt(); + // dump_multiboot(mb_magic, mb_addr); + // dump_gdt(); - printk("GDT::SegmentDescriptor tests\n"); + // printk("GDT::SegmentDescriptor tests\n"); auto x = GDT::SegmentDescriptor::make<0xffff>(0xdeadbeef, {}); - printk("x.base(): ", uhex{x.base()}, '\n'); + // printk("x.base(): ", uhex{x.base()}, '\n'); - printk("Setting new GDT\n"); + // printk("Setting new GDT\n"); GDT gdt; - dump_gdt(); + // dump_gdt(); IDT idt; - // abort(); + while (true) asm volatile("hlt"); } } // extern "C" |