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

use GENinstance*, instead of void*

This commit is contained in:
rlar 2010-08-10 19:11:26 +00:00
parent 6713cb5e00
commit 085afaee37
7 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2010-08-10 Robert Larice
* src/include/cktdefs.h ,
* src/include/ifsim.h ,
* src/spicelib/analysis/ckt.h ,
* src/spicelib/devices/cktbindnode.c ,
* src/spicelib/devices/urc/urcsetup.c ,
* src/spicelib/parser/inp2y.c :
use GENinstance*, instead of void*
2010-08-10 Robert Larice
* src/frontend/plotting/x11.c :
fix comment

2
src/include/cktdefs.h
View File

@ -278,7 +278,7 @@ extern int CKTacct(CKTcircuit *, void *, int , IFvalue *);
extern int CKTask(CKTcircuit *, GENinstance *, int , IFvalue *, IFvalue *);
extern int CKTaskAnalQ(CKTcircuit *, void *, int , IFvalue *, IFvalue *);
extern int CKTaskNodQst(CKTcircuit *, void *, int , IFvalue *, IFvalue *);
extern int CKTbindNode(CKTcircuit *, void *, int , void *);
extern int CKTbindNode(CKTcircuit *, GENinstance *, int , void *);
extern void CKTbreakDump(CKTcircuit *);
extern int CKTclrBreak(CKTcircuit *);
extern int CKTconvTest(CKTcircuit *);

2
src/include/ifsim.h
View File

@ -351,7 +351,7 @@ struct IFsimulator {
/* create new node */
int (*groundNode) (CKTcircuit *, void **, IFuid);
/* create ground node */
int (*bindNode) (CKTcircuit *, void *, int, void *);
int (*bindNode) (CKTcircuit *, GENinstance *, int, void *);
/* bind a node to a terminal */
int (*findNode) (CKTcircuit *, void **, IFuid);
/* find a node by name */

2
src/spicelib/analysis/ckt.h
View File

@ -21,7 +21,7 @@ int CKTacct( CKTcircuit *, void *, int , IFvalue *);
int CKTask( CKTcircuit *, GENinstance *, int , IFvalue *, IFvalue *);
int CKTaskAnalQ( CKTcircuit *, void *, int , IFvalue *, IFvalue *);
int CKTaskNodQst( CKTcircuit *, void *, int , IFvalue *, IFvalue *);
int CKTbindNode( CKTcircuit *, void *, int , void *);
int CKTbindNode( CKTcircuit *, GENinstance *, int , void *);
void CKTbreakDump( CKTcircuit *);
int CKTclrBreak( CKTcircuit *);
int CKTconvTest( CKTcircuit *);

4
src/spicelib/devices/cktbindnode.c
View File

@ -16,11 +16,11 @@ Author: 1985 Thomas L. Quarles
#include "dev.h"
int
CKTbindNode(CKTcircuit *ckt, void *fast, int term, void *node)
CKTbindNode(CKTcircuit *ckt, GENinstance *fast, int term, void *node)
{
int mappednode;
SPICEdev **devs;
GENinstance *instance = (GENinstance *) fast;
GENinstance *instance = /*fixme*/ fast;
int type = instance->GENmodPtr->GENmodType;
devs = devices();

24
src/spicelib/devices/urc/urcsetup.c
View File

@ -153,9 +153,9 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
error = CKTcrtElt(ckt,rmodfast,
&fast,eltUid);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,1,lowl);
error = CKTbindNode(ckt,fast,1,lowl);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,2,lowr);
error = CKTbindNode(ckt,fast,2,lowr);
if(error) return(error);
ptemp.rValue = r;
error = CKTpName("resistance",&ptemp,ckt,rtype,nameelt,&fast);
@ -170,9 +170,9 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
error = CKTcrtElt(ckt,rmodfast,
&fast,eltUid);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,1,hil);
error = CKTbindNode(ckt,fast,1,hil);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,2,hir);
error = CKTbindNode(ckt,fast,2,hir);
if(error) return(error);
ptemp.rValue = r;
error = CKTpName("resistance",&ptemp,ckt,rtype,nameelt,&fast);
@ -190,9 +190,9 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
error = CKTcrtElt(ckt,modfast,
&fast, eltUid);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,1,lowr);
error = CKTbindNode(ckt,fast,1,lowr);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,2,
error = CKTbindNode(ckt,fast,2,
(void *)CKTnum2nod(ckt, here->URCgndNode));
if(error) return(error);
ptemp.rValue = prop;
@ -209,9 +209,9 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
error = CKTcrtElt(ckt,modfast,
&fast, eltUid);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,1,lowr);
error = CKTbindNode(ckt,fast,1,lowr);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,2,
error = CKTbindNode(ckt,fast,2,
(void *)CKTnum2nod(ckt, here->URCgndNode));
if(error) return(error);
ptemp.rValue = c;
@ -233,9 +233,9 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
error = CKTcrtElt(ckt,modfast,
&fast,eltUid);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,1,hil);
error = CKTbindNode(ckt,fast,1,hil);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,2,
error = CKTbindNode(ckt,fast,2,
(void *)CKTnum2nod(ckt, here->URCgndNode));
if(error) return(error);
ptemp.rValue = prop;
@ -253,9 +253,9 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state)
error = CKTcrtElt(ckt,modfast,
&fast,eltUid);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,1,hil);
error = CKTbindNode(ckt,fast,1,hil);
if(error) return(error);
error = CKTbindNode(ckt,(void *)fast,2,
error = CKTbindNode(ckt,fast,2,
(void *)CKTnum2nod(ckt, here->URCgndNode));
if(error) return(error);
ptemp.rValue = c;

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

@ -229,7 +229,7 @@ int lenvalgiven = 0;
IFC(bindNode,(ckt,fast,1,node1))
IFC(bindNode,(ckt,fast,2,node2))
txl = (GENinstance *)fast;
txl = /*fixme*/ fast;
return;
}