Changeset 635

Timestamp:

Jan 5, 2021, 5:34:23 PM (5 years ago)

Author:

David Azarewicz

Message:

Fixed adapter selection logic.

File:

• GPL/branches/uniaud32-next/lib32/pci.c (modified) (4 diffs)

GPL/branches/uniaud32-next/lib32/pci.c

@@ -483 +483 @@
   struct pci_dev *pcidev;
   struct pci_device_id IdTable;
+  USHORT usVendor, usDevice;
   int iAdapter = 0;
 
@@ -508 +509 @@
       ulLast, pcidev->vendor, pcidev->device, pcidev->class, driver->name));
 
+    usVendor = 0;
+    usDevice = 0;
+
     for( iTableIx = 0; driver->id_table[iTableIx].vendor; iTableIx++)
     {
@@ -516 +520 @@
       if ( (pDriverId->device != PCI_ANY_ID) && (pDriverId->device != pcidev->device) ) continue;
 
+      /* skip a duplicate device that could be matched by both and exact match and a class match */
+      if (usVendor == pcidev->vendor && usDevice == pcidev->device) continue;
+      usVendor = pcidev->vendor;
+      usDevice = pcidev->device;
+
       rprintf(("pci_register_driver: matched %d %x:%x/%x with %x:%x/%x %x (%s)", iTableIx,
         pcidev->vendor, pcidev->device, pcidev->class,
@@ -522 +531 @@
       if ((iAdapterNumber >= 0) && (iAdapter < iAdapterNumber))
       {
+        rprintf(("iAdapterNumber=%x skipping iAdapter=%x", iAdapterNumber, iAdapter));
         iAdapter++;
         continue;