luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

whitespace change, cleanup, untabify

This commit is contained in:
rlar 2010-07-03 15:36:05 +00:00
parent a321d7f419
commit 68c0ee9cd3
7 changed files with 416 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2010-07-03 Robert Larice
* src/include/cktdefs.h ,
* src/include/gendefs.h ,
* src/include/graph.h ,
* src/include/ifsim.h ,
* src/include/inpdefs.h ,
* src/include/tfdefs.h :
whitespace change, cleanup, untabify
2010-07-03 Robert Larice 2010-07-03 Robert Larice
* src/include/cktdefs.h , * src/include/cktdefs.h ,
* src/include/gendefs.h , * src/include/gendefs.h ,

5
src/include/cktdefs.h
View File

@ -33,6 +33,7 @@ extern int DEVmaxnum; /* Not sure if still used */
typedef struct CKTnode CKTnode; typedef struct CKTnode CKTnode;
typedef struct CKTcircuit CKTcircuit; typedef struct CKTcircuit CKTcircuit;
struct CKTnode { struct CKTnode {
IFuid name; IFuid name;
int type; int type;
@ -57,7 +58,6 @@ struct CKTnode {
#define PARM_NODETYPE 3 #define PARM_NODETYPE 3
struct CKTcircuit { struct CKTcircuit {
/* gtri - begin - wbk - change declaration to allow dynamic sizing */ /* gtri - begin - wbk - change declaration to allow dynamic sizing */
@ -265,6 +265,7 @@ struct CKTcircuit {
}; };
/* Now function prottypes */ /* Now function prottypes */
extern int ACan(CKTcircuit *, int); extern int ACan(CKTcircuit *, int);
@ -391,6 +392,8 @@ extern int NIreinit( CKTcircuit *);
extern int NIsenReinit(CKTcircuit *); extern int NIsenReinit(CKTcircuit *);
extern int NIdIter (CKTcircuit *); extern int NIdIter (CKTcircuit *);
extern void NInzIter(CKTcircuit *, int, int); extern void NInzIter(CKTcircuit *, int, int);
extern IFfrontEnd *SPfrontEnd; extern IFfrontEnd *SPfrontEnd;
#endif /*CKT*/ #endif /*CKT*/

1
src/include/gendefs.h
View File

@ -37,6 +37,7 @@ struct GENinstance {
typedef void GENcircuit; typedef void GENcircuit;
/* per model data */ /* per model data */
struct GENmodel { /* model structure for a resistor */ struct GENmodel { /* model structure for a resistor */

111
src/include/ifsim.h
View File

@ -55,8 +55,8 @@ struct IFparm {
char *description; char *description;
}; };
/* /*
*
* datatype: IFuid * datatype: IFuid
* *
* unique identifier for all name-type data in the simulator. * unique identifier for all name-type data in the simulator.
@ -68,6 +68,7 @@ struct IFparm {
typedef char *IFuid; typedef char *IFuid;
/* /*
* *
* types for IFnewUid * types for IFnewUid
@ -152,6 +153,7 @@ typedef char *IFuid;
/* For "show" command: do not print value in a table by default */ /* For "show" command: do not print value in a table by default */
#define IF_UNINTERESTING 0x2000000 #define IF_UNINTERESTING 0x2000000
/* Structure: IFparseTree /* Structure: IFparseTree
* *
* This structure is returned by the parser for a IF_PARSETREE valued * This structure is returned by the parser for a IF_PARSETREE valued
@ -171,9 +173,9 @@ struct IFparseTree {
int *varTypes; /* array of types of variables */ int *varTypes; /* array of types of variables */
IFvalue *vars; /* array of structures describing values */ IFvalue *vars; /* array of structures describing values */
#ifdef __STDC__ #ifdef __STDC__
int ((*IFeval)(IFparseTree*,double,double*,double*,double*)); int (*IFeval) (IFparseTree *, double, double *, double *, double *);
#else #else
int ((*IFeval)()); /* function to call to get evaluated */ int (*IFeval) (); /* function to call to get evaluated */
#endif /* STDC */ #endif /* STDC */
}; };
@ -221,12 +223,13 @@ struct IFparseTree {
* *
*/ */
typedef void *IFnode; typedef void *IFnode;
/* /*
* and of course, the standard complex data type * and of course, the standard complex data type
*/ */
struct IFcomplex { struct IFcomplex {
double real; double real;
double imag; double imag;
@ -289,7 +292,7 @@ struct IFdevice {
/* gtri - modify - wbk - 10/11/90 - add entries to hold data required */ /* gtri - modify - wbk - 10/11/90 - add entries to hold data required */
/* by new parser */ /* by new parser */
#ifdef XSPICE #ifdef XSPICE
void ((*cm_func)(Mif_Private_t *)); /* pointer to code model function */ void (*cm_func) (Mif_Private_t *); /* pointer to code model function */
int num_conn; /* number of code model connections */ int num_conn; /* number of code model connections */
Mif_Conn_Info_t *conn; /* array of connection info for mif parser */ Mif_Conn_Info_t *conn; /* array of connection info for mif parser */
@ -301,8 +304,8 @@ struct IFdevice {
Mif_Inst_Var_Info_t *inst_var; /* array of instance var info for mif parser */ Mif_Inst_Var_Info_t *inst_var; /* array of instance var info for mif parser */
/* gtri - end - wbk - 10/11/90 */ /* gtri - end - wbk - 10/11/90 */
#endif #endif
int flags; /* DEV_ */
int flags; /* DEV_ */
}; };
@ -326,7 +329,6 @@ struct IFanalysis {
int numParms; /* number of analysis parameter descriptors */ int numParms; /* number of analysis parameter descriptors */
IFparm *analysisParms; /* array of analysis parameter descriptors */ IFparm *analysisParms; /* array of analysis parameter descriptors */
}; };
@ -346,67 +348,67 @@ struct IFsimulator {
char *description; /* description of this simulator */ char *description; /* description of this simulator */
char *version; /* version or revision level of simulator*/ char *version; /* version or revision level of simulator*/
int ((*newCircuit)(void **)); int (*newCircuit) (void **);
/* create new circuit */ /* create new circuit */
int ((*deleteCircuit)(void *)); int (*deleteCircuit) (void *);
/* destroy old circuit's data structures*/ /* destroy old circuit's data structures*/
int ((*newNode)(void *,void**,IFuid)); int (*newNode) (void *, void **, IFuid);
/* create new node */ /* create new node */
int ((*groundNode)(void*,void**,IFuid)); int (*groundNode) (void *, void **, IFuid);
/* create ground node */ /* create ground node */
int ((*bindNode)(void *,void*,int,void*)); int (*bindNode) (void *, void *, int, void *);
/* bind a node to a terminal */ /* bind a node to a terminal */
int ((*findNode)(void *,void**,IFuid)); int (*findNode) (void *, void **, IFuid);
/* find a node by name */ /* find a node by name */
int ((*instToNode)(void *,void *,int,void **,IFuid *)); int (*instToNode) (void *, void *, int, void **, IFuid *);
/* find the node attached to a terminal */ /* find the node attached to a terminal */
int ((*setNodeParm)(void*,void*,int,IFvalue*,IFvalue*)); int (*setNodeParm) (void *, void *, int, IFvalue *, IFvalue *);
/* set a parameter on a node */ /* set a parameter on a node */
int ((*askNodeQuest)(void*,void*,int,IFvalue*,IFvalue*)); int (*askNodeQuest) (void *, void *, int, IFvalue *, IFvalue *);
/* ask a question about a node */ /* ask a question about a node */
int ((*deleteNode)(void*,void*)); int (*deleteNode) (void *, void *);
/* delete a node from the circuit */ /* delete a node from the circuit */
int ((*newInstance)(void*,void*,void**,IFuid)); int (*newInstance) (void *, void *, void **, IFuid);
/* create new instance */ /* create new instance */
int ((*setInstanceParm)(void*,void*,int,IFvalue*,IFvalue*)); int (*setInstanceParm) (void *, void *, int, IFvalue *, IFvalue *);
/* set a parameter on an instance */ /* set a parameter on an instance */
int ((*askInstanceQuest)(void*,void*,int,IFvalue*,IFvalue*)); int (*askInstanceQuest) (void *, void *, int, IFvalue *, IFvalue *);
/* ask a question about an instance */ /* ask a question about an instance */
int ((*findInstance)(void*,int*,void**,IFuid,void*,IFuid)); int (*findInstance) (void *, int *, void **, IFuid, void *, IFuid);
/* find a specific instance */ /* find a specific instance */
int ((*deleteInstance)(void*,void*)); int (*deleteInstance) (void *, void *);
/* delete an instance from the circuit */ /* delete an instance from the circuit */
int ((*newModel)(void*,int,void**,IFuid)); int (*newModel) (void *, int, void **, IFuid);
/* create new model */ /* create new model */
int ((*setModelParm)(void*,void*,int,IFvalue*,IFvalue*)); int (*setModelParm) (void *, void *, int, IFvalue *, IFvalue *);
/* set a parameter on a model */ /* set a parameter on a model */
int ((*askModelQuest)(void*,void*,int,IFvalue*,IFvalue*)); int (*askModelQuest) (void *, void *, int, IFvalue *, IFvalue *);
/* ask a questions about a model */ /* ask a questions about a model */
int ((*findModel)(void*,int*,void**,IFuid)); int (*findModel) (void *, int *, void **, IFuid);
/* find a specific model */ /* find a specific model */
int ((*deleteModel)(void*,void*)); int (*deleteModel) (void *, void *);
/* delete a model from the circuit*/ /* delete a model from the circuit*/
int ((*newTask)(void*,void**,IFuid, void**)); /*CDHW*/ int (*newTask) (void *, void **, IFuid, void **); /*CDHW*/
/* create a new task */ /* create a new task */
int ((*newAnalysis)(void*,int,IFuid,void**,void*)); int (*newAnalysis) (void *, int, IFuid, void **, void *);
/* create new analysis within a task */ /* create new analysis within a task */
int ((*setAnalysisParm)(void*,void*,int,IFvalue*,IFvalue*)); int (*setAnalysisParm) (void *, void *, int, IFvalue *, IFvalue *);
/* set a parameter on an analysis */ /* set a parameter on an analysis */
int ((*askAnalysisQuest)(void*,void*,int,IFvalue*,IFvalue*)); int (*askAnalysisQuest) (void *, void *, int, IFvalue *, IFvalue *);
/* ask a question about an analysis */ /* ask a question about an analysis */
int ((*findAnalysis)(void*,int*,void**,IFuid,void*,IFuid)); int (*findAnalysis) (void *, int *, void **, IFuid, void *, IFuid);
/* find a specific analysis */ /* find a specific analysis */
int ((*findTask)(void*,void**,IFuid)); int (*findTask) (void *, void **, IFuid);
/* find a specific task */ /* find a specific task */
int ((*deleteTask)(void*,void*)); int (*deleteTask) (void *, void *);
/* delete a task */ /* delete a task */
int ((*doAnalyses)(void*,int,void*)); int (*doAnalyses) (void *, int, void *);
char *((*nonconvErr)(void*,char *)); /* return nonconvergence error */ char *(*nonconvErr) (void *, char *); /* return nonconvergence error */
int numDevices; /* number of device types supported */ int numDevices; /* number of device types supported */
IFdevice **devices; /* array of device type descriptors */ IFdevice **devices; /* array of device type descriptors */
@ -419,9 +421,9 @@ struct IFsimulator {
int numSpecSigs; /* number of special signals legal in parse trees */ int numSpecSigs; /* number of special signals legal in parse trees */
char **specSigs; /* names of special signals legal in parse trees */ char **specSigs; /* names of special signals legal in parse trees */
}; };
/* /*
* Structure: IFfrontEnd * Structure: IFfrontEnd
* *
@ -433,40 +435,41 @@ struct IFsimulator {
*/ */
struct IFfrontEnd { struct IFfrontEnd {
int ((*IFnewUid)(void*,IFuid*,IFuid,char*,int,void**)); int (*IFnewUid) (void *, IFuid *, IFuid, char *, int, void **);
/* create a new UID in the circuit */ /* create a new UID in the circuit */
int ((*IFdelUid)(void*,IFuid,int)); int (*IFdelUid) (void *, IFuid, int);
/* create a new UID in the circuit */ /* create a new UID in the circuit */
int ((*IFpauseTest)(void)); int (*IFpauseTest) (void);
/* should we stop now? */ /* should we stop now? */
double ((*IFseconds)(void)); double (*IFseconds) (void);
/* what time is it? */ /* what time is it? */
int ((*IFerror)(int,char*,IFuid*)); int (*IFerror) (int, char *, IFuid *);
/* output an error or warning message */ /* output an error or warning message */
int ((*OUTpBeginPlot)(void*,void*,IFuid,IFuid,int, int (*OUTpBeginPlot) (void *, void *, IFuid, IFuid, int,
int,IFuid*,int,void**)); int, IFuid *, int, void **);
/* start pointwise output plot */ /* start pointwise output plot */
int ((*OUTpData)(void*,IFvalue*,IFvalue*)); int (*OUTpData) (void *, IFvalue *, IFvalue *);
/* data for pointwise plot */ /* data for pointwise plot */
int ((*OUTwBeginPlot)(void*,void*,IFuid,IFuid,int, int (*OUTwBeginPlot) (void *, void *, IFuid, IFuid, int,
int,IFuid*,int,void**)); int, IFuid *, int, void **);
/* start windowed output plot */ /* start windowed output plot */
int ((*OUTwReference)(void*,IFvalue*,void**)); int (*OUTwReference) (void *, IFvalue *, void **);
/* independent vector for windowed plot */ /* independent vector for windowed plot */
int ((*OUTwData)(void*,int,IFvalue*,void*)); int (*OUTwData) (void *, int, IFvalue *, void *);
/* data for windowed plot */ /* data for windowed plot */
int ((*OUTwEnd)(void*)); int (*OUTwEnd) (void *);
/* signal end of windows */ /* signal end of windows */
int ((*OUTendPlot)(void*)); int (*OUTendPlot) (void *);
/* end of plot */ /* end of plot */
int ((*OUTbeginDomain)(void*,IFuid,int,IFvalue*)); int (*OUTbeginDomain) (void *, IFuid, int, IFvalue *);
/* start nested domain */ /* start nested domain */
int ((*OUTendDomain)(void*)); int (*OUTendDomain) (void *);
/* end nested domain */ /* end nested domain */
int ((*OUTattributes)(void *,IFuid,int,IFvalue*)); int (*OUTattributes) (void *, IFuid, int, IFvalue *);
/* specify output attributes of node */ /* specify output attributes of node */
}; };
/* flags for the first argument to IFerror */ /* flags for the first argument to IFerror */
#define ERR_WARNING 0x1 #define ERR_WARNING 0x1
#define ERR_FATAL 0x2 #define ERR_FATAL 0x2

1
src/include/inpdefs.h
View File

@ -147,4 +147,5 @@ int INP2dot(void*,INPtables*,card*,void*,void*);
INPtables *INPtabInit(int); INPtables *INPtabInit(int);
void INPkillMods(void); void INPkillMods(void);
void INPtabEnd(INPtables *); void INPtabEnd(INPtables *);
#endif /*INP*/ #endif /*INP*/

3
src/include/tfdefs.h
View File

@ -30,11 +30,14 @@ struct TFan {
unsigned int TFinIsI :1; unsigned int TFinIsI :1;
}; };
#define TF_OUTPOS 1 #define TF_OUTPOS 1
#define TF_OUTNEG 2 #define TF_OUTNEG 2
#define TF_OUTSRC 3 #define TF_OUTSRC 3
#define TF_INSRC 4 #define TF_INSRC 4
#define TF_OUTNAME 5 #define TF_OUTNAME 5
extern int TFsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value); extern int TFsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value);
extern int TFaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value); extern int TFaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value);
#endif /*TF*/ #endif /*TF*/