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 18:14:02 +00:00
parent 9e07ef2d67
commit aae53f5564
9 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2010-08-10 Robert Larice
* src/include/cktdefs.h ,
* src/include/ifsim.h ,
* src/include/inpdefs.h ,
* src/spicelib/analysis/ckt.h ,
* src/spicelib/analysis/cktparam.c ,
* src/spicelib/analysis/cktpname.c ,
* src/spicelib/parser/inp.h ,
* src/spicelib/parser/inpdpar.c :
use GENinstance*, instead of void*
2010-08-10 Robert Larice
* src/include/cktdefs.h ,
* src/include/ifsim.h ,

2
src/include/cktdefs.h
View File

@ -327,7 +327,7 @@ extern CKTnode * CKTnum2nod(CKTcircuit *, int);
extern int CKTop(CKTcircuit *, long, long, int);
extern int CKTpModName(char *, IFvalue *, CKTcircuit *, int , IFuid , GENmodel **);
extern int CKTpName(char *, IFvalue *, CKTcircuit *, int , char *, GENinstance **);
extern int CKTparam(CKTcircuit *, void *, int , IFvalue *, IFvalue *);
extern int CKTparam(CKTcircuit *, GENinstance *, int , IFvalue *, IFvalue *);
extern int CKTpartition(register CKTcircuit *ckt);
extern int CKTpzFindZeros(CKTcircuit *, PZtrial **, int *);
extern int CKTpzLoad(CKTcircuit *, SPcomplex *);

2
src/include/ifsim.h
View File

@ -366,7 +366,7 @@ struct IFsimulator {
int (*newInstance) (CKTcircuit *, GENmodel *, GENinstance **, IFuid);
/* create new instance */
int (*setInstanceParm) (CKTcircuit *, void *, int, IFvalue *, IFvalue *);
int (*setInstanceParm) (CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
/* set a parameter on an instance */
int (*askInstanceQuest) (CKTcircuit *, GENinstance *, int, IFvalue *, IFvalue *);
/* ask a question about an instance */

2
src/include/inpdefs.h
View File

@ -92,7 +92,7 @@ int INPaName(char *, IFvalue *, CKTcircuit *, int *, char *, GENinstance **, IFs
IFvalue *);
int INPapName(CKTcircuit *, int, void *, char *, IFvalue *);
void INPcaseFix(char *);
char *INPdevParse(char **, CKTcircuit *, int, void *, double *, int *, INPtables *);
char *INPdevParse(char **, CKTcircuit *, int, GENinstance *, double *, int *, INPtables *);
char *INPdomodel(CKTcircuit *, card *, INPtables *);
void INPdoOpts(CKTcircuit *, void *, card *, INPtables *);
char *INPerrCat(char *, char *);

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

@ -64,7 +64,7 @@ CKTnode * CKTnum2nod( CKTcircuit *, int );
int CKTop(CKTcircuit *, long, long, int );
int CKTpModName( char *, IFvalue *, CKTcircuit *, int , IFuid , GENmodel **);
int CKTpName( char *, IFvalue *, CKTcircuit *, int , char *, GENinstance **);
int CKTparam( CKTcircuit *, void *, int , IFvalue *, IFvalue *);
int CKTparam( CKTcircuit *, GENinstance *, int , IFvalue *, IFvalue *);
int CKTpzFindZeros( CKTcircuit *, PZtrial **, int * );
int CKTpzLoad( CKTcircuit *, SPcomplex * );
int CKTpzSetup( CKTcircuit *, int);

4
src/spicelib/analysis/cktparam.c
View File

@ -16,10 +16,10 @@ Author: 1985 Thomas L. Quarles
/* ARGSUSED */
int
CKTparam(CKTcircuit *ckt, void *fast, int param, IFvalue *val, IFvalue *selector)
CKTparam(CKTcircuit *ckt, GENinstance *fast, int param, IFvalue *val, IFvalue *selector)
{
int type;
GENinstance *myfast = (GENinstance *)fast;
GENinstance *myfast = /*fixme*/ fast;
type = myfast->GENmodPtr->GENmodType;
if(((*DEVices[type]).DEVparam)) {
return(((*((*DEVices[type]).DEVparam)) (param,val,myfast,selector)));

2
src/spicelib/analysis/cktpname.c
View File

@ -36,7 +36,7 @@ CKTpName(char *parm, IFvalue *val, CKTcircuit *ckt, int dev, char *name, GENinst
for(i=0;i<(*(*DEVices[dev]).DEVpublic.numInstanceParms);i++) {
if(strcmp(parm,
((*DEVices[dev]).DEVpublic.instanceParms[i].keyword))==0) {
error = CKTparam(ckt,(void *)*fast,
error = CKTparam(ckt, *fast,
(*DEVices[dev]).DEVpublic.instanceParms[i].id,val,
(IFvalue *)NULL);
if(error) return(error);

2
src/spicelib/parser/inp.h
View File

@ -52,7 +52,7 @@ int INPapName(CKTcircuit *ckt, int type, void *analPtr, char *parmname, IFvalue
void INPcaseFix(register char *string);
char * INPdomodel(CKTcircuit *ckt, card *image, INPtables *tab);
void INPdoOpts(CKTcircuit *ckt, void *anal, card *optCard, INPtables *tab);
char * INPdevParse(char **line, CKTcircuit *ckt, int dev, void *fast, double *leading,
char * INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast, double *leading,
int *waslead, INPtables *tab);
char * INPerrCat(char *a, char *b);
char * INPerror(int type);

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

@ -20,7 +20,7 @@ Author: 1985 Thomas L. Quarles
#include "fteext.h"
#include "inp.h"
char *INPdevParse(char **line, CKTcircuit *ckt, int dev, void *fast,
char *INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast,
double *leading, int *waslead, INPtables * tab)
/* the line to parse */
/* the circuit this device is a member of */