Changeset 547 for GPL/trunk/drv32/strategy.c

Timestamp:

Mar 16, 2011, 10:31:12 PM (14 years ago)

Author:

David Azarewicz

Message:

APIC interrupt transition fixes

File:

• GPL/trunk/drv32/strategy.c (modified) (5 diffs)

GPL/trunk/drv32/strategy.c

@@ -33 +33 @@
 #include <ossidc32.h>
 #include <dbgos2.h>
+#include <string.h>
 
 ULONG StratRead(RP __far *_rp);
@@ -41 +42 @@
 ULONG deviceOwner = DEV_NO_OWNER;
 ULONG numOS2Opens = 0;
+extern "C" BOOL fRewired; //pci.c
+
+DBGINT DbgInt;
 
 //******************************************************************************
@@ -67 +71 @@
         ULONG rc;
 
+        memset(&DbgInt, 0, sizeof(DbgInt));
+
         RPInit __far* rp = (RPInit __far*)_rp;
         rc = DiscardableInit(rp);
         //dprintf(("StratInit End rc=%d", rc));
+        DbgInt.usState = 1;
         return rc;
 }
@@ -82 +89 @@
 #pragma on (unreferenced)
 {
+        DbgInt.usState = 2;
 #ifdef ACPI
         PciAdjustInterrupts();
 #endif
+        rprintf(("StratInitComplete: Init=%ld/%ld Between=%ld/%ld Complete=%ld/%ld",
+                DbgInt.ulIntServiced[0], DbgInt.ulIntUnserviced[0],
+                DbgInt.ulIntServiced[1], DbgInt.ulIntUnserviced[1],
+                DbgInt.ulIntServiced[2], DbgInt.ulIntUnserviced[2]));
         //dprintf(("StratInitComplete"));
         return(RPDONE);
@@ -160 +172 @@
 ULONG Strategy(RP __far* rp)
 {
-  if (rp->Command < sizeof(StratDispatch)/sizeof(StratDispatch[0]))
+        if (fRewired) {
+                fRewired = FALSE;
+                rprintf(("Strategy: Resuming"));
+                OSS32_APMResume();
+        }
+
+        if (rp->Command < sizeof(StratDispatch)/sizeof(StratDispatch[0]))
                 return(StratDispatch[rp->Command](rp));
-  else  return(RPERR_COMMAND | RPDONE);
+        else return(RPERR_COMMAND | RPDONE);
 }
 //******************************************************************************