Changeset 591 for GPL/trunk/drv32

Timestamp:

Mar 9, 2017, 12:59:01 AM (9 years ago)

Author:

David Azarewicz

Message:

Remove dead code. Build system updates.

Location:

GPL/trunk/drv32

Files:

• Makefile (modified) (3 diffs)
• idc.c (modified) (2 diffs)
• strategy.c (modified) (2 diffs)

GPL/trunk/drv32/Makefile

@@ -67 +67 @@
 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
 
@@ -86 +86 @@
   @%write $^@ option alignment=16
   @%write $^@ option map=$(WMAPNAME)
-  @$(ROOT)\tools\AddToFile.cmd $^@,$option description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 (c) 2016 $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
+  @$(ROOT)\tools\AddToFile.cmd $^@,$option description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 (c) %Y $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
   @%write $^@ name $(OBJDIR)\$(TARGET).sys
   @for %f in ($(FILES)) do @%append $^@ file $(OBJDIR)\%f
@@ -105 +105 @@
 $(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES) $(LIBS)
   @%create $(DEFFILE)
-  $(ROOT)\tools\AddToFile.cmd $(DEFFILE),description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 and eCS (c) 2014 $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
+  $(ROOT)\tools\AddToFile.cmd $(DEFFILE),description,BLDLEVEL,$(BLDLVL_VENDOR),$(BLDLVL_VERSION),Universal Audio Driver for OS/2 (c) %Y $(BLDLVL_VENDOR),$(BLDLVL_FIXPACK)
   $(LINK) @$(LNKFILE)
   copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN)

GPL/trunk/drv32/idc.c

@@ -40 +40 @@
 extern int pcm_device;
 WORD32 OSS32IDC(ULONG cmd, PIDC32_PACKET pPacket);
-extern BOOL fRewired; //pci.c
 
 //packet pointer must reference a structure on the stack
@@ -50 +49 @@
     ULONG  oldfileid;
     OSSRET rc;
-
-        if (fRewired) {
-                fRewired = FALSE;
-                rprintf(("AlsaIDC: Resuming"));
-                OSS32_APMResume();
-                DbgPrintIrq();
-        }
 
     //Sets file id in current task structure

GPL/trunk/drv32/strategy.c

@@ -43 +43 @@
 ULONG deviceOwner = DEV_NO_OWNER;
 ULONG numOS2Opens = 0;
-extern BOOL fRewired; //pci.c
 
 extern DBGINT DbgInt;
@@ -170 +169 @@
 ULONG Strategy(REQPACKET __far* rp)
 {
-  if (fRewired)
-  {
-    fRewired = FALSE;
-    rprintf(("Strategy: Resuming"));
-    OSS32_APMResume();
-    DbgPrintIrq();
-  }
-
   if (rp->bCommand < sizeof(StratDispatch)/sizeof(StratDispatch[0])) return(StratDispatch[rp->bCommand](rp));
   else return(RPERR_BADCOMMAND | RPDONE);