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

Timestamp:

Apr 1, 2008, 10:54:17 AM (17 years ago)

Author:

Paul Smedley

Message:

Add ACPI support, make OSS compatability stuff build

File:

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

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

@@ -55 +55 @@
 #define PCI_CONFIG_DATA         0xCFC
 
+#ifdef ACPI 
+APIRET APIENTRY ACPIFindPCIDevice(ULONG Bus, ULONG Dev, ULONG Fun, ULONG *PicIRQ, ULONG *ApicIRQ, ULONG *Hdl, char *Component); 
+#endif 
 
 //******************************************************************************
@@ -135 +138 @@
                             struct pci_dev near *pcidev, int idx)
 {
+#ifdef ACPI 
+    APIRET           rc; 
+#endif 
     int         resNo, addr, found = 0;
     u32         devNr, busNr, funcNr, detectedId, pciId, cfgaddrreg, temp, temp2;
+#ifdef ACPI 
+    ULONG            temp1,temp3; //PS++ 
+#endif 
     u8          headerType;
 
@@ -221 +230 @@
                         // IRQ and PIN
                         pci_read_config_dword(pcidev, PCI_INTERRUPT_LINE, &temp);
+#ifdef ACPI 
+                        temp2 = temp3 = 0; 
+                        rc = ACPIFindPCIDevice( (ULONG)busNr,                        // Bus 
+                                                (ULONG)devNr,                        // Dev 
+                                                (ULONG)(pcidev->devfn >> 8) & 7,     // Function 
+                                                &temp1,                              // PIC IRQ 
+                                                &temp3,                              // APIC IRQ 
+                                                NULL,                                // ACPI handle to finding device 
+                                                "Uniaud32");                         // Name for acpi log 
+                        if (!rc) 
+                        { 
+                        // Check APIC IRQ, if we have /SMP /APIC, must be set 
+                        if (temp3) 
+                           temp = (temp & (~0xff)) | (temp3 & 0xff); 
+                        // Check PIC IRQ 
+                        else if (temp1) 
+                                 temp = (temp & (~0xff)) | (temp1 & 0xff); 
+                        dprintf(("pci_query_device: IRQs ACPI PIC%d APIC%d", temp1, temp3)); 
+                        } 
+#endif /* ACPI */ 
                         if( (u8)temp && (u8)temp != 0xff )
                         {