diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c index 6dafc4348..b69381214 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c @@ -81,5 +81,3 @@ get_b3soidd_info (void) { return &B3SOIDDinfo; } - - diff --git a/src/spicelib/devices/bsim4v5/bsim4v5init.c b/src/spicelib/devices/bsim4v5/bsim4v5init.c index 0f465efc9..6efef398d 100644 --- a/src/spicelib/devices/bsim4v5/bsim4v5init.c +++ b/src/spicelib/devices/bsim4v5/bsim4v5init.c @@ -77,7 +77,6 @@ SPICEdev BSIM4v5info = { #endif }; - SPICEdev * get_bsim4v5_info(void) { diff --git a/src/spicelib/devices/bsim4v6/bsim4v6init.c b/src/spicelib/devices/bsim4v6/bsim4v6init.c index c83063ed1..87f08dcd0 100644 --- a/src/spicelib/devices/bsim4v6/bsim4v6init.c +++ b/src/spicelib/devices/bsim4v6/bsim4v6init.c @@ -77,7 +77,6 @@ SPICEdev BSIM4v6info = { #endif }; - SPICEdev * get_bsim4v6_info(void) { diff --git a/src/spicelib/devices/bsimsoi/b4soiinit.c b/src/spicelib/devices/bsimsoi/b4soiinit.c index 8f069822e..6a0c8d709 100644 --- a/src/spicelib/devices/bsimsoi/b4soiinit.c +++ b/src/spicelib/devices/bsimsoi/b4soiinit.c @@ -81,5 +81,3 @@ get_b4soi_info (void) { return &B4SOIinfo; } - - diff --git a/src/spicelib/devices/cap/captemp.c b/src/spicelib/devices/cap/captemp.c index 64d803429..b3cdd38c0 100644 --- a/src/spicelib/devices/cap/captemp.c +++ b/src/spicelib/devices/cap/captemp.c @@ -115,6 +115,6 @@ CAPtemp(GENmodel *inModel, CKTcircuit *ckt) #endif } - return(OK); + return (OK) ; } diff --git a/src/spicelib/devices/dio/dioinit.c b/src/spicelib/devices/dio/dioinit.c index acb260b45..545f77297 100644 --- a/src/spicelib/devices/dio/dioinit.c +++ b/src/spicelib/devices/dio/dioinit.c @@ -78,7 +78,6 @@ SPICEdev DIOinfo = { #endif }; - SPICEdev * get_dio_info(void) { diff --git a/src/spicelib/devices/hfet2/hfet2init.c b/src/spicelib/devices/hfet2/hfet2init.c index 6f0209e6b..3431b5c09 100644 --- a/src/spicelib/devices/hfet2/hfet2init.c +++ b/src/spicelib/devices/hfet2/hfet2init.c @@ -77,7 +77,6 @@ SPICEdev HFET2info = { #endif }; - SPICEdev * get_hfet2_info(void) { diff --git a/src/spicelib/devices/hisim2/hsm2init.c b/src/spicelib/devices/hisim2/hsm2init.c index 141d88c6a..255dd4b64 100644 --- a/src/spicelib/devices/hisim2/hsm2init.c +++ b/src/spicelib/devices/hisim2/hsm2init.c @@ -77,7 +77,6 @@ SPICEdev HSM2info = { #endif }; - SPICEdev * get_hsm2_info(void) { diff --git a/src/spicelib/devices/hisimhv1/hsmhvinit.c b/src/spicelib/devices/hisimhv1/hsmhvinit.c index 5e398048b..b475949cb 100644 --- a/src/spicelib/devices/hisimhv1/hsmhvinit.c +++ b/src/spicelib/devices/hisimhv1/hsmhvinit.c @@ -77,7 +77,6 @@ SPICEdev HSMHVinfo = { #endif }; - SPICEdev * get_hsmhv_info(void) { diff --git a/src/spicelib/devices/ind/inddefs.h b/src/spicelib/devices/ind/inddefs.h index 769e3d18d..70880b340 100644 --- a/src/spicelib/devices/ind/inddefs.h +++ b/src/spicelib/devices/ind/inddefs.h @@ -310,6 +310,7 @@ struct INDsystem { #define IND_QUEST_SENS_CPLX 205 #define IND_QUEST_SENS_DC 206 + /* device parameters */ #define MUT_COEFF 401 #define MUT_IND1 402 diff --git a/src/spicelib/devices/ind/indload.c b/src/spicelib/devices/ind/indload.c index f70ebbb71..078cf38f0 100644 --- a/src/spicelib/devices/ind/indload.c +++ b/src/spicelib/devices/ind/indload.c @@ -29,6 +29,7 @@ INDload(GENmodel *inModel, CKTcircuit *ckt) int ktype; int itype; + /* loop through all the inductor models */ for( ; model != NULL; model = INDnextModel(model)) { diff --git a/src/spicelib/devices/ind/indsacl.c b/src/spicelib/devices/ind/indsacl.c index 719bea901..504377fc1 100644 --- a/src/spicelib/devices/ind/indsacl.c +++ b/src/spicelib/devices/ind/indsacl.c @@ -22,6 +22,7 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt) INDmodel *model = (INDmodel*)inModel; INDinstance *here; double cind,icind,val,ival; + MUTinstance *muthere; MUTmodel *mutmodel; double cind1; @@ -47,6 +48,7 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt) double k2; int ktype; int itype; + SENstruct *info; info = ckt->CKTsenInfo; @@ -139,6 +141,7 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = INDinstances(model); here != NULL ; here=INDnextInstance(here)) { + if(here->INDsenParmNo){ cind = *(ckt->CKTrhsOld + here->INDbrEq); icind = *(ckt->CKTirhsOld + here->INDbrEq); diff --git a/src/spicelib/devices/ind/indsetup.c b/src/spicelib/devices/ind/indsetup.c index cfbafeecb..0a23bfcfd 100644 --- a/src/spicelib/devices/ind/indsetup.c +++ b/src/spicelib/devices/ind/indsetup.c @@ -26,9 +26,9 @@ INDsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) CKTnode *tmp; /* loop through all the inductor models */ - for( ; model != NULL; model = INDnextModel(model)) { - - /* Default Value Processing for Model Parameters */ + for ( ; model != NULL ; model = INDnextModel(model)) + { + /* Default Value Processing for Model Parameters */ if (!model->INDmIndGiven) { model->INDmInd = 0.0; } @@ -197,7 +197,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\ } #endif - return(OK); + return (OK) ; } int diff --git a/src/spicelib/devices/ind/indsupd.c b/src/spicelib/devices/ind/indsupd.c index 0c12957d1..6f2c81498 100644 --- a/src/spicelib/devices/ind/indsupd.c +++ b/src/spicelib/devices/ind/indsupd.c @@ -28,6 +28,7 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt) double dummy1; double dummy2; SENstruct *info; + MUTinstance *muthere; MUTmodel *mutmodel; double sxp1; @@ -37,6 +38,7 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt) int ktype; int itype; + info = ckt->CKTsenInfo; if(ckt->CKTmode & MODEINITTRAN) return(OK); @@ -63,8 +65,6 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt) *(ckt->CKTstate0 + here->INDsensxp + 2 * (iparmno - 1)) = sxp; } - - } } ktype = CKTtypelook("mutual"); @@ -125,6 +125,7 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt) /* loop through all the instances of the model */ for (here = INDinstances(model); here != NULL ; here=INDnextInstance(here)) { + for(iparmno = 1;iparmno<=info->SENparms;iparmno++){ if(ckt->CKTmode&MODETRANOP){ diff --git a/src/spicelib/devices/ind/indtemp.c b/src/spicelib/devices/ind/indtemp.c index 7fff7e504..7eeba855c 100644 --- a/src/spicelib/devices/ind/indtemp.c +++ b/src/spicelib/devices/ind/indtemp.c @@ -5,7 +5,6 @@ Author: 2003 Paolo Nenzi /* */ - #include "ngspice/ngspice.h" #include "ngspice/cktdefs.h" #include "inddefs.h" @@ -99,6 +98,6 @@ INDtemp(GENmodel *inModel, CKTcircuit *ckt) #endif } - return(OK); + return (OK) ; } diff --git a/src/spicelib/devices/ind/mutacld.c b/src/spicelib/devices/ind/mutacld.c index 09aa3ce76..50644c680 100644 --- a/src/spicelib/devices/ind/mutacld.c +++ b/src/spicelib/devices/ind/mutacld.c @@ -11,7 +11,6 @@ Author: 1985 Thomas L. Quarles #include "ngspice/sperror.h" #include "ngspice/suffix.h" - int MUTacLoad(GENmodel *inModel, CKTcircuit *ckt) { diff --git a/src/spicelib/devices/isrc/Makefile.am b/src/spicelib/devices/isrc/Makefile.am index 463c5a908..3b9598b80 100644 --- a/src/spicelib/devices/isrc/Makefile.am +++ b/src/spicelib/devices/isrc/Makefile.am @@ -20,7 +20,6 @@ libisrc_la_SOURCES = \ isrctemp.c - AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include AM_CFLAGS = $(STATIC) diff --git a/src/spicelib/devices/isrc/isrctemp.c b/src/spicelib/devices/isrc/isrctemp.c index 609664fcb..db9a03837 100644 --- a/src/spicelib/devices/isrc/isrctemp.c +++ b/src/spicelib/devices/isrc/isrctemp.c @@ -89,5 +89,5 @@ ISRCtemp(GENmodel *inModel, CKTcircuit *ckt) } - return(OK); + return (OK) ; } diff --git a/src/spicelib/devices/jfet/jfetinit.c b/src/spicelib/devices/jfet/jfetinit.c index 4e241bb60..6825cddbf 100644 --- a/src/spicelib/devices/jfet/jfetinit.c +++ b/src/spicelib/devices/jfet/jfetinit.c @@ -77,7 +77,6 @@ SPICEdev JFETinfo = { #endif }; - SPICEdev * get_jfet_info(void) { diff --git a/src/spicelib/devices/jfet2/jfet2init.c b/src/spicelib/devices/jfet2/jfet2init.c index c019a2783..1187a26a7 100644 --- a/src/spicelib/devices/jfet2/jfet2init.c +++ b/src/spicelib/devices/jfet2/jfet2init.c @@ -77,7 +77,6 @@ SPICEdev JFET2info = { #endif }; - SPICEdev * get_jfet2_info(void) { diff --git a/src/spicelib/devices/ltra/ltrainit.c b/src/spicelib/devices/ltra/ltrainit.c index c46ec3438..08a95fcd5 100644 --- a/src/spicelib/devices/ltra/ltrainit.c +++ b/src/spicelib/devices/ltra/ltrainit.c @@ -77,7 +77,6 @@ SPICEdev LTRAinfo = { #endif }; - SPICEdev * get_ltra_info(void) { diff --git a/src/spicelib/devices/mes/mesinit.c b/src/spicelib/devices/mes/mesinit.c index ed175c992..ecc4c24d3 100644 --- a/src/spicelib/devices/mes/mesinit.c +++ b/src/spicelib/devices/mes/mesinit.c @@ -77,7 +77,6 @@ SPICEdev MESinfo = { #endif }; - SPICEdev * get_mes_info(void) { diff --git a/src/spicelib/devices/mesa/mesainit.c b/src/spicelib/devices/mesa/mesainit.c index b4e371d66..4136af1ea 100644 --- a/src/spicelib/devices/mesa/mesainit.c +++ b/src/spicelib/devices/mesa/mesainit.c @@ -77,7 +77,6 @@ SPICEdev MESAinfo = { #endif }; - SPICEdev * get_mesa_info(void) { diff --git a/src/spicelib/devices/mos1/mos1init.c b/src/spicelib/devices/mos1/mos1init.c index a6cd9dac6..0c5becbe2 100644 --- a/src/spicelib/devices/mos1/mos1init.c +++ b/src/spicelib/devices/mos1/mos1init.c @@ -77,7 +77,6 @@ SPICEdev MOS1info = { #endif }; - SPICEdev * get_mos1_info(void) { diff --git a/src/spicelib/devices/mos2/mos2init.c b/src/spicelib/devices/mos2/mos2init.c index 79a51fe7e..590e08e75 100644 --- a/src/spicelib/devices/mos2/mos2init.c +++ b/src/spicelib/devices/mos2/mos2init.c @@ -77,7 +77,6 @@ SPICEdev MOS2info = { #endif }; - SPICEdev * get_mos2_info(void) { diff --git a/src/spicelib/devices/mos3/mos3init.c b/src/spicelib/devices/mos3/mos3init.c index 2f6c37c4c..1e2d72fa2 100644 --- a/src/spicelib/devices/mos3/mos3init.c +++ b/src/spicelib/devices/mos3/mos3init.c @@ -77,7 +77,6 @@ SPICEdev MOS3info = { #endif }; - SPICEdev * get_mos3_info(void) { diff --git a/src/spicelib/devices/mos6/mos6init.c b/src/spicelib/devices/mos6/mos6init.c index 60957c314..e81117f6b 100644 --- a/src/spicelib/devices/mos6/mos6init.c +++ b/src/spicelib/devices/mos6/mos6init.c @@ -77,7 +77,6 @@ SPICEdev MOS6info = { #endif }; - SPICEdev * get_mos6_info(void) { diff --git a/src/spicelib/devices/mos9/mos9init.c b/src/spicelib/devices/mos9/mos9init.c index cf0310243..71c512707 100644 --- a/src/spicelib/devices/mos9/mos9init.c +++ b/src/spicelib/devices/mos9/mos9init.c @@ -77,7 +77,6 @@ SPICEdev MOS9info = { #endif }; - SPICEdev * get_mos9_info(void) { diff --git a/src/spicelib/devices/nbjt/nbjtinit.c b/src/spicelib/devices/nbjt/nbjtinit.c index 004e8fced..9b25d80e6 100644 --- a/src/spicelib/devices/nbjt/nbjtinit.c +++ b/src/spicelib/devices/nbjt/nbjtinit.c @@ -77,7 +77,6 @@ SPICEdev NBJTinfo = { #endif }; - SPICEdev * get_nbjt_info(void) { diff --git a/src/spicelib/devices/nbjt2/nbt2init.c b/src/spicelib/devices/nbjt2/nbt2init.c index ba87f5685..f27591ae1 100644 --- a/src/spicelib/devices/nbjt2/nbt2init.c +++ b/src/spicelib/devices/nbjt2/nbt2init.c @@ -77,7 +77,6 @@ SPICEdev NBJT2info = { #endif }; - SPICEdev * get_nbjt2_info(void) { diff --git a/src/spicelib/devices/ndev/ndevinit.c b/src/spicelib/devices/ndev/ndevinit.c index 49e4bdbea..bab699529 100644 --- a/src/spicelib/devices/ndev/ndevinit.c +++ b/src/spicelib/devices/ndev/ndevinit.c @@ -77,7 +77,6 @@ SPICEdev NDEVinfo = { #endif }; - SPICEdev * get_ndev_info(void) { diff --git a/src/spicelib/devices/numd/numdinit.c b/src/spicelib/devices/numd/numdinit.c index 22fd67130..cf6a23537 100644 --- a/src/spicelib/devices/numd/numdinit.c +++ b/src/spicelib/devices/numd/numdinit.c @@ -77,7 +77,6 @@ SPICEdev NUMDinfo = { #endif }; - SPICEdev * get_numd_info(void) { diff --git a/src/spicelib/devices/numd2/numd2init.c b/src/spicelib/devices/numd2/numd2init.c index 919c1e30e..880d4d643 100644 --- a/src/spicelib/devices/numd2/numd2init.c +++ b/src/spicelib/devices/numd2/numd2init.c @@ -77,7 +77,6 @@ SPICEdev NUMD2info = { #endif }; - SPICEdev * get_numd2_info(void) { diff --git a/src/spicelib/devices/numos/numosinit.c b/src/spicelib/devices/numos/numosinit.c index 45e443b58..0385b225a 100644 --- a/src/spicelib/devices/numos/numosinit.c +++ b/src/spicelib/devices/numos/numosinit.c @@ -77,7 +77,6 @@ SPICEdev NUMOSinfo = { #endif }; - SPICEdev * get_numos_info(void) { diff --git a/src/spicelib/devices/soi3/soi3init.c b/src/spicelib/devices/soi3/soi3init.c index 9071d4154..505a0942d 100644 --- a/src/spicelib/devices/soi3/soi3init.c +++ b/src/spicelib/devices/soi3/soi3init.c @@ -77,7 +77,6 @@ SPICEdev SOI3info = { #endif }; - SPICEdev * get_soi3_info(void) { diff --git a/src/spicelib/devices/sw/swinit.c b/src/spicelib/devices/sw/swinit.c index cb28af90a..427187f6d 100644 --- a/src/spicelib/devices/sw/swinit.c +++ b/src/spicelib/devices/sw/swinit.c @@ -78,7 +78,6 @@ SPICEdev SWinfo = { #endif }; - SPICEdev * get_sw_info(void) { diff --git a/src/spicelib/devices/tra/trainit.c b/src/spicelib/devices/tra/trainit.c index 50995e72f..5d1cf91dc 100644 --- a/src/spicelib/devices/tra/trainit.c +++ b/src/spicelib/devices/tra/trainit.c @@ -77,7 +77,6 @@ SPICEdev TRAinfo = { #endif }; - SPICEdev * get_tra_info(void) { diff --git a/src/spicelib/devices/urc/urcinit.c b/src/spicelib/devices/urc/urcinit.c index d38ad6f66..7226b777b 100644 --- a/src/spicelib/devices/urc/urcinit.c +++ b/src/spicelib/devices/urc/urcinit.c @@ -77,7 +77,6 @@ SPICEdev URCinfo = { #endif }; - SPICEdev * get_urc_info(void) { diff --git a/src/spicelib/devices/vbic/vbicinit.c b/src/spicelib/devices/vbic/vbicinit.c index 46b2159fa..d71c3f0fb 100644 --- a/src/spicelib/devices/vbic/vbicinit.c +++ b/src/spicelib/devices/vbic/vbicinit.c @@ -82,7 +82,6 @@ SPICEdev VBICinfo = { #endif }; - SPICEdev * get_vbic_info(void) { diff --git a/src/spicelib/devices/vccs/vccsinit.c b/src/spicelib/devices/vccs/vccsinit.c index 9a62673ec..9d7c42c1b 100644 --- a/src/spicelib/devices/vccs/vccsinit.c +++ b/src/spicelib/devices/vccs/vccsinit.c @@ -77,7 +77,6 @@ SPICEdev VCCSinfo = { #endif }; - SPICEdev * get_vccs_info(void) { diff --git a/src/spicelib/devices/vcvs/vcvsinit.c b/src/spicelib/devices/vcvs/vcvsinit.c index 7df6d7fbc..4e7766121 100644 --- a/src/spicelib/devices/vcvs/vcvsinit.c +++ b/src/spicelib/devices/vcvs/vcvsinit.c @@ -77,7 +77,6 @@ SPICEdev VCVSinfo = { #endif }; - SPICEdev * get_vcvs_info(void) { diff --git a/src/spicelib/devices/vsrc/vsrctemp.c b/src/spicelib/devices/vsrc/vsrctemp.c index 9b4ed1c2f..b6d20d74f 100644 --- a/src/spicelib/devices/vsrc/vsrctemp.c +++ b/src/spicelib/devices/vsrc/vsrctemp.c @@ -20,7 +20,7 @@ VSRCtemp(GENmodel *inModel, CKTcircuit *ckt) /* Pre-process voltage source parameters */ { - VSRCmodel *model = (VSRCmodel *) inModel; + VSRCmodel *model = (VSRCmodel *)inModel; VSRCinstance *here; double radians; @@ -90,5 +90,5 @@ VSRCtemp(GENmodel *inModel, CKTcircuit *ckt) } - return(OK); + return (OK) ; }