From 3794c1eb20a9e34edaba4c92a106338cf94d4b38 Mon Sep 17 00:00:00 2001 From: Henrik Forsten Date: Sat, 22 Jun 2013 18:40:48 +0200 Subject: [PATCH] mark end of struct GENmodel overlay --- src/include/ngspice/mifdefs.h | 2 ++ src/include/ngspice/numgen.h | 3 +++ src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml | 2 ++ src/spicelib/devices/asrc/asrcdefs.h | 3 +++ src/spicelib/devices/bjt/bjtdefs.h | 3 +++ src/spicelib/devices/bsim1/bsim1def.h | 3 +++ src/spicelib/devices/bsim2/bsim2def.h | 3 +++ src/spicelib/devices/bsim3/bsim3def.h | 3 +++ src/spicelib/devices/bsim3soi_dd/b3soidddef.h | 3 +++ src/spicelib/devices/bsim3soi_fd/b3soifddef.h | 3 +++ src/spicelib/devices/bsim3soi_pd/b3soipddef.h | 3 +++ src/spicelib/devices/bsim3v0/bsim3v0def.h | 3 +++ src/spicelib/devices/bsim3v1/bsim3v1def.h | 3 +++ src/spicelib/devices/bsim3v32/bsim3v32def.h | 3 +++ src/spicelib/devices/bsim4/bsim4def.h | 3 +++ src/spicelib/devices/bsim4v4/bsim4v4def.h | 3 +++ src/spicelib/devices/bsim4v5/bsim4v5def.h | 3 +++ src/spicelib/devices/bsim4v6/bsim4v6def.h | 3 +++ src/spicelib/devices/bsimsoi/b4soidef.h | 3 +++ src/spicelib/devices/cap/capdefs.h | 2 ++ src/spicelib/devices/cccs/cccsdefs.h | 3 +++ src/spicelib/devices/ccvs/ccvsdefs.h | 3 +++ src/spicelib/devices/cpl/cpldefs.h | 2 ++ src/spicelib/devices/csw/cswdefs.h | 2 ++ src/spicelib/devices/dio/diodefs.h | 2 ++ src/spicelib/devices/hfet1/hfetdefs.h | 3 +++ src/spicelib/devices/hfet2/hfet2defs.h | 3 +++ src/spicelib/devices/hisim2/hsm2def.h | 3 +++ src/spicelib/devices/hisimhv1/hsmhvdef.h | 3 +++ src/spicelib/devices/ind/inddefs.h | 5 +++++ src/spicelib/devices/isrc/isrcdefs.h | 3 +++ src/spicelib/devices/jfet/jfetdefs.h | 3 +++ src/spicelib/devices/jfet2/jfet2defs.h | 3 +++ src/spicelib/devices/ltra/ltradefs.h | 2 ++ src/spicelib/devices/mes/mesdefs.h | 3 +++ src/spicelib/devices/mesa/mesadefs.h | 3 +++ src/spicelib/devices/mos1/mos1defs.h | 3 +++ src/spicelib/devices/mos2/mos2defs.h | 3 +++ src/spicelib/devices/mos3/mos3defs.h | 3 +++ src/spicelib/devices/mos6/mos6defs.h | 3 +++ src/spicelib/devices/mos9/mos9defs.h | 3 +++ src/spicelib/devices/nbjt/nbjtdefs.h | 3 +++ src/spicelib/devices/nbjt2/nbjt2def.h | 3 +++ src/spicelib/devices/ndev/ndevdefs.h | 3 +++ src/spicelib/devices/numd/numddefs.h | 3 +++ src/spicelib/devices/numd2/numd2def.h | 3 +++ src/spicelib/devices/numos/numosdef.h | 3 +++ src/spicelib/devices/res/resdefs.h | 2 ++ src/spicelib/devices/soi3/soi3defs.h | 3 +++ src/spicelib/devices/sw/swdefs.h | 2 ++ src/spicelib/devices/tra/tradefs.h | 3 +++ src/spicelib/devices/txl/txldefs.h | 2 ++ src/spicelib/devices/urc/urcdefs.h | 2 ++ src/spicelib/devices/vbic/vbicdefs.h | 3 +++ src/spicelib/devices/vccs/vccsdefs.h | 3 +++ src/spicelib/devices/vcvs/vcvsdefs.h | 3 +++ src/spicelib/devices/vsrc/vsrcdefs.h | 3 +++ 57 files changed, 162 insertions(+) diff --git a/src/include/ngspice/mifdefs.h b/src/include/ngspice/mifdefs.h index c808854a6..945757051 100644 --- a/src/include/ngspice/mifdefs.h +++ b/src/include/ngspice/mifdefs.h @@ -93,6 +93,8 @@ typedef struct sMIFmodel { MIFinstance *MIFinstances; /* pointer to list of instances that have this model */ IFuid MIFmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + int num_param; /* number of parameters on the code model */ Mif_Param_Data_t **param; /* array of structs for each parameter */ diff --git a/src/include/ngspice/numgen.h b/src/include/ngspice/numgen.h index 72f8c5ac8..c012a49fe 100644 --- a/src/include/ngspice/numgen.h +++ b/src/include/ngspice/numgen.h @@ -23,6 +23,9 @@ typedef struct sGENnumModel { /* model structure for a numerical device */ struct sGENnumModel *GENnextModel; /* pointer to next model in list */ GENinstance *GENinstances; /* pointer to list of instances */ IFuid GENmodName; /* pointer to string naming this model */ + + /* --- end of generic struct GENmodel --- */ + /* Everything below here is numerical-device-specific */ MESHcard *GENxMeshes; /* list of xmesh cards */ MESHcard *GENyMeshes; /* list of ymesh cards */ diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml index 9070045e9..47c12af49 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml @@ -270,6 +270,8 @@ typedef struct s$(module)model { /* model structure */ $(module)instance * $(module)instances; /* pointer to list of instances that have this model */ IFuid $(module)modName; /* pointer to the name of this model */ + /* --- end of generic struct GENmodel --- */ + /* model parameters */ diff --git a/src/spicelib/devices/asrc/asrcdefs.h b/src/spicelib/devices/asrc/asrcdefs.h index 18945b65a..b1aa80dcc 100644 --- a/src/spicelib/devices/asrc/asrcdefs.h +++ b/src/spicelib/devices/asrc/asrcdefs.h @@ -56,6 +56,9 @@ typedef struct sASRCmodel { /* model structure for a source */ ASRCinstance * ASRCinstances; /* pointer to list of instances * that have this model */ IFuid ASRCmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + } ASRCmodel; /* device parameters */ diff --git a/src/spicelib/devices/bjt/bjtdefs.h b/src/spicelib/devices/bjt/bjtdefs.h index 7e4c84727..000919e3f 100644 --- a/src/spicelib/devices/bjt/bjtdefs.h +++ b/src/spicelib/devices/bjt/bjtdefs.h @@ -329,6 +329,9 @@ typedef struct sBJTmodel { /* model structure for a bjt */ BJTinstance * BJTinstances; /* pointer to list of instances * that have this model */ IFuid BJTmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int BJTtype; int BJTsubs; diff --git a/src/spicelib/devices/bsim1/bsim1def.h b/src/spicelib/devices/bsim1/bsim1def.h index acbb54ac7..7e8188499 100644 --- a/src/spicelib/devices/bsim1/bsim1def.h +++ b/src/spicelib/devices/bsim1/bsim1def.h @@ -321,6 +321,9 @@ typedef struct sBSIM1model { /* model structure for a resistor */ B1instance * B1instances; /* pointer to list of instances * that have this model */ IFuid B1modName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int B1type; /* device type : 1 = nmos, -1 = pmos */ double B1vfb0; diff --git a/src/spicelib/devices/bsim2/bsim2def.h b/src/spicelib/devices/bsim2/bsim2def.h index ddcc65a34..d60d268c8 100644 --- a/src/spicelib/devices/bsim2/bsim2def.h +++ b/src/spicelib/devices/bsim2/bsim2def.h @@ -243,6 +243,9 @@ typedef struct sBSIM2model { /* model structure for a resistor */ B2instance * B2instances; /* pointer to list of instances * that have this model */ IFuid B2modName; /* pointer to the name of this model */ + + /* --- end of generic struct GENmodel --- */ + int B2type; /* device type: 1 = nmos, -1 = pmos */ int pad; diff --git a/src/spicelib/devices/bsim3/bsim3def.h b/src/spicelib/devices/bsim3/bsim3def.h index ac9609e42..9b1b9503d 100644 --- a/src/spicelib/devices/bsim3/bsim3def.h +++ b/src/spicelib/devices/bsim3/bsim3def.h @@ -403,6 +403,9 @@ typedef struct sBSIM3model struct sBSIM3model *BSIM3nextModel; BSIM3instance *BSIM3instances; IFuid BSIM3modName; + + /* --- end of generic struct GENmodel --- */ + int BSIM3type; int BSIM3mobMod; diff --git a/src/spicelib/devices/bsim3soi_dd/b3soidddef.h b/src/spicelib/devices/bsim3soi_dd/b3soidddef.h index 39823c04d..01fb81667 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soidddef.h +++ b/src/spicelib/devices/bsim3soi_dd/b3soidddef.h @@ -598,6 +598,9 @@ typedef struct sB3SOIDDmodel struct sB3SOIDDmodel *B3SOIDDnextModel; B3SOIDDinstance *B3SOIDDinstances; IFuid B3SOIDDmodName; + + /* --- end of generic struct GENmodel --- */ + int B3SOIDDtype; int B3SOIDDmobMod; diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifddef.h b/src/spicelib/devices/bsim3soi_fd/b3soifddef.h index 16e55c84a..f3c0a1007 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifddef.h +++ b/src/spicelib/devices/bsim3soi_fd/b3soifddef.h @@ -598,6 +598,9 @@ typedef struct sB3SOIFDmodel struct sB3SOIFDmodel *B3SOIFDnextModel; B3SOIFDinstance *B3SOIFDinstances; IFuid B3SOIFDmodName; + + /* --- end of generic struct GENmodel --- */ + int B3SOIFDtype; int B3SOIFDmobMod; diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipddef.h b/src/spicelib/devices/bsim3soi_pd/b3soipddef.h index 2221ebc1f..ceddbe2f8 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipddef.h +++ b/src/spicelib/devices/bsim3soi_pd/b3soipddef.h @@ -588,6 +588,9 @@ typedef struct sB3SOIPDmodel struct sB3SOIPDmodel *B3SOIPDnextModel; B3SOIPDinstance *B3SOIPDinstances; IFuid B3SOIPDmodName; + + /* --- end of generic struct GENmodel --- */ + int B3SOIPDtype; int B3SOIPDmobMod; diff --git a/src/spicelib/devices/bsim3v0/bsim3v0def.h b/src/spicelib/devices/bsim3v0/bsim3v0def.h index 06eac1a98..a72931e73 100644 --- a/src/spicelib/devices/bsim3v0/bsim3v0def.h +++ b/src/spicelib/devices/bsim3v0/bsim3v0def.h @@ -322,6 +322,9 @@ typedef struct sBSIM3v0model struct sBSIM3v0model *BSIM3v0nextModel; BSIM3v0instance *BSIM3v0instances; IFuid BSIM3v0modName; + + /* --- end of generic struct GENmodel --- */ + int BSIM3v0type; int BSIM3v0mobMod; diff --git a/src/spicelib/devices/bsim3v1/bsim3v1def.h b/src/spicelib/devices/bsim3v1/bsim3v1def.h index 8b1e3d53b..3424582f2 100644 --- a/src/spicelib/devices/bsim3v1/bsim3v1def.h +++ b/src/spicelib/devices/bsim3v1/bsim3v1def.h @@ -324,6 +324,9 @@ typedef struct sBSIM3v1model struct sBSIM3v1model *BSIM3v1nextModel; BSIM3v1instance *BSIM3v1instances; IFuid BSIM3v1modName; + + /* --- end of generic struct GENmodel --- */ + int BSIM3v1type; int BSIM3v1mobMod; diff --git a/src/spicelib/devices/bsim3v32/bsim3v32def.h b/src/spicelib/devices/bsim3v32/bsim3v32def.h index 1962c5493..a913d02df 100644 --- a/src/spicelib/devices/bsim3v32/bsim3v32def.h +++ b/src/spicelib/devices/bsim3v32/bsim3v32def.h @@ -358,6 +358,9 @@ typedef struct sBSIM3v32model struct sBSIM3v32model *BSIM3v32nextModel; BSIM3v32instance *BSIM3v32instances; IFuid BSIM3v32modName; + + /* --- end of generic struct GENmodel --- */ + int BSIM3v32type; int BSIM3v32mobMod; diff --git a/src/spicelib/devices/bsim4/bsim4def.h b/src/spicelib/devices/bsim4/bsim4def.h index bfdd9204a..87f041fd6 100644 --- a/src/spicelib/devices/bsim4/bsim4def.h +++ b/src/spicelib/devices/bsim4/bsim4def.h @@ -815,6 +815,9 @@ typedef struct sBSIM4model struct sBSIM4model *BSIM4nextModel; BSIM4instance *BSIM4instances; IFuid BSIM4modName; + + /* --- end of generic struct GENmodel --- */ + int BSIM4type; int BSIM4mobMod; diff --git a/src/spicelib/devices/bsim4v4/bsim4v4def.h b/src/spicelib/devices/bsim4v4/bsim4v4def.h index 8e37d2d6e..829562f93 100644 --- a/src/spicelib/devices/bsim4v4/bsim4v4def.h +++ b/src/spicelib/devices/bsim4v4/bsim4v4def.h @@ -634,6 +634,9 @@ typedef struct sBSIM4v4model struct sBSIM4v4model *BSIM4v4nextModel; BSIM4v4instance *BSIM4v4instances; IFuid BSIM4v4modName; + + /* --- end of generic struct GENmodel --- */ + int BSIM4v4type; int BSIM4v4mobMod; diff --git a/src/spicelib/devices/bsim4v5/bsim4v5def.h b/src/spicelib/devices/bsim4v5/bsim4v5def.h index 3cef6e15b..e20a53e67 100644 --- a/src/spicelib/devices/bsim4v5/bsim4v5def.h +++ b/src/spicelib/devices/bsim4v5/bsim4v5def.h @@ -659,6 +659,9 @@ typedef struct sBSIM4v5model struct sBSIM4v5model *BSIM4v5nextModel; BSIM4v5instance *BSIM4v5instances; IFuid BSIM4v5modName; + + /* --- end of generic struct GENmodel --- */ + int BSIM4v5type; int BSIM4v5mobMod; diff --git a/src/spicelib/devices/bsim4v6/bsim4v6def.h b/src/spicelib/devices/bsim4v6/bsim4v6def.h index 8e522bd73..04a5b776b 100644 --- a/src/spicelib/devices/bsim4v6/bsim4v6def.h +++ b/src/spicelib/devices/bsim4v6/bsim4v6def.h @@ -799,6 +799,9 @@ typedef struct sBSIM4v6model struct sBSIM4v6model *BSIM4v6nextModel; BSIM4v6instance *BSIM4v6instances; IFuid BSIM4v6modName; + + /* --- end of generic struct GENmodel --- */ + int BSIM4v6type; int BSIM4v6mobMod; diff --git a/src/spicelib/devices/bsimsoi/b4soidef.h b/src/spicelib/devices/bsimsoi/b4soidef.h index 32b488fab..8ebb90ada 100644 --- a/src/spicelib/devices/bsimsoi/b4soidef.h +++ b/src/spicelib/devices/bsimsoi/b4soidef.h @@ -1081,6 +1081,9 @@ typedef struct sB4SOImodel struct sB4SOImodel *B4SOInextModel; B4SOIinstance *B4SOIinstances; IFuid B4SOImodName; + + /* --- end of generic struct GENmodel --- */ + int B4SOItype; int B4SOImobMod; diff --git a/src/spicelib/devices/cap/capdefs.h b/src/spicelib/devices/cap/capdefs.h index c9acb9158..fbf860f9a 100644 --- a/src/spicelib/devices/cap/capdefs.h +++ b/src/spicelib/devices/cap/capdefs.h @@ -80,6 +80,8 @@ typedef struct sCAPmodel { /* model structure for a capacitor */ * model */ IFuid CAPmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + double CAPtnom; /* temperature at which capacitance measured */ double CAPtempCoeff1; /* linear temperature coefficient */ double CAPtempCoeff2; /* quadratic temperature coefficient */ diff --git a/src/spicelib/devices/cccs/cccsdefs.h b/src/spicelib/devices/cccs/cccsdefs.h index 9c2362001..036a0f15d 100644 --- a/src/spicelib/devices/cccs/cccsdefs.h +++ b/src/spicelib/devices/cccs/cccsdefs.h @@ -53,6 +53,9 @@ typedef struct sCCCSmodel { /* model structure for a source */ CCCSinstance * CCCSinstances; /* pointer to list of instances that have this model */ IFuid CCCSmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + } CCCSmodel; /* device parameters */ diff --git a/src/spicelib/devices/ccvs/ccvsdefs.h b/src/spicelib/devices/ccvs/ccvsdefs.h index da53ef271..5ad545fef 100644 --- a/src/spicelib/devices/ccvs/ccvsdefs.h +++ b/src/spicelib/devices/ccvs/ccvsdefs.h @@ -57,6 +57,9 @@ typedef struct sCCVSmodel { /* model structure for a CCVsource */ CCVSinstance * CCVSinstances; /* pointer to list of instances that have this model */ IFuid CCVSmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + } CCVSmodel; /* device parameters */ diff --git a/src/spicelib/devices/cpl/cpldefs.h b/src/spicelib/devices/cpl/cpldefs.h index ab5bc792b..ad833fb32 100644 --- a/src/spicelib/devices/cpl/cpldefs.h +++ b/src/spicelib/devices/cpl/cpldefs.h @@ -70,6 +70,8 @@ typedef struct sCPLmodel { /* model structure for a cpl */ * model */ IFuid CPLmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + double *Rm; int Rm_counter; double *Gm; diff --git a/src/spicelib/devices/csw/cswdefs.h b/src/spicelib/devices/csw/cswdefs.h index c976a9b1b..3ccb78796 100644 --- a/src/spicelib/devices/csw/cswdefs.h +++ b/src/spicelib/devices/csw/cswdefs.h @@ -64,6 +64,8 @@ typedef struct sCSWmodel { /* model structure for a switch */ * model */ IFuid CSWmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + double CSWonResistance; /* switch "on" resistance */ double CSWoffResistance; /* switch "off" resistance */ double CSWiThreshold; /* switching threshold current */ diff --git a/src/spicelib/devices/dio/diodefs.h b/src/spicelib/devices/dio/diodefs.h index 7cb4da8a2..6a92dac96 100644 --- a/src/spicelib/devices/dio/diodefs.h +++ b/src/spicelib/devices/dio/diodefs.h @@ -169,6 +169,8 @@ typedef struct sDIOmodel { /* model structure for a diode */ * that have this model */ IFuid DIOmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + unsigned DIOlevelGiven : 1; unsigned DIOsatCurGiven : 1; unsigned DIOsatSWCurGiven : 1; diff --git a/src/spicelib/devices/hfet1/hfetdefs.h b/src/spicelib/devices/hfet1/hfetdefs.h index f5563712d..9a324b4c6 100644 --- a/src/spicelib/devices/hfet1/hfetdefs.h +++ b/src/spicelib/devices/hfet1/hfetdefs.h @@ -132,6 +132,9 @@ typedef struct sHFETAmodel { struct sHFETAmodel *HFETAnextModel; HFETAinstance *HFETAinstances; IFuid HFETAmodName; + + /* --- end of generic struct GENmodel --- */ + int HFETAtype; int HFETAgatemod; diff --git a/src/spicelib/devices/hfet2/hfet2defs.h b/src/spicelib/devices/hfet2/hfet2defs.h index 01aba6175..d042e5886 100644 --- a/src/spicelib/devices/hfet2/hfet2defs.h +++ b/src/spicelib/devices/hfet2/hfet2defs.h @@ -89,6 +89,9 @@ typedef struct sHFET2model { int HFET2modType; struct sHFET2model *HFET2nextModel; HFET2instance * HFET2instances; + + /* --- end of generic struct GENmodel --- */ + IFuid HFET2modName; int HFET2type; diff --git a/src/spicelib/devices/hisim2/hsm2def.h b/src/spicelib/devices/hisim2/hsm2def.h index 7848e80ad..2fded8e68 100644 --- a/src/spicelib/devices/hisim2/hsm2def.h +++ b/src/spicelib/devices/hisim2/hsm2def.h @@ -596,6 +596,9 @@ typedef struct sHSM2model { /* model structure for a resistor */ HSM2instance * HSM2instances; /* pointer to list of instances that have this model */ IFuid HSM2modName; /* pointer to the name of this model */ + + /* --- end of generic struct GENmodel --- */ + int HSM2_type; /* device type: 1 = nmos, -1 = pmos */ int HSM2_level; /* level */ int HSM2_info; /* information */ diff --git a/src/spicelib/devices/hisimhv1/hsmhvdef.h b/src/spicelib/devices/hisimhv1/hsmhvdef.h index f32b7b211..224736084 100644 --- a/src/spicelib/devices/hisimhv1/hsmhvdef.h +++ b/src/spicelib/devices/hisimhv1/hsmhvdef.h @@ -915,6 +915,9 @@ typedef struct sHSMHVmodel { /* model structure for a resistor */ HSMHVinstance * HSMHVinstances; /* pointer to list of instances that have this model */ IFuid HSMHVmodName; /* pointer to the name of this model */ + + /* --- end of generic struct GENmodel --- */ + int HSMHV_type; /* device type: 1 = nmos, -1 = pmos */ int HSMHV_level; /* level */ int HSMHV_info; /* information */ diff --git a/src/spicelib/devices/ind/inddefs.h b/src/spicelib/devices/ind/inddefs.h index f024d1490..d043c4afe 100644 --- a/src/spicelib/devices/ind/inddefs.h +++ b/src/spicelib/devices/ind/inddefs.h @@ -82,6 +82,8 @@ typedef struct sINDmodel { /* model structure for an inductor */ * model */ IFuid INDmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + double INDmInd; /* Model inductance */ double INDtnom; /* temperature at which inductance measured */ double INDtempCoeff1; /* first temperature coefficient */ @@ -142,6 +144,9 @@ struct sMUTmodel *MUTnextModel; /* pointer to next possible model in MUTinstance * MUTinstances; /* pointer to list of instances that have this * model */ IFuid MUTmodName; /* pointer to character string naming this model */ + +/* --- end of generic struct GENmodel --- */ + } MUTmodel; #endif /*MUTUAL*/ diff --git a/src/spicelib/devices/isrc/isrcdefs.h b/src/spicelib/devices/isrc/isrcdefs.h index 0c2cfab02..f06741eb7 100644 --- a/src/spicelib/devices/isrc/isrcdefs.h +++ b/src/spicelib/devices/isrc/isrcdefs.h @@ -78,6 +78,9 @@ typedef struct sISRCmodel { ISRCinstance * ISRCinstances; /* pointer to list of instances * that have this model */ IFuid ISRCmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + } ISRCmodel; diff --git a/src/spicelib/devices/jfet/jfetdefs.h b/src/spicelib/devices/jfet/jfetdefs.h index 90e0f7d73..929e43f7e 100644 --- a/src/spicelib/devices/jfet/jfetdefs.h +++ b/src/spicelib/devices/jfet/jfetdefs.h @@ -174,6 +174,9 @@ typedef struct sJFETmodel { /* model structure for a jfet */ JFETinstance * JFETinstances; /* pointer to list of instances * that have this model */ IFuid JFETmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int JFETtype; double JFETthreshold; diff --git a/src/spicelib/devices/jfet2/jfet2defs.h b/src/spicelib/devices/jfet2/jfet2defs.h index a50e02574..572f34b20 100644 --- a/src/spicelib/devices/jfet2/jfet2defs.h +++ b/src/spicelib/devices/jfet2/jfet2defs.h @@ -186,6 +186,9 @@ typedef struct sJFET2model { /* model structure for a jfet */ JFET2instance * JFET2instances; /* pointer to list of instances * that have this model */ IFuid JFET2modName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int JFET2type; #define PARAM(code,id,flag,ref,default,descrip) double ref; diff --git a/src/spicelib/devices/ltra/ltradefs.h b/src/spicelib/devices/ltra/ltradefs.h index 5afd6c5dd..71833ba33 100644 --- a/src/spicelib/devices/ltra/ltradefs.h +++ b/src/spicelib/devices/ltra/ltradefs.h @@ -80,6 +80,8 @@ typedef struct sLTRAmodel { /* model structure for a transmission lines */ * model */ IFuid LTRAmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + double LTRAh1dashFirstVal; /* first needed value of h1dasg at current timepoint */ double LTRAh2FirstVal; /* first needed value of h2 at current diff --git a/src/spicelib/devices/mes/mesdefs.h b/src/spicelib/devices/mes/mesdefs.h index 0bbc9387b..316f14b8c 100644 --- a/src/spicelib/devices/mes/mesdefs.h +++ b/src/spicelib/devices/mes/mesdefs.h @@ -167,6 +167,9 @@ typedef struct sMESmodel { /* model structure for a mesfet */ MESinstance * MESinstances; /* pointer to list of instances * that have this model */ IFuid MESmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int MEStype; double MESthreshold; diff --git a/src/spicelib/devices/mesa/mesadefs.h b/src/spicelib/devices/mesa/mesadefs.h index b1ad7d220..37fffc4a4 100644 --- a/src/spicelib/devices/mesa/mesadefs.h +++ b/src/spicelib/devices/mesa/mesadefs.h @@ -220,6 +220,9 @@ typedef struct sMESAmodel { /* model structure for a MESAfet */ MESAinstance * MESAinstances; /* pointer to list of instances * that have this model */ IFuid MESAmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int MESAtype; double MESAthreshold; diff --git a/src/spicelib/devices/mos1/mos1defs.h b/src/spicelib/devices/mos1/mos1defs.h index a322c1f86..c51cc2eb9 100644 --- a/src/spicelib/devices/mos1/mos1defs.h +++ b/src/spicelib/devices/mos1/mos1defs.h @@ -318,6 +318,9 @@ typedef struct sMOS1model { /* model structure for a resistor */ MOS1instance * MOS1instances; /* pointer to list of instances * that have this model */ IFuid MOS1modName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int MOS1type; /* device type : 1 = nmos, -1 = pmos */ double MOS1tnom; /* temperature at which parameters measured */ double MOS1latDiff; diff --git a/src/spicelib/devices/mos2/mos2defs.h b/src/spicelib/devices/mos2/mos2defs.h index 45e1c4c2d..6d42d8eee 100644 --- a/src/spicelib/devices/mos2/mos2defs.h +++ b/src/spicelib/devices/mos2/mos2defs.h @@ -326,6 +326,9 @@ typedef struct sMOS2model { /* model structure for a resistor */ MOS2instance * MOS2instances; /* pointer to list of instances * that have this model */ IFuid MOS2modName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int MOS2type; /* device type : 1 = nmos, -1 = pmos */ int MOS2gateType; diff --git a/src/spicelib/devices/mos3/mos3defs.h b/src/spicelib/devices/mos3/mos3defs.h index ef0098582..51fe799a7 100644 --- a/src/spicelib/devices/mos3/mos3defs.h +++ b/src/spicelib/devices/mos3/mos3defs.h @@ -322,6 +322,9 @@ typedef struct sMOS3model { /* model structure for a resistor */ MOS3instance * MOS3instances; /* pointer to list of instances * that have this model */ IFuid MOS3modName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int MOS3type; /* device type : 1 = nmos, -1 = pmos */ double MOS3tnom; /* temperature at which parameters measured */ double MOS3latDiff; diff --git a/src/spicelib/devices/mos6/mos6defs.h b/src/spicelib/devices/mos6/mos6defs.h index d03070a81..af1ad82ac 100644 --- a/src/spicelib/devices/mos6/mos6defs.h +++ b/src/spicelib/devices/mos6/mos6defs.h @@ -249,6 +249,9 @@ typedef struct sMOS6model { /* model structure for a resistor */ MOS6instance * MOS6instances; /* pointer to list of instances * that have this model */ IFuid MOS6modName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int MOS6type; /* device type : 1 = nmos, -1 = pmos */ double MOS6tnom; /* temperature at which parameters measured */ double MOS6latDiff; diff --git a/src/spicelib/devices/mos9/mos9defs.h b/src/spicelib/devices/mos9/mos9defs.h index 2e9c72ee8..2a863c25d 100644 --- a/src/spicelib/devices/mos9/mos9defs.h +++ b/src/spicelib/devices/mos9/mos9defs.h @@ -324,6 +324,9 @@ typedef struct sMOS9model { /* model structure for a resistor */ MOS9instance * MOS9instances; /* pointer to list of instances * that have this model */ IFuid MOS9modName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int MOS9type; /* device type : 1 = nmos, -1 = pmos */ double MOS9tnom; /* temperature at which parameters measured */ double MOS9latDiff; diff --git a/src/spicelib/devices/nbjt/nbjtdefs.h b/src/spicelib/devices/nbjt/nbjtdefs.h index 886841130..911dac696 100644 --- a/src/spicelib/devices/nbjt/nbjtdefs.h +++ b/src/spicelib/devices/nbjt/nbjtdefs.h @@ -92,6 +92,9 @@ typedef struct sNBJTmodel { /* model structure for a bjt */ * linked list */ NBJTinstance *NBJTinstances; /* pointer to list of instances that have * this model */ + + /* --- end of generic struct GENmodel --- */ + IFuid NBJTmodName; /* pointer to character string naming this * model */ /* Everything below here is numerical-device-specific */ diff --git a/src/spicelib/devices/nbjt2/nbjt2def.h b/src/spicelib/devices/nbjt2/nbjt2def.h index 1ca3ee70c..c66ac191a 100644 --- a/src/spicelib/devices/nbjt2/nbjt2def.h +++ b/src/spicelib/devices/nbjt2/nbjt2def.h @@ -96,6 +96,9 @@ typedef struct sNBJT2model { /* model structure for a bjt */ * this model */ IFuid NBJT2modName; /* pointer to character string naming this * model */ + + /* --- end of generic struct GENmodel --- */ + /* Everything below here is numerical-device-specific */ MESHcard *NBJT2xMeshes; /* list of xmesh cards */ MESHcard *NBJT2yMeshes; /* list of ymesh cards */ diff --git a/src/spicelib/devices/ndev/ndevdefs.h b/src/spicelib/devices/ndev/ndevdefs.h index e388a4da6..60e29d29b 100644 --- a/src/spicelib/devices/ndev/ndevdefs.h +++ b/src/spicelib/devices/ndev/ndevdefs.h @@ -49,6 +49,9 @@ typedef struct sNDEVmodel { /* model structure for a diode */ struct sNDEVmodel *NDEVnextModel; /* pointer to next possible model in linked list */ NDEVinstance *NDEVinstances; /* pointer to list of instances that have this model */ IFuid NDEVmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + /* here can be freely defined as your wish*/ char * NDEVmodelfile; diff --git a/src/spicelib/devices/numd/numddefs.h b/src/spicelib/devices/numd/numddefs.h index 4b833bdce..c24dd358d 100644 --- a/src/spicelib/devices/numd/numddefs.h +++ b/src/spicelib/devices/numd/numddefs.h @@ -75,6 +75,9 @@ typedef struct sNUMDmodel { /* model structure for a diode */ * this model */ IFuid NUMDmodName; /* pointer to character string naming this * model */ + + /* --- end of generic struct GENmodel --- */ + /* Everything below here is numerical-device-specific */ MESHcard *NUMDxMeshes; /* list of xmesh cards */ MESHcard *NUMDyMeshes; /* list of ymesh cards */ diff --git a/src/spicelib/devices/numd2/numd2def.h b/src/spicelib/devices/numd2/numd2def.h index 75477d585..46017446f 100644 --- a/src/spicelib/devices/numd2/numd2def.h +++ b/src/spicelib/devices/numd2/numd2def.h @@ -77,6 +77,9 @@ typedef struct sNUMD2model { /* model structure for a diode */ * this model */ IFuid NUMD2modName; /* pointer to character string naming this * model */ + + /* --- end of generic struct GENmodel --- */ + /* Everything below here is numerical-device-specific */ MESHcard *NUMD2xMeshes; /* list of xmesh cards */ MESHcard *NUMD2yMeshes; /* list of ymesh cards */ diff --git a/src/spicelib/devices/numos/numosdef.h b/src/spicelib/devices/numos/numosdef.h index c0bd18ad6..6bcad9fc8 100644 --- a/src/spicelib/devices/numos/numosdef.h +++ b/src/spicelib/devices/numos/numosdef.h @@ -122,6 +122,9 @@ typedef struct sNUMOSmodel { /* model structure for a numerical device */ struct sNUMOSmodel *NUMOSnextModel; /* pointer to next model in list */ NUMOSinstance *NUMOSinstances;/* pointer to list of instances */ IFuid NUMOSmodName; /* pointer to string naming this model */ + + /* --- end of generic struct GENmodel --- */ + /* Everything below here is numerical-device-specific */ MESHcard *NUMOSxMeshes; /* list of xmesh cards */ MESHcard *NUMOSyMeshes; /* list of ymesh cards */ diff --git a/src/spicelib/devices/res/resdefs.h b/src/spicelib/devices/res/resdefs.h index 84ddf6e09..0dfeff817 100644 --- a/src/spicelib/devices/res/resdefs.h +++ b/src/spicelib/devices/res/resdefs.h @@ -96,6 +96,8 @@ typedef struct sRESmodel { /* model structure for a resistor */ * model */ IFuid RESmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + double REStnom; /* temperature at which resistance measured */ double REStempCoeff1; /* first temperature coefficient of resistors */ double REStempCoeff2; /* second temperature coefficient of resistors */ diff --git a/src/spicelib/devices/soi3/soi3defs.h b/src/spicelib/devices/soi3/soi3defs.h index 89ab69668..4d7dba923 100644 --- a/src/spicelib/devices/soi3/soi3defs.h +++ b/src/spicelib/devices/soi3/soi3defs.h @@ -422,6 +422,9 @@ typedef struct sSOI3model { /* model structure for an SOI3 MOSFET */ SOI3instance * SOI3instances; /* pointer to list of instances * that have this model */ IFuid SOI3modName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int SOI3type; /* device type : 1 = nsoi, -1 = psoi */ double SOI3tnom; /* temperature at which parameters measured */ double SOI3latDiff; diff --git a/src/spicelib/devices/sw/swdefs.h b/src/spicelib/devices/sw/swdefs.h index ce3c89d44..0a97c984e 100644 --- a/src/spicelib/devices/sw/swdefs.h +++ b/src/spicelib/devices/sw/swdefs.h @@ -63,6 +63,8 @@ typedef struct sSWmodel { /* model structure for a switch */ * model */ IFuid SWmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + double SWonResistance; /* switch "on" resistance */ double SWoffResistance; /* switch "off" resistance */ double SWvThreshold; /* switching threshold voltage */ diff --git a/src/spicelib/devices/tra/tradefs.h b/src/spicelib/devices/tra/tradefs.h index 2da7d66aa..17b158c1e 100644 --- a/src/spicelib/devices/tra/tradefs.h +++ b/src/spicelib/devices/tra/tradefs.h @@ -92,6 +92,9 @@ typedef struct sTRAmodel { /* model structure for a transmission lines */ TRAinstance * TRAinstances; /* pointer to list of instances that have this * model */ IFuid TRAmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + } TRAmodel; /* device parameters */ diff --git a/src/spicelib/devices/txl/txldefs.h b/src/spicelib/devices/txl/txldefs.h index cb8db1e4b..7452ea385 100644 --- a/src/spicelib/devices/txl/txldefs.h +++ b/src/spicelib/devices/txl/txldefs.h @@ -62,6 +62,8 @@ typedef struct sTXLmodel { /* model structure for a txl */ * model */ IFuid TXLmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + double R; double L; double G; diff --git a/src/spicelib/devices/urc/urcdefs.h b/src/spicelib/devices/urc/urcdefs.h index e2e02687a..aab20f9cb 100644 --- a/src/spicelib/devices/urc/urcdefs.h +++ b/src/spicelib/devices/urc/urcdefs.h @@ -44,6 +44,8 @@ typedef struct sURCmodel { /* model structure for a resistor */ * model */ IFuid URCmodName; /* pointer to character string naming this model */ + /* --- end of generic struct GENmodel --- */ + double URCk; /* propagation constant for URC */ double URCfmax; /* max frequence of interest */ double URCrPerL; /* resistance per unit length */ diff --git a/src/spicelib/devices/vbic/vbicdefs.h b/src/spicelib/devices/vbic/vbicdefs.h index 22b01f684..4f7078567 100644 --- a/src/spicelib/devices/vbic/vbicdefs.h +++ b/src/spicelib/devices/vbic/vbicdefs.h @@ -357,6 +357,9 @@ typedef struct sVBICmodel { /* model structure for a vbic */ this model */ IFuid VBICmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + int VBICtype; double VBICtnom; diff --git a/src/spicelib/devices/vccs/vccsdefs.h b/src/spicelib/devices/vccs/vccsdefs.h index 8874fcd3b..13eb94aa1 100644 --- a/src/spicelib/devices/vccs/vccsdefs.h +++ b/src/spicelib/devices/vccs/vccsdefs.h @@ -61,6 +61,9 @@ typedef struct sVCCSmodel { /* model structure for a source */ VCCSinstance * VCCSinstances; /* pointer to list of instances * that have this model */ IFuid VCCSmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + } VCCSmodel; /* device parameters */ diff --git a/src/spicelib/devices/vcvs/vcvsdefs.h b/src/spicelib/devices/vcvs/vcvsdefs.h index 6073121c8..b1d6045f4 100644 --- a/src/spicelib/devices/vcvs/vcvsdefs.h +++ b/src/spicelib/devices/vcvs/vcvsdefs.h @@ -65,6 +65,9 @@ typedef struct sVCVSmodel { /* model structure for a source */ VCVSinstance * VCVSinstances; /* pointer to list of instances * that have this model */ IFuid VCVSmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + } VCVSmodel; /* device parameters */ diff --git a/src/spicelib/devices/vsrc/vsrcdefs.h b/src/spicelib/devices/vsrc/vsrcdefs.h index 1e60e3db3..82736daa6 100644 --- a/src/spicelib/devices/vsrc/vsrcdefs.h +++ b/src/spicelib/devices/vsrc/vsrcdefs.h @@ -87,6 +87,9 @@ typedef struct sVSRCmodel { VSRCinstance * VSRCinstances; /* pointer to list of instances * that have this model */ IFuid VSRCmodName; /* pointer to character string naming this model */ + + /* --- end of generic struct GENmodel --- */ + } VSRCmodel; /* source function types (shared with current sources) */