Changeset 421 for GPL/branches/uniaud32-2.0/lib32/pci.c

Timestamp:

Mar 23, 2009, 9:13:00 AM (16 years ago)

Author:

Paul Smedley

Message:

Updates from Pasha to improve IRQ handling and resolve long delays at startup in APIC mode when using ACPI

File:

• GPL/branches/uniaud32-2.0/lib32/pci.c (modified) (3 diffs)

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

@@ -135 +135 @@
 //******************************************************************************
 //******************************************************************************
+#ifdef ACPI 
+struct SaveIRQForSlot
+{
+    ULONG  ulSlotNo;
+    BYTE   LowIRQ;
+    BYTE   HighIRQ;
+    BYTE   Pin;   
+};
+extern struct SaveIRQForSlot sISRHigh[];
+extern int  SaveIRQCounter;
+#endif
+
 static int pci_query_device(unsigned int vendor, unsigned int device,
                             struct pci_dev near *pcidev, int idx)
@@ -230 +242 @@
                         // IRQ and PIN
                         pci_read_config_dword(pcidev, PCI_INTERRUPT_LINE, &temp);
+                        sISRHigh[SaveIRQCounter].Pin  = (temp >> 8) & 0xf;
 #ifdef ACPI 
                         temp2 = temp3 = 0; 
@@ -242 +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;
+                        sISRHigh[SaveIRQCounter].HighIRQ = temp3;
                         } 
 #endif /* ACPI */