Changeset 604 for GPL/trunk/drv32

Timestamp:

Jan 8, 2018, 2:07:36 AM (8 years ago)

Author:

David Azarewicz

Message:

Incorporated changes from Andy.
Added limited MSI support.

Location:

GPL/trunk/drv32

Files:

• Makefile (modified) (3 diffs)
• irq.c (modified) (3 diffs)

GPL/trunk/drv32/Makefile

@@ -48 +48 @@
 !endif
 
-
 #===================================================================
 #
@@ -67 +66 @@
 FILES += end.obj
 
-LIBS     = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\synth.lib $(ALSA_LIB)\cs46xx.lib $(ALSA_LIB)\cs5535audio.lib $(ALSA_LIB)\emu10k1.lib $(ALSA_LIB)\ymfpci.lib $(ALSA_LIB)\ali5451.lib $(ALSA_LIB)\trident.lib $(ALSA_LIB)\nm256.lib $(ALSA_LIB)\sb.lib $(ALSA_LIB)\core_oss.lib
+LIBS = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib &
+ $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib &
+ $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\synth.lib $(ALSA_LIB)\cs46xx.lib $(ALSA_LIB)\cs5535audio.lib &
+ $(ALSA_LIB)\emu10k1.lib $(ALSA_LIB)\ymfpci.lib $(ALSA_LIB)\ali5451.lib $(ALSA_LIB)\trident.lib &
+ $(ALSA_LIB)\nm256.lib $(ALSA_LIB)\sb.lib $(ALSA_LIB)\core_oss.lib
 WMAPNAME = $(OBJDIR)\$(TARGET).wmap
 
@@ -100 +103 @@
   @%write $^@ $(WATCOM)\lib386\os2\clib3r.lib
   @%write $^@ $(WATCOM)\lib386\os2\os2386.lib
+!ifdef %DRV32KIT
+  @%write $^@ $(%DRV32KIT)\drv32.lib
+!endif
   @%write $^@ $(DEFFILE)
 !endif

GPL/trunk/drv32/irq.c

@@ -51 +51 @@
 BOOL ALSA_SetIrq(ULONG ulIrq, ULONG ulSlotNo, BOOL fShared)
 {
-    USHORT rc = 1;
+  USHORT rc = 1;
 
-    if( ulSlotNo >= MAX_IRQ_SLOTS ) {
-        DebugInt3();
-        return FALSE;
-    }
+  if( ulSlotNo >= MAX_IRQ_SLOTS )
+  {
+    DebugInt3();
+    return FALSE;
+  }
 
-    if(fShared)
-    {
-        rc = DevIRQSet((WORD16) *pISR[ulSlotNo],
-                       (WORD16)ulIrq,
-                       1 );   // first try shared shared
-    }
+  if(fShared)
+  {
+    rc = DevIRQSet((WORD16) *pISR[ulSlotNo], (WORD16)ulIrq, 1 );   // first try shared shared
+  }
 
-    if (rc != 0) {                    // If error ...
-       rprintf(("ERROR: RMSetIrq %d %d %x - failed to set shared - trying exclusive!!", ulIrq, fShared, ulSlotNo));
-        rc = DevIRQSet((WORD16) *pISR[ulSlotNo],
-                       (WORD16)ulIrq,
-                       0);   // failed, so try exclusive instead
-    }
+  if (rc != 0)
+  {                    // If error ...
+    rprintf(("ERROR: RMSetIrq %d %d %x - failed to set shared - trying exclusive!!", ulIrq, fShared, ulSlotNo));
+    rc = DevIRQSet((WORD16) *pISR[ulSlotNo], (WORD16)ulIrq, 0);   // failed, so try exclusive instead
+  }
 
-    if (rc != 0) {                    // If error ...
-        rprintf(("ERROR: RMSetIrq %d %d %x FAILED shared and exclusive mode!!", ulIrq, fShared, ulSlotNo));
-        DebugInt3();
-        return FALSE;
-    }
+  if (rc != 0)
+  {                    // If error ...
+    rprintf(("ERROR: RMSetIrq %d %d %x FAILED shared and exclusive mode!!", ulIrq, fShared, ulSlotNo));
+    DebugInt3();
+    return FALSE;
+  }
 
-    return TRUE;
+  return TRUE;
 }
 
@@ -84 +83 @@
 BOOL ALSA_FreeIrq(ULONG ulIrq)
 {
-    return (DevIRQClear((WORD16)ulIrq) == 0);
+  return (DevIRQClear((WORD16)ulIrq) == 0);
 }
 
@@ -91 +90 @@
 ULONG ALSA_Interrupt(ULONG ulSlotNo)
 {
-    ULONG       ulIrqNo;
+  ULONG ulIrqNo;
 
-   // enable interrupts that have higher priority we should
-   // allow higher priority interrupts
-   sti();
-   if( process_interrupt(ulSlotNo, &ulIrqNo) ) {
-                DbgInt.ulIntServiced[DbgInt.ulState]++;
-       // We've cleared all service requests.
-       // Clear (disable) Interrupts, Send EOI
-       // and clear the carry flag (tells OS/2 kernel that Int was handled).
-       // Note carry flag is handled in setup.asm
-       cli();
-       DevEOI( (WORD16)ulIrqNo );
-       return TRUE;
-   }
-        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!
-   // NOTE: Make sure interrupts are not turned on again when this irq isn't ours!
-   return FALSE;
+  // enable interrupts that have higher priority we should
+  // allow higher priority interrupts
+  sti();
+  if( process_interrupt(ulSlotNo, &ulIrqNo) )
+  {
+    DbgInt.ulIntServiced[DbgInt.ulState]++;
+    // We've cleared all service requests.
+    // Clear (disable) Interrupts, Send EOI
+    // and clear the carry flag (tells OS/2 kernel that Int was handled).
+    // Note carry flag is handled in setup.asm
+    cli();
+    DevEOI( (WORD16)ulIrqNo );
+    return TRUE;
+  }
+  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!
+  // NOTE: Make sure interrupts are not turned on again when this irq isn't ours!
+  return FALSE;
 }