From 2c11e03776a6c6df279109b45c6acdf51e738529 Mon Sep 17 00:00:00 2001 From: sezero Date: Fri, 3 Aug 2018 17:10:10 +0300 Subject: [PATCH] removed some static vars relying on cvs revision number (glide2x side) --- glide2x/cvg/incsrc/fxhal.h | 4 ---- glide2x/cvg/init/rcver.h | 2 +- glide2x/cvg/init/sst1init.c | 15 --------------- glide2x/cvg/init/sst1init.h | 10 ---------- glide2x/h3/incsrc/fxhal.h | 3 --- glide2x/sst1/init/init96/init96.c | 7 ++----- glide2x/sst1/init/init96/initmcrx.c | 4 ---- glide2x/sst1/init/initvg/rcver.h | 2 +- glide2x/sst1/init/initvg/sst1init.c | 11 ----------- glide2x/sst1/init/initvg/sst1init.h | 5 ----- 10 files changed, 4 insertions(+), 59 deletions(-) diff --git a/glide2x/cvg/incsrc/fxhal.h b/glide2x/cvg/incsrc/fxhal.h index f7d04c4..d0c26bd 100644 --- a/glide2x/cvg/incsrc/fxhal.h +++ b/glide2x/cvg/incsrc/fxhal.h @@ -1,4 +1,3 @@ -/*-*-c++-*-*/ #ifndef __FXHAL_H__ #define __FXHAL_H__ @@ -32,9 +31,6 @@ #include -// Allow SourceSafe to track Revision values -#define HAL_H_REV "$Revision$" - // Just to unconfuse myself: // // CHIP FBI-REV TMU-REV DEV-ID diff --git a/glide2x/cvg/init/rcver.h b/glide2x/cvg/init/rcver.h index 4335c51..7b5d90c 100644 --- a/glide2x/cvg/init/rcver.h +++ b/glide2x/cvg/init/rcver.h @@ -2,4 +2,4 @@ #define MANREVISION 1 #define BUILD_NUMBER 1 -#define VERSIONSTR "Voodoo2 InitCode " "$Revision$" "\0" +#define VERSIONSTR "Voodoo2 InitCode " "$Revision: 1 $" "\0" diff --git a/glide2x/cvg/init/sst1init.c b/glide2x/cvg/init/sst1init.c index 603b6ca..effcc83 100644 --- a/glide2x/cvg/init/sst1init.c +++ b/glide2x/cvg/init/sst1init.c @@ -18,10 +18,6 @@ ** ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED ** -** -** $Revision$ -** $Date$ -** */ /* @@ -170,9 +166,6 @@ #include #endif -// Allow SourceSafe to track Revision -static char codeIdent[] = "@#%" VERSIONSTR ; - /* ** sst1InitMapBoard(): ** Find and map SST-1 board into virtual memory @@ -229,10 +222,6 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoardDirect(FxU32 BoardNumber, * board which will (of course) fail to map. */ if(firstTime) { - // Make Watcom happy - codeIdent[0] = '@'; - headersIdent[0] = '@'; - // Find "voodoo2.ini" file if it exists... sst1InitUseVoodooFile = sst1InitVoodooFile(); @@ -254,10 +243,6 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoardDirect(FxU32 BoardNumber, if( clearBoardInfo ) { INIT_PRINTF(("sst1Init Routines")); -#ifdef FX_DLL_ENABLE - INIT_PRINTF(("(DLL)")); -#endif - INIT_PRINTF((": %s\n", VERSIONSTR)); INIT_PRINTF(("sst1InitMapBoard(): BoardsInSystem = %d\n", boardsInSystem)); diff --git a/glide2x/cvg/init/sst1init.h b/glide2x/cvg/init/sst1init.h index 1473cec..3284fff 100644 --- a/glide2x/cvg/init/sst1init.h +++ b/glide2x/cvg/init/sst1init.h @@ -1,4 +1,3 @@ -/*-*-c++-*-*/ /* ** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY ** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT @@ -18,20 +17,12 @@ ** ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED ** -** -** $Revision$ -** $Date$ -** */ #ifndef __SST1INIT_H__ #define __SST1INIT_H__ /* -** -** $Revision$ -** $Date$ -** ** SST-1 Initialization routine protypes ** ** If all initialization routines are called, it is assumed they are called @@ -760,7 +751,6 @@ extern "C" { #endif #ifdef SST1INIT_ALLOCATE - static char headersIdent[] = "@#%Voodoo2 InitHeaders $Revision$"; FxBool sst1InitUseVoodooFile = FXFALSE; sst1InitEnvVarStruct *envVarsBase = (sst1InitEnvVarStruct *) NULL; sst1InitDacStruct *dacStructBase = (sst1InitDacStruct *) NULL; diff --git a/glide2x/h3/incsrc/fxhal.h b/glide2x/h3/incsrc/fxhal.h index 0c9d1c0..85b50e8 100644 --- a/glide2x/h3/incsrc/fxhal.h +++ b/glide2x/h3/incsrc/fxhal.h @@ -32,9 +32,6 @@ #include -// Allow SourceSafe to track Revision values -#define HAL_H_REV "$Revision$" - // Just to unconfuse myself: // // CHIP FBI-REV TMU-REV DEV-ID diff --git a/glide2x/sst1/init/init96/init96.c b/glide2x/sst1/init/init96/init96.c index 472d63f..0dbc6f4 100644 --- a/glide2x/sst1/init/init96/init96.c +++ b/glide2x/sst1/init/init96/init96.c @@ -20,7 +20,6 @@ ** $Date$ ** */ -static char revString[] = "@#%$Workfile: INIT96.C $ $Revision$"; /* ANSI Headers */ #include @@ -691,10 +690,8 @@ INITVG96ENTRY(init96MapBoard, FxBool , (void *rd, void *info, FxU16 vID, FxU16 d vendorID = vID, deviceID = dID; - GDBG_INFO((80, "SST-96 Initialization code %s\n", revString)); - - /* Watcom warning suppression */ - revString[0] = revString[0]; + GDBG_INFO((80, "SST-96 Initialization code\n")); + /* !!! FIXME hack for vxd bug */ putenv( "SST_DUALHEAD=1" ); diff --git a/glide2x/sst1/init/init96/initmcrx.c b/glide2x/sst1/init/init96/initmcrx.c index b5ea1e8..ad02ef6 100644 --- a/glide2x/sst1/init/init96/initmcrx.c +++ b/glide2x/sst1/init/init96/initmcrx.c @@ -22,7 +22,6 @@ ** $Date$ ** */ -static char revString[] = "@#%$Workfile: initmcrx.c $ $Revision$"; #include <3dfx.h> @@ -594,9 +593,6 @@ INITMCRXENTRY(initMCRXGetInfo,FxBool,(VG96Info *info)) /* We care about bit 5 & 6 */ mBytesPow = ((res >> 5) & 3); - - /* Watcom warning suppression */ - revString[0] = revString[0]; info->vgaChip = 0; info->vg96Rev = 0; diff --git a/glide2x/sst1/init/initvg/rcver.h b/glide2x/sst1/init/initvg/rcver.h index 86e239a..5807a7f 100644 --- a/glide2x/sst1/init/initvg/rcver.h +++ b/glide2x/sst1/init/initvg/rcver.h @@ -22,4 +22,4 @@ #define MANREVISION 1 #define BUILD_NUMBER 1 -#define VERSIONSTR "InitCode " "$Revision$" "\0" +#define VERSIONSTR "InitCode " "$Revision: 1 $" "\0" diff --git a/glide2x/sst1/init/initvg/sst1init.c b/glide2x/sst1/init/initvg/sst1init.c index ed0dd38..e75f95d 100644 --- a/glide2x/sst1/init/initvg/sst1init.c +++ b/glide2x/sst1/init/initvg/sst1init.c @@ -139,9 +139,6 @@ #include #endif -/* Allow SourceSafe to track Revision */ -static char codeIdent[] = "@#%" VERSIONSTR ; - /* ** sst1InitMapBoard(): ** Find and map SST-1 board into virtual memory @@ -160,10 +157,6 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoard(FxU32 BoardNumber) FxU32 n, j; if(firstTime) { - /* Make Watcom happy */ - codeIdent[0] = '@'; - headersIdent[0] = '@'; - /* Find "voodoo.ini" file if it exists... */ sst1InitUseVoodooFile = sst1InitVoodooFile(); @@ -173,10 +166,6 @@ FX_EXPORT FxU32 * FX_CSTYLE sst1InitMapBoard(FxU32 BoardNumber) if(BoardNumber == 0) { INIT_PRINTF(("sst1Init Routines")); -#ifdef FX_DLL_ENABLE - INIT_PRINTF(("(DLL)")); -#endif - INIT_PRINTF((": %s\n", VERSIONSTR)); INIT_PRINTF(("sst1InitMapBoard(): BoardsInSystem = %d\n", boardsInSystem)); diff --git a/glide2x/sst1/init/initvg/sst1init.h b/glide2x/sst1/init/initvg/sst1init.h index 7694272..9c6e1f4 100644 --- a/glide2x/sst1/init/initvg/sst1init.h +++ b/glide2x/sst1/init/initvg/sst1init.h @@ -17,10 +17,6 @@ ** ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED ** -** -** $Revision$ -** $Date$ -** */ #ifndef __SST1INIT_H__ @@ -673,7 +669,6 @@ extern "C" { #endif #ifdef SST1INIT_ALLOCATE - static char headersIdent[] = "@#%InitHeaders $Revision$"; FxBool sst1InitUseVoodooFile = FXFALSE; sst1InitEnvVarStruct *envVarsBase = (sst1InitEnvVarStruct *) NULL; sst1InitDacStruct *dacStructBase = (sst1InitDacStruct *) NULL;