diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2021-02-12 17:55:31 +0200 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2021-02-12 17:55:31 +0200 |
| commit | 46a5f1ee4db70a037af5038deaa1d64ad0f7862c (patch) | |
| tree | 0250b88f2eb69a7a0987a78d23a06e2125df74a2 /src/kernel.cc | |
| parent | Add comments to explain CGA ports better (diff) | |
| download | kernel.cpp-46a5f1ee4db70a037af5038deaa1d64ad0f7862c.tar.xz | |
Add serial0 console output
Diffstat (limited to 'src/kernel.cc')
| -rw-r--r-- | src/kernel.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/kernel.cc b/src/kernel.cc index 4c17969..624f472 100644 --- a/src/kernel.cc +++ b/src/kernel.cc @@ -12,18 +12,22 @@ #include <types.h> #include "cga.h" #include "gdt.h" +#include "serial.h" extern "C" { void dump_multiboot(uint32_t mb_magic, uint32_t mb_addr); void dump_gdt(); void kernel_main([[maybe_unused]] uint32_t mb_magic, [[maybe_unused]] uint32_t mb_addr) { + SerialPort s0; + Console::set(&s0); + CGA terminal; Console::set(&terminal); printk("Hello, kernel World!\n"); - // dump_multiboot(mb_magic, mb_addr); + dump_multiboot(mb_magic, mb_addr); dump_gdt(); printk("GDT::SegmentDescriptor tests\n"); |