RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:17:45 +00:00
Code Issues Activity Actions

Kernel/PCI: Cache more details about PCI devices when enumerating them

Browse source 
There's no good reason to fetch these values each time we need them.
This commit is contained in:
Liav A 2021-09-23 09:05:34 +03:00 • committed by Andreas Kling
parent e22d9dc360
commit 82bb08a15c
14 changed files with 85 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Kernel/Bus/USB/USBManagement.cpp
View file

@ -27,10 +27,10 @@ UNMAP_AFTER_INIT void USBManagement::enumerate_controllers()
if (kernel_command_line().disable_usb())
return;
PCI::enumerate([this](PCI::Address const& address, PCI::ID) {
if (!(PCI::get_class(address) == 0xc && PCI::get_subclass(address) == 0x3))
PCI::enumerate([this](PCI::Address const& address, PCI::PhysicalID const& physical_id) {
if (!(physical_id.class_code().value() == 0xc && physical_id.subclass_code().value() == 0x3))
return;
if (PCI::get_programming_interface(address) == 0x0) {
if (physical_id.prog_if().value() == 0x0) {
if (kernel_command_line().disable_uhci_controller())
return;
@ -40,22 +40,22 @@ UNMAP_AFTER_INIT void USBManagement::enumerate_controllers()
return;
}
if (PCI::get_programming_interface(address) == 0x10) {
if (physical_id.prog_if().value() == 0x10) {
dmesgln("USBManagement: OHCI controller found at {} is not currently supported.", address);
return;
}
if (PCI::get_programming_interface(address) == 0x20) {
if (physical_id.prog_if().value() == 0x20) {
dmesgln("USBManagement: EHCI controller found at {} is not currently supported.", address);
return;
}
if (PCI::get_programming_interface(address) == 0x30) {
if (physical_id.prog_if().value() == 0x30) {
dmesgln("USBManagement: xHCI controller found at {} is not currently supported.", address);
return;
}
dmesgln("USBManagement: Unknown/unsupported controller at {} with programming interface 0x{:02x}", address, PCI::get_programming_interface(address));
dmesgln("USBManagement: Unknown/unsupported controller at {} with programming interface 0x{:02x}", address, physical_id.prog_if().value());
});
}