Changeset 550 for GPL/branches/uniaud32-2.1.x/drv32/strategy.c

Timestamp:

Apr 14, 2011, 7:32:42 PM (14 years ago)

Author:

David Azarewicz

Message:

merge interrupt fixes from trunk

File:

• GPL/branches/uniaud32-2.1.x/drv32/strategy.c (modified) (4 diffs)

GPL/branches/uniaud32-2.1.x/drv32/strategy.c

@@ -44 +44 @@
 extern "C" BOOL fRewired; //pci.c
 
-DBGINT DbgInt;
+extern "C" DBGINT DbgInt;
 
 //******************************************************************************
@@ -72 +72 @@
 
         memset(&DbgInt, 0, sizeof(DbgInt));
+        DbgPrintIrq();
 
         RPInit __far* rp = (RPInit __far*)_rp;
         rc = DiscardableInit(rp);
         //dprintf(("StratInit End rc=%d", rc));
-        DbgInt.usState = 1;
+        DbgPrintIrq();
+        DbgInt.ulState = 1;
         return rc;
 }
@@ -89 +91 @@
 #pragma on (unreferenced)
 {
-        DbgInt.usState = 2;
+        DbgInt.ulState = 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]));
+        DbgPrintIrq();
         //dprintf(("StratInitComplete"));
         return(RPDONE);
@@ -176 +175 @@
                 rprintf(("Strategy: Resuming"));
                 OSS32_APMResume();
+                DbgPrintIrq();
         }