Changeset 683

Timestamp:

Mar 21, 2021, 9:36:40 AM (4 years ago)

Author:

Paul Smedley

Message:

Apply changes from trunk changeset 680 to uniaud32-next branch

Location:

GPL/branches/uniaud32-next

Files:

• alsa-kernel/core/seq/Makefile (modified) (1 diff)
• alsa-kernel/pci/emu10k1/Makefile (modified) (1 diff)
• alsa-kernel/synth/Makefile (modified) (1 diff)
• drv32/irq.c (modified) (1 diff)

GPL/branches/uniaud32-next/alsa-kernel/core/seq/Makefile

@@ -17 +17 @@
   seq_fifo.obj seq_prioq.obj seq_timer.obj &
   seq_system.obj seq_ports.obj seq_info.obj &
-  seq_midi.obj seq_midi_emul.obj seq_midi_event.obj seq_dummy.obj seq_virmidi.obj
+  seq_midi.obj seq_midi_emul.obj seq_midi_event.obj seq_dummy.obj
 
 TARGET   = sequencer

GPL/branches/uniaud32-next/alsa-kernel/pci/emu10k1/Makefile

@@ -15 +15 @@
   irq.obj memory.obj voice.obj emumpu401.obj emupcm.obj io.obj &
   emuproc.obj emumixer.obj emufx.obj &
-  emu10k1_synth.obj emu10k1_callback.obj emu10k1_patch.obj &
+  emu10k1_synth.obj emu10k1_callback.obj &
   timer.obj emu10k1x.obj p16v.obj
 

GPL/branches/uniaud32-next/alsa-kernel/synth/Makefile

@@ -25 +25 @@
 #
 #===================================================================
-all: $(OBJDIR)\$(TARGET).lib subdirs
+all: $(OBJDIR)\$(TARGET).lib
 
 

GPL/branches/uniaud32-next/drv32/irq.c

@@ -63 +63 @@
 
   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));
+  {
+    // If error ...
+    rprintf(("ERROR: RMSetIrq %d %d %x FAILED to set interrupt.", ulIrq, fShared, ulSlotNo));
     DebugInt3();
     return FALSE;