convert K&R function definitions to ansi style

This commit is contained in:
rlar 2010-07-03 20:37:00 +00:00
parent d19476685a
commit 463ef4a3b1
70 changed files with 160 additions and 342 deletions

View File

@ -1,3 +1,75 @@
2010-07-03 Robert Larice
* src/ciderlib/support/database.c ,
* src/ciderlib/support/logfile.c ,
* src/ciderlib/support/suprem.c ,
* src/ciderlib/support/suprmitf.c ,
* src/ciderlib/twod/twosetup.c ,
* src/spicelib/devices/nbjt/nbjtacld.c ,
* src/spicelib/devices/nbjt/nbjtask.c ,
* src/spicelib/devices/nbjt/nbjtdel.c ,
* src/spicelib/devices/nbjt/nbjtdest.c ,
* src/spicelib/devices/nbjt/nbjtdump.c ,
* src/spicelib/devices/nbjt/nbjtload.c ,
* src/spicelib/devices/nbjt/nbjtmdel.c ,
* src/spicelib/devices/nbjt/nbjtmpar.c ,
* src/spicelib/devices/nbjt/nbjtparm.c ,
* src/spicelib/devices/nbjt/nbjtpzld.c ,
* src/spicelib/devices/nbjt/nbjtset.c ,
* src/spicelib/devices/nbjt/nbjttemp.c ,
* src/spicelib/devices/nbjt/nbjttrun.c ,
* src/spicelib/devices/nbjt2/nbt2acld.c ,
* src/spicelib/devices/nbjt2/nbt2ask.c ,
* src/spicelib/devices/nbjt2/nbt2del.c ,
* src/spicelib/devices/nbjt2/nbt2dest.c ,
* src/spicelib/devices/nbjt2/nbt2dump.c ,
* src/spicelib/devices/nbjt2/nbt2load.c ,
* src/spicelib/devices/nbjt2/nbt2mdel.c ,
* src/spicelib/devices/nbjt2/nbt2mpar.c ,
* src/spicelib/devices/nbjt2/nbt2parm.c ,
* src/spicelib/devices/nbjt2/nbt2pzld.c ,
* src/spicelib/devices/nbjt2/nbt2set.c ,
* src/spicelib/devices/nbjt2/nbt2temp.c ,
* src/spicelib/devices/nbjt2/nbt2trun.c ,
* src/spicelib/devices/numd/numdacld.c ,
* src/spicelib/devices/numd/numdask.c ,
* src/spicelib/devices/numd/numddel.c ,
* src/spicelib/devices/numd/numddest.c ,
* src/spicelib/devices/numd/numddump.c ,
* src/spicelib/devices/numd/numdload.c ,
* src/spicelib/devices/numd/numdmdel.c ,
* src/spicelib/devices/numd/numdmpar.c ,
* src/spicelib/devices/numd/numdparm.c ,
* src/spicelib/devices/numd/numdpzld.c ,
* src/spicelib/devices/numd/numdtemp.c ,
* src/spicelib/devices/numd/numdtrun.c ,
* src/spicelib/devices/numd2/nud2acld.c ,
* src/spicelib/devices/numd2/nud2ask.c ,
* src/spicelib/devices/numd2/nud2del.c ,
* src/spicelib/devices/numd2/nud2dest.c ,
* src/spicelib/devices/numd2/nud2dump.c ,
* src/spicelib/devices/numd2/nud2load.c ,
* src/spicelib/devices/numd2/nud2mdel.c ,
* src/spicelib/devices/numd2/nud2mpar.c ,
* src/spicelib/devices/numd2/nud2parm.c ,
* src/spicelib/devices/numd2/nud2pzld.c ,
* src/spicelib/devices/numd2/nud2set.c ,
* src/spicelib/devices/numd2/nud2temp.c ,
* src/spicelib/devices/numd2/nud2trun.c ,
* src/spicelib/devices/numos/nummacld.c ,
* src/spicelib/devices/numos/nummask.c ,
* src/spicelib/devices/numos/nummdel.c ,
* src/spicelib/devices/numos/nummdest.c ,
* src/spicelib/devices/numos/nummdump.c ,
* src/spicelib/devices/numos/nummload.c ,
* src/spicelib/devices/numos/nummmdel.c ,
* src/spicelib/devices/numos/nummmpar.c ,
* src/spicelib/devices/numos/nummparm.c ,
* src/spicelib/devices/numos/nummpzld.c ,
* src/spicelib/devices/numos/nummset.c ,
* src/spicelib/devices/numos/nummtemp.c ,
* src/spicelib/devices/numos/nummtrun.c :
convert K&R function definitions to ansi style
2010-07-03 Robert Larice 2010-07-03 Robert Larice
* src/frontend/subckt.c : drop unsued variable. * src/frontend/subckt.c : drop unsued variable.
* src/include/ngspice.h : add a missing extern * src/include/ngspice.h : add a missing extern

View File

@ -8,7 +8,7 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group
/* #include "ftedata.h" */ /* #include "ftedata.h" */
struct plot * struct plot *
DBread( fileName ) DBread( char *fileName )
{ {
struct plot *plot; struct plot *plot;
@ -18,10 +18,7 @@ DBread( fileName )
} }
double * double *
DBgetData( plot, name, lengthWanted ) DBgetData(struct plot *plot, char *name, int lengthWanted)
struct plot *plot;
char *name;
int lengthWanted;
{ {
struct dvec *v; struct dvec *v;
double *data; double *data;
@ -50,8 +47,7 @@ int lengthWanted;
} }
void void
DBfree( plot ) DBfree(struct plot *plot)
struct plot *plot;
{ {
struct dvec *v, *nextv; struct dvec *v, *nextv;
struct plot *pl, *nextpl; struct plot *pl, *nextpl;

View File

@ -9,9 +9,7 @@ static char *LogFileName = "cider.log";
static int LogError = 0; static int LogError = 0;
void void
LOGmakeEntry(name, description) LOGmakeEntry(char *name, char *description)
char *name;
char *description;
{ {
int procStamp; int procStamp;
FILE *fpLog; FILE *fpLog;

View File

@ -110,11 +110,7 @@ readAsciiData( char *fileName, int impType, DOPtable **ppTable )
void void
readSupremData( fileName, fileType, impType, ppTable ) readSupremData(char *fileName, int fileType, int impType, DOPtable **ppTable)
char *fileName;
int fileType;
int impType;
DOPtable **ppTable;
{ {
#define MAX_GRID 500 #define MAX_GRID 500
float x[ MAX_GRID ], conc[ MAX_GRID ]; float x[ MAX_GRID ], conc[ MAX_GRID ];

View File

@ -24,10 +24,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#define DEBUG if (0) #define DEBUG if (0)
void void
SUPbinRead( inFile, x, conc, impId, numNod ) SUPbinRead(char *inFile, float *x, float *conc, int *impId, int *numNod)
char *inFile;
float *x, *conc;
int *impId, *numNod;
{ {
int idata, recordMark; int idata, recordMark;
int ldata; int ldata;
@ -223,10 +220,7 @@ int *impId, *numNod;
} }
void void
SUPascRead( inFile, x, conc, impId, numNod ) SUPascRead(char *inFile, float *x, float *conc, int *impId, int *numNod)
char *inFile;
float *x, *conc;
int *impId, *numNod;
{ {
int idata; int idata;
int i, j; int i, j;

View File

@ -141,11 +141,8 @@ void TWOsetup(TWOdevice *pDevice)
} }
/* Transfer BC info from card to nodes and edges. */ /* Transfer BC info from card to nodes and edges. */
static void TWOcopyBCinfo( pDevice, pElem, card, index ) static void
TWOdevice *pDevice; TWOcopyBCinfo(TWOdevice *pDevice, TWOelem *pElem, BDRYcard *card, int index )
TWOelem *pElem;
BDRYcard *card;
int index;
{ {
TWOnode *pNode; TWOnode *pNode;
TWOelem *pNElem; TWOelem *pNElem;

View File

@ -22,10 +22,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
extern int ONEacDebug; extern int ONEacDebug;
int int
NBJTacLoad(inModel, ckt) NBJTacLoad(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NBJTmodel *model = (NBJTmodel *) inModel; register NBJTmodel *model = (NBJTmodel *) inModel;
register NBJTinstance *inst; register NBJTinstance *inst;

View File

@ -18,12 +18,7 @@ extern int NBJTinitSmSig(NBJTinstance *);
/* ARGSUSED */ /* ARGSUSED */
int int
NBJTask(ckt, inInst, which, value, select) NBJTask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue *select)
CKTcircuit *ckt;
GENinstance *inInst;
int which;
IFvalue *value;
IFvalue *select;
{ {
NBJTinstance *inst = (NBJTinstance *) inInst; NBJTinstance *inst = (NBJTinstance *) inInst;
switch (which) { switch (which) {

View File

@ -14,11 +14,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NBJTdelete(inModel, name, kill) NBJTdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
GENmodel *inModel;
IFuid name;
GENinstance **kill;
{ {
NBJTmodel *model = (NBJTmodel *) inModel; NBJTmodel *model = (NBJTmodel *) inModel;
NBJTinstance **fast = (NBJTinstance **) kill; NBJTinstance **fast = (NBJTinstance **) kill;

View File

@ -15,9 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
void void
NBJTdestroy(inModel) NBJTdestroy(GENmodel **inModel)
GENmodel **inModel;
{ {
NBJTmodel **model = (NBJTmodel **) inModel; NBJTmodel **model = (NBJTmodel **) inModel;

View File

@ -26,9 +26,7 @@ static int state_numDC = 0;
static int state_numTR = 0; static int state_numTR = 0;
void void
NBJTdump(inModel, ckt) NBJTdump(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NBJTmodel *model = (NBJTmodel *) inModel; register NBJTmodel *model = (NBJTmodel *) inModel;
register NBJTinstance *inst; register NBJTinstance *inst;
@ -92,10 +90,7 @@ NBJTdump(inModel, ckt)
static static
void void
NBJTputHeader(file, ckt, inst) NBJTputHeader(FILE *file, CKTcircuit *ckt, NBJTinstance *inst)
FILE *file;
CKTcircuit *ckt;
NBJTinstance *inst;
{ {
char *reference; char *reference;
double refVal = 0.0; double refVal = 0.0;
@ -153,10 +148,7 @@ NBJTputHeader(file, ckt, inst)
} }
void void
NBJTacct(inModel, ckt, file) NBJTacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
GENmodel *inModel;
CKTcircuit *ckt;
FILE *file;
{ {
register NBJTmodel *model = (NBJTmodel *) inModel; register NBJTmodel *model = (NBJTmodel *) inModel;
register NBJTinstance *inst; register NBJTinstance *inst;

View File

@ -29,9 +29,7 @@ extern int ONEacDebug;
int int
NBJTload(inModel, ckt) NBJTload(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NBJTmodel *model = (NBJTmodel *) inModel; register NBJTmodel *model = (NBJTmodel *) inModel;
register NBJTinstance *inst; register NBJTinstance *inst;
@ -491,8 +489,7 @@ NBJTload(inModel, ckt)
} }
int int
NBJTinitSmSig(inst) NBJTinitSmSig(NBJTinstance *inst)
NBJTinstance *inst;
{ {
SPcomplex yIeVce, yIeVbe; SPcomplex yIeVce, yIeVbe;
SPcomplex yIcVce, yIcVbe; SPcomplex yIcVce, yIcVbe;

View File

@ -14,11 +14,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NBJTmDelete(inModel, modname, kill) NBJTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
GENmodel **inModel;
IFuid modname;
GENmodel *kill;
{ {
NBJTmodel **model = (NBJTmodel **) inModel; NBJTmodel **model = (NBJTmodel **) inModel;

View File

@ -15,10 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NBJTmParam(param, value, inModel) NBJTmParam(int param, IFvalue *value, GENmodel *inModel)
int param;
IFvalue *value;
GENmodel *inModel;
{ {
switch (param) { switch (param) {
case NBJT_MOD_NBJT: case NBJT_MOD_NBJT:

View File

@ -15,11 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NBJTparam(param, value, inInst, select) NBJTparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
int param;
IFvalue *value;
GENinstance *inInst;
IFvalue *select;
{ {
register NBJTinstance *inst = (NBJTinstance *) inInst; register NBJTinstance *inst = (NBJTinstance *) inInst;
switch (param) { switch (param) {

View File

@ -21,11 +21,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
extern int ONEacDebug; extern int ONEacDebug;
int int
NBJTpzLoad(inModel, ckt, s) NBJTpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
GENmodel *inModel;
CKTcircuit *ckt;
SPcomplex *s;
{ {
register NBJTmodel *model = (NBJTmodel *) inModel; register NBJTmodel *model = (NBJTmodel *) inModel;
register NBJTinstance *inst; register NBJTinstance *inst;

View File

@ -22,11 +22,7 @@ if (size && (!(var =(type *)calloc(1, (unsigned)(size)*sizeof(type))))) {\
} }
int int
NBJTsetup(matrix, inModel, ckt, states) NBJTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
register SMPmatrix *matrix;
GENmodel *inModel;
CKTcircuit *ckt;
int *states;
/* /*
* load the diode structure with those pointers needed later for fast matrix * load the diode structure with those pointers needed later for fast matrix
* loading * loading

View File

@ -19,9 +19,7 @@ extern int ONEdcDebug;
extern double LNorm; extern double LNorm;
int int
NBJTtemp(inModel, ckt) NBJTtemp(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
register CKTcircuit *ckt;
/* /*
* perform the temperature update to the bjt * perform the temperature update to the bjt
*/ */

View File

@ -18,11 +18,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
int int
NBJTtrunc(inModel, ckt, timeStep) NBJTtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
GENmodel *inModel;
register CKTcircuit *ckt;
double *timeStep;
{ {
register NBJTmodel *model = (NBJTmodel *) inModel; register NBJTmodel *model = (NBJTmodel *) inModel;
register NBJTinstance *inst; register NBJTinstance *inst;

View File

@ -22,10 +22,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
extern int TWOacDebug; extern int TWOacDebug;
int int
NBJT2acLoad(inModel, ckt) NBJT2acLoad(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NBJT2model *model = (NBJT2model *) inModel; register NBJT2model *model = (NBJT2model *) inModel;
register NBJT2instance *inst; register NBJT2instance *inst;

View File

@ -19,12 +19,7 @@ extern int NBJT2initSmSig(NBJT2instance *);
/* ARGSUSED */ /* ARGSUSED */
int int
NBJT2ask(ckt, inInst, which, value, select) NBJT2ask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue *select)
CKTcircuit *ckt;
GENinstance *inInst;
int which;
IFvalue *value;
IFvalue *select;
{ {
NBJT2instance *inst = (NBJT2instance *) inInst; NBJT2instance *inst = (NBJT2instance *) inInst;
switch (which) { switch (which) {

View File

@ -14,11 +14,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NBJT2delete(inModel, name, kill) NBJT2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
GENmodel *inModel;
IFuid name;
GENinstance **kill;
{ {
NBJT2model *model = (NBJT2model *) inModel; NBJT2model *model = (NBJT2model *) inModel;

View File

@ -15,9 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
void void
NBJT2destroy(inModel) NBJT2destroy(GENmodel **inModel)
GENmodel **inModel;
{ {
NBJT2model **model = (NBJT2model **) inModel; NBJT2model **model = (NBJT2model **) inModel;

View File

@ -27,9 +27,7 @@ static int state_numDC = 0;
static int state_numTR = 0; static int state_numTR = 0;
void void
NBJT2dump(inModel, ckt) NBJT2dump(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NBJT2model *model = (NBJT2model *) inModel; register NBJT2model *model = (NBJT2model *) inModel;
register NBJT2instance *inst; register NBJT2instance *inst;
@ -93,10 +91,7 @@ NBJT2dump(inModel, ckt)
static static
void void
NBJT2putHeader(file, ckt, inst) NBJT2putHeader(FILE *file, CKTcircuit *ckt, NBJT2instance *inst)
FILE *file;
CKTcircuit *ckt;
NBJT2instance *inst;
{ {
char *reference; char *reference;
double refVal = 0.0; double refVal = 0.0;
@ -154,10 +149,7 @@ NBJT2putHeader(file, ckt, inst)
} }
void void
NBJT2acct(inModel, ckt, file) NBJT2acct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
GENmodel *inModel;
CKTcircuit *ckt;
FILE *file;
{ {
register NBJT2model *model = (NBJT2model *) inModel; register NBJT2model *model = (NBJT2model *) inModel;
register NBJT2instance *inst; register NBJT2instance *inst;

View File

@ -31,9 +31,7 @@ extern int TWOacDebug;
int int
NBJT2load(inModel, ckt) NBJT2load(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NBJT2model *model = (NBJT2model *) inModel; register NBJT2model *model = (NBJT2model *) inModel;
register NBJT2instance *inst; register NBJT2instance *inst;
@ -482,8 +480,7 @@ NBJT2load(inModel, ckt)
} }
int int
NBJT2initSmSig(inst) NBJT2initSmSig(NBJT2instance *inst)
NBJT2instance *inst;
{ {
SPcomplex yIeVce, yIeVbe; SPcomplex yIeVce, yIeVbe;
SPcomplex yIcVce, yIcVbe; SPcomplex yIcVce, yIcVbe;

View File

@ -14,11 +14,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NBJT2mDelete(inModel, modname, kill) NBJT2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
GENmodel **inModel;
IFuid modname;
GENmodel *kill;
{ {
NBJT2model **model = (NBJT2model **) inModel; NBJT2model **model = (NBJT2model **) inModel;

View File

@ -15,10 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NBJT2mParam(param, value, inModel) NBJT2mParam(int param, IFvalue *value, GENmodel *inModel)
int param;
IFvalue *value;
GENmodel *inModel;
{ {
switch (param) { switch (param) {
case NBJT2_MOD_NBJT: case NBJT2_MOD_NBJT:

View File

@ -15,11 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NBJT2param(param, value, inInst, select) NBJT2param(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
int param;
IFvalue *value;
GENinstance *inInst;
IFvalue *select;
{ {
register NBJT2instance *inst = (NBJT2instance *) inInst; register NBJT2instance *inst = (NBJT2instance *) inInst;
switch (param) { switch (param) {

View File

@ -17,10 +17,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
extern int TWOacDebug; extern int TWOacDebug;
int int
NBJT2pzLoad(inModel, ckt, s) NBJT2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
GENmodel *inModel;
CKTcircuit *ckt;
SPcomplex *s;
{ {
register NBJT2model *model = (NBJT2model *) inModel; register NBJT2model *model = (NBJT2model *) inModel;
register NBJT2instance *inst; register NBJT2instance *inst;

View File

@ -25,11 +25,7 @@ if (size && (!(var =(type *)calloc(1, (unsigned)(size)*sizeof(type))))) {\
} }
int int
NBJT2setup(matrix, inModel, ckt, states) NBJT2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
register SMPmatrix *matrix;
GENmodel *inModel;
CKTcircuit *ckt;
int *states;
/* /*
* load the structure with those pointers needed later for fast matrix * load the structure with those pointers needed later for fast matrix
* loading * loading

View File

@ -18,9 +18,7 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group
#define NIL(type) ((type *)0) #define NIL(type) ((type *)0)
int int
NBJT2temp(inModel, ckt) NBJT2temp(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
register CKTcircuit *ckt;
/* /*
* perform the temperature update * perform the temperature update
*/ */

View File

@ -19,11 +19,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
int int
NBJT2trunc(inModel, ckt, timeStep) NBJT2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
GENmodel *inModel;
register CKTcircuit *ckt;
double *timeStep;
{ {
register NBJT2model *model = (NBJT2model *) inModel; register NBJT2model *model = (NBJT2model *) inModel;
register NBJT2instance *inst; register NBJT2instance *inst;

View File

@ -22,9 +22,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
extern int ONEacDebug; extern int ONEacDebug;
int int
NUMDacLoad(inModel, ckt) NUMDacLoad(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NUMDmodel *model = (NUMDmodel *) inModel; register NUMDmodel *model = (NUMDmodel *) inModel;
register NUMDinstance *inst; register NUMDinstance *inst;

View File

@ -20,12 +20,7 @@ extern int NUMDinitSmSig(NUMDinstance *);
/* ARGSUSED */ /* ARGSUSED */
int int
NUMDask(ckt, inInst, which, value, select) NUMDask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue *select)
CKTcircuit *ckt;
GENinstance *inInst;
int which;
IFvalue *value;
IFvalue *select;
{ {
NUMDinstance *inst = (NUMDinstance *) inInst; NUMDinstance *inst = (NUMDinstance *) inInst;

View File

@ -9,11 +9,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMDdelete(inModel, name, kill) NUMDdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
GENmodel *inModel;
IFuid name;
GENinstance **kill;
{ {
NUMDmodel *model = (NUMDmodel *) inModel; NUMDmodel *model = (NUMDmodel *) inModel;

View File

@ -15,8 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
void void
NUMDdestroy(inModel) NUMDdestroy(GENmodel **inModel)
GENmodel **inModel;
{ {
NUMDmodel **model = (NUMDmodel **) inModel; NUMDmodel **model = (NUMDmodel **) inModel;

View File

@ -26,9 +26,7 @@ static int state_numDC = 0;
static int state_numTR = 0; static int state_numTR = 0;
void void
NUMDdump(inModel, ckt) NUMDdump(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NUMDmodel *model = (NUMDmodel *) inModel; register NUMDmodel *model = (NUMDmodel *) inModel;
register NUMDinstance *inst; register NUMDinstance *inst;
@ -92,10 +90,7 @@ NUMDdump(inModel, ckt)
static static
void void
NUMDputHeader(file, ckt, inst) NUMDputHeader(FILE *file, CKTcircuit *ckt, NUMDinstance *inst)
FILE *file;
CKTcircuit *ckt;
NUMDinstance *inst;
{ {
char *reference; char *reference;
double refVal = 0.0; double refVal = 0.0;
@ -140,10 +135,7 @@ NUMDputHeader(file, ckt, inst)
} }
void void
NUMDacct(inModel, ckt, file) NUMDacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
GENmodel *inModel;
CKTcircuit *ckt;
FILE *file;
{ {
register NUMDmodel *model = (NUMDmodel *) inModel; register NUMDmodel *model = (NUMDmodel *) inModel;
register NUMDinstance *inst; register NUMDinstance *inst;

View File

@ -27,9 +27,7 @@ extern int ONEacDebug;
int int
NUMDload(inModel, ckt) NUMDload(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NUMDmodel *model = (NUMDmodel *) inModel; register NUMDmodel *model = (NUMDmodel *) inModel;
register NUMDinstance *inst; register NUMDinstance *inst;
@ -377,8 +375,7 @@ NUMDload(inModel, ckt)
} }
int int
NUMDinitSmSig(inst) NUMDinitSmSig(NUMDinstance *inst)
NUMDinstance *inst;
{ {
SPcomplex yd; SPcomplex yd;
double omega = inst->NUMDmodPtr->NUMDmethods->METHomega; double omega = inst->NUMDmodPtr->NUMDmethods->METHomega;

View File

@ -9,10 +9,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMDmDelete(inModel, modname, kill) NUMDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
GENmodel **inModel;
IFuid modname;
GENmodel *kill;
{ {
NUMDmodel **model = (NUMDmodel **) inModel; NUMDmodel **model = (NUMDmodel **) inModel;

View File

@ -15,10 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMDmParam(param, value, inModel) NUMDmParam(int param, IFvalue *value, GENmodel *inModel)
int param;
IFvalue *value;
GENmodel *inModel;
{ {
switch (param) { switch (param) {
case NUMD_MOD_NUMD: case NUMD_MOD_NUMD:

View File

@ -11,11 +11,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMDparam(param, value, inInst, select) NUMDparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
int param;
IFvalue *value;
GENinstance *inInst;
IFvalue *select;
{ {
NUMDinstance *inst = (NUMDinstance *) inInst; NUMDinstance *inst = (NUMDinstance *) inInst;
switch (param) { switch (param) {

View File

@ -16,10 +16,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
extern int ONEacDebug; extern int ONEacDebug;
int int
NUMDpzLoad(inModel, ckt, s) NUMDpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
GENmodel *inModel;
register CKTcircuit *ckt;
SPcomplex *s;
{ {
register NUMDmodel *model = (NUMDmodel *) inModel; register NUMDmodel *model = (NUMDmodel *) inModel;
register NUMDinstance *inst; register NUMDinstance *inst;

View File

@ -17,9 +17,7 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group
#define NIL(type) ((type *)0) #define NIL(type) ((type *)0)
int int
NUMDtemp(inModel, ckt) NUMDtemp(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
register CKTcircuit *ckt;
/* /*
* perform the temperature update to the diode * perform the temperature update to the diode
*/ */

View File

@ -14,11 +14,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
int int
NUMDtrunc(inModel, ckt, timeStep) NUMDtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
GENmodel *inModel;
register CKTcircuit *ckt;
double *timeStep;
{ {
register NUMDmodel *model = (NUMDmodel *) inModel; register NUMDmodel *model = (NUMDmodel *) inModel;
register NUMDinstance *inst; register NUMDinstance *inst;

View File

@ -23,9 +23,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
extern int TWOacDebug; extern int TWOacDebug;
int int
NUMD2acLoad(inModel, ckt) NUMD2acLoad(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NUMD2model *model = (NUMD2model *) inModel; register NUMD2model *model = (NUMD2model *) inModel;
register NUMD2instance *inst; register NUMD2instance *inst;

View File

@ -19,12 +19,7 @@ extern int NUMD2initSmSig(NUMD2instance *);
/* ARGSUSED */ /* ARGSUSED */
int int
NUMD2ask(ckt, inInst, which, value, select) NUMD2ask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue *select)
CKTcircuit *ckt;
GENinstance *inInst;
int which;
IFvalue *value;
IFvalue *select;
{ {
NUMD2instance *inst = (NUMD2instance *) inInst; NUMD2instance *inst = (NUMD2instance *) inInst;
switch (which) { switch (which) {

View File

@ -9,10 +9,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMD2delete(inModel, name, kill) NUMD2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
GENmodel *inModel;
IFuid name;
GENinstance **kill;
{ {
NUMD2model *model = (NUMD2model *) inModel; NUMD2model *model = (NUMD2model *) inModel;
NUMD2instance **fast = (NUMD2instance **) kill; NUMD2instance **fast = (NUMD2instance **) kill;

View File

@ -16,8 +16,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
void void
NUMD2destroy(inModel) NUMD2destroy(GENmodel **inModel)
GENmodel **inModel;
{ {
NUMD2model **model = (NUMD2model **) inModel; NUMD2model **model = (NUMD2model **) inModel;

View File

@ -27,9 +27,7 @@ static int state_numDC = 0;
static int state_numTR = 0; static int state_numTR = 0;
void void
NUMD2dump(inModel, ckt) NUMD2dump(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NUMD2model *model = (NUMD2model *) inModel; register NUMD2model *model = (NUMD2model *) inModel;
register NUMD2instance *inst; register NUMD2instance *inst;
@ -93,10 +91,7 @@ NUMD2dump(inModel, ckt)
static static
void void
NUMD2putHeader(file, ckt, inst) NUMD2putHeader(FILE *file, CKTcircuit *ckt, NUMD2instance *inst)
FILE *file;
CKTcircuit *ckt;
NUMD2instance *inst;
{ {
char *reference; char *reference;
double refVal = 0.0; double refVal = 0.0;
@ -141,10 +136,7 @@ NUMD2putHeader(file, ckt, inst)
} }
void void
NUMD2acct(inModel, ckt, file) NUMD2acct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
GENmodel *inModel;
CKTcircuit *ckt;
FILE *file;
{ {
register NUMD2model *model = (NUMD2model *) inModel; register NUMD2model *model = (NUMD2model *) inModel;
register NUMD2instance *inst; register NUMD2instance *inst;

View File

@ -30,10 +30,7 @@ extern int TWOtranDebug;
extern int TWOacDebug; extern int TWOacDebug;
int int
NUMD2load(inModel, ckt) NUMD2load(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NUMD2model *model = (NUMD2model *) inModel; register NUMD2model *model = (NUMD2model *) inModel;
register NUMD2instance *inst; register NUMD2instance *inst;
@ -392,8 +389,7 @@ NUMD2load(inModel, ckt)
} }
int int
NUMD2initSmSig(inst) NUMD2initSmSig(NUMD2instance *inst)
NUMD2instance *inst;
{ {
SPcomplex yd; SPcomplex yd;
double omega = inst->NUMD2modPtr->NUMD2methods->METHomega; double omega = inst->NUMD2modPtr->NUMD2methods->METHomega;

View File

@ -9,11 +9,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMD2mDelete(inModel, modname, kill) NUMD2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
GENmodel **inModel;
IFuid modname;
GENmodel *kill;
{ {
NUMD2model **model = (NUMD2model **) inModel; NUMD2model **model = (NUMD2model **) inModel;
NUMD2model *modfast = (NUMD2model *) kill; NUMD2model *modfast = (NUMD2model *) kill;

View File

@ -15,10 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMD2mParam(param, value, inModel) NUMD2mParam(int param, IFvalue *value, GENmodel *inModel)
int param;
IFvalue *value;
GENmodel *inModel;
{ {
switch (param) { switch (param) {
case NUMD2_MOD_NUMD: case NUMD2_MOD_NUMD:

View File

@ -11,11 +11,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMD2param(param, value, inInst, select) NUMD2param(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
int param;
IFvalue *value;
GENinstance *inInst;
IFvalue *select;
{ {
NUMD2instance *inst = (NUMD2instance *) inInst; NUMD2instance *inst = (NUMD2instance *) inInst;
switch (param) { switch (param) {

View File

@ -17,10 +17,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
extern int TWOacDebug; extern int TWOacDebug;
int int
NUMD2pzLoad(inModel, ckt, s) NUMD2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
GENmodel *inModel;
register CKTcircuit *ckt;
SPcomplex *s;
{ {
register NUMD2model *model = (NUMD2model *) inModel; register NUMD2model *model = (NUMD2model *) inModel;
register NUMD2instance *inst; register NUMD2instance *inst;

View File

@ -25,11 +25,7 @@ if (size && (!(var =(type *)calloc(1, (unsigned)(size)*sizeof(type))))) {\
} }
int int
NUMD2setup(matrix, inModel, ckt, states) NUMD2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
register SMPmatrix *matrix;
GENmodel *inModel;
CKTcircuit *ckt;
int *states;
/* /*
* load the structure with those pointers needed later for fast matrix * load the structure with those pointers needed later for fast matrix
* loading * loading

View File

@ -18,9 +18,7 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group
#define NIL(type) ((type *)0) #define NIL(type) ((type *)0)
int int
NUMD2temp(inModel, ckt) NUMD2temp(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
register CKTcircuit *ckt;
/* /*
* perform the temperature update * perform the temperature update
*/ */

View File

@ -13,10 +13,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "cidersupt.h" #include "cidersupt.h"
int int
NUMD2trunc(inModel, ckt, timeStep) NUMD2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
GENmodel *inModel;
register CKTcircuit *ckt;
double *timeStep;
{ {
register NUMD2model *model = (NUMD2model *) inModel; register NUMD2model *model = (NUMD2model *) inModel;
register NUMD2instance *inst; register NUMD2instance *inst;

View File

@ -22,9 +22,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
extern int TWOacDebug; extern int TWOacDebug;
int int
NUMOSacLoad(inModel, ckt) NUMOSacLoad(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NUMOSmodel *model = (NUMOSmodel *) inModel; register NUMOSmodel *model = (NUMOSmodel *) inModel;
register NUMOSinstance *inst; register NUMOSinstance *inst;

View File

@ -17,12 +17,7 @@ extern int NUMOSinitSmSig(NUMOSinstance *);
/* ARGSUSED */ /* ARGSUSED */
int int
NUMOSask(ckt, inInst, which, value, select) NUMOSask(CKTcircuit *ckt, GENinstance *inInst, int which, IFvalue *value, IFvalue *select)
CKTcircuit *ckt;
GENinstance *inInst;
int which;
IFvalue *value;
IFvalue *select;
{ {
NUMOSinstance *inst = (NUMOSinstance *) inInst; NUMOSinstance *inst = (NUMOSinstance *) inInst;
switch (which) { switch (which) {

View File

@ -14,11 +14,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMOSdelete(inModel, name, kill) NUMOSdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
GENmodel *inModel;
IFuid name;
GENinstance **kill;
{ {
NUMOSmodel *model = (NUMOSmodel *) inModel; NUMOSmodel *model = (NUMOSmodel *) inModel;

View File

@ -15,9 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
void void
NUMOSdestroy(inModel) NUMOSdestroy(GENmodel **inModel)
GENmodel **inModel;
{ {
NUMOSmodel **model = (NUMOSmodel **) inModel; NUMOSmodel **model = (NUMOSmodel **) inModel;

View File

@ -27,9 +27,7 @@ static int state_numDC = 0;
static int state_numTR = 0; static int state_numTR = 0;
void void
NUMOSdump(inModel, ckt) NUMOSdump(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NUMOSmodel *model = (NUMOSmodel *) inModel; register NUMOSmodel *model = (NUMOSmodel *) inModel;
register NUMOSinstance *inst; register NUMOSinstance *inst;
@ -93,10 +91,7 @@ NUMOSdump(inModel, ckt)
static static
void void
NUMOSputHeader(file, ckt, inst) NUMOSputHeader(FILE *file, CKTcircuit *ckt, NUMOSinstance *inst)
FILE *file;
CKTcircuit *ckt;
NUMOSinstance *inst;
{ {
char *reference; char *reference;
double refVal = 0.0; double refVal = 0.0;
@ -155,10 +150,7 @@ NUMOSputHeader(file, ckt, inst)
} }
void void
NUMOSacct(inModel, ckt, file) NUMOSacct(GENmodel *inModel, CKTcircuit *ckt, FILE *file)
GENmodel *inModel;
CKTcircuit *ckt;
FILE *file;
{ {
register NUMOSmodel *model = (NUMOSmodel *) inModel; register NUMOSmodel *model = (NUMOSmodel *) inModel;
register NUMOSinstance *inst; register NUMOSinstance *inst;

View File

@ -31,9 +31,7 @@ extern int TWOacDebug;
int NUMOSinitSmSig(NUMOSinstance *inst); int NUMOSinitSmSig(NUMOSinstance *inst);
int int
NUMOSload(inModel, ckt) NUMOSload(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
CKTcircuit *ckt;
{ {
register NUMOSmodel *model = (NUMOSmodel *) inModel; register NUMOSmodel *model = (NUMOSmodel *) inModel;
register NUMOSinstance *inst; register NUMOSinstance *inst;
@ -599,8 +597,7 @@ NUMOSload(inModel, ckt)
} }
int int
NUMOSinitSmSig(inst) NUMOSinitSmSig(NUMOSinstance *inst)
NUMOSinstance *inst;
{ {
struct mosAdmittances yAc; struct mosAdmittances yAc;
double omega = inst->NUMOSmodPtr->NUMOSmethods->METHomega; double omega = inst->NUMOSmodPtr->NUMOSmethods->METHomega;

View File

@ -14,11 +14,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMOSmDelete(inModel, modname, kill) NUMOSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
GENmodel **inModel;
IFuid modname;
GENmodel *kill;
{ {
NUMOSmodel **model = (NUMOSmodel **) inModel; NUMOSmodel **model = (NUMOSmodel **) inModel;

View File

@ -15,10 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMOSmParam(param, value, inModel) NUMOSmParam(int param, IFvalue *value, GENmodel *inModel)
int param;
IFvalue *value;
GENmodel *inModel;
{ {
switch (param) { switch (param) {
case NUMOS_MOD_NUMOS: case NUMOS_MOD_NUMOS:

View File

@ -15,11 +15,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
#include "suffix.h" #include "suffix.h"
int int
NUMOSparam(param, value, inInst, select) NUMOSparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select)
int param;
IFvalue *value;
GENinstance *inInst;
IFvalue *select;
{ {
register NUMOSinstance *inst = (NUMOSinstance *) inInst; register NUMOSinstance *inst = (NUMOSinstance *) inInst;
switch (param) { switch (param) {

View File

@ -18,11 +18,7 @@ extern int TWOacDebug;
int int
NUMOSpzLoad(inModel, ckt, s) NUMOSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
GENmodel *inModel;
CKTcircuit *ckt;
SPcomplex *s;
{ {
register NUMOSmodel *model = (NUMOSmodel *) inModel; register NUMOSmodel *model = (NUMOSmodel *) inModel;
register NUMOSinstance *inst; register NUMOSinstance *inst;

View File

@ -25,11 +25,7 @@ if (size && (!(var =(type *)calloc(1, (unsigned)(size)*sizeof(type))))) {\
} }
int int
NUMOSsetup(matrix, inModel, ckt, states) NUMOSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
register SMPmatrix *matrix;
GENmodel *inModel;
CKTcircuit *ckt;
int *states;
/* /*
* load the structure with those pointers needed later for fast matrix * load the structure with those pointers needed later for fast matrix
* loading * loading

View File

@ -18,9 +18,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group
#define NIL(type) ((type *)0) #define NIL(type) ((type *)0)
int int
NUMOStemp(inModel, ckt) NUMOStemp(GENmodel *inModel, CKTcircuit *ckt)
GENmodel *inModel;
register CKTcircuit *ckt;
/* /*
* perform the temperature update * perform the temperature update
*/ */

View File

@ -19,10 +19,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
int int
NUMOStrunc(inModel, ckt, timeStep) NUMOStrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
GENmodel *inModel;
register CKTcircuit *ckt;
double *timeStep;
{ {
register NUMOSmodel *model = (NUMOSmodel *) inModel; register NUMOSmodel *model = (NUMOSmodel *) inModel;
register NUMOSinstance *inst; register NUMOSinstance *inst;