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

src/frontend, cleanup, drop `GENcircuit'

This commit is contained in:
rlar 2015-03-21 13:56:40 +01:00
parent b69e61d010
commit bcda90e258
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/device.c
View File

@ -638,7 +638,7 @@ param_forall(dgen *dg, int flags)
for (i = 0; i < xcount; i++)
if ((plist[i].dataType & IF_ASK)
&& !(plist[i].dataType & IF_REDUNDANT)
&& ((plist[i].dataType & IF_SET) || ((CKTcircuit *) (dg->ckt))->CKTrhsOld)
&& ((plist[i].dataType & IF_SET) || dg->ckt->CKTrhsOld)
&& (!(plist[i].dataType & IF_UNINTERESTING) || (flags == DGEN_ALLPARAMS)))
{
j = 0;
@ -672,7 +672,7 @@ param_forall_old(dgen *dg, int flags)
for (i = 0; i < xcount; i++)
if ((plist[i].dataType & IF_ASK)
&& !(plist[i].dataType & IF_REDUNDANT)
&& ((plist[i].dataType & IF_SET) || ((CKTcircuit *) (dg->ckt))->CKTrhsOld)
&& ((plist[i].dataType & IF_SET) || dg->ckt->CKTrhsOld)
&& (!(plist[i].dataType & IF_UNINTERESTING) || (flags == DGEN_ALLPARAMS)))
{
j = 0;
@ -714,8 +714,8 @@ listparam(wordlist *p, dgen *dg)
}
if (found) {
if ((((CKTcircuit *) (dg->ckt))->CKTrhsOld ||
(plist[i].dataType & IF_SET)))
if (dg->ckt->CKTrhsOld ||
(plist[i].dataType & IF_SET))
{
j = 0;
do {

4
src/frontend/gens.c
View File

@ -24,7 +24,7 @@ wl_forall(wordlist *wl, void (*fn)(wordlist*, dgen*), dgen *data)
dgen *
dgen_init(GENcircuit *ckt, wordlist *wl, int nomix, int flag, int model)
dgen_init(CKTcircuit *ckt, wordlist *wl, int nomix, int flag, int model)
{
dgen *dg, *dg_save;
@ -142,7 +142,7 @@ dgen_next(dgen **dgx)
} else if (dg->dev_type_no < DEVmaxnum) {
dg->dev_type_no += 1;
if (dg->dev_type_no < DEVmaxnum) {
dg->model = ((CKTcircuit *)(dg->ckt))->CKThead[dg->dev_type_no];
dg->model = dg->ckt->CKThead[dg->dev_type_no];
if (dg->model)
dg->instance = dg->model->GENinstances;
} else {

4
src/include/ngspice/dgen.h
View File

@ -4,7 +4,7 @@
typedef struct st_dgen dgen;
struct st_dgen {
GENcircuit *ckt;
CKTcircuit *ckt;
wordlist *dev_list;
int flags;
int dev_type_no;
@ -26,6 +26,6 @@ struct st_dgen {
#define DGEN_DEFPARAMS 0x001
#define DGEN_ALLPARAMS 0x002
extern dgen *dgen_init(GENcircuit *ckt, wordlist *wl, int nomix, int flag, int model);
extern dgen *dgen_init(CKTcircuit *ckt, wordlist *wl, int nomix, int flag, int model);
#endif

5
src/include/ngspice/gendefs.h
View File

@ -31,11 +31,6 @@ struct GENinstance {
};
/* Generic circuit data */
typedef void GENcircuit;
/* per model data */
struct GENmodel { /* model structure for a resistor */