Changeset 458 for GPL/trunk/lib32/pci.c

Timestamp:

Aug 6, 2009, 11:49:04 AM (16 years ago)

Author:

Paul Smedley

Message:

Revert ACPI fixes from changeset 453 due to reported hangs

File:

• GPL/trunk/lib32/pci.c (modified) (2 diffs)

GPL/trunk/lib32/pci.c

@@ -255 +255 @@
                         { 
                         // Check APIC IRQ, if we have /SMP /APIC, must be set 
-                        if (temp3) 
-                           temp = (temp & (~0xff)) | (temp3 & 0xff); 
+                        if (temp1) 
+                           temp = (temp & (~0xff)) | (temp1 & 0xff); 
                         // Check PIC IRQ 
-                        else if (temp1) 
-                                 temp = (temp & (~0xff)) | (temp1 & 0xff); 
+                        else if (temp3) 
+                                 temp = (temp & (~0xff)) | (temp3 & 0xff); 
                         dprintf(("pci_query_device: IRQs ACPI PIC%d APIC%d", temp1, temp3)); 
                         sISRHigh[SaveIRQCounter].LowIRQ  = temp1;
@@ -521 +521 @@
         }
     }
-if (nrCardsDetected >=1)
+    if (nrCardsDetected >=1)
         return 1;