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

CKTfndMod(), unuse the `type' argument

This commit is contained in:
rlar 2013-07-17 20:34:04 +02:00
parent f46dbc883b
commit 247ae92ae8
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/spiceif.c
View File

@ -626,7 +626,7 @@ finddev_special(
*modptr = ft_sim->findModel (ckt, &type, modptr, name);
if (*modptr) {
*device_or_model = 1;
return (type);
return (*modptr)->GENmodType;
}
*modptr = NULL;
@ -1224,7 +1224,7 @@ finddev(CKTcircuit *ckt, char *name, GENinstance **devptr, GENmodel **modptr)
// assert(third && *third == NULL)
*modptr = ft_sim->findModel (ckt, &type, modptr, name);
if (*modptr)
return (type);
return (*modptr)->GENmodType;
*modptr = NULL;
return (-1);

1
src/spicelib/analysis/cktmcrt.c
View File

@ -35,6 +35,7 @@ CKTmodCrt(CKTcircuit *ckt, int type, GENmodel **modfast, IFuid name)
if(modfast) *modfast=mymodfast;
return(OK);
} else {
type = mymodfast->GENmodType; /* unused */
if(modfast) *modfast=mymodfast;
return(E_EXISTS);
}

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

@ -313,6 +313,7 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
modfast = CKTfndMod(ckt, &type, &modfast, varUid);
if (!modfast)
return E_NOMOD;
type = modfast->GENmodType; /* unused */
for (in = modfast->GENinstances; in; in = in->GENnextInstance)
CKTdltNNum(ckt, in->GENnode1);
@ -333,6 +334,7 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
if (!modfast)
return E_NOMOD;
type = modfast->GENmodType; /* unused */
CKTdltMod(ckt, modfast);
}
}

2
src/tclspice.c
View File

@ -1401,6 +1401,8 @@ get_mod_param TCL_CMDPROCARGS(clientData, interp, argc, argv)
// assert(third && *third == NULL)
modptr = ft_sim->findModel (ft_curckt->ci_ckt, &typecode, &modptr, name);
err = modptr ? OK : E_NOMOD;
if (modptr)
typecode = modptr->GENmodType;
} else {
typecode = devptr->GENmodPtr->GENmodType;
err = OK;