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

struct card, #5/6, rewrite from type "card" to "struct card"

This commit is contained in:
rlar 2017-10-30 17:37:41 +01:00
parent 10a353ebf4
commit 4ec2717079
45 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/shyu.c
View File

@ -29,7 +29,7 @@ if_sens_run(CKTcircuit *ckt, wordlist *args, INPtables *tab)
{ {
JOB *senseJob; JOB *senseJob;
JOB *opJob; JOB *opJob;
card *current; struct card *current;
IFvalue ptemp; IFvalue ptemp;
IFvalue *parm; IFvalue *parm;
char buf[BSIZE_SP]; char buf[BSIZE_SP];
@ -38,7 +38,7 @@ if_sens_run(CKTcircuit *ckt, wordlist *args, INPtables *tab)
char *steptype; char *steptype;
char *name; char *name;
char *line; char *line;
card deck; struct card deck;
int error; int error;
int save; int save;
int flag = 0; int flag = 0;
@ -53,7 +53,7 @@ if_sens_run(CKTcircuit *ckt, wordlist *args, INPtables *tab)
deck.linenum_orig = 0; deck.linenum_orig = 0;
deck.line = buf; deck.line = buf;
current = (card *) &deck; current = (struct card *) &deck;
line = current->line; line = current->line;
INPgetTok(&line, &token, 1); INPgetTok(&line, &token, 1);

8
src/frontend/spiceif.c
View File

@ -160,16 +160,16 @@ if_inpdeck(struct card *deck, INPtables **tab)
/* reset the model table, will be filled in anew in INPpas1() */ /* reset the model table, will be filled in anew in INPpas1() */
modtab = NULL; modtab = NULL;
INPpas1(ckt, (card *) deck->nextcard, *tab); INPpas1(ckt, (struct card *) deck->nextcard, *tab);
/* store the new model table in the current circuit */ /* store the new model table in the current circuit */
ft_curckt->ci_modtab = modtab; ft_curckt->ci_modtab = modtab;
INPpas2(ckt, (card *) deck->nextcard, *tab, ft_curckt->ci_defTask); INPpas2(ckt, (struct card *) deck->nextcard, *tab, ft_curckt->ci_defTask);
/* INPpas2 has been modified to ignore .NODESET and .IC /* INPpas2 has been modified to ignore .NODESET and .IC
* cards. These are left till INPpas3 so that we can check for * cards. These are left till INPpas3 so that we can check for
* nodeset/ic of non-existant nodes. */ * nodeset/ic of non-existant nodes. */
INPpas3(ckt, (card *) deck->nextcard, INPpas3(ckt, (struct card *) deck->nextcard,
*tab, ft_curckt->ci_defTask, ft_sim->nodeParms, *tab, ft_curckt->ci_defTask, ft_sim->nodeParms,
ft_sim->numNodeParms); ft_sim->numNodeParms);
@ -300,7 +300,7 @@ if_run(CKTcircuit *ckt, char *what, wordlist *args, INPtables *tab)
/*CDHW ci_curTask and ci_specTask point to the interactive task AAA CDHW*/ /*CDHW ci_curTask and ci_specTask point to the interactive task AAA CDHW*/
INPpas2(ckt, (card *) &deck, tab, ft_curckt->ci_specTask); INPpas2(ckt, (struct card *) &deck, tab, ft_curckt->ci_specTask);
if (deck.error) { if (deck.error) {
fprintf(cp_err, "Warning: %s\n", deck.error); fprintf(cp_err, "Warning: %s\n", deck.error);

2
src/include/ngspice/dllitf.h
View File

@ -15,7 +15,7 @@
struct coreInfo_t { struct coreInfo_t {
/* MIF stuff */ /* MIF stuff */
void ((*dllitf_MIF_INP2A)(CKTcircuit *, INPtables *, card *)); void ((*dllitf_MIF_INP2A)(CKTcircuit *, INPtables *, struct card *));
char * ((*dllitf_MIFgetMod)(CKTcircuit *, char *, INPmodel **, INPtables *)); char * ((*dllitf_MIFgetMod)(CKTcircuit *, char *, INPmodel **, INPtables *));
IFvalue * ((*dllitf_MIFgetValue)(CKTcircuit *, char **, int, INPtables *, char **)); IFvalue * ((*dllitf_MIFgetValue)(CKTcircuit *, char **, int, INPtables *, char **));
int ((*dllitf_MIFsetup)(SMPmatrix *, GENmodel *, CKTcircuit *, int *)); int ((*dllitf_MIFsetup)(SMPmatrix *, GENmodel *, CKTcircuit *, int *));

22
src/include/ngspice/inpdefs.h
View File

@ -65,8 +65,8 @@ struct card {
int linenum_orig; int linenum_orig;
char *line; char *line;
char *error; char *error;
card *nextcard; struct card *nextcard;
card *actualLine; struct card *actualLine;
}; };
/* structure used to save models in after they are read during pass 1 */ /* structure used to save models in after they are read during pass 1 */
@ -74,7 +74,7 @@ struct INPmodel{
IFuid INPmodName; /* uid of model */ IFuid INPmodName; /* uid of model */
int INPmodType; /* type index of device type */ int INPmodType; /* type index of device type */
INPmodel *INPnextModel; /* link to next model */ INPmodel *INPnextModel; /* link to next model */
card *INPmodLine; /* pointer to line describing model */ struct card *INPmodLine; /* pointer to line describing model */
GENmodel *INPmodfast; /* high speed pointer to model for access */ GENmodel *INPmodfast; /* high speed pointer to model for access */
}; };
@ -91,8 +91,8 @@ int INPaName(char *, IFvalue *, CKTcircuit *, int *, char *, GENinstance **, IFs
int INPapName(CKTcircuit *, int, JOB *, char *, IFvalue *); int INPapName(CKTcircuit *, int, JOB *, char *, IFvalue *);
void INPcaseFix(char *); void INPcaseFix(char *);
char *INPdevParse(char **, CKTcircuit *, int, GENinstance *, double *, int *, INPtables *); char *INPdevParse(char **, CKTcircuit *, int, GENinstance *, double *, int *, INPtables *);
char *INPdomodel(CKTcircuit *, card *, INPtables *); char *INPdomodel(CKTcircuit *, struct card *, INPtables *);
void INPdoOpts(CKTcircuit *, JOB *, card *, INPtables *); void INPdoOpts(CKTcircuit *, JOB *, struct card *, INPtables *);
char *INPerrCat(char *, char *); char *INPerrCat(char *, char *);
char *INPstrCat(char *, char *, char *); char *INPstrCat(char *, char *, char *);
char *INPerror(int); char *INPerror(int);
@ -111,22 +111,22 @@ int INPinsert(char **, INPtables *);
int INPretrieve(char **, INPtables *); int INPretrieve(char **, INPtables *);
int INPremove(char *, INPtables *); int INPremove(char *, INPtables *);
INPmodel *INPlookMod(const char *); INPmodel *INPlookMod(const char *);
int INPmakeMod(char *, int, card *); int INPmakeMod(char *, int, struct card *);
char *INPmkTemp(char *); char *INPmkTemp(char *);
void INPpas1(CKTcircuit *, card *, INPtables *); void INPpas1(CKTcircuit *, struct card *, INPtables *);
void INPpas2(CKTcircuit *, card *, INPtables *, TSKtask *); void INPpas2(CKTcircuit *, struct card *, INPtables *, TSKtask *);
void INPpas3(CKTcircuit *, card *, INPtables *, TSKtask *, IFparm *, int); void INPpas3(CKTcircuit *, struct card *, INPtables *, TSKtask *, IFparm *, int);
int INPpName(char *, IFvalue *, CKTcircuit *, int, GENinstance *); int INPpName(char *, IFvalue *, CKTcircuit *, int, GENinstance *);
int INPtermInsert(CKTcircuit *, char **, INPtables *, CKTnode **); int INPtermInsert(CKTcircuit *, char **, INPtables *, CKTnode **);
int INPmkTerm(CKTcircuit *, char **, INPtables *, CKTnode **); int INPmkTerm(CKTcircuit *, char **, INPtables *, CKTnode **);
int INPtypelook(char *); int INPtypelook(char *);
int INP2dot(CKTcircuit *, INPtables *, card *, TSKtask *, CKTnode *); int INP2dot(CKTcircuit *, INPtables *, struct card *, TSKtask *, CKTnode *);
INPtables *INPtabInit(int); INPtables *INPtabInit(int);
void INPkillMods(void); void INPkillMods(void);
void INPtabEnd(INPtables *); void INPtabEnd(INPtables *);
char * INPfindVer(char *line, char *version); char * INPfindVer(char *line, char *version);
int INPgetStr(char **line, char **token, int gobble); int INPgetStr(char **line, char **token, int gobble);
int INPgetTitle(CKTcircuit **ckt, card **data); int INPgetTitle(CKTcircuit **ckt, struct card **data);
int INPgetUTok(char **line, char **token, int gobble); int INPgetUTok(char **line, char **token, int gobble);
int INPgetU2Tok(char **line, char **token, int gobble); int INPgetU2Tok(char **line, char **token, int gobble);
int INPremTerm(char *token, INPtables *tab); int INPremTerm(char *token, INPtables *tab);

2
src/include/ngspice/mifproto.h
View File

@ -53,7 +53,7 @@ NON-STANDARD FEATURES
extern void MIF_INP2A( extern void MIF_INP2A(
CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */ CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */
INPtables *tab, /* symbol table for node names, etc. */ INPtables *tab, /* symbol table for node names, etc. */
card *current /* the card we are to parse */ struct card *current /* the card we are to parse */
); );

2
src/spicelib/parser/inp2b.c
View File

@ -12,7 +12,7 @@ Author: 1988 Thomas L. Quarles
#include "inpxx.h" #include "inpxx.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
void INP2B(CKTcircuit *ckt, INPtables * tab, card * current) void INP2B(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Bname <node> <node> [V=expr] [I=expr] */ /* Bname <node> <node> [V=expr] [I=expr] */

2
src/spicelib/parser/inp2c.c
View File

@ -10,7 +10,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2C(CKTcircuit *ckt, INPtables * tab, card * current) void INP2C(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* parse a capacitor card */ /* parse a capacitor card */

2
src/spicelib/parser/inp2d.c
View File

@ -12,7 +12,7 @@ Modified: 2001 Paolo Nenzi (Cider Integration)
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2D(CKTcircuit *ckt, INPtables * tab, card * current) void INP2D(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Dname <node> <node> <model> [<val>] [OFF] [IC=<val>] */ /* Dname <node> <node> <model> [<val>] [OFF] [IC=<val>] */

26
src/spicelib/parser/inp2dot.c
View File

@ -15,7 +15,7 @@ Modified: 2000 AlansFixes
#include "ngspice/tskdefs.h" #include "ngspice/tskdefs.h"
static int static int
dot_noise(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_noise(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
int which; /* which analysis we are performing */ int which; /* which analysis we are performing */
@ -114,7 +114,7 @@ dot_noise(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
static int static int
dot_op(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_op(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
int which; /* which analysis we are performing */ int which; /* which analysis we are performing */
@ -136,7 +136,7 @@ dot_op(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
static int static int
dot_disto(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_disto(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
int which; /* which analysis we are performing */ int which; /* which analysis we are performing */
@ -172,7 +172,7 @@ dot_disto(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
static int static int
dot_ac(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_ac(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
int error; /* error code temporary */ int error; /* error code temporary */
@ -204,7 +204,7 @@ dot_ac(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
} }
static int static int
dot_pz(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_pz(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
int error; /* error code temporary */ int error; /* error code temporary */
@ -241,7 +241,7 @@ dot_pz(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
static int static int
dot_dc(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_dc(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
char *name; /* the resistor's name */ char *name; /* the resistor's name */
@ -287,7 +287,7 @@ dot_dc(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
static int static int
dot_tf(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_tf(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
char *name; /* the resistor's name */ char *name; /* the resistor's name */
@ -348,7 +348,7 @@ dot_tf(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
static int static int
dot_tran(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_tran(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
int error; /* error code temporary */ int error; /* error code temporary */
@ -398,7 +398,7 @@ dot_tran(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
static int static int
dot_sens(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_sens(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
char *name; /* the resistor's name */ char *name; /* the resistor's name */
@ -488,7 +488,7 @@ dot_sens(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
#ifdef WANT_SENSE2 #ifdef WANT_SENSE2
static int static int
dot_sens2(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_sens2(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
int error; /* error code temporary */ int error; /* error code temporary */
@ -554,7 +554,7 @@ dot_sens2(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
#ifdef WITH_PSS #ifdef WITH_PSS
/*SP: Steady State Analyis */ /*SP: Steady State Analyis */
static int static int
dot_pss(char *line, void *ckt, INPtables *tab, card *current, dot_pss(char *line, void *ckt, INPtables *tab, struct card *current,
void *task, void *gnode, JOB *foo) void *task, void *gnode, JOB *foo)
{ {
int error; /* error code temporary */ int error; /* error code temporary */
@ -613,7 +613,7 @@ dot_pss(char *line, void *ckt, INPtables *tab, card *current,
#endif #endif
static int static int
dot_options(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_options(char *line, CKTcircuit *ckt, INPtables *tab, struct card *current,
TSKtask *task, CKTnode *gnode, JOB *foo) TSKtask *task, CKTnode *gnode, JOB *foo)
{ {
NG_IGNORE(line); NG_IGNORE(line);
@ -630,7 +630,7 @@ dot_options(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
int int
INP2dot(CKTcircuit *ckt, INPtables *tab, card *current, TSKtask *task, CKTnode *gnode) INP2dot(CKTcircuit *ckt, INPtables *tab, struct card *current, TSKtask *task, CKTnode *gnode)
{ {
/* .<something> Many possibilities */ /* .<something> Many possibilities */

2
src/spicelib/parser/inp2e.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2E(CKTcircuit *ckt, INPtables * tab, card * current) void INP2E(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Ename <node> <node> <node> <node> <val> */ /* Ename <node> <node> <node> <node> <val> */

2
src/spicelib/parser/inp2f.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2F(CKTcircuit *ckt, INPtables * tab, card * current) void INP2F(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Fname <node> <node> <vname> <val> */ /* Fname <node> <node> <vname> <val> */

2
src/spicelib/parser/inp2g.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2G(CKTcircuit *ckt, INPtables * tab, card * current) void INP2G(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Gname <node> <node> <node> <node> <val> */ /* Gname <node> <node> <node> <node> <val> */

2
src/spicelib/parser/inp2h.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2H(CKTcircuit *ckt, INPtables * tab, card * current) void INP2H(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Hname <node> <node> <vname> <val> */ /* Hname <node> <node> <vname> <val> */

2
src/spicelib/parser/inp2i.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2I(CKTcircuit *ckt, INPtables * tab, card * current) void INP2I(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Iname <node> <node> [ [DC] <val>] [AC [<val> [<val> ] ] ] /* Iname <node> <node> [ [DC] <val>] [AC [<val> [<val> ] ] ]

2
src/spicelib/parser/inp2j.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2J(CKTcircuit *ckt, INPtables * tab, card * current) void INP2J(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Jname <node> <node> <node> <model> [<val>] [OFF] [IC=<val>,<val>] */ /* Jname <node> <node> <node> <model> [<val>] [OFF] [IC=<val>,<val>] */

2
src/spicelib/parser/inp2k.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2K(CKTcircuit *ckt, INPtables * tab, card * current) void INP2K(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Kname Lname Lname <val> */ /* Kname Lname Lname <val> */

2
src/spicelib/parser/inp2l.c
View File

@ -10,7 +10,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2L(CKTcircuit *ckt, INPtables * tab, card * current) void INP2L(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* parse an inductor card */ /* parse an inductor card */

2
src/spicelib/parser/inp2m.c
View File

@ -36,7 +36,7 @@ model_numnodes(int type)
void void
INP2M(CKTcircuit *ckt, INPtables *tab, card *current) INP2M(CKTcircuit *ckt, INPtables *tab, struct card *current)
{ {
/* Mname <node> <node> <node> <node> <model> [L=<val>] /* Mname <node> <node> <node> <node> <model> [L=<val>]
* [W=<val>] [AD=<val>] [AS=<val>] [PD=<val>] * [W=<val>] [AD=<val>] [AS=<val>] [PD=<val>]

2
src/spicelib/parser/inp2n.c
View File

@ -16,7 +16,7 @@ University of Science and Technology of China
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2N(CKTcircuit *ckt, INPtables * tab, card * current) void INP2N(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* parse a numerical device card */ /* parse a numerical device card */
/* Nname <node> <node> [<node> ...] [<mname>] */ /* Nname <node> <node> [<node> ...] [<mname>] */

2
src/spicelib/parser/inp2o.c
View File

@ -12,7 +12,7 @@ Author: 1990 Jaijeet S. Roychowdhury
#include "inpxx.h" #include "inpxx.h"
void INP2O(CKTcircuit *ckt, INPtables * tab, card * current) void INP2O(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Oname <node> <node> <node> <node> [IC=<val>,<val>,<val>,<val>] */ /* Oname <node> <node> <node> <node> [IC=<val>,<val>,<val>,<val>] */

2
src/spicelib/parser/inp2p.c
View File

@ -15,7 +15,7 @@ void
INP2P( INP2P(
CKTcircuit *ckt, CKTcircuit *ckt,
INPtables *tab, INPtables *tab,
card *current) struct card *current)
{ {

2
src/spicelib/parser/inp2q.c
View File

@ -28,7 +28,7 @@ model_numnodes(int type)
} }
void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode) void INP2Q(CKTcircuit *ckt, INPtables * tab, struct card *current, CKTnode *gnode)
{ {
/* Qname <node> <node> <node> [<node>] <model> [<val>] [OFF] /* Qname <node> <node> <node> [<node>] <model> [<val>] [OFF]

2
src/spicelib/parser/inp2r.c
View File

@ -18,7 +18,7 @@ Remarks: This code is based on a version written by Serban Popescu which
/* undefine to add tracing to this file */ /* undefine to add tracing to this file */
/* #define TRACE */ /* #define TRACE */
void INP2R(CKTcircuit *ckt, INPtables * tab, card * current) void INP2R(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* parse a resistor card */ /* parse a resistor card */
/* Rname <node> <node> [<val>][<mname>][w=<val>][l=<val>][ac=<val>] */ /* Rname <node> <node> [<val>][<mname>][w=<val>][l=<val>][ac=<val>] */

2
src/spicelib/parser/inp2s.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2S(CKTcircuit *ckt, INPtables * tab, card * current) void INP2S(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Sname <node> <node> <node> <node> [<modname>] [IC] */ /* Sname <node> <node> <node> <node> [<modname>] [IC] */

2
src/spicelib/parser/inp2t.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2T(CKTcircuit *ckt, INPtables * tab, card * current) void INP2T(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Tname <node> <node> <node> <node> [TD=<val>] /* Tname <node> <node> <node> <node> [TD=<val>]

2
src/spicelib/parser/inp2u.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2U(CKTcircuit *ckt, INPtables * tab, card * current) void INP2U(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Uname <node> <node> <model> [l=<val>] [n=<val>] */ /* Uname <node> <node> <model> [l=<val>] [n=<val>] */

2
src/spicelib/parser/inp2v.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2V(CKTcircuit *ckt, INPtables * tab, card * current) void INP2V(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Vname <node> <node> [ [DC] <val>] [AC [<val> [<val> ] ] ] /* Vname <node> <node> [ [DC] <val>] [AC [<val> [<val> ] ] ]

2
src/spicelib/parser/inp2w.c
View File

@ -11,7 +11,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2W(CKTcircuit *ckt, INPtables * tab, card * current) void INP2W(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Wname <node> <node> <vctrl> [<modname>] [IC] */ /* Wname <node> <node> <vctrl> [<modname>] [IC] */

2
src/spicelib/parser/inp2y.c
View File

@ -15,7 +15,7 @@ void
INP2Y( INP2Y(
CKTcircuit *ckt, CKTcircuit *ckt,
INPtables *tab, INPtables *tab,
card *current) struct card *current)
{ {
/* parse a txl card */ /* parse a txl card */

2
src/spicelib/parser/inp2z.c
View File

@ -18,7 +18,7 @@ Author: 1988 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
void INP2Z(CKTcircuit *ckt, INPtables * tab, card * current) void INP2Z(CKTcircuit *ckt, INPtables * tab, struct card *current)
{ {
/* Zname <node> <node> <node> <model> [<val>] [OFF] [IC=<val>,<val>] */ /* Zname <node> <node> <node> <model> [<val>] [OFF] [IC=<val>,<val>] */

2
src/spicelib/parser/inpdomod.c
View File

@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
* Note that multi-line models are handled in the calling fcn * Note that multi-line models are handled in the calling fcn
* (INPpas1). * (INPpas1).
*-------------------------------------------------------------*/ *-------------------------------------------------------------*/
char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab) char *INPdomodel(CKTcircuit *ckt, struct card *image, INPtables * tab)
{ {
char *modname; char *modname;

2
src/spicelib/parser/inpdoopt.c
View File

@ -21,7 +21,7 @@ void
INPdoOpts( INPdoOpts(
CKTcircuit *ckt, CKTcircuit *ckt,
JOB *anal, JOB *anal,
card *optCard, struct card *optCard,
INPtables *tab) INPtables *tab)
{ {
char *line; char *line;

2
src/spicelib/parser/inpgmod.c
View File

@ -326,7 +326,7 @@ INPgetMod(CKTcircuit *ckt, char *name, INPmodel **model, INPtables *tab)
static int static int
INPparseNumMod(CKTcircuit *ckt, INPmodel *model, INPtables *tab, char **errMessage) INPparseNumMod(CKTcircuit *ckt, INPmodel *model, INPtables *tab, char **errMessage)
{ {
card *txtCard; /* Text description of a card */ struct card *txtCard; /* Text description of a card */
GENcard *tmpCard; /* Processed description of a card */ GENcard *tmpCard; /* Processed description of a card */
IFcardInfo *info = NULL; /* Info about the type of card located */ IFcardInfo *info = NULL; /* Info about the type of card located */
char *cardName = NULL; /* name of a card */ char *cardName = NULL; /* name of a card */

2
src/spicelib/parser/inpgtitl.c
View File

@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles
#include "ngspice/fteext.h" #include "ngspice/fteext.h"
#include "inpxx.h" #include "inpxx.h"
int INPgetTitle(CKTcircuit **ckt, card ** data) int INPgetTitle(CKTcircuit **ckt, struct card ** data)
{ {
int error; int error;

8
src/spicelib/parser/inplist.c
View File

@ -16,13 +16,13 @@ Author: 1985 Thomas L. Quarles
#include "ngspice/inpdefs.h" #include "ngspice/inpdefs.h"
#include "inpxx.h" #include "inpxx.h"
extern void INPlist(FILE *file, card *deck, int type); /* nowhere used function */ extern void INPlist(FILE *file, struct card *deck, int type); /* nowhere used function */
void INPlist(FILE * file, card * deck, int type) void INPlist(FILE * file, struct card *deck, int type)
{ {
card *here; struct card *here;
card *there; struct card *there;
if (type == LOGICAL) { if (type == LOGICAL) {
for (here = deck; here != NULL; here = here->nextcard) { for (here = deck; here != NULL; here = here->nextcard) {

2
src/spicelib/parser/inpmkmod.c
View File

@ -19,7 +19,7 @@ INPmodel *modtab = NULL;
* Note that the model table INPmodel * Note that the model table INPmodel
*--------------------------------------------------------------*/ *--------------------------------------------------------------*/
int INPmakeMod(char *token, int type, card * line) int INPmakeMod(char *token, int type, struct card *line)
{ {
register INPmodel **i; register INPmodel **i;

4
src/spicelib/parser/inppas1.c
View File

@ -11,9 +11,9 @@ Author: 1985 Thomas L. Quarles
* The first pass of the circuit parser just looks for '.model' lines * The first pass of the circuit parser just looks for '.model' lines
*/ */
void INPpas1(CKTcircuit *ckt, card * deck, INPtables * tab) void INPpas1(CKTcircuit *ckt, struct card *deck, INPtables * tab)
{ {
card *current; struct card *current;
char *temp, *thisline; char *temp, *thisline;
for (current = deck; current != NULL; current = current->nextcard) { for (current = deck; current != NULL; current = current->nextcard) {

4
src/spicelib/parser/inppas2.c
View File

@ -23,10 +23,10 @@ Author: 1985 Thomas L. Quarles
/* pass 2 - Scan through the lines. ".model" cards have processed in /* pass 2 - Scan through the lines. ".model" cards have processed in
* pass1 and are ignored here. */ * pass1 and are ignored here. */
void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task) void INPpas2(CKTcircuit *ckt, struct card *data, INPtables * tab, TSKtask *task)
{ {
card *current; struct card *current;
char c; char c;
char *groundname = "0"; char *groundname = "0";
char *gname; char *gname;

4
src/spicelib/parser/inppas3.c
View File

@ -21,11 +21,11 @@ extern IFsimulator *ft_sim;
* warning. */ * warning. */
void void
INPpas3(CKTcircuit *ckt, card *data, INPtables *tab, TSKtask *task, INPpas3(CKTcircuit *ckt, struct card *data, INPtables *tab, TSKtask *task,
IFparm *nodeParms, int numNodeParms) IFparm *nodeParms, int numNodeParms)
{ {
card *current; struct card *current;
int error; /* used by the macros defined above */ int error; /* used by the macros defined above */
char *line; /* the part of the current line left char *line; /* the part of the current line left
to parse */ to parse */

48
src/spicelib/parser/inpxx.h
View File

@ -8,30 +8,30 @@
/* inp2xx.c */ /* inp2xx.c */
void INP2B(CKTcircuit *ckt, INPtables *tab, card *current); void INP2B(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2C(CKTcircuit *ckt, INPtables *tab, card *current); void INP2C(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2D(CKTcircuit *ckt, INPtables *tab, card *current); void INP2D(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2E(CKTcircuit *ckt, INPtables *tab, card *current); void INP2E(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2F(CKTcircuit *ckt, INPtables *tab, card *current); void INP2F(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2G(CKTcircuit *ckt, INPtables *tab, card *current); void INP2G(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2H(CKTcircuit *ckt, INPtables *tab, card *current); void INP2H(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2I(CKTcircuit *ckt, INPtables *tab, card *current); void INP2I(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2J(CKTcircuit *ckt, INPtables *tab, card *current); void INP2J(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2K(CKTcircuit *ckt, INPtables *tab, card *current); void INP2K(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2L(CKTcircuit *ckt, INPtables *tab, card *current); void INP2L(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2M(CKTcircuit *ckt, INPtables *tab, card *current); void INP2M(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2N(CKTcircuit *ckt, INPtables *tab, card *current); void INP2N(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2O(CKTcircuit *ckt, INPtables *tab, card *current); void INP2O(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2P(CKTcircuit *ckt, INPtables *tab, card *current); void INP2P(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2Q(CKTcircuit *ckt, INPtables *tab, card *current, CKTnode *gnode); void INP2Q(CKTcircuit *ckt, INPtables *tab, struct card *current, CKTnode *gnode);
void INP2R(CKTcircuit *ckt, INPtables *tab, card *current); void INP2R(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2S(CKTcircuit *ckt, INPtables *tab, card *current); void INP2S(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2T(CKTcircuit *ckt, INPtables *tab, card *current); void INP2T(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2U(CKTcircuit *ckt, INPtables *tab, card *current); void INP2U(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2V(CKTcircuit *ckt, INPtables *tab, card *current); void INP2V(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2W(CKTcircuit *ckt, INPtables *tab, card *current); void INP2W(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2Y(CKTcircuit *ckt, INPtables *tab, card *current); void INP2Y(CKTcircuit *ckt, INPtables *tab, struct card *current);
void INP2Z(CKTcircuit *ckt, INPtables *tab, card *current); void INP2Z(CKTcircuit *ckt, INPtables *tab, struct card *current);
/* ptfuncs.c */ /* ptfuncs.c */

2
src/xspice/icm/dlmain.c
View File

@ -105,7 +105,7 @@ CM_EXPORT void *CMgetCoreItfPtr(void) {
void MIF_INP2A( void MIF_INP2A(
CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */ CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */
INPtables *tab, /* symbol table for node names, etc. */ INPtables *tab, /* symbol table for node names, etc. */
card *current /* the card we are to parse */ struct card *current /* the card we are to parse */
) { ) {
(coreitf->dllitf_MIF_INP2A)(ckt,tab,current); (coreitf->dllitf_MIF_INP2A)(ckt,tab,current);
} }

10
src/xspice/mif/mif_inp2.c
View File

@ -62,7 +62,7 @@ static void MIFinit_inst(MIFmodel *mdfast, MIFinstance *fast);
static void MIFget_port_type( static void MIFget_port_type(
CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */ CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */
INPtables *tab, /* symbol table for node names, etc. */ INPtables *tab, /* symbol table for node names, etc. */
card *current, /* MUST be named 'current' for spice macros */ struct card *current, /* MUST be named 'current' for spice macros */
char **line, char **line,
char **next_token, char **next_token,
Mif_Token_Type_t *next_token_type, Mif_Token_Type_t *next_token_type,
@ -75,7 +75,7 @@ static void MIFget_port_type(
static void MIFget_port( static void MIFget_port(
CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */ CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */
INPtables *tab, /* symbol table for node names, etc. */ INPtables *tab, /* symbol table for node names, etc. */
card *current, /* MUST be named 'current' for spice macros */ struct card *current, /* MUST be named 'current' for spice macros */
MIFinstance *fast, /* pointer to instance struct */ MIFinstance *fast, /* pointer to instance struct */
char **line, char **line,
char **next_token, char **next_token,
@ -142,7 +142,7 @@ void
MIF_INP2A ( MIF_INP2A (
CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */ CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */
INPtables *tab, /* symbol table for node names, etc. */ INPtables *tab, /* symbol table for node names, etc. */
card *current ) /* the card we are to parse */ struct card *current ) /* the card we are to parse */
/* Must be called "current" for compatibility */ /* Must be called "current" for compatibility */
/* with macros */ /* with macros */
{ {
@ -682,7 +682,7 @@ static void
MIFget_port_type( MIFget_port_type(
CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */ CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */
INPtables *tab, /* symbol table for node names, etc. */ INPtables *tab, /* symbol table for node names, etc. */
card *current, /* MUST be named 'current' for spice macros */ struct card *current, /* MUST be named 'current' for spice macros */
char **line, char **line,
char **next_token, char **next_token,
Mif_Token_Type_t *next_token_type, Mif_Token_Type_t *next_token_type,
@ -777,7 +777,7 @@ static void
MIFget_port( MIFget_port(
CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */ CKTcircuit *ckt, /* circuit structure to put mod/inst structs in */
INPtables *tab, /* symbol table for node names, etc. */ INPtables *tab, /* symbol table for node names, etc. */
card *current, /* MUST be named 'current' for spice macros */ struct card *current, /* MUST be named 'current' for spice macros */
MIFinstance *fast, /* pointer to instance struct */ MIFinstance *fast, /* pointer to instance struct */
char **line, char **line,
char **next_token, char **next_token,