From 085afaee37e5c7c7c3535dbd393d1a2141030647 Mon Sep 17 00:00:00 2001 From: rlar Date: Tue, 10 Aug 2010 19:11:26 +0000 Subject: [PATCH] use GENinstance*, instead of void* --- ChangeLog | 9 +++++++++ src/include/cktdefs.h | 2 +- src/include/ifsim.h | 2 +- src/spicelib/analysis/ckt.h | 2 +- src/spicelib/devices/cktbindnode.c | 4 ++-- src/spicelib/devices/urc/urcsetup.c | 24 ++++++++++++------------ src/spicelib/parser/inp2y.c | 2 +- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 129602df1..c8d9c08a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/src/include/cktdefs.h b/src/include/cktdefs.h index 9efbaf1cb..e3f32e92a 100644 --- a/src/include/cktdefs.h +++ b/src/include/cktdefs.h @@ -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 *); diff --git a/src/include/ifsim.h b/src/include/ifsim.h index 7c120df28..9ddd6333a 100644 --- a/src/include/ifsim.h +++ b/src/include/ifsim.h @@ -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 */ diff --git a/src/spicelib/analysis/ckt.h b/src/spicelib/analysis/ckt.h index 19397dca7..0dd03c862 100644 --- a/src/spicelib/analysis/ckt.h +++ b/src/spicelib/analysis/ckt.h @@ -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 *); diff --git a/src/spicelib/devices/cktbindnode.c b/src/spicelib/devices/cktbindnode.c index f24b549b0..af08f1bdb 100644 --- a/src/spicelib/devices/cktbindnode.c +++ b/src/spicelib/devices/cktbindnode.c @@ -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(); diff --git a/src/spicelib/devices/urc/urcsetup.c b/src/spicelib/devices/urc/urcsetup.c index 8611bb154..9d0e1dc96 100644 --- a/src/spicelib/devices/urc/urcsetup.c +++ b/src/spicelib/devices/urc/urcsetup.c @@ -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; diff --git a/src/spicelib/parser/inp2y.c b/src/spicelib/parser/inp2y.c index a3759cedf..77174dcfe 100644 --- a/src/spicelib/parser/inp2y.c +++ b/src/spicelib/parser/inp2y.c @@ -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; }