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

use CKTcircuit instead of void*, #4/4

This commit is contained in:
rlar 2010-07-07 17:36:56 +00:00
parent 94518fdb02
commit c9bfe72187
7 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2010-07-07 Robert Larice
* src/include/dllitf.h ,
* src/include/mifproto.h ,
* src/xspice/icm/dlmain.c ,
* src/xspice/mif/mif_inp2.c ,
* src/xspice/mif/mifgetmod.c ,
* src/xspice/mif/mifgetvalue.c :
the fourth of a series of four patches, which will change the code
to use the CKTcircuit type instead of the current mixed void*/char*
2010-07-07 Robert Larice
* src/main.c ,
* src/ngnutmeg.c ,

6
src/include/dllitf.h
View File

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

6
src/include/mifproto.h
View File

@ -51,14 +51,14 @@ NON-STANDARD FEATURES
extern void MIF_INP2A(
void *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. */
card *current /* the card we are to parse */
);
extern char * MIFgetMod(
void *ckt,
CKTcircuit *ckt,
char *name,
INPmodel **model,
INPtables *tab
@ -66,7 +66,7 @@ extern char * MIFgetMod(
extern IFvalue * MIFgetValue(
void *ckt,
CKTcircuit *ckt,
char **line,
int type,
INPtables *tab,

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

@ -82,7 +82,7 @@ CM_EXPORT void *CMgetCoreItfPtr(void) {
// pointers in coreitf structure.
//////////////////////////////////////////////////////////////////////////////
void MIF_INP2A(
void *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. */
card *current /* the card we are to parse */
) {
@ -90,7 +90,7 @@ void MIF_INP2A(
}
char * MIFgetMod(
void *ckt,
CKTcircuit *ckt,
char *name,
INPmodel **model,
INPtables *tab
@ -99,7 +99,7 @@ char * MIFgetMod(
}
IFvalue * MIFgetValue(
void *ckt,
CKTcircuit *ckt,
char **line,
int type,
INPtables *tab,

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

@ -70,7 +70,7 @@ extern int DEVmaxnum; /* size of DEVices array */
static void MIFinit_inst(MIFmodel *mdfast, MIFinstance *fast);
static void MIFget_port_type(
void *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. */
card *current, /* MUST be named 'current' for spice macros */
char **line,
@ -83,7 +83,7 @@ static void MIFget_port_type(
static void MIFget_port(
void *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. */
card *current, /* MUST be named 'current' for spice macros */
MIFinstance *fast, /* pointer to instance struct */
@ -149,7 +149,7 @@ and error checks are performed.
void
MIF_INP2A (
void *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. */
card *current ) /* the card we are to parse */
/* Must be called "current" for compatibility */
@ -652,7 +652,7 @@ port type (i.e. the thing after vnam, v, vd, id, etc).
static void
MIFget_port_type(
void *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. */
card *current, /* MUST be named 'current' for spice macros */
char **line,
@ -746,7 +746,7 @@ netname processed.
static void
MIFget_port(
void *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. */
card *current, /* MUST be named 'current' for spice macros */
MIFinstance *fast, /* pointer to instance struct */

2
src/xspice/mif/mifgetmod.c
View File

@ -83,7 +83,7 @@ successful, and an error string on failure.
*/
char *MIFgetMod(
void *ckt, /* The circuit structure */
CKTcircuit *ckt, /* The circuit structure */
char *name, /* The name of the model to look for */
INPmodel **model, /* The model found/created */
INPtables *tab /* Table of model info from first pass */

2
src/xspice/mif/mifgetvalue.c
View File

@ -84,7 +84,7 @@ the number of elements found.
IFvalue *
MIFgetValue (
void *ckt, /* The circuit structure */
CKTcircuit *ckt, /* The circuit structure */
char **line, /* The text line to read value from */
int type, /* The type of data to read */
INPtables *tab, /* Unused */