Changeset 421 for GPL/branches/uniaud32-2.0/drv32/rmhelp.cpp

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/drv32/rmhelp.cpp (modified) (2 diffs)

GPL/branches/uniaud32-2.0/drv32/rmhelp.cpp

@@ -149 +149 @@
 //******************************************************************************
 //******************************************************************************
+//PS+++ see to irq.cpp
+#ifdef ACPI 
+#ifdef __cplusplus
+extern "C" {
+#endif
+struct SaveIRQForSlot
+{
+    ULONG  ulSlotNo;
+    BYTE   LowIRQ;
+    BYTE   HighIRQ;
+    BYTE   Pin;   
+};
+extern struct SaveIRQForSlot sISRHigh[];
+extern int  SaveIRQCounter;
+#ifdef __cplusplus
+}
+#endif
+#endif
 BOOL RMRequestIRQ(ULONG ulIrq, BOOL fShared)
 {
@@ -156 +174 @@
 
   Resource.ResourceType          = RS_TYPE_IRQ;
+#ifdef ACPI  //PS+++
+  Resource.IRQResource.PCIIrqPin = (USHORT)(sISRHigh[SaveIRQCounter].Pin & 0xf);
+  if (sISRHigh[SaveIRQCounter].HighIRQ)
+      Resource.IRQResource.IRQLevel  = (USHORT)sISRHigh[SaveIRQCounter].HighIRQ & 0xff;
+  else
+      Resource.IRQResource.IRQLevel  = (USHORT)ulIrq & 0xff;
+#else
   Resource.IRQResource.IRQLevel  = (USHORT)ulIrq & 0xff;
+  Resource.IRQResource.PCIIrqPin = 0;
+#endif
   Resource.IRQResource.IRQFlags  = ( fShared ) ? RS_IRQ_SHARED : RS_IRQ_EXCLUSIVE;
-  Resource.IRQResource.PCIIrqPin = (USHORT)( (ulIrq >> 8) & 0xf);
 
   rc = RMAllocResource(DriverHandle,                    // Handle to driver.