Changeset e8d6ce2 in mainline

Timestamp:

2013-09-10T13:47:34Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

feeac0d

Parents:

4cdcd2b

Message:

Do not add unimplemented ranges.

File:

• uspace/drv/bus/pci/pciintel/pci.c (modified) (2 diffs)

uspace/drv/bus/pci/pciintel/pci.c

@@ -454 +454 @@
 {
         /* Value of the BAR */
-        uint32_t val, mask;
+        uint32_t val;
+        uint32_t bar;
+        uint32_t mask;
+
         /* IO space address */
         bool io;
@@ -492 +495 @@
         /* Get the address mask. */
         pci_conf_write_32(fun, addr, 0xffffffff);
-        mask &= pci_conf_read_32(fun, addr);
-        
+        bar = pci_conf_read_32(fun, addr);
+
+        /*
+         * Unimplemented BARs read back as all 0's.
+         */
+        if (!bar)
+                return addr + (addrw64 ? 8 : 4);
+
+        mask &= bar;    
+
         /* Restore the original value. */
         pci_conf_write_32(fun, addr, val);