Changeset 549 for GPL/trunk/drv32

Timestamp:

Apr 13, 2011, 7:59:35 PM (15 years ago)

Author:

David Azarewicz

Message:

Fixes for changin interrupts in APIC mode

Location:

GPL/trunk/drv32

Files:

• idc.c (modified) (2 diffs)
• irq.cpp (modified) (3 diffs)
• read.cpp (modified) (1 diff)
• strategy.c (modified) (4 diffs)

GPL/trunk/drv32/idc.c

@@ -56 +56 @@
                 rprintf(("AlsaIDC: Resuming"));
                 OSS32_APMResume();
+                DbgPrintIrq();
         }
 
@@ -129 +130 @@
 
   case IDC32_WAVE_STOP:
+                DbgPrintIrq();
        return OSS32_WaveStop(pPacket->streamid);
 

GPL/trunk/drv32/irq.cpp

@@ -46 +46 @@
 };
 
-extern DBGINT DbgInt;
+extern "C" DBGINT DbgInt;
 
 //******************************************************************************
@@ -98 +98 @@
    sti();
    if( process_interrupt(ulSlotNo, &ulIrqNo) ) {
-                DbgInt.ulIntServiced[DbgInt.usState]++;
+                DbgInt.ulIntServiced[DbgInt.ulState]++;
        // We've cleared all service requests.
        // Clear (disable) Interrupts, Send EOI
@@ -107 +107 @@
        return TRUE;
    }
-        DbgInt.ulIntUnserviced[DbgInt.usState]++;
+        DbgInt.ulIntUnserviced[DbgInt.ulState]++;
    // Indicate Interrupt not serviced by setting carry flag before
    // returning to OS/2 kernel.  OS/2 will then shut down the interrupt!

GPL/trunk/drv32/read.cpp

@@ -16 +16 @@
 
 }
-
-extern DBGINT DbgInt;
 
 ULONG StratRead(RP __far* _rp)

GPL/trunk/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();
         }