diff --git a/src/spicelib/devices/cpl/cpl.c b/src/spicelib/devices/cpl/cpl.c index 58838ac65..73216203e 100644 --- a/src/spicelib/devices/cpl/cpl.c +++ b/src/spicelib/devices/cpl/cpl.c @@ -23,7 +23,11 @@ IFparm CPLmPTable[] = { /* model parameters */ IOP( "c", CPL_C, IF_REALVEC,"capacitance per length"), IOP( "g", CPL_G, IF_REALVEC,"conductance per length"), IOP( "length", CPL_length, IF_REAL,"length"), + /* txl devices can be transformed to cpl devices in inpdomod.c + * Then we need to be able to swallow the 'txl' flag on a 'cpl' .model line + */ IP( "cpl", CPL_MOD_R, IF_FLAG,"Device is a cpl model"), + IPR( "txl", CPL_MOD_R, IF_FLAG,"Device is a cpl model"), }; char *CPLnames[] = { diff --git a/src/spicelib/parser/inpgmod.c b/src/spicelib/parser/inpgmod.c index 8485006a1..56739c278 100644 --- a/src/spicelib/parser/inpgmod.c +++ b/src/spicelib/parser/inpgmod.c @@ -88,10 +88,6 @@ create_model(CKTcircuit *ckt, INPmodel *modtmp, INPtables *tab) for (j = 0; j < *(ft_sim->devices[modtmp->INPmodType]->numModelParms); j++) { - if (strcmp(parm, "txl") == 0) - if (strcmp("cpl", ft_sim->devices[modtmp->INPmodType]->modelParms[j].keyword) == 0) - strcpy(parm, "cpl"); - if (strcmp(parm, ft_sim->devices[modtmp->INPmodType]->modelParms[j].keyword) == 0) { val = INPgetValue(ckt, &line, ft_sim->devices[modtmp->INPmodType]->modelParms[j].dataType, tab);