pci: enumeration fixes for real hardware

lux-operating-system · Oct 6, 2024 · 5d966d2 · 5d966d2
1 parent 55be75a
commit 5d966d2
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/devices/pci/src/enumerate.c b/devices/pci/src/enumerate.c
@@ -172,21 +172,18 @@ void pciEnumerate() {
         uint16_t device = pciReadWord(bus, slot, function, PCI_DEVICE);
 
         if(!vendor || vendor == 0xFFFF) {
-            if(function) {
-                function++;
-                if(function > 7) {
-                    function = 0;
-                    slot++;
-                    if(slot > 31) {
-                        slot = 0;
-                        bus++;
-                    }
+            function++;
+            if(function > 7) {
+                function = 0;
+                slot++;
+                if(slot > 31) {
+                    slot = 0;
+                    bus++;
+                    if(bus > 31) break;
                 }
-
-                continue;
-            } else {
-                break;
             }
+
+            continue;
         }
 
         uint8_t header = pciReadByte(bus, slot, function, PCI_HEADER_TYPE);