Changeset 453 for GPL/trunk/drv32/irq.cpp

Timestamp:

Jun 23, 2009, 11:48:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Fixes for suspend/resume in APIC mode from Pasha

File:

• GPL/trunk/drv32/irq.cpp (modified) (3 diffs)

GPL/trunk/drv32/irq.cpp

@@ -87 +87 @@
     }
 
+//PS+++ Begin
+#ifdef ACPI
+    if (InitCompleteWas == 0)
+    {
+        dprintf(("RMSetIrq saved %d %d %x was %d", (ULONG)ulIrq, ulSlotNo,(ULONG)sISRHigh[SaveIRQCounter].LowIRQ));
+        sISRHigh[SaveIRQCounter].ulSlotNo = ulSlotNo;
+        ulIrq = sISRHigh[SaveIRQCounter].LowIRQ;
+        SaveIRQCounter++;
+    }
+
+#endif
+//PS End
+
     if(fShared)
     {
@@ -106 +119 @@
         return FALSE;
     }
-//PS+++ Begin
-#ifdef ACPI
-    if (InitCompleteWas == 0)
-    {
-        dprintf(("RMSetIrq saved %d %d %x was %d", (ULONG)ulIrq, ulSlotNo,(ULONG)sISRHigh[SaveIRQCounter].LowIRQ));
-        sISRHigh[SaveIRQCounter].ulSlotNo = ulSlotNo;
-        SaveIRQCounter++;
-        return TRUE;
-    }
-#endif
-//PS End
 
     return TRUE;
@@ -143 +145 @@
        // Note carry flag is handled in setup.asm 
        cli();
+#ifdef ACPI
+       // Before init complete we must send PIC IRQ (APIC MODE)
+       if (!InitCompleteWas && SaveIRQCounter)
+       {
+           ulIrqNo = sISRHigh[SaveIRQCounter-1].LowIRQ;
+       }
+#endif
        DevEOI( (WORD16)ulIrqNo );
        return TRUE;