Changeset 79 for trunk/src/os2ahci/pci.c

Timestamp:

Feb 24, 2011, 9:56:54 PM (14 years ago)

Author:

chris

Message:

• fixed debug print code in readl/writel (stack offset after printf() call was wrong after I removed the port offset token a few weeks ago and this was never tested)
• added some logic to prevent PCI devices from being detected twice -- first by a thorough scan and then again by a class-based scan
• still not working on ICH8 notebook; already found out that a port reset is required for this particular hardware (Dell D630) but the boot process is still hanging...

File:

• trunk/src/os2ahci/pci.c (modified) (2 diffs)

trunk/src/os2ahci/pci.c

@@ -411 +411 @@
   int ad_indx = 0;
   int i;
+  int n;
 
   ddprintf("scanning PCI bus...\n");
@@ -461 +462 @@
       if (rc == OH_SUCCESS) {
         /* found a device */
-        if (ad_ignore & (1U << ad_indx++)) {
-          /* ignore this adapter */
-          continue;
-        }
-        add_pci_device(pci_ids + i, &data);
+        int already_found = 0;
+
+        /* increment index for next loop */
         if (++index > 180) {
           /* something's wrong here... */
           return;
         }
+
+        /* check whether we already found this device */
+        for (n = 0; n < ad_info_cnt; n++) {
+          if (ad_infos[n].bus == data.find_device.bus &&
+              ad_infos[n].dev_func == data.find_device.dev_func) {
+            /* this device has already been found (e.g. via thorough scan) */
+            already_found = 1;
+            break;
+          }
+        }
+            
+        if (already_found || (ad_ignore & (1U << ad_indx++))) {
+          /* ignore this device; it has either already been found via a
+           * thorough scan or has been specified to be ignored via command
+           * line option */
+          continue;
+        }
+
+        /* add this PCI device to ad_infos[] */
+        add_pci_device(pci_ids + i, &data);
       }