Changeset 458 for GPL/trunk/drv32

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

Location:

GPL/trunk/drv32

Files:

• irq.cpp (modified) (3 diffs)
• strategy.c (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)
     {
@@ -119 +106 @@
         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;
+        ulIrq = sISRHigh[SaveIRQCounter].LowIRQ;
+        SaveIRQCounter++;
+    }
+
+#endif
+//PS End
 
     return TRUE;
@@ -145 +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;

GPL/trunk/drv32/strategy.c

@@ -96 +96 @@
 }
 #endif
-#define cli()  _asm cli;
-#define sti()  _asm sti;
 #endif //ACPI
 //******************************************************************************
@@ -108 +106 @@
     ULONG  i, rc = 0;
 
-
-    cli();
     InitCompleteWas = 1;
     for (i = 0; i < SaveIRQCounter; i++)
@@ -123 +119 @@
          }
     }
-    sti();
 #endif
 //PS++ End