Changeset 532 for GPL/branches/uniaud32-2.1.x/lib32/pci.c

Timestamp:

Jul 28, 2010, 8:05:20 AM (15 years ago)

Author:

David Azarewicz

Message:

Incorporate fixed from the trunk

File:

• GPL/branches/uniaud32-2.1.x/lib32/pci.c (modified) (6 diffs)

GPL/branches/uniaud32-2.1.x/lib32/pci.c

@@ -41 +41 @@
 #include <osspci.h>
 
-#define MAX_PCI_BUSSES          16
+#define MAX_PCI_BUSSES          256
 #define MAX_PCI_DEVICES         16
 
 struct pci_dev pci_devices[MAX_PCI_DEVICES] = {0};
-struct pci_bus pci_busses[MAX_PCI_BUSSES] = {0};
+//struct pci_bus pci_busses[MAX_PCI_BUSSES] = {0};
 
 BOOL    fSuspended = FALSE;
@@ -158 +158 @@
         u8              headerType;
 
-        busNr = (ulLast >> 8) & 0x1f;
+        busNr = (ulLast >> 8) & 0xff;
         devNr = PCI_SLOT(ulLast);
         funcNr = PCI_FUNC(ulLast);
@@ -200 +200 @@
                                 pcidev->vendor          = detectedId & 0xffff;
                                 pcidev->device          = detectedId >> 16;
-                                pcidev->bus             = &pci_busses[busNr];
+                                //pcidev->bus           = &pci_busses[busNr];
+                                pcidev->bus             = kmalloc(sizeof(struct pci_bus), GFP_KERNEL);
+                                if (pcidev->bus == NULL) return 0;
+                                memset (pcidev->bus, 0, sizeof(struct pci_bus));
                                 pcidev->bus->number = busNr;
                                 pcidev->devfn           = PCI_DEVFN(devNr, funcNr);
@@ -507 +510 @@
                 while( (ulLast = pci_query_device(&driver->id_table[iTableIx], pcidev, ulLast)) ) {
 
-
                         RMInit();
                         dprintf(("pci_register_driver: found=%x:%x searching for %x:%x\n",
@@ -526 +528 @@
                                 if (iTmp >= MAX_PCI_DEVICES) break;
                                 pcidev = &pci_devices[iTmp];
-                        } else pcidev->devfn = 0;
+                        } else {
+                                kfree(pcidev->bus);
+                                pcidev->devfn = 0;
+                        }
 
                         RMDone(0);
@@ -553 +558 @@
                         pcidev = &pci_devices[j];
                         if (pcidev->devfn == 0) continue;
-                        if(pcidev->vendor != driver->id_table[i].vendor) continue;
+                        if (pcidev->vendor != driver->id_table[i].vendor) continue;
                         if ( (driver->id_table[i].device != PCI_ANY_ID) && (pcidev->device != driver->id_table[i].device) ) continue;
                         dprintf(("pci unreg match: %x:%x %x:%x", pci_devices[j].vendor, pci_devices[j].device, driver->id_table[i].vendor, driver->id_table[i].device));
-                        if(!driver->remove) continue;
-                        driver->remove(pcidev);
+                        if (driver->remove) driver->remove(pcidev);
+                        kfree(pcidev->bus);
+                        pcidev->devfn = 0;
                 }
         }