mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 19:57:35 +00:00
Kernel: Simplify PCI initialization logic
- Get rid of the PCI::Initializer object which was not serving any real purpose or holding any data members. - Move command line parsing from init to PCI::initialize().
This commit is contained in:
parent
a6a8f36a83
commit
f2ebfb9e4e
4 changed files with 28 additions and 76 deletions
|
@ -86,7 +86,6 @@ namespace Kernel {
|
|||
[[noreturn]] static void init_stage2();
|
||||
static void setup_serial_debug();
|
||||
static void setup_acpi();
|
||||
static void setup_pci();
|
||||
static void setup_interrupts();
|
||||
static void setup_time_management();
|
||||
|
||||
|
@ -171,7 +170,7 @@ void init_stage2()
|
|||
// Sample test to see if the ACPI parser is working...
|
||||
klog() << "ACPI: HPET table @ " << ACPI::Parser::the().find_table("HPET");
|
||||
|
||||
setup_pci();
|
||||
PCI::initialize();
|
||||
|
||||
if (kernel_command_line().contains("text_debug")) {
|
||||
dbg() << "Text mode enabled";
|
||||
|
@ -389,25 +388,6 @@ void setup_acpi()
|
|||
hang();
|
||||
}
|
||||
|
||||
void setup_pci()
|
||||
{
|
||||
if (!kernel_command_line().contains("pci_mmio")) {
|
||||
PCI::Initializer::the().test_and_initialize(false);
|
||||
PCI::Initializer::the().dismiss();
|
||||
return;
|
||||
}
|
||||
auto pci_mmio = kernel_command_line().get("pci_mmio");
|
||||
if (pci_mmio == "on") {
|
||||
PCI::Initializer::the().test_and_initialize(false);
|
||||
} else if (pci_mmio == "off") {
|
||||
PCI::Initializer::the().test_and_initialize(true);
|
||||
} else {
|
||||
klog() << "pci_mmio boot argmuent has an invalid value.";
|
||||
hang();
|
||||
}
|
||||
PCI::Initializer::the().dismiss();
|
||||
}
|
||||
|
||||
void setup_interrupts()
|
||||
{
|
||||
InterruptManagement::initialize();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue