Explorar o código

Kernel: Simplify PCI messages on initialization

Liav A %!s(int64=5) %!d(string=hai) anos
pai
achega
caa7a6c2fb
Modificáronse 2 ficheiros con 5 adicións e 2 borrados
  1. 4 1
      Kernel/PCI/Definitions.h
  2. 1 1
      Kernel/PCI/Initializer.cpp

+ 4 - 1
Kernel/PCI/Definitions.h

@@ -83,7 +83,10 @@ struct ID {
         return vendor_id != other.vendor_id || device_id != other.device_id;
     }
 };
-
+inline const LogStream& operator<<(const LogStream& stream, const ID value)
+{
+    return stream << "(" << String::format("%w", value.vendor_id) << ":" << String::format("%w", value.device_id) << ")";
+}
 struct Address {
 public:
     Address() {}

+ 1 - 1
Kernel/PCI/Initializer.cpp

@@ -60,7 +60,7 @@ void initialize()
         IOAccess::initialize();
 
     enumerate_all([&](const Address& address, ID id) {
-        klog() << "PCI: Device @ " << String::format("%w", address.seg()) << ":" << String::format("%b", address.bus()) << ":" << String::format("%b", address.slot()) << "." << String::format("%d", address.function()) << " [" << String::format("%w", id.vendor_id) << ":" << String::format("%w", id.device_id) << "]";
+        klog() << address << " " << id;
         E1000NetworkAdapter::detect(address);
         RTL8139NetworkAdapter::detect(address);
     });