Ver código fonte

Kernel/PCI: Make SATAProgIF comparable with ProgrammingInterface

This makes checking it a bit nicer
Hendiadyoin1 1 ano atrás
pai
commit
cfba182b61

+ 1 - 0
Kernel/Bus/PCI/Definitions.h

@@ -355,6 +355,7 @@ AK_MAKE_DISTINCT_NUMERIC_COMPARABLE_TO_ENUM(SubclassCode, Base::SubclassID);
 AK_MAKE_DISTINCT_NUMERIC_COMPARABLE_TO_ENUM(SubclassCode, SerialBus::SubclassID);
 
 AK_TYPEDEF_DISTINCT_ORDERED_ID(u8, ProgrammingInterface);
+AK_MAKE_DISTINCT_NUMERIC_COMPARABLE_TO_ENUM(ProgrammingInterface, MassStorage::SATAProgIF);
 AK_MAKE_DISTINCT_NUMERIC_COMPARABLE_TO_ENUM(ProgrammingInterface, SerialBus::USBProgIf);
 
 AK_TYPEDEF_DISTINCT_ORDERED_ID(u8, RevisionID);

+ 1 - 1
Kernel/Devices/Storage/StorageManagement.cpp

@@ -120,7 +120,7 @@ UNMAP_AFTER_INIT void StorageManagement::enumerate_pci_controllers(bool force_pi
 #endif
 
             if (subclass_code == SubclassID::SATAController
-                && device_identifier.prog_if().value() == to_underlying(PCI::MassStorage::SATAProgIF::AHCI)) {
+                && device_identifier.prog_if() == PCI::MassStorage::SATAProgIF::AHCI) {
                 if (auto ahci_controller_or_error = AHCIController::initialize(device_identifier); !ahci_controller_or_error.is_error())
                     m_controllers.append(ahci_controller_or_error.value());
                 else