update main #1

Merged
Sinipelto merged 240 commits from Bananymous/banan-os:main into main 2023-11-20 13:20:51 +02:00
1 changed files with 7 additions and 4 deletions
Showing only changes of commit 31aa157201 - Show all commits

View File

@ -117,8 +117,8 @@ extern "C" void kernel_main()
dprintln("PageTable initialized");
g_terminal_driver = VesaTerminalDriver::create();
ASSERT(g_terminal_driver);
dprintln("VESA initialized");
if (g_terminal_driver)
dprintln("VESA initialized");
Heap::initialize();
dprintln("Heap initialzed");
@ -147,8 +147,11 @@ extern "C" void kernel_main()
dprintln("Serial devices initialized");
}
auto vtty = MUST(VirtualTTY::create(g_terminal_driver));
dprintln("Virtual TTY initialized");
if (g_terminal_driver)
{
auto vtty = MUST(VirtualTTY::create(g_terminal_driver));
dprintln("Virtual TTY initialized");
}
MUST(Scheduler::initialize());
dprintln("Scheduler initialized");