Changeset 235

Timestamp:

Aug 8, 2007, 7:31:43 AM (18 years ago)

Author:

Brendan Oakley

Message:

New mkversion thanks to Mike, with BLDLEVEL and driver load output fixes from Allan

Location:

GPL/trunk

Files:

• !m_kee.cmd (modified) (1 diff)
• !m_kee_debug.cmd (modified) (1 diff)
• !m_w4.cmd (modified) (1 diff)
• drv32/dispatch.c (modified) (1 diff)
• drv32/init.c (modified) (2 diffs)
• drv32/makefile.os2 (modified) (3 diffs)
• include/version.h (deleted)
• include/version.mak (deleted)
• tools/mkversion.cmd (added)
• uniaud.inc (added)

GPL/trunk/!m_kee.cmd

@@ -1 +1 @@
 @echo off
 set KEE=1
-call tools\mkversion include\version.h include\version.mak
+call tools\mkversion
 wmake -ms -f makefile.os2
 set KEE=

GPL/trunk/!m_kee_debug.cmd

@@ -1 +1 @@
 @echo off
 set KEE=1
-call tools\mkversion include\version.h include\version.mak
+call tools\mkversion
 wmake -ms -f makefile.os2 DEBUG=1
 set KEE=

GPL/trunk/!m_w4.cmd

@@ -1 +1 @@
 @echo off
 set KEE=0
-call tools\mkversion include\version.h include\version.mak
+call tools\mkversion
 wmake -ms -f makefile.os2
 set KEE=

GPL/trunk/drv32/dispatch.c

@@ -214 +214 @@
             }
             pData = (ULONG *) linData;
-            (*pData) = UNIAUD_VERSION;
+            (*pData) = RM_VERSION;
 
         } break;

GPL/trunk/drv32/init.c

@@ -48 +48 @@
 const char ERR_INIT[]    = "Initialization failed\r\r\n";
 const char ERR_NAMES[]    = "Query names failed\r\r\n";
-const char szALSA[]      = "\r\n\r\nOS/2 Universal Audio Core Driver v"ALSA_VERSION"\r\n";
+const char szALSA[]      = "\r\n"PRODUCT_NAME" v"UNIAUD_VERSION"\r\nBased on ALSA "ALSA_VERSION"\r\n";
 
 const char szCopyRight1[]= "Copyright 2000-2002 InnoTek Systemberatung GmbH\r\n";
-const char szCopyRight2[]= "Copyright 2000-2002 The ALSA Project\r\n\r\n";
-const char szCopyRight3[]= "Copyright 2005-2006 Netlabs http://www.netlabs.org\r\n";
+const char szCopyRight2[]= "Copyright 2000-2007 The ALSA Project\r\n\r\n";
+const char szCopyRight3[]= "Copyright 2005-2007 Netlabs http://www.netlabs.org\r\n";
 //const char szCopyRight3[]= "Maintained by http://os2.kiev.ua/en/uniaud.php\r\n\r\n";
 
@@ -217 +217 @@
 
     if(fVerbose) {
+        WriteString(szCopyRight3, sizeof(szCopyRight3)-1);
         WriteString(szALSA, sizeof(szALSA)-1);
-        WriteString(szCopyRight1, sizeof(szCopyRight1)-1);
-        WriteString(szCopyRight3, sizeof(szCopyRight3)-1);
         WriteString(szCopyRight2, sizeof(szCopyRight2)-1);
     }

GPL/trunk/drv32/makefile.os2

@@ -89 +89 @@
     @%write $^@ option map=$(WMAPNAME)
 !if "$(KEE)" == "1"
-    @%write $^@ option description '@$#$(BLDLVL_VENDOR):$(BLDLVL_REVISION)$#@$#$#1$#$# $(BLDLVL_DATETIME)      $(BLDLVL_MACHINE)::::$(BLDLVL_FILEVER)::@@$(BLDLVL_PRODUCT) (KEE)'
+    @%write $^@ option description '$(%BUILDLEVEL) (KEE)'
 !else
-    @%write $^@ option description '@$#$(BLDLVL_VENDOR):$(BLDLVL_REVISION)$#@$#$#1$#$# $(BLDLVL_DATETIME)      $(BLDLVL_MACHINE)::::$(BLDLVL_FILEVER)::@@$(BLDLVL_PRODUCT) (W4)'
+    @%write $^@ option description '$(%BUILDLEVEL) (W4)'
 !endif
     @%write $^@ name $(OBJDIR)\$(TARGET).sys
@@ -111 +111 @@
 $(OBJDIR)\$(TARGET).sys: $(LNKFILE) $(FILES) $(LIBS)
 !if "$(KEE)" == "1"
-     @%write $(DEFFILE) description '@$#$(BLDLVL_VENDOR):$(BLDLVL_REVISION)$#@$#$#1$#$# $(BLDLVL_DATETIME)      $(BLDLVL_MACHINE)::::$(BLDLVL_FILEVER)::@@$(BLDLVL_PRODUCT) (KEE)'
+     @%write $(DEFFILE) description '$(%BUILDLEVEL) (KEE)'
 !else
-     @%write $(DEFFILE) description '@$#$(BLDLVL_VENDOR):$(BLDLVL_REVISION)$#@$#$#1$#$# $(BLDLVL_DATETIME)      $(BLDLVL_MACHINE)::::$(BLDLVL_FILEVER)::@@$(BLDLVL_PRODUCT) (W4)'
+     @%write $(DEFFILE) description '$(%BUILDLEVEL) (W4)'
 !endif
 
@@ -121 +121 @@
 !if "$(KEE)" == "1"
 #     copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN)\$(TARGET)kee.sys
-             
+         
       copy $(OBJDIR)\$(TARGET).sys $(ALSA_BIN_)\$(TARGET)kee.sys
 !else