RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 18:42:43 +00:00
Code Issues Activity Actions

Userland: Rename PCI slot to PCI device terminology

Browse source
This commit is contained in:
Jean-Baptiste Boric 2021-01-31 12:32:50 +01:00 • committed by Andreas Kling
parent 06d76a4717
commit b48d8d1d6d
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/FileSystem/ProcFS.cpp
View file

@ -363,7 +363,7 @@ static bool procfs$pci(InodeIdentifier, KBufferBuilder& builder)
auto obj = array.add_object(); auto obj = array.add_object();
obj.add("seg", address.seg()); obj.add("seg", address.seg());
obj.add("bus", address.bus()); obj.add("bus", address.bus());
obj.add("slot", address.device()); obj.add("device", address.device());
obj.add("function", address.function()); obj.add("function", address.function());
obj.add("vendor_id", id.vendor_id); obj.add("vendor_id", id.vendor_id);
obj.add("device_id", id.device_id); obj.add("device_id", id.device_id);

4
Userland/Applications/SystemMonitor/main.cpp
View file

@ -507,9 +507,9 @@ NonnullRefPtr<GUI::Widget> build_pci_devices_tab()
[](const JsonObject& object) { [](const JsonObject& object) {
auto seg = object.get("seg").to_u32(); auto seg = object.get("seg").to_u32();
auto bus = object.get("bus").to_u32(); auto bus = object.get("bus").to_u32();
auto slot = object.get("slot").to_u32(); auto device = object.get("device").to_u32();
auto function = object.get("function").to_u32(); auto function = object.get("function").to_u32();
return String::formatted("{:04x}:{:02x}:{:02x}.{}", seg, bus, slot, function); return String::formatted("{:04x}:{:02x}:{:02x}.{}", seg, bus, device, function);
}); });
pci_fields.empend( pci_fields.empend(
"Class", Gfx::TextAlignment::CenterLeft, "Class", Gfx::TextAlignment::CenterLeft,

4
Userland/Utilities/lspci.cpp
View file

@ -91,7 +91,7 @@ int main(int argc, char** argv)
auto dev = value.as_object(); auto dev = value.as_object();
auto seg = dev.get("seg").to_u32(); auto seg = dev.get("seg").to_u32();
auto bus = dev.get("bus").to_u32(); auto bus = dev.get("bus").to_u32();
auto slot = dev.get("slot").to_u32(); auto device = dev.get("device").to_u32();
auto function = dev.get("function").to_u32(); auto function = dev.get("function").to_u32();
auto vendor_id = dev.get("vendor_id").to_u32(); auto vendor_id = dev.get("vendor_id").to_u32();
auto device_id = dev.get("device_id").to_u32(); auto device_id = dev.get("device_id").to_u32();
@ -116,7 +116,7 @@ int main(int argc, char** argv)
if (class_name.is_empty()) if (class_name.is_empty())
class_name = String::format("%02x%02x", class_id, subclass_id); class_name = String::format("%02x%02x", class_id, subclass_id);
outln(format, seg, bus, slot, function, class_name, vendor_name, device_name, revision_id); outln(format, seg, bus, device, function, class_name, vendor_name, device_name, revision_id);
}); });
return 0; return 0;