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

Timestamp:

Jul 20, 2010, 5:52:49 PM (15 years ago)

Author:

David Azarewicz

Message:

Changes to PCI bus scan, malloc, cleanup all warnings, misc other changes

File:

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

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

@@ -477 +477 @@
         u16 pci_command;
 
-        printk("pci_enable_device %x\n", dev);
+        dprintf(("pci_enable_device %x\n", dev));
 
         pci_read_config_word(dev, PCI_COMMAND, &pci_command);
@@ -495 +495 @@
 
         iNumCards = 0;
-        ulLast = 0;
-        pcidev=&pci_devices[0];
+
+        /* find an empty slot */
+        for (iTmp=0; iTmp<MAX_PCI_DEVICES; iTmp++) {
+                if (pci_devices[iTmp].devfn == 0) break;
+        }
+        if (iTmp >= MAX_PCI_DEVICES) return 0;
+        pcidev = &pci_devices[iTmp];
 
         for( iTableIx = 0; driver->id_table[iTableIx].vendor; iTableIx++) {
-
-                if (pcidev->devfn) { /* find an empty slot */
-                        for (iTmp=0; iTmp<MAX_PCI_DEVICES; iTmp++) {
-                                if (pci_devices[iTmp].devfn == 0) break;
-                        }
-                        if (iTmp >= MAX_PCI_DEVICES) break;
-                        pcidev=&pci_devices[iTmp];
-                }
-
-
+                ulLast = 0;
                 while( (ulLast = pci_query_device(&driver->id_table[iTableIx], pcidev, ulLast)) ) {
+
+
                         RMInit();
                         dprintf(("pci_register_driver: found=%x:%x searching for %x:%x\n",
@@ -521 +519 @@
                                 RMDone((pcidev->device << 16) | pcidev->vendor);
                                 iNumCards++;
+
+                                /* find another empty slot */
+                                for (iTmp=0; iTmp<MAX_PCI_DEVICES; iTmp++) {
+                                        if (pci_devices[iTmp].devfn == 0) break;
+                                }
+                                if (iTmp >= MAX_PCI_DEVICES) break;
+                                pcidev = &pci_devices[iTmp];
                         } else pcidev->devfn = 0;
 
@@ -612 +617 @@
         int gfp = GFP_ATOMIC;
         int order;
-#ifdef DEBUG
         dprintf(("pci_alloc_consistent %d mask %x", size, (hwdev) ? hwdev->dma_mask : 0));
-#endif
         if (hwdev == NULL || hwdev->dma_mask != 0xffffffff) {
                 //try not to exhaust low memory (< 16mb) so allocate from the high region first
@@ -965 +968 @@
         struct pci_driver *driver;
 
-        dprintf(("OSS32_APMSuspend"));
+        dprintf(("OSS32_APMSuspend 1"));
 
         fSuspended = TRUE;
@@ -980 +983 @@
         }
 
+        dprintf(("OSS32_APMSuspend 2"));
         return OSSERR_SUCCESS;
 }