From ee6f1249295e4e9c3a0c55f8200aa25b14c8b466 Mon Sep 17 00:00:00 2001 From: sezero Date: Mon, 20 Aug 2018 20:16:20 +0300 Subject: [PATCH] sst1: fix argc arg of main() --- glide2x/sst1/cmd/pass/pass.c | 96 ++++++++++++++++++------------------ glide3x/sst1/cmd/pass/pass.c | 6 +-- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/glide2x/sst1/cmd/pass/pass.c b/glide2x/sst1/cmd/pass/pass.c index fcd9fcd..b2fb77a 100644 --- a/glide2x/sst1/cmd/pass/pass.c +++ b/glide2x/sst1/cmd/pass/pass.c @@ -1,48 +1,48 @@ -/* - * THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY - * PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT - * TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX - * INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE - * DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). - * THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A - * FULL TEXT OF THE NON-WARRANTY PROVISIONS. - * - * USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO - * RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN - * TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, - * AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR - * SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF - * THE UNITED STATES. - * - * COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED - */ - -#include -#include - -#include <3dfx.h> -#include -#include - -/* This should be exported, but isn't yet */ -#define SST1INIT_MAX_BOARDS 16 - -int main (int argc[], char* argv[]) -{ - FxU32* sst[SST1INIT_MAX_BOARDS]; - int num_sst; - int i; - - /* Map all the boards in the system */ - num_sst = 0; - do { - sst[num_sst] = sst1InitMapBoard (num_sst); - } while (sst[num_sst++] != NULL); - - /* Shut them all down */ - for (i = 0; i < num_sst; i += 1) - sst1InitVgaPassCtrl(sst[i], 1); - - return 0; -} +/* + * THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY + * PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT + * TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX + * INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE + * DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). + * THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER + * EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A + * FULL TEXT OF THE NON-WARRANTY PROVISIONS. + * + * USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO + * RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN + * TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, + * AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR + * SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF + * THE UNITED STATES. + * + * COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED + */ + +#include +#include + +#include <3dfx.h> +#include +#include + +/* This should be exported, but isn't yet */ +#define SST1INIT_MAX_BOARDS 16 + +int main (int argc, char* argv[]) +{ + FxU32* sst[SST1INIT_MAX_BOARDS]; + int num_sst; + int i; + + /* Map all the boards in the system */ + num_sst = 0; + do { + sst[num_sst] = sst1InitMapBoard (num_sst); + } while (sst[num_sst++] != NULL); + + /* Shut them all down */ + for (i = 0; i < num_sst; i += 1) + sst1InitVgaPassCtrl(sst[i], 1); + + return 0; +} diff --git a/glide3x/sst1/cmd/pass/pass.c b/glide3x/sst1/cmd/pass/pass.c index 64d2783..b2fb77a 100644 --- a/glide3x/sst1/cmd/pass/pass.c +++ b/glide3x/sst1/cmd/pass/pass.c @@ -7,14 +7,14 @@ * THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A * FULL TEXT OF THE NON-WARRANTY PROVISIONS. - * + * * USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO * RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN * TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013, * AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR * SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF * THE UNITED STATES. - * + * * COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED */ @@ -28,7 +28,7 @@ /* This should be exported, but isn't yet */ #define SST1INIT_MAX_BOARDS 16 -int main (int argc[], char* argv[]) +int main (int argc, char* argv[]) { FxU32* sst[SST1INIT_MAX_BOARDS]; int num_sst;