Changeset 550 for GPL/branches/uniaud32-2.1.x/drv32/irq.cpp

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/irq.cpp (modified) (3 diffs)

GPL/branches/uniaud32-2.1.x/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!