beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 09:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Init Stage: Use latest changes

Browse source 
Now we setup interrupts before ACPI, and we don't use the ACPI
parser to find the MADT table anymore.
This commit is contained in:
Liav A 2020-02-28 22:51:09 +02:00 committed by Andreas Kling
parent 6f914ed0a4
commit c616eb6aaf
Notes: sideshowbarker 2024-07-19 08:58:21 +09:00 
Author: https://github.com/supercomputer7
Commit: https://github.com/SerenityOS/serenity/commit/c616eb6aaf2
Pull-request: https://github.com/SerenityOS/serenity/pull/1323
Reviewed-by: https://github.com/awesomekling
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Kernel/init.cpp
View file

@ -109,8 +109,8 @@ extern "C" [[noreturn]] void init()
gdt_init(); gdt_init();
idt_init(); idt_init();
setup_acpi();
setup_interrupts(); setup_interrupts();
setup_acpi();
new VFS; new VFS;
new DebugLogDevice; new DebugLogDevice;
@ -146,7 +146,7 @@ extern "C" [[noreturn]] void init()
VirtualConsole::switch_to(0); VirtualConsole::switch_to(0);
// Sample test to see if the ACPI parser is working... // Sample test to see if the ACPI parser is working...
kprintf("ACPI: HPET table @ P 0x%x\n", ACPIParser::the().find_table("HPET").get()); kprintf("ACPI: HPET table @ P 0x%x\n", ACPI::Parser::the().find_table("HPET").get());
setup_pci(); setup_pci();
@ -403,21 +403,21 @@ extern "C" int __cxa_atexit(void (*)(void*), void*, void*)
void setup_acpi() void setup_acpi()
{ {
if (!KParams::the().has("acpi")) { if (!KParams::the().has("acpi")) {
ACPIDynamicParser::initialize_without_rsdp(); ACPI::DynamicParser::initialize_without_rsdp();
return; return;
} }
auto acpi = KParams::the().get("acpi"); auto acpi = KParams::the().get("acpi");
if (acpi == "off") { if (acpi == "off") {
ACPIParser::initialize_limited(); ACPI::Parser::initialize_limited();
return; return;
} }
if (acpi == "on") { if (acpi == "on") {
ACPIDynamicParser::initialize_without_rsdp(); ACPI::DynamicParser::initialize_without_rsdp();
return; return;
} }
if (acpi == "limited") { if (acpi == "limited") {
ACPIStaticParser::initialize_without_rsdp(); ACPI::StaticParser::initialize_without_rsdp();
return; return;
} }
kprintf("acpi boot argmuent has an invalid value.\n"); kprintf("acpi boot argmuent has an invalid value.\n");
@ -461,19 +461,9 @@ void setup_pci()
PCI::Initializer::the().dismiss(); PCI::Initializer::the().dismiss();
} }
static void setup_interrupt_management()
{
auto madt = ACPIParser::the().find_table("APIC");
if (madt.is_null()) {
InterruptManagement::initialize();
return;
}
AdvancedInterruptManagement::initialize(madt);
}
void setup_interrupts() void setup_interrupts()
{ {
setup_interrupt_management(); InterruptManagement::initialize();
if (!KParams::the().has("smp")) { if (!KParams::the().has("smp")) {
InterruptManagement::the().switch_to_pic_mode(); InterruptManagement::the().switch_to_pic_mode();