Changeset 649 for GPL/branches/uniaud32-next/lib32/pci.c

Timestamp:

Jan 23, 2021, 9:53:50 PM (5 years ago)

Author:

Paul Smedley

Message:

Patch from AlexT to improve Resource Manager information

File:

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

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

@@ -536 +536 @@
       }
 
-      RMInit();
       if (driver->probe(pcidev, pDriverId) == 0)
       {
@@ -543 +542 @@
 
         // create adapter
-        RMDone((pcidev->device << 16) | pcidev->vendor, &pcidev->hAdapter, &pcidev->hDevice);
+        RMCreateAdapterU32((pcidev->device << 16) | pcidev->vendor, &pcidev->hAdapter, ulLast, iNumCards);
+
         iNumCards++;
         pcidev = NULL; /* we need a new slot */
         break;
       }
-      RMDone(0, 0, 0);
+      // release resources which were possibly allocated during probe() 
+      RMDeallocRes();
     } /* for id_table loop */
 
@@ -1084 +1085 @@
     if(pci_devices[i].devfn)
     {
-      RMSetHandles(pci_devices[i].hAdapter, pci_devices[i].hDevice); /* DAZ - dirty hack */
+      RMSetHandles(pci_devices[i].hAdapter); /* DAZ - dirty hack */
       driver = pci_devices[i].pcidriver;
       if(driver && driver->resume) {
@@ -1107 +1108 @@
     if(pci_devices[i].devfn)
     {
-      RMSetHandles(pci_devices[i].hAdapter, pci_devices[i].hDevice); /* DAZ - dirty hack */
+      RMSetHandles(pci_devices[i].hAdapter); /* DAZ - dirty hack */
       driver = pci_devices[i].pcidriver;
       if(driver && driver->suspend) {