From cd1bbf2003781611346d270793afc4bffb41bc01 Mon Sep 17 00:00:00 2001 From: rlar Date: Wed, 21 Feb 2018 20:02:00 +0100 Subject: [PATCH] rewrite, use designated initializer for SPICEdev initialisation --- .../adms/admst/ngspiceMODULEinit.c.xml | 113 +++++---- src/spicelib/devices/asrc/asrcinit.c | 111 ++++----- src/spicelib/devices/bjt/bjtinit.c | 117 +++++---- src/spicelib/devices/bsim1/bsim1init.c | 113 ++++----- src/spicelib/devices/bsim2/bsim2init.c | 113 ++++----- src/spicelib/devices/bsim3/bsim3init.c | 112 ++++----- .../devices/bsim3soi_dd/b3soiddinit.c | 112 +++++---- .../devices/bsim3soi_fd/b3soifdinit.c | 118 +++++---- .../devices/bsim3soi_pd/b3soipdinit.c | 113 +++++---- src/spicelib/devices/bsim3v0/bsim3v0init.c | 112 ++++----- src/spicelib/devices/bsim3v1/bsim3v1init.c | 112 ++++----- src/spicelib/devices/bsim3v32/bsim3v32init.c | 112 ++++----- src/spicelib/devices/bsim4/bsim4init.c | 110 ++++----- src/spicelib/devices/bsim4v5/bsim4v5init.c | 110 ++++----- src/spicelib/devices/bsim4v6/bsim4v6init.c | 110 ++++----- src/spicelib/devices/bsim4v7/bsim4v7init.c | 110 ++++----- src/spicelib/devices/bsimsoi/b4soiinit.c | 111 ++++----- src/spicelib/devices/cap/capinit.c | 111 ++++----- src/spicelib/devices/cccs/cccsinit.c | 112 ++++----- src/spicelib/devices/ccvs/ccvsinit.c | 113 ++++----- src/spicelib/devices/cpl/cplinit.c | 116 +++++---- src/spicelib/devices/csw/cswinit.c | 113 ++++----- src/spicelib/devices/dio/dioinit.c | 112 ++++----- src/spicelib/devices/hfet1/hfetinit.c | 113 ++++----- src/spicelib/devices/hfet2/hfet2init.c | 113 ++++----- src/spicelib/devices/hisim2/hsm2init.c | 111 ++++----- src/spicelib/devices/hisimhv1/hsmhvinit.c | 111 ++++----- src/spicelib/devices/hisimhv2/hsmhv2init.c | 111 ++++----- src/spicelib/devices/ind/indinit.c | 225 ++++++++---------- src/spicelib/devices/isrc/isrcinit.c | 112 ++++----- src/spicelib/devices/jfet/jfetinit.c | 113 ++++----- src/spicelib/devices/jfet2/jfet2init.c | 113 ++++----- src/spicelib/devices/ltra/ltrainit.c | 113 ++++----- src/spicelib/devices/mes/mesinit.c | 113 ++++----- src/spicelib/devices/mesa/mesainit.c | 113 ++++----- src/spicelib/devices/mos1/mos1init.c | 112 ++++----- src/spicelib/devices/mos2/mos2init.c | 112 ++++----- src/spicelib/devices/mos3/mos3init.c | 113 ++++----- src/spicelib/devices/mos6/mos6init.c | 112 ++++----- src/spicelib/devices/mos9/mos9init.c | 113 ++++----- src/spicelib/devices/nbjt/nbjtinit.c | 112 ++++----- src/spicelib/devices/nbjt2/nbt2init.c | 114 ++++----- src/spicelib/devices/ndev/ndevinit.c | 114 ++++----- src/spicelib/devices/numd/numdinit.c | 114 ++++----- src/spicelib/devices/numd2/numd2init.c | 114 ++++----- src/spicelib/devices/numos/numosinit.c | 114 ++++----- src/spicelib/devices/res/resinit.c | 113 ++++----- src/spicelib/devices/soi3/soi3init.c | 113 ++++----- src/spicelib/devices/sw/swinit.c | 113 ++++----- src/spicelib/devices/tra/trainit.c | 113 ++++----- src/spicelib/devices/txl/txlinit.c | 112 ++++----- src/spicelib/devices/urc/urcinit.c | 113 ++++----- src/spicelib/devices/vbic/vbicinit.c | 113 ++++----- src/spicelib/devices/vccs/vccsinit.c | 114 ++++----- src/spicelib/devices/vcvs/vcvsinit.c | 113 ++++----- src/spicelib/devices/vsrc/vsrcinit.c | 112 ++++----- src/xspice/cmpp/writ_ifs.c | 119 +++++---- 57 files changed, 3026 insertions(+), 3513 deletions(-) diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml index d0dd05d96..4721505dd 100644 --- a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml +++ b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml @@ -35,75 +35,72 @@ #include "$(module)init.h" SPICEdev $(module)info = { - { "$module", - "$module created by adms", - &$(module)nSize, - &$(module)nSize, - $(module)names, - &$(module)pTSize, - $(module)pTable, - &$(module)mPTSize, - $(module)mPTable, + .DEVpublic = { + .name = "$module", + .description = "$module created by adms", + .terms = &$(module)nSize, + .numNames = &$(module)nSize, + .termNames = $(module)names, + .numInstanceParms = &$(module)pTSize, + .instanceParms = $(module)pTable, + .numModelParms = &$(module)mPTSize, + .modelParms = $(module)mPTable, + .flags = DEV_DEFAULT, + #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - DEV_DEFAULT - }, + }, + + .DEVparam = $(module)par, + .DEVmodParam = $(module)mParam, + .DEVload = $(module)load, + .DEVsetup = $(module)setup, + .DEVunsetup = $(module)unsetup, + .DEVpzSetup = $(module)setup, + .DEVtemperature = $(module)temp, + .DEVtrunc = $(module)trunc, + .DEVfindBranch = NULL, + .DEVacLoad = $(module)acLoad, + .DEVaccept = NULL, + .DEVdestroy = $(module)destroy, + .DEVmodDelete = $(module)mDelete, + .DEVdelete = $(module)delete, + .DEVsetic = NULL, + .DEVask = $(module)ask, + .DEVmodAsk = $(module)mAsk, + .DEVpzLoad = $(module)pzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &$(module)iSize, + .DEVmodSize = &$(module)mSize, - $(module)par, /* DEVparam */ - $(module)mParam, /* DEVmodParam */ - $(module)load, /* DEVload */ - $(module)setup, /* DEVsetup */ - $(module)unsetup, /* DEVunsetup */ - $(module)setup, /* DEVpzSetup */ - $(module)temp, /* DEVtemperature */ - $(module)trunc, /* DEVtrunc */ - NULL, /* DEVfindBranch */ - $(module)acLoad, /* DEVacLoad */ - NULL, /* DEVaccept */ - $(module)destroy, /* DEVdestroy */ - $(module)mDelete, /* DEVmodDelete */ - $(module)delete, /* DEVdelete */ - NULL, /* DEVsetic */ - $(module)ask, /* DEVask */ - $(module)mAsk, /* DEVmodAsk */ - $(module)pzLoad, /* DEVpzLoad */ - NULL, /* DEVconvTest */ - NULL, /* DEVsenSetup */ - NULL, /* DEVsenLoad */ - NULL, /* DEVsenUpdate */ - NULL, /* DEVsenAcLoad */ - NULL, /* DEVsenPrint */ - NULL, /* DEVsenTrunc */ - NULL, /* DEVdisto */ - NULL, /* DEVnoise */ - NULL, /* DEVsoaCheck */ #ifdef CIDER - NULL, /* DEVdump */ - NULL, /* DEVacct */ -#endif - &$(module)iSize, /* DEVinstSize */ - &$(module)mSize /* DEVmodSize */ - + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; + SPICEdev * get_$(module)_info(void) { return &$(module)info; } - diff --git a/src/spicelib/devices/asrc/asrcinit.c b/src/spicelib/devices/asrc/asrcinit.c index 8360f5418..ab1a23c77 100644 --- a/src/spicelib/devices/asrc/asrcinit.c +++ b/src/spicelib/devices/asrc/asrcinit.c @@ -8,73 +8,64 @@ SPICEdev ASRCinfo = { - { - "ASRC", - "Arbitrary Source ", - - &ASRCnSize, - &ASRCnSize, - ASRCnames, - - &ASRCpTSize, - ASRCpTable, - - NULL, - NULL, + .DEVpublic = { + .name = "ASRC", + .description = "Arbitrary Source ", + .terms = &ASRCnSize, + .numNames = &ASRCnSize, + .termNames = ASRCnames, + .numInstanceParms = &ASRCpTSize, + .instanceParms = ASRCpTable, + .numModelParms = NULL, + .modelParms = NULL, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - - DEV_DEFAULT }, - /* DEVparam */ ASRCparam, - /* DEVmodParam */ NULL, - /* DEVload */ ASRCload, - /* DEVsetup */ ASRCsetup, - /* DEVunsetup */ ASRCunsetup, - /* DEVpzSetup */ ASRCsetup, - /* DEVtemperature*/ ASRCtemp, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ ASRCfindBr, - /* DEVacLoad */ ASRCacLoad, /* ac and normal load functions NOT identical */ - /* DEVaccept */ NULL, - /* DEVdestroy */ ASRCdestroy, - /* DEVmodDelete */ ASRCmDelete, - /* DEVdelete */ ASRCdelete, - /* DEVsetic */ NULL, - /* DEVask */ ASRCask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ ASRCpzLoad, - /* DEVconvTest */ ASRCconvTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, + .DEVparam = ASRCparam, + .DEVmodParam = NULL, + .DEVload = ASRCload, + .DEVsetup = ASRCsetup, + .DEVunsetup = ASRCunsetup, + .DEVpzSetup = ASRCsetup, + .DEVtemperature = ASRCtemp, + .DEVtrunc = NULL, + .DEVfindBranch = ASRCfindBr, + .DEVacLoad = ASRCacLoad, + .DEVaccept = NULL, + .DEVdestroy = ASRCdestroy, + .DEVmodDelete = ASRCmDelete, + .DEVdelete = ASRCdelete, + .DEVsetic = NULL, + .DEVask = ASRCask, + .DEVmodAsk = NULL, + .DEVpzLoad = ASRCpzLoad, + .DEVconvTest = ASRCconvTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &ASRCiSize, + .DEVmodSize = &ASRCmSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, + .DEVdump = NULL, + .DEVacct = NULL, #endif - /* DEVinstSize */ &ASRCiSize, - /* DEVmodSize */ &ASRCmSize }; diff --git a/src/spicelib/devices/bjt/bjtinit.c b/src/spicelib/devices/bjt/bjtinit.c index dc5e025b1..aded3c9d2 100644 --- a/src/spicelib/devices/bjt/bjtinit.c +++ b/src/spicelib/devices/bjt/bjtinit.c @@ -7,74 +7,65 @@ #include "bjtinit.h" -SPICEdev BJTinfo = { /* description from struct IFdevice */ - { - "BJT", /* char *name */ - "Bipolar Junction Transistor", /* char *description */ - - &BJTnSize, /* int *terms */ - &BJTnSize, /* int *numNames */ - BJTnames, /* char **termnames */ - - &BJTpTSize, /* int *numInstanceparms */ - BJTpTable, /* IFparm *instanceParms */ - - &BJTmPTSize, /* int *numModelparms */ - BJTmPTable, /* IFparm *modelParms */ +SPICEdev BJTinfo = { + .DEVpublic = { + .name = "BJT", + .description = "Bipolar Junction Transistor", + .terms = &BJTnSize, + .numNames = &BJTnSize, + .termNames = BJTnames, + .numInstanceParms = &BJTpTSize, + .instanceParms = BJTpTable, + .numModelParms = &BJTmPTSize, + .modelParms = BJTmPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT /* int flags */ }, - - /* DEVparam */ BJTparam, - /* DEVmodParam */ BJTmParam, - /* DEVload */ BJTload, - /* DEVsetup */ BJTsetup, - /* DEVunsetup */ BJTunsetup, - /* DEVpzSetup */ BJTsetup, - /* DEVtemperature*/ BJTtemp, - /* DEVtrunc */ BJTtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ BJTacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ BJTdestroy, - /* DEVmodDelete */ BJTmDelete, - /* DEVdelete */ BJTdelete, - /* DEVsetic */ BJTgetic, - /* DEVask */ BJTask, - /* DEVmodAsk */ BJTmAsk, - /* DEVpzLoad */ BJTpzLoad, - /* DEVconvTest */ BJTconvTest, - /* DEVsenSetup */ BJTsSetup, - /* DEVsenLoad */ BJTsLoad, - /* DEVsenUpdate */ BJTsUpdate, - /* DEVsenAcLoad */ BJTsAcLoad, - /* DEVsenPrint */ BJTsPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ BJTdisto, - /* DEVnoise */ BJTnoise, - /* DEVsoaCheck */ BJTsoaCheck, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &BJTiSize, - /* DEVmodSize */ &BJTmSize + .DEVparam = BJTparam, + .DEVmodParam = BJTmParam, + .DEVload = BJTload, + .DEVsetup = BJTsetup, + .DEVunsetup = BJTunsetup, + .DEVpzSetup = BJTsetup, + .DEVtemperature = BJTtemp, + .DEVtrunc = BJTtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = BJTacLoad, + .DEVaccept = NULL, + .DEVdestroy = BJTdestroy, + .DEVmodDelete = BJTmDelete, + .DEVdelete = BJTdelete, + .DEVsetic = BJTgetic, + .DEVask = BJTask, + .DEVmodAsk = BJTmAsk, + .DEVpzLoad = BJTpzLoad, + .DEVconvTest = BJTconvTest, + .DEVsenSetup = BJTsSetup, + .DEVsenLoad = BJTsLoad, + .DEVsenUpdate = BJTsUpdate, + .DEVsenAcLoad = BJTsAcLoad, + .DEVsenPrint = BJTsPrint, + .DEVsenTrunc = NULL, + .DEVdisto = BJTdisto, + .DEVnoise = BJTnoise, + .DEVsoaCheck = BJTsoaCheck, + .DEVinstSize = &BJTiSize, + .DEVmodSize = &BJTmSize, + +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/bsim1/bsim1init.c b/src/spicelib/devices/bsim1/bsim1init.c index 16d4e9ef7..416455477 100644 --- a/src/spicelib/devices/bsim1/bsim1init.c +++ b/src/spicelib/devices/bsim1/bsim1init.c @@ -8,73 +8,64 @@ SPICEdev B1info = { - { - "BSIM1", - "Berkeley Short Channel IGFET Model", - - &B1nSize, - &B1nSize, - B1names, - - &B1pTSize, - B1pTable, - - &B1mPTSize, - B1mPTable, + .DEVpublic = { + .name = "BSIM1", + .description = "Berkeley Short Channel IGFET Model", + .terms = &B1nSize, + .numNames = &B1nSize, + .termNames = B1names, + .numInstanceParms = &B1pTSize, + .instanceParms = B1pTable, + .numModelParms = &B1mPTSize, + .modelParms = B1mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ B1param, - /* DEVmodParam */ B1mParam, - /* DEVload */ B1load, - /* DEVsetup */ B1setup, - /* DEVunsetup */ B1unsetup, - /* DEVpzSetup */ B1setup, - /* DEVtemperature*/ B1temp, - /* DEVtrunc */ B1trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ B1acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ B1destroy, - /* DEVmodDelete */ B1mDelete, - /* DEVdelete */ B1delete, - /* DEVsetic */ B1getic, - /* DEVask */ B1ask, - /* DEVmodAsk */ B1mAsk, - /* DEVpzLoad */ B1pzLoad, - /* DEVconvTest */ B1convTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ B1disto, - /* DEVnoise */ B1noise, /* NOISE */ - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &B1iSize, - /* DEVmodSize */ &B1mSize + .DEVparam = B1param, + .DEVmodParam = B1mParam, + .DEVload = B1load, + .DEVsetup = B1setup, + .DEVunsetup = B1unsetup, + .DEVpzSetup = B1setup, + .DEVtemperature = B1temp, + .DEVtrunc = B1trunc, + .DEVfindBranch = NULL, + .DEVacLoad = B1acLoad, + .DEVaccept = NULL, + .DEVdestroy = B1destroy, + .DEVmodDelete = B1mDelete, + .DEVdelete = B1delete, + .DEVsetic = B1getic, + .DEVask = B1ask, + .DEVmodAsk = B1mAsk, + .DEVpzLoad = B1pzLoad, + .DEVconvTest = B1convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = B1disto, + .DEVnoise = B1noise, + .DEVsoaCheck = NULL, + .DEVinstSize = &B1iSize, + .DEVmodSize = &B1mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/bsim2/bsim2init.c b/src/spicelib/devices/bsim2/bsim2init.c index 6a4294505..168a80e4b 100644 --- a/src/spicelib/devices/bsim2/bsim2init.c +++ b/src/spicelib/devices/bsim2/bsim2init.c @@ -8,73 +8,64 @@ SPICEdev B2info = { - { - "BSIM2", - "Berkeley Short Channel IGFET Model", - - &B2nSize, - &B2nSize, - B2names, - - &B2pTSize, - B2pTable, - - &B2mPTSize, - B2mPTable, + .DEVpublic = { + .name = "BSIM2", + .description = "Berkeley Short Channel IGFET Model", + .terms = &B2nSize, + .numNames = &B2nSize, + .termNames = B2names, + .numInstanceParms = &B2pTSize, + .instanceParms = B2pTable, + .numModelParms = &B2mPTSize, + .modelParms = B2mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ B2param, - /* DEVmodParam */ B2mParam, - /* DEVload */ B2load, - /* DEVsetup */ B2setup, - /* DEVunsetup */ B2unsetup, - /* DEVpzSetup */ B2setup, - /* DEVtemperature*/ B2temp, - /* DEVtrunc */ B2trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ B2acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ B2destroy, - /* DEVmodDelete */ B2mDelete, - /* DEVdelete */ B2delete, - /* DEVsetic */ B2getic, - /* DEVask */ B2ask, - /* DEVmodAsk */ B2mAsk, - /* DEVpzLoad */ B2pzLoad, - /* DEVconvTest */ B2convTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ B2noise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &B2iSize, - /* DEVmodSize */ &B2mSize + .DEVparam = B2param, + .DEVmodParam = B2mParam, + .DEVload = B2load, + .DEVsetup = B2setup, + .DEVunsetup = B2unsetup, + .DEVpzSetup = B2setup, + .DEVtemperature = B2temp, + .DEVtrunc = B2trunc, + .DEVfindBranch = NULL, + .DEVacLoad = B2acLoad, + .DEVaccept = NULL, + .DEVdestroy = B2destroy, + .DEVmodDelete = B2mDelete, + .DEVdelete = B2delete, + .DEVsetic = B2getic, + .DEVask = B2ask, + .DEVmodAsk = B2mAsk, + .DEVpzLoad = B2pzLoad, + .DEVconvTest = B2convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = B2noise, + .DEVsoaCheck = NULL, + .DEVinstSize = &B2iSize, + .DEVmodSize = &B2mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/bsim3/bsim3init.c b/src/spicelib/devices/bsim3/bsim3init.c index e27f3925b..420ec6f20 100644 --- a/src/spicelib/devices/bsim3/bsim3init.c +++ b/src/spicelib/devices/bsim3/bsim3init.c @@ -8,72 +8,64 @@ SPICEdev BSIM3info = { - { "BSIM3", - "Berkeley Short Channel IGFET Model Version-3", - - &BSIM3nSize, - &BSIM3nSize, - BSIM3names, - - &BSIM3pTSize, - BSIM3pTable, - - &BSIM3mPTSize, - BSIM3mPTable, + .DEVpublic = { + .name = "BSIM3", + .description = "Berkeley Short Channel IGFET Model Version-3", + .terms = &BSIM3nSize, + .numNames = &BSIM3nSize, + .termNames = BSIM3names, + .numInstanceParms = &BSIM3pTSize, + .instanceParms = BSIM3pTable, + .numModelParms = &BSIM3mPTSize, + .modelParms = BSIM3mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ BSIM3param, - /* DEVmodParam */ BSIM3mParam, - /* DEVload */ BSIM3load, - /* DEVsetup */ BSIM3setup, - /* DEVunsetup */ BSIM3unsetup, - /* DEVpzSetup */ BSIM3setup, - /* DEVtemperature*/ BSIM3temp, - /* DEVtrunc */ BSIM3trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ BSIM3acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ BSIM3destroy, - /* DEVmodDelete */ BSIM3mDelete, - /* DEVdelete */ BSIM3delete, - /* DEVsetic */ BSIM3getic, - /* DEVask */ BSIM3ask, - /* DEVmodAsk */ BSIM3mAsk, - /* DEVpzLoad */ BSIM3pzLoad, - /* DEVconvTest */ BSIM3convTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ BSIM3noise, - /* DEVsoaCheck */ BSIM3soaCheck, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &BSIM3iSize, - /* DEVmodSize */ &BSIM3mSize + .DEVparam = BSIM3param, + .DEVmodParam = BSIM3mParam, + .DEVload = BSIM3load, + .DEVsetup = BSIM3setup, + .DEVunsetup = BSIM3unsetup, + .DEVpzSetup = BSIM3setup, + .DEVtemperature = BSIM3temp, + .DEVtrunc = BSIM3trunc, + .DEVfindBranch = NULL, + .DEVacLoad = BSIM3acLoad, + .DEVaccept = NULL, + .DEVdestroy = BSIM3destroy, + .DEVmodDelete = BSIM3mDelete, + .DEVdelete = BSIM3delete, + .DEVsetic = BSIM3getic, + .DEVask = BSIM3ask, + .DEVmodAsk = BSIM3mAsk, + .DEVpzLoad = BSIM3pzLoad, + .DEVconvTest = BSIM3convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = BSIM3noise, + .DEVsoaCheck = BSIM3soaCheck, + .DEVinstSize = &BSIM3iSize, + .DEVmodSize = &BSIM3mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c index 12b98c75f..fbc36aa13 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c @@ -6,73 +6,67 @@ #include "b3soiddinit.h" SPICEdev B3SOIDDinfo = { - { "B3SOIDD", - "Berkeley SOI MOSFET (DD) model version 2.1", + .DEVpublic = { + .name = "B3SOIDD", + .description = "Berkeley SOI MOSFET (DD) model version 2.1", + .terms = &B3SOIDDnSize, + .numNames = &B3SOIDDnSize, + .termNames = B3SOIDDnames, + .numInstanceParms = &B3SOIDDpTSize, + .instanceParms = B3SOIDDpTable, + .numModelParms = &B3SOIDDmPTSize, + .modelParms = B3SOIDDmPTable, + .flags = DEV_DEFAULT, - &B3SOIDDnSize, - &B3SOIDDnSize, - B3SOIDDnames, - - &B3SOIDDpTSize, - B3SOIDDpTable, - - &B3SOIDDmPTSize, - B3SOIDDmPTable, - #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ -#endif - DEV_DEFAULT - + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, +#endif }, - /* DEVparam */ B3SOIDDparam, - /* DEVmodParam */ B3SOIDDmParam, - /* DEVload */ B3SOIDDload, - /* DEVsetup */ B3SOIDDsetup, - /* DEVunsetup */ B3SOIDDunsetup, - /* DEVpzSetup */ B3SOIDDsetup, - /* DEVtemperature*/ B3SOIDDtemp, - /* DEVtrunc */ B3SOIDDtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ B3SOIDDacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ B3SOIDDdestroy, - /* DEVmodDelete */ B3SOIDDmDelete, - /* DEVdelete */ B3SOIDDdelete, - /* DEVsetic */ B3SOIDDgetic, - /* DEVask */ B3SOIDDask, - /* DEVmodAsk */ B3SOIDDmAsk, - /* DEVpzLoad */ B3SOIDDpzLoad, - /* DEVconvTest */ B3SOIDDconvTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ B3SOIDDnoise, - /* DEVsoaCheck */ NULL, + .DEVparam = B3SOIDDparam, + .DEVmodParam = B3SOIDDmParam, + .DEVload = B3SOIDDload, + .DEVsetup = B3SOIDDsetup, + .DEVunsetup = B3SOIDDunsetup, + .DEVpzSetup = B3SOIDDsetup, + .DEVtemperature = B3SOIDDtemp, + .DEVtrunc = B3SOIDDtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = B3SOIDDacLoad, + .DEVaccept = NULL, + .DEVdestroy = B3SOIDDdestroy, + .DEVmodDelete = B3SOIDDmDelete, + .DEVdelete = B3SOIDDdelete, + .DEVsetic = B3SOIDDgetic, + .DEVask = B3SOIDDask, + .DEVmodAsk = B3SOIDDmAsk, + .DEVpzLoad = B3SOIDDpzLoad, + .DEVconvTest = B3SOIDDconvTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = B3SOIDDnoise, + .DEVsoaCheck = NULL, + .DEVinstSize = &B3SOIDDiSize, + .DEVmodSize = &B3SOIDDmSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, + .DEVdump = NULL, + .DEVacct = NULL, #endif - /* DEVinstSize */ &B3SOIDDiSize, - /* DEVmodSize */ &B3SOIDDmSize }; + SPICEdev * get_b3soidd_info (void) { diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c b/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c index d5213e623..c41973691 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c @@ -6,79 +6,67 @@ #include "b3soifdinit.h" SPICEdev B3SOIFDinfo = { - { "B3SOIFD", - "Berkeley SOI MOSFET (FD) model version 2.1", + .DEVpublic = { + .name = "B3SOIFD", + .description = "Berkeley SOI MOSFET (FD) model version 2.1", + .terms = &B3SOIFDnSize, + .numNames = &B3SOIFDnSize, + .termNames = B3SOIFDnames, + .numInstanceParms = &B3SOIFDpTSize, + .instanceParms = B3SOIFDpTable, + .numModelParms = &B3SOIFDmPTSize, + .modelParms = B3SOIFDmPTable, + .flags = DEV_DEFAULT, - &B3SOIFDnSize, - &B3SOIFDnSize, - B3SOIFDnames, - - &B3SOIFDpTSize, - B3SOIFDpTable, - - &B3SOIFDmPTSize, - B3SOIFDmPTable, - #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ -#endif - - DEV_DEFAULT - + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, +#endif }, - /* DEVparam */ B3SOIFDparam, - /* DEVmodParam */ B3SOIFDmParam, - /* DEVload */ B3SOIFDload, - /* DEVsetup */ B3SOIFDsetup, - /* DEVunsetup */ B3SOIFDunsetup, - /* DEVpzSetup */ B3SOIFDsetup, - /* DEVtemperature*/ B3SOIFDtemp, - /* DEVtrunc */ B3SOIFDtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ B3SOIFDacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ B3SOIFDdestroy, - /* DEVmodDelete */ B3SOIFDmDelete, - /* DEVdelete */ B3SOIFDdelete, - /* DEVsetic */ B3SOIFDgetic, - /* DEVask */ B3SOIFDask, - /* DEVmodAsk */ B3SOIFDmAsk, - /* DEVpzLoad */ B3SOIFDpzLoad, - /* DEVconvTest */ B3SOIFDconvTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ B3SOIFDnoise, - /* DEVsoaCheck */ NULL, + .DEVparam = B3SOIFDparam, + .DEVmodParam = B3SOIFDmParam, + .DEVload = B3SOIFDload, + .DEVsetup = B3SOIFDsetup, + .DEVunsetup = B3SOIFDunsetup, + .DEVpzSetup = B3SOIFDsetup, + .DEVtemperature = B3SOIFDtemp, + .DEVtrunc = B3SOIFDtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = B3SOIFDacLoad, + .DEVaccept = NULL, + .DEVdestroy = B3SOIFDdestroy, + .DEVmodDelete = B3SOIFDmDelete, + .DEVdelete = B3SOIFDdelete, + .DEVsetic = B3SOIFDgetic, + .DEVask = B3SOIFDask, + .DEVmodAsk = B3SOIFDmAsk, + .DEVpzLoad = B3SOIFDpzLoad, + .DEVconvTest = B3SOIFDconvTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = B3SOIFDnoise, + .DEVsoaCheck = NULL, + .DEVinstSize = &B3SOIFDiSize, + .DEVmodSize = &B3SOIFDmSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize*/ &B3SOIFDiSize, - /* DEVmodSize*/ &B3SOIFDmSize + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; - - - - SPICEdev * get_b3soifd_info (void) { diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c b/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c index 60c8a0033..381ea938e 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c @@ -7,74 +7,67 @@ SPICEdev B3SOIPDinfo = { - {"B3SOIPD", - "Berkeley SOI (PD) MOSFET model version 2.2.3", + .DEVpublic = { + .name = "B3SOIPD", + .description = "Berkeley SOI (PD) MOSFET model version 2.2.3", + .terms = &B3SOIPDnSize, + .numNames = &B3SOIPDnSize, + .termNames = B3SOIPDnames, + .numInstanceParms = &B3SOIPDpTSize, + .instanceParms = B3SOIPDpTable, + .numModelParms = &B3SOIPDmPTSize, + .modelParms = B3SOIPDmPTable, + .flags = DEV_DEFAULT, - &B3SOIPDnSize, - &B3SOIPDnSize, - B3SOIPDnames, - - &B3SOIPDpTSize, - B3SOIPDpTable, - - &B3SOIPDmPTSize, - B3SOIPDmPTable, - #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ -#endif - - DEV_DEFAULT - + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, +#endif }, - /* DEVparam*/ B3SOIPDparam, - /* DEVmodParam*/ B3SOIPDmParam, - /* DEVload*/ B3SOIPDload, - /* DEVsetup*/ B3SOIPDsetup, - /* DEVunsetup*/ B3SOIPDunsetup, - /* DEVpzSetup*/ B3SOIPDsetup, - /* DEVtemperature*/ B3SOIPDtemp, - /* DEVtrunc*/ B3SOIPDtrunc, - /* DEVfindBranch*/ NULL, - /* DEVacLoad*/ B3SOIPDacLoad, - /* DEVaccept*/ NULL, - /* DEVdestroy*/ B3SOIPDdestroy, - /* DEVmodDelete*/ B3SOIPDmDelete, - /* DEVdelete*/ B3SOIPDdelete, - /* DEVsetic*/ B3SOIPDgetic, - /* DEVask*/ B3SOIPDask, - /* DEVmodAsk*/ B3SOIPDmAsk, - /* DEVpzLoad*/ B3SOIPDpzLoad, - /* DEVconvTest*/ B3SOIPDconvTest, - /* DEVsenSetup*/ NULL, - /* DEVsenLoad*/ NULL, - /* DEVsenUpdate*/ NULL, - /* DEVsenAcLoad*/ NULL, - /* DEVsenPrint*/ NULL, - /* DEVsenTrunc*/ NULL, - /* DEVdisto*/ NULL, - /* DEVnoise*/ B3SOIPDnoise, - /* DEVsoaCheck */ NULL, + .DEVparam = B3SOIPDparam, + .DEVmodParam = B3SOIPDmParam, + .DEVload = B3SOIPDload, + .DEVsetup = B3SOIPDsetup, + .DEVunsetup = B3SOIPDunsetup, + .DEVpzSetup = B3SOIPDsetup, + .DEVtemperature = B3SOIPDtemp, + .DEVtrunc = B3SOIPDtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = B3SOIPDacLoad, + .DEVaccept = NULL, + .DEVdestroy = B3SOIPDdestroy, + .DEVmodDelete = B3SOIPDmDelete, + .DEVdelete = B3SOIPDdelete, + .DEVsetic = B3SOIPDgetic, + .DEVask = B3SOIPDask, + .DEVmodAsk = B3SOIPDmAsk, + .DEVpzLoad = B3SOIPDpzLoad, + .DEVconvTest = B3SOIPDconvTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = B3SOIPDnoise, + .DEVsoaCheck = NULL, + .DEVinstSize = &B3SOIPDiSize, + .DEVmodSize = &B3SOIPDmSize, + #ifdef CIDER - /* DEVdump*/ NULL, - /* DEVacct*/ NULL, + .DEVdump = NULL, + .DEVacct = NULL, #endif - /* DEVinstSize*/ &B3SOIPDiSize, - /* DEVmodSize*/ &B3SOIPDmSize }; + SPICEdev * get_b3soipd_info (void) { diff --git a/src/spicelib/devices/bsim3v0/bsim3v0init.c b/src/spicelib/devices/bsim3v0/bsim3v0init.c index 9eb299c49..0b673bca9 100644 --- a/src/spicelib/devices/bsim3v0/bsim3v0init.c +++ b/src/spicelib/devices/bsim3v0/bsim3v0init.c @@ -7,72 +7,64 @@ #include "bsim3v0init.h" SPICEdev B3v0info = { - { "BSIM3v0", - "Berkeley Short Channel IGFET Model Version-3 (3.0)", + .DEVpublic = { + .name = "BSIM3v0", + .description = "Berkeley Short Channel IGFET Model Version-3 (3.0)", + .terms = &BSIM3v0nSize, + .numNames = &BSIM3v0nSize, + .termNames = BSIM3v0names, + .numInstanceParms = &BSIM3v0pTSize, + .instanceParms = BSIM3v0pTable, + .numModelParms = &BSIM3v0mPTSize, + .modelParms = BSIM3v0mPTable, + .flags = DEV_DEFAULT, - &BSIM3v0nSize, - &BSIM3v0nSize, - BSIM3v0names, - - &BSIM3v0pTSize, - BSIM3v0pTable, - - &BSIM3v0mPTSize, - BSIM3v0mPTable, - #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ BSIM3v0param, - /* DEVmodParam */ BSIM3v0mParam, - /* DEVload */ BSIM3v0load, - /* DEVsetup */ BSIM3v0setup, - /* DEVunsetup */ BSIM3v0unsetup, - /* DEVpzSetup */ BSIM3v0setup, - /* DEVtemperature*/ BSIM3v0temp, - /* DEVtrunc */ BSIM3v0trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ BSIM3v0acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ BSIM3v0destroy, - /* DEVmodDelete */ BSIM3v0mDelete, - /* DEVdelete */ BSIM3v0delete, - /* DEVsetic */ BSIM3v0getic, - /* DEVask */ BSIM3v0ask, - /* DEVmodAsk */ BSIM3v0mAsk, - /* DEVpzLoad */ BSIM3v0pzLoad, - /* DEVconvTest */ BSIM3v0convTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ BSIM3v0noise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &BSIM3v0iSize, - /* DEVmodSize */ &BSIM3v0mSize + .DEVparam = BSIM3v0param, + .DEVmodParam = BSIM3v0mParam, + .DEVload = BSIM3v0load, + .DEVsetup = BSIM3v0setup, + .DEVunsetup = BSIM3v0unsetup, + .DEVpzSetup = BSIM3v0setup, + .DEVtemperature = BSIM3v0temp, + .DEVtrunc = BSIM3v0trunc, + .DEVfindBranch = NULL, + .DEVacLoad = BSIM3v0acLoad, + .DEVaccept = NULL, + .DEVdestroy = BSIM3v0destroy, + .DEVmodDelete = BSIM3v0mDelete, + .DEVdelete = BSIM3v0delete, + .DEVsetic = BSIM3v0getic, + .DEVask = BSIM3v0ask, + .DEVmodAsk = BSIM3v0mAsk, + .DEVpzLoad = BSIM3v0pzLoad, + .DEVconvTest = BSIM3v0convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = BSIM3v0noise, + .DEVsoaCheck = NULL, + .DEVinstSize = &BSIM3v0iSize, + .DEVmodSize = &BSIM3v0mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/bsim3v1/bsim3v1init.c b/src/spicelib/devices/bsim3v1/bsim3v1init.c index 3efb57efc..b290af7e2 100644 --- a/src/spicelib/devices/bsim3v1/bsim3v1init.c +++ b/src/spicelib/devices/bsim3v1/bsim3v1init.c @@ -7,72 +7,64 @@ #include "bsim3v1init.h" SPICEdev BSIM3v1info = { - { "BSIM3v1", - "Berkeley Short Channel IGFET Model Version-3 (3.1)", - - &BSIM3v1nSize, - &BSIM3v1nSize, - BSIM3v1names, - - &BSIM3v1pTSize, - BSIM3v1pTable, - - &BSIM3v1mPTSize, - BSIM3v1mPTable, + .DEVpublic = { + .name = "BSIM3v1", + .description = "Berkeley Short Channel IGFET Model Version-3 (3.1)", + .terms = &BSIM3v1nSize, + .numNames = &BSIM3v1nSize, + .termNames = BSIM3v1names, + .numInstanceParms = &BSIM3v1pTSize, + .instanceParms = BSIM3v1pTable, + .numModelParms = &BSIM3v1mPTSize, + .modelParms = BSIM3v1mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ BSIM3v1param, - /* DEVmodParam */ BSIM3v1mParam, - /* DEVload */ BSIM3v1load, - /* DEVsetup */ BSIM3v1setup, - /* DEVunsetup */ BSIM3v1unsetup, - /* DEVpzSetup */ BSIM3v1setup, - /* DEVtemperature*/ BSIM3v1temp, - /* DEVtrunc */ BSIM3v1trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ BSIM3v1acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ BSIM3v1destroy, - /* DEVmodDelete */ BSIM3v1mDelete, - /* DEVdelete */ BSIM3v1delete, - /* DEVsetic */ BSIM3v1getic, - /* DEVask */ BSIM3v1ask, - /* DEVmodAsk */ BSIM3v1mAsk, - /* DEVpzLoad */ BSIM3v1pzLoad, - /* DEVconvTest */ BSIM3v1convTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ BSIM3v1noise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &BSIM3v1iSize, - /* DEVmodSize */ &BSIM3v1mSize + .DEVparam = BSIM3v1param, + .DEVmodParam = BSIM3v1mParam, + .DEVload = BSIM3v1load, + .DEVsetup = BSIM3v1setup, + .DEVunsetup = BSIM3v1unsetup, + .DEVpzSetup = BSIM3v1setup, + .DEVtemperature = BSIM3v1temp, + .DEVtrunc = BSIM3v1trunc, + .DEVfindBranch = NULL, + .DEVacLoad = BSIM3v1acLoad, + .DEVaccept = NULL, + .DEVdestroy = BSIM3v1destroy, + .DEVmodDelete = BSIM3v1mDelete, + .DEVdelete = BSIM3v1delete, + .DEVsetic = BSIM3v1getic, + .DEVask = BSIM3v1ask, + .DEVmodAsk = BSIM3v1mAsk, + .DEVpzLoad = BSIM3v1pzLoad, + .DEVconvTest = BSIM3v1convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = BSIM3v1noise, + .DEVsoaCheck = NULL, + .DEVinstSize = &BSIM3v1iSize, + .DEVmodSize = &BSIM3v1mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/bsim3v32/bsim3v32init.c b/src/spicelib/devices/bsim3v32/bsim3v32init.c index e109cf654..960d7fd81 100644 --- a/src/spicelib/devices/bsim3v32/bsim3v32init.c +++ b/src/spicelib/devices/bsim3v32/bsim3v32init.c @@ -8,72 +8,64 @@ SPICEdev BSIM3v32info = { - { "BSIM3v32", - "Berkeley Short Channel IGFET Model Version-3", - - &BSIM3v32nSize, - &BSIM3v32nSize, - BSIM3v32names, - - &BSIM3v32pTSize, - BSIM3v32pTable, - - &BSIM3v32mPTSize, - BSIM3v32mPTable, + .DEVpublic = { + .name = "BSIM3v32", + .description = "Berkeley Short Channel IGFET Model Version-3", + .terms = &BSIM3v32nSize, + .numNames = &BSIM3v32nSize, + .termNames = BSIM3v32names, + .numInstanceParms = &BSIM3v32pTSize, + .instanceParms = BSIM3v32pTable, + .numModelParms = &BSIM3v32mPTSize, + .modelParms = BSIM3v32mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ BSIM3v32param, - /* DEVmodParam */ BSIM3v32mParam, - /* DEVload */ BSIM3v32load, - /* DEVsetup */ BSIM3v32setup, - /* DEVunsetup */ BSIM3v32unsetup, - /* DEVpzSetup */ BSIM3v32setup, - /* DEVtemperature*/ BSIM3v32temp, - /* DEVtrunc */ BSIM3v32trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ BSIM3v32acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ BSIM3v32destroy, - /* DEVmodDelete */ BSIM3v32mDelete, - /* DEVdelete */ BSIM3v32delete, - /* DEVsetic */ BSIM3v32getic, - /* DEVask */ BSIM3v32ask, - /* DEVmodAsk */ BSIM3v32mAsk, - /* DEVpzLoad */ BSIM3v32pzLoad, - /* DEVconvTest */ BSIM3v32convTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ BSIM3v32noise, - /* DEVsoaCheck */ BSIM3v32soaCheck, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &BSIM3v32iSize, - /* DEVmodSize */ &BSIM3v32mSize + .DEVparam = BSIM3v32param, + .DEVmodParam = BSIM3v32mParam, + .DEVload = BSIM3v32load, + .DEVsetup = BSIM3v32setup, + .DEVunsetup = BSIM3v32unsetup, + .DEVpzSetup = BSIM3v32setup, + .DEVtemperature = BSIM3v32temp, + .DEVtrunc = BSIM3v32trunc, + .DEVfindBranch = NULL, + .DEVacLoad = BSIM3v32acLoad, + .DEVaccept = NULL, + .DEVdestroy = BSIM3v32destroy, + .DEVmodDelete = BSIM3v32mDelete, + .DEVdelete = BSIM3v32delete, + .DEVsetic = BSIM3v32getic, + .DEVask = BSIM3v32ask, + .DEVmodAsk = BSIM3v32mAsk, + .DEVpzLoad = BSIM3v32pzLoad, + .DEVconvTest = BSIM3v32convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = BSIM3v32noise, + .DEVsoaCheck = BSIM3v32soaCheck, + .DEVinstSize = &BSIM3v32iSize, + .DEVmodSize = &BSIM3v32mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/bsim4/bsim4init.c b/src/spicelib/devices/bsim4/bsim4init.c index e9d13577d..fe03fb432 100644 --- a/src/spicelib/devices/bsim4/bsim4init.c +++ b/src/spicelib/devices/bsim4/bsim4init.c @@ -8,72 +8,64 @@ SPICEdev BSIM4info = { - { - "BSIM4", - "Berkeley Short Channel IGFET Model-4", - - &BSIM4nSize, - &BSIM4nSize, - BSIM4names, - - &BSIM4pTSize, - BSIM4pTable, - - &BSIM4mPTSize, - BSIM4mPTable, + .DEVpublic = { + .name = "BSIM4", + .description = "Berkeley Short Channel IGFET Model-4", + .terms = &BSIM4nSize, + .numNames = &BSIM4nSize, + .termNames = BSIM4names, + .numInstanceParms = &BSIM4pTSize, + .instanceParms = BSIM4pTable, + .numModelParms = &BSIM4mPTSize, + .modelParms = BSIM4mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - BSIM4param, /* DEVparam */ - BSIM4mParam, /* DEVmodParam */ - BSIM4load, /* DEVload */ - BSIM4setup, /* DEVsetup */ - BSIM4unsetup, /* DEVunsetup */ - BSIM4setup, /* DEVpzSetup */ - BSIM4temp, /* DEVtemperature */ - BSIM4trunc, /* DEVtrunc */ - NULL, /* DEVfindBranch */ - BSIM4acLoad, /* DEVacLoad */ - NULL, /* DEVaccept */ - BSIM4destroy, /* DEVdestroy */ - BSIM4mDelete, /* DEVmodDelete */ - BSIM4delete, /* DEVdelete */ - BSIM4getic, /* DEVsetic */ - BSIM4ask, /* DEVask */ - BSIM4mAsk, /* DEVmodAsk */ - BSIM4pzLoad, /* DEVpzLoad */ - BSIM4convTest, /* DEVconvTest */ - NULL, /* DEVsenSetup */ - NULL, /* DEVsenLoad */ - NULL, /* DEVsenUpdate */ - NULL, /* DEVsenAcLoad */ - NULL, /* DEVsenPrint */ - NULL, /* DEVsenTrunc */ - NULL, /* DEVdisto */ - BSIM4noise, /* DEVnoise */ - BSIM4soaCheck, /* DEVsoaCheck */ + .DEVparam = BSIM4param, + .DEVmodParam = BSIM4mParam, + .DEVload = BSIM4load, + .DEVsetup = BSIM4setup, + .DEVunsetup = BSIM4unsetup, + .DEVpzSetup = BSIM4setup, + .DEVtemperature = BSIM4temp, + .DEVtrunc = BSIM4trunc, + .DEVfindBranch = NULL, + .DEVacLoad = BSIM4acLoad, + .DEVaccept = NULL, + .DEVdestroy = BSIM4destroy, + .DEVmodDelete = BSIM4mDelete, + .DEVdelete = BSIM4delete, + .DEVsetic = BSIM4getic, + .DEVask = BSIM4ask, + .DEVmodAsk = BSIM4mAsk, + .DEVpzLoad = BSIM4pzLoad, + .DEVconvTest = BSIM4convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = BSIM4noise, + .DEVsoaCheck = BSIM4soaCheck, + .DEVinstSize = &BSIM4iSize, + .DEVmodSize = &BSIM4mSize, + #ifdef CIDER - NULL, /* DEVdump */ - NULL, /* DEVacct */ + .DEVdump = NULL, + .DEVacct = NULL, #endif - &BSIM4iSize, /* DEVinstSize */ - &BSIM4mSize /* DEVmodSize */ }; diff --git a/src/spicelib/devices/bsim4v5/bsim4v5init.c b/src/spicelib/devices/bsim4v5/bsim4v5init.c index ba6aca999..8ac071444 100644 --- a/src/spicelib/devices/bsim4v5/bsim4v5init.c +++ b/src/spicelib/devices/bsim4v5/bsim4v5init.c @@ -8,72 +8,64 @@ SPICEdev BSIM4v5info = { - { - "BSIM4v5", - "Berkeley Short Channel IGFET Model-4", - - &BSIM4v5nSize, - &BSIM4v5nSize, - BSIM4v5names, - - &BSIM4v5pTSize, - BSIM4v5pTable, - - &BSIM4v5mPTSize, - BSIM4v5mPTable, + .DEVpublic = { + .name = "BSIM4v5", + .description = "Berkeley Short Channel IGFET Model-4", + .terms = &BSIM4v5nSize, + .numNames = &BSIM4v5nSize, + .termNames = BSIM4v5names, + .numInstanceParms = &BSIM4v5pTSize, + .instanceParms = BSIM4v5pTable, + .numModelParms = &BSIM4v5mPTSize, + .modelParms = BSIM4v5mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - BSIM4v5param, /* DEVparam */ - BSIM4v5mParam, /* DEVmodParam */ - BSIM4v5load, /* DEVload */ - BSIM4v5setup, /* DEVsetup */ - BSIM4v5unsetup, /* DEVunsetup */ - BSIM4v5setup, /* DEVpzSetup */ - BSIM4v5temp, /* DEVtemperature */ - BSIM4v5trunc, /* DEVtrunc */ - NULL, /* DEVfindBranch */ - BSIM4v5acLoad, /* DEVacLoad */ - NULL, /* DEVaccept */ - BSIM4v5destroy, /* DEVdestroy */ - BSIM4v5mDelete, /* DEVmodDelete */ - BSIM4v5delete, /* DEVdelete */ - BSIM4v5getic, /* DEVsetic */ - BSIM4v5ask, /* DEVask */ - BSIM4v5mAsk, /* DEVmodAsk */ - BSIM4v5pzLoad, /* DEVpzLoad */ - BSIM4v5convTest, /* DEVconvTest */ - NULL, /* DEVsenSetup */ - NULL, /* DEVsenLoad */ - NULL, /* DEVsenUpdate */ - NULL, /* DEVsenAcLoad */ - NULL, /* DEVsenPrint */ - NULL, /* DEVsenTrunc */ - NULL, /* DEVdisto */ - BSIM4v5noise, /* DEVnoise */ - BSIM4v5soaCheck, /* DEVsoaCheck */ + .DEVparam = BSIM4v5param, + .DEVmodParam = BSIM4v5mParam, + .DEVload = BSIM4v5load, + .DEVsetup = BSIM4v5setup, + .DEVunsetup = BSIM4v5unsetup, + .DEVpzSetup = BSIM4v5setup, + .DEVtemperature = BSIM4v5temp, + .DEVtrunc = BSIM4v5trunc, + .DEVfindBranch = NULL, + .DEVacLoad = BSIM4v5acLoad, + .DEVaccept = NULL, + .DEVdestroy = BSIM4v5destroy, + .DEVmodDelete = BSIM4v5mDelete, + .DEVdelete = BSIM4v5delete, + .DEVsetic = BSIM4v5getic, + .DEVask = BSIM4v5ask, + .DEVmodAsk = BSIM4v5mAsk, + .DEVpzLoad = BSIM4v5pzLoad, + .DEVconvTest = BSIM4v5convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = BSIM4v5noise, + .DEVsoaCheck = BSIM4v5soaCheck, + .DEVinstSize = &BSIM4v5iSize, + .DEVmodSize = &BSIM4v5mSize, + #ifdef CIDER - NULL, /* DEVdump */ - NULL, /* DEVacct */ + .DEVdump = NULL, + .DEVacct = NULL, #endif - &BSIM4v5iSize, /* DEVinstSize */ - &BSIM4v5mSize /* DEVmodSize */ }; diff --git a/src/spicelib/devices/bsim4v6/bsim4v6init.c b/src/spicelib/devices/bsim4v6/bsim4v6init.c index 28cd3e28a..6e25377d4 100644 --- a/src/spicelib/devices/bsim4v6/bsim4v6init.c +++ b/src/spicelib/devices/bsim4v6/bsim4v6init.c @@ -8,72 +8,64 @@ SPICEdev BSIM4v6info = { - { - "BSIM4v6", - "Berkeley Short Channel IGFET Model-4", - - &BSIM4v6nSize, - &BSIM4v6nSize, - BSIM4v6names, - - &BSIM4v6pTSize, - BSIM4v6pTable, - - &BSIM4v6mPTSize, - BSIM4v6mPTable, + .DEVpublic = { + .name = "BSIM4v6", + .description = "Berkeley Short Channel IGFET Model-4", + .terms = &BSIM4v6nSize, + .numNames = &BSIM4v6nSize, + .termNames = BSIM4v6names, + .numInstanceParms = &BSIM4v6pTSize, + .instanceParms = BSIM4v6pTable, + .numModelParms = &BSIM4v6mPTSize, + .modelParms = BSIM4v6mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - BSIM4v6param, /* DEVparam */ - BSIM4v6mParam, /* DEVmodParam */ - BSIM4v6load, /* DEVload */ - BSIM4v6setup, /* DEVsetup */ - BSIM4v6unsetup, /* DEVunsetup */ - BSIM4v6setup, /* DEVpzSetup */ - BSIM4v6temp, /* DEVtemperature */ - BSIM4v6trunc, /* DEVtrunc */ - NULL, /* DEVfindBranch */ - BSIM4v6acLoad, /* DEVacLoad */ - NULL, /* DEVaccept */ - BSIM4v6destroy, /* DEVdestroy */ - BSIM4v6mDelete, /* DEVmodDelete */ - BSIM4v6delete, /* DEVdelete */ - BSIM4v6getic, /* DEVsetic */ - BSIM4v6ask, /* DEVask */ - BSIM4v6mAsk, /* DEVmodAsk */ - BSIM4v6pzLoad, /* DEVpzLoad */ - BSIM4v6convTest, /* DEVconvTest */ - NULL, /* DEVsenSetup */ - NULL, /* DEVsenLoad */ - NULL, /* DEVsenUpdate */ - NULL, /* DEVsenAcLoad */ - NULL, /* DEVsenPrint */ - NULL, /* DEVsenTrunc */ - NULL, /* DEVdisto */ - BSIM4v6noise, /* DEVnoise */ - BSIM4v6soaCheck,/* DEVsoaCheck */ + .DEVparam = BSIM4v6param, + .DEVmodParam = BSIM4v6mParam, + .DEVload = BSIM4v6load, + .DEVsetup = BSIM4v6setup, + .DEVunsetup = BSIM4v6unsetup, + .DEVpzSetup = BSIM4v6setup, + .DEVtemperature = BSIM4v6temp, + .DEVtrunc = BSIM4v6trunc, + .DEVfindBranch = NULL, + .DEVacLoad = BSIM4v6acLoad, + .DEVaccept = NULL, + .DEVdestroy = BSIM4v6destroy, + .DEVmodDelete = BSIM4v6mDelete, + .DEVdelete = BSIM4v6delete, + .DEVsetic = BSIM4v6getic, + .DEVask = BSIM4v6ask, + .DEVmodAsk = BSIM4v6mAsk, + .DEVpzLoad = BSIM4v6pzLoad, + .DEVconvTest = BSIM4v6convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = BSIM4v6noise, + .DEVsoaCheck = BSIM4v6soaCheck, + .DEVinstSize = &BSIM4v6iSize, + .DEVmodSize = &BSIM4v6mSize, + #ifdef CIDER - NULL, /* DEVdump */ - NULL, /* DEVacct */ + .DEVdump = NULL, + .DEVacct = NULL, #endif - &BSIM4v6iSize, /* DEVinstSize */ - &BSIM4v6mSize /* DEVmodSize */ }; diff --git a/src/spicelib/devices/bsim4v7/bsim4v7init.c b/src/spicelib/devices/bsim4v7/bsim4v7init.c index 519fbf6ed..72111f90b 100644 --- a/src/spicelib/devices/bsim4v7/bsim4v7init.c +++ b/src/spicelib/devices/bsim4v7/bsim4v7init.c @@ -8,72 +8,64 @@ SPICEdev BSIM4v7info = { - { - "BSIM4v7", - "Berkeley Short Channel IGFET Model-4", - - &BSIM4v7nSize, - &BSIM4v7nSize, - BSIM4v7names, - - &BSIM4v7pTSize, - BSIM4v7pTable, - - &BSIM4v7mPTSize, - BSIM4v7mPTable, + .DEVpublic = { + .name = "BSIM4v7", + .description = "Berkeley Short Channel IGFET Model-4", + .terms = &BSIM4v7nSize, + .numNames = &BSIM4v7nSize, + .termNames = BSIM4v7names, + .numInstanceParms = &BSIM4v7pTSize, + .instanceParms = BSIM4v7pTable, + .numModelParms = &BSIM4v7mPTSize, + .modelParms = BSIM4v7mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - BSIM4v7param, /* DEVparam */ - BSIM4v7mParam, /* DEVmodParam */ - BSIM4v7load, /* DEVload */ - BSIM4v7setup, /* DEVsetup */ - BSIM4v7unsetup, /* DEVunsetup */ - BSIM4v7setup, /* DEVpzSetup */ - BSIM4v7temp, /* DEVtemperature */ - BSIM4v7trunc, /* DEVtrunc */ - NULL, /* DEVfindBranch */ - BSIM4v7acLoad, /* DEVacLoad */ - NULL, /* DEVaccept */ - BSIM4v7destroy, /* DEVdestroy */ - BSIM4v7mDelete, /* DEVmodDelete */ - BSIM4v7delete, /* DEVdelete */ - BSIM4v7getic, /* DEVsetic */ - BSIM4v7ask, /* DEVask */ - BSIM4v7mAsk, /* DEVmodAsk */ - BSIM4v7pzLoad, /* DEVpzLoad */ - BSIM4v7convTest, /* DEVconvTest */ - NULL, /* DEVsenSetup */ - NULL, /* DEVsenLoad */ - NULL, /* DEVsenUpdate */ - NULL, /* DEVsenAcLoad */ - NULL, /* DEVsenPrint */ - NULL, /* DEVsenTrunc */ - NULL, /* DEVdisto */ - BSIM4v7noise, /* DEVnoise */ - BSIM4v7soaCheck, /* DEVsoaCheck */ + .DEVparam = BSIM4v7param, + .DEVmodParam = BSIM4v7mParam, + .DEVload = BSIM4v7load, + .DEVsetup = BSIM4v7setup, + .DEVunsetup = BSIM4v7unsetup, + .DEVpzSetup = BSIM4v7setup, + .DEVtemperature = BSIM4v7temp, + .DEVtrunc = BSIM4v7trunc, + .DEVfindBranch = NULL, + .DEVacLoad = BSIM4v7acLoad, + .DEVaccept = NULL, + .DEVdestroy = BSIM4v7destroy, + .DEVmodDelete = BSIM4v7mDelete, + .DEVdelete = BSIM4v7delete, + .DEVsetic = BSIM4v7getic, + .DEVask = BSIM4v7ask, + .DEVmodAsk = BSIM4v7mAsk, + .DEVpzLoad = BSIM4v7pzLoad, + .DEVconvTest = BSIM4v7convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = BSIM4v7noise, + .DEVsoaCheck = BSIM4v7soaCheck, + .DEVinstSize = &BSIM4v7iSize, + .DEVmodSize = &BSIM4v7mSize, + #ifdef CIDER - NULL, /* DEVdump */ - NULL, /* DEVacct */ + .DEVdump = NULL, + .DEVacct = NULL, #endif - &BSIM4v7iSize, /* DEVinstSize */ - &BSIM4v7mSize /* DEVmodSize */ }; diff --git a/src/spicelib/devices/bsimsoi/b4soiinit.c b/src/spicelib/devices/bsimsoi/b4soiinit.c index 1372967e4..3cdc3c117 100644 --- a/src/spicelib/devices/bsimsoi/b4soiinit.c +++ b/src/spicelib/devices/bsimsoi/b4soiinit.c @@ -6,74 +6,67 @@ #include "b4soiinit.h" SPICEdev B4SOIinfo = { - { "B4SOI", - "Berkeley SOI MOSFET model version 4.4.0", + .DEVpublic = { + .name = "B4SOI", + .description = "Berkeley SOI MOSFET model version 4.4.0", + .terms = &B4SOInSize, + .numNames = &B4SOInSize, + .termNames = B4SOInames, + .numInstanceParms = &B4SOIpTSize, + .instanceParms = B4SOIpTable, + .numModelParms = &B4SOImPTSize, + .modelParms = B4SOImPTable, + .flags = DEV_DEFAULT, - &B4SOInSize, - &B4SOInSize, - B4SOInames, - - &B4SOIpTSize, - B4SOIpTable, - - &B4SOImPTSize, - B4SOImPTable, - #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT - }, - /* DEVparam */ B4SOIparam, - /* DEVmodParam */ B4SOImParam, - /* DEVload */ B4SOIload, - /* DEVsetup */ B4SOIsetup, - /* DEVunsetup */ B4SOIunsetup, - /* DEVpzSetup */ B4SOIsetup, - /* DEVtemperature*/ B4SOItemp, - /* DEVtrunc */ B4SOItrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ B4SOIacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ B4SOIdestroy, - /* DEVmodDelete */ B4SOImDelete, - /* DEVdelete */ B4SOIdelete, - /* DEVsetic */ B4SOIgetic, - /* DEVask */ B4SOIask, - /* DEVmodAsk */ B4SOImAsk, - /* DEVpzLoad */ B4SOIpzLoad, - /* DEVconvTest */ B4SOIconvTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ B4SOInoise, - /* DEVsoaCheck */ B4SOIsoaCheck, + .DEVparam = B4SOIparam, + .DEVmodParam = B4SOImParam, + .DEVload = B4SOIload, + .DEVsetup = B4SOIsetup, + .DEVunsetup = B4SOIunsetup, + .DEVpzSetup = B4SOIsetup, + .DEVtemperature = B4SOItemp, + .DEVtrunc = B4SOItrunc, + .DEVfindBranch = NULL, + .DEVacLoad = B4SOIacLoad, + .DEVaccept = NULL, + .DEVdestroy = B4SOIdestroy, + .DEVmodDelete = B4SOImDelete, + .DEVdelete = B4SOIdelete, + .DEVsetic = B4SOIgetic, + .DEVask = B4SOIask, + .DEVmodAsk = B4SOImAsk, + .DEVpzLoad = B4SOIpzLoad, + .DEVconvTest = B4SOIconvTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = B4SOInoise, + .DEVsoaCheck = B4SOIsoaCheck, + .DEVinstSize = &B4SOIiSize, + .DEVmodSize = &B4SOImSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, + .DEVdump = NULL, + .DEVacct = NULL, #endif - /* DEVinstSize */ &B4SOIiSize, - /* DEVmodSize */ &B4SOImSize }; + SPICEdev * get_b4soi_info (void) { diff --git a/src/spicelib/devices/cap/capinit.c b/src/spicelib/devices/cap/capinit.c index 1c8bb5126..b467bce5a 100644 --- a/src/spicelib/devices/cap/capinit.c +++ b/src/spicelib/devices/cap/capinit.c @@ -8,71 +8,64 @@ SPICEdev CAPinfo = { - { "Capacitor", - "Fixed capacitor", - - &CAPnSize, - &CAPnSize, - CAPnames, - - &CAPpTSize, - CAPpTable, - - &CAPmPTSize, - CAPmPTable, + .DEVpublic = { + .name = "Capacitor", + .description = "Fixed capacitor", + .terms = &CAPnSize, + .numNames = &CAPnSize, + .termNames = CAPnames, + .numInstanceParms = &CAPpTSize, + .instanceParms = CAPpTable, + .numModelParms = &CAPmPTSize, + .modelParms = CAPmPTable, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - 0 }, - /* DEVparam */ CAPparam, - /* DEVmodParam */ CAPmParam, - /* DEVload */ CAPload, - /* DEVsetup */ CAPsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ CAPsetup, - /* DEVtemperature*/ CAPtemp, - /* DEVtrunc */ CAPtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ CAPacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ CAPdestroy, - /* DEVmodDelete */ CAPmDelete, - /* DEVdelete */ CAPdelete, - /* DEVsetic */ CAPgetic, - /* DEVask */ CAPask, - /* DEVmodAsk */ CAPmAsk, - /* DEVpzLoad */ CAPpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ CAPsSetup, - /* DEVsenLoad */ CAPsLoad, - /* DEVsenUpdate */ CAPsUpdate, - /* DEVsenAcLoad */ CAPsAcLoad, - /* DEVsenPrint */ CAPsPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ CAPsoaCheck, + .DEVparam = CAPparam, + .DEVmodParam = CAPmParam, + .DEVload = CAPload, + .DEVsetup = CAPsetup, + .DEVunsetup = NULL, + .DEVpzSetup = CAPsetup, + .DEVtemperature = CAPtemp, + .DEVtrunc = CAPtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = CAPacLoad, + .DEVaccept = NULL, + .DEVdestroy = CAPdestroy, + .DEVmodDelete = CAPmDelete, + .DEVdelete = CAPdelete, + .DEVsetic = CAPgetic, + .DEVask = CAPask, + .DEVmodAsk = CAPmAsk, + .DEVpzLoad = CAPpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = CAPsSetup, + .DEVsenLoad = CAPsLoad, + .DEVsenUpdate = CAPsUpdate, + .DEVsenAcLoad = CAPsAcLoad, + .DEVsenPrint = CAPsPrint, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = CAPsoaCheck, + .DEVinstSize = &CAPiSize, + .DEVmodSize = &CAPmSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &CAPiSize, - /* DEVmodSize */ &CAPmSize + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/cccs/cccsinit.c b/src/spicelib/devices/cccs/cccsinit.c index 92b593ae4..98be7bf4f 100644 --- a/src/spicelib/devices/cccs/cccsinit.c +++ b/src/spicelib/devices/cccs/cccsinit.c @@ -8,72 +8,64 @@ SPICEdev CCCSinfo = { - { "CCCS", - "Current controlled current source", - - &CCCSnSize, - &CCCSnSize, - CCCSnames, - - &CCCSpTSize, - CCCSpTable, - - NULL, - NULL, + .DEVpublic = { + .name = "CCCS", + .description = "Current controlled current source", + .terms = &CCCSnSize, + .numNames = &CCCSnSize, + .termNames = CCCSnames, + .numInstanceParms = &CCCSpTSize, + .instanceParms = CCCSpTable, + .numModelParms = NULL, + .modelParms = NULL, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ CCCSparam, - /* DEVmodParam */ NULL, - /* DEVload */ CCCSload, - /* DEVsetup */ CCCSsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ CCCSsetup, - /* DEVtemperature*/ NULL, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ CCCSload, - /* DEVaccept */ NULL, - /* DEVdestroy */ CCCSdestroy, - /* DEVmodDelete */ CCCSmDelete, - /* DEVdelete */ CCCSdelete, - /* DEVsetic */ NULL, - /* DEVask */ CCCSask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ CCCSpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ CCCSsSetup, - /* DEVsenLoad */ CCCSsLoad, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ CCCSsAcLoad, - /* DEVsenPrint */ CCCSsPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &CCCSiSize, - /* DEVmodSize */ &CCCSmSize + .DEVparam = CCCSparam, + .DEVmodParam = NULL, + .DEVload = CCCSload, + .DEVsetup = CCCSsetup, + .DEVunsetup = NULL, + .DEVpzSetup = CCCSsetup, + .DEVtemperature = NULL, + .DEVtrunc = NULL, + .DEVfindBranch = NULL, + .DEVacLoad = CCCSload, + .DEVaccept = NULL, + .DEVdestroy = CCCSdestroy, + .DEVmodDelete = CCCSmDelete, + .DEVdelete = CCCSdelete, + .DEVsetic = NULL, + .DEVask = CCCSask, + .DEVmodAsk = NULL, + .DEVpzLoad = CCCSpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = CCCSsSetup, + .DEVsenLoad = CCCSsLoad, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = CCCSsAcLoad, + .DEVsenPrint = CCCSsPrint, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &CCCSiSize, + .DEVmodSize = &CCCSmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/ccvs/ccvsinit.c b/src/spicelib/devices/ccvs/ccvsinit.c index 952f54124..e779e6fc1 100644 --- a/src/spicelib/devices/ccvs/ccvsinit.c +++ b/src/spicelib/devices/ccvs/ccvsinit.c @@ -8,73 +8,64 @@ SPICEdev CCVSinfo = { - { - "CCVS", - "Linear current controlled current source", - - &CCVSnSize, - &CCVSnSize, - CCVSnames, - - &CCVSpTSize, - CCVSpTable, - - NULL, - NULL, + .DEVpublic = { + .name = "CCVS", + .description = "Linear current controlled current source", + .terms = &CCVSnSize, + .numNames = &CCVSnSize, + .termNames = CCVSnames, + .numInstanceParms = &CCVSpTSize, + .instanceParms = CCVSpTable, + .numModelParms = NULL, + .modelParms = NULL, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ CCVSparam, - /* DEVmodParam */ NULL, - /* DEVload */ CCVSload, - /* DEVsetup */ CCVSsetup, - /* DEVunsetup */ CCVSunsetup, - /* DEVpzSetup */ CCVSsetup, - /* DEVtemperature*/ NULL, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ CCVSfindBr, - /* DEVacLoad */ CCVSload, /* ac and normal load functions identical */ - /* DEVaccept */ NULL, - /* DEVdestroy */ CCVSdestroy, - /* DEVmodDelete */ CCVSmDelete, - /* DEVdelete */ CCVSdelete, - /* DEVsetic */ NULL, - /* DEVask */ CCVSask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ CCVSpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ CCVSsSetup, - /* DEVsenLoad */ CCVSsLoad, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ CCVSsAcLoad, - /* DEVsenPrint */ CCVSsPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &CCVSiSize, - /* DEVmodSize */ &CCVSmSize + .DEVparam = CCVSparam, + .DEVmodParam = NULL, + .DEVload = CCVSload, + .DEVsetup = CCVSsetup, + .DEVunsetup = CCVSunsetup, + .DEVpzSetup = CCVSsetup, + .DEVtemperature = NULL, + .DEVtrunc = NULL, + .DEVfindBranch = CCVSfindBr, + .DEVacLoad = CCVSload, + .DEVaccept = NULL, + .DEVdestroy = CCVSdestroy, + .DEVmodDelete = CCVSmDelete, + .DEVdelete = CCVSdelete, + .DEVsetic = NULL, + .DEVask = CCVSask, + .DEVmodAsk = NULL, + .DEVpzLoad = CCVSpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = CCVSsSetup, + .DEVsenLoad = CCVSsLoad, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = CCVSsAcLoad, + .DEVsenPrint = CCVSsPrint, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &CCVSiSize, + .DEVmodSize = &CCVSmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/cpl/cplinit.c b/src/spicelib/devices/cpl/cplinit.c index 34f1bc43c..1e3dc3e9e 100644 --- a/src/spicelib/devices/cpl/cplinit.c +++ b/src/spicelib/devices/cpl/cplinit.c @@ -6,77 +6,69 @@ #include "cplext.h" #include "cplinit.h" + SPICEdev CPLinfo = { - { - "CplLines", - "Simple Coupled Multiconductor Lines", - - &CPLnSize, - &CPLnSize, - CPLnames, - - &CPLpTSize, - CPLpTable, - - &CPLmPTSize, - CPLmPTable, + .DEVpublic = { + .name = "CplLines", + .description = "Simple Coupled Multiconductor Lines", + .terms = &CPLnSize, + .numNames = &CPLnSize, + .termNames = CPLnames, + .numInstanceParms = &CPLpTSize, + .instanceParms = CPLpTable, + .numModelParms = &CPLmPTSize, + .modelParms = CPLmPTable, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif + }, - 0 - }, + .DEVparam = CPLparam, + .DEVmodParam = CPLmParam, + .DEVload = CPLload, + .DEVsetup = CPLsetup, + .DEVunsetup = CPLunsetup, + .DEVpzSetup = NULL, + .DEVtemperature = NULL, + .DEVtrunc = NULL, + .DEVfindBranch = NULL, + .DEVacLoad = NULL, + .DEVaccept = NULL, + .DEVdestroy = CPLdestroy, + .DEVmodDelete = CPLmDelete, + .DEVdelete = CPLdelete, + .DEVsetic = NULL, + .DEVask = CPLask, + .DEVmodAsk = CPLmAsk, + .DEVpzLoad = NULL, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &CPLiSize, + .DEVmodSize = &CPLmSize, - -/* DEVparam */ CPLparam, -/* DEVmodParam */ CPLmParam, -/* DEVload */ CPLload, -/* DEVsetup */ CPLsetup, -/* DEVunsetup */ CPLunsetup, -/* DEVpzSetup */ NULL, -/* DEVtemperature */ NULL, -/* DEVtrunc */ NULL, -/* DEVfindBranch */ NULL, /* CPLfindBranch, */ -/* DEVacLoad */ NULL, -/* DEVaccept */ NULL, -/* DEVdestroy */ CPLdestroy, -/* DEVmodDelete */ CPLmDelete, -/* DEVdelete */ CPLdelete, -/* DEVsetic */ NULL, -/* DEVask */ CPLask, -/* DEVmodAsk */ CPLmAsk, -/* DEVpzLoad */ NULL, -/* DEVconvTest */ NULL, -/* DEVsenSetup */ NULL, -/* DEVsenLoad */ NULL, -/* DEVsenUpdate */ NULL, -/* DEVsenAcLoad */ NULL, -/* DEVsenPrint */ NULL, -/* DEVsenTrunc */ NULL, -/* DEVdisto */ NULL, -/* DEVnoise */ NULL, -/* DEVsoaCheck */ NULL, #ifdef CIDER -/* DEVdump */ NULL, -/* DEVacct */ NULL, -#endif -/* DEVinstSize */ &CPLiSize, -/* DEVmodSize */ &CPLmSize - + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; + SPICEdev * get_cpl_info(void) { diff --git a/src/spicelib/devices/csw/cswinit.c b/src/spicelib/devices/csw/cswinit.c index de4a7bf89..6a724dbc0 100644 --- a/src/spicelib/devices/csw/cswinit.c +++ b/src/spicelib/devices/csw/cswinit.c @@ -10,73 +10,64 @@ SPICEdev CSWinfo = { - { - "CSwitch", - "Current controlled ideal switch", - - &CSWnSize, - &CSWnSize, - CSWnames, - - &CSWpTSize, - CSWpTable, - - &CSWmPTSize, - CSWmPTable, + .DEVpublic = { + .name = "CSwitch", + .description = "Current controlled ideal switch", + .terms = &CSWnSize, + .numNames = &CSWnSize, + .termNames = CSWnames, + .numInstanceParms = &CSWpTSize, + .instanceParms = CSWpTable, + .numModelParms = &CSWmPTSize, + .modelParms = CSWmPTable, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - 0 }, - /* DEVparam */ CSWparam, - /* DEVmodParam */ CSWmParam, - /* DEVload */ CSWload, - /* DEVsetup */ CSWsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ CSWsetup, - /* DEVtemperature*/ NULL, - /* DEVtrunc */ CSWtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ CSWacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ CSWdestroy, - /* DEVmodDelete */ CSWmDelete, - /* DEVdelete */ CSWdelete, - /* DEVsetic */ NULL, - /* DEVask */ CSWask, - /* DEVmodAsk */ CSWmAsk, - /* DEVpzLoad */ CSWpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ CSWnoise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &CSWiSize, - /* DEVmodSize */ &CSWmSize + .DEVparam = CSWparam, + .DEVmodParam = CSWmParam, + .DEVload = CSWload, + .DEVsetup = CSWsetup, + .DEVunsetup = NULL, + .DEVpzSetup = CSWsetup, + .DEVtemperature = NULL, + .DEVtrunc = CSWtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = CSWacLoad, + .DEVaccept = NULL, + .DEVdestroy = CSWdestroy, + .DEVmodDelete = CSWmDelete, + .DEVdelete = CSWdelete, + .DEVsetic = NULL, + .DEVask = CSWask, + .DEVmodAsk = CSWmAsk, + .DEVpzLoad = CSWpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = CSWnoise, + .DEVsoaCheck = NULL, + .DEVinstSize = &CSWiSize, + .DEVmodSize = &CSWmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/dio/dioinit.c b/src/spicelib/devices/dio/dioinit.c index 4161316d2..64d64be7d 100644 --- a/src/spicelib/devices/dio/dioinit.c +++ b/src/spicelib/devices/dio/dioinit.c @@ -9,72 +9,64 @@ SPICEdev DIOinfo = { - { - "Diode", - "Junction Diode model", - - &DIOnSize, - &DIOnSize, - DIOnames, - - &DIOpTSize, - DIOpTable, - - &DIOmPTSize, - DIOmPTable, + .DEVpublic = { + .name = "Diode", + .description = "Junction Diode model", + .terms = &DIOnSize, + .numNames = &DIOnSize, + .termNames = DIOnames, + .numInstanceParms = &DIOpTSize, + .instanceParms = DIOpTable, + .numModelParms = &DIOmPTSize, + .modelParms = DIOmPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ DIOparam, - /* DEVmodParam */ DIOmParam, - /* DEVload */ DIOload, - /* DEVsetup */ DIOsetup, - /* DEVunsetup */ DIOunsetup, - /* DEVpzSetup */ DIOsetup, - /* DEVtemperature*/ DIOtemp, - /* DEVtrunc */ DIOtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ DIOacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ DIOdestroy, - /* DEVmodDelete */ DIOmDelete, - /* DEVdelete */ DIOdelete, - /* DEVsetic */ DIOgetic, - /* DEVask */ DIOask, - /* DEVmodAsk */ DIOmAsk, - /* DEVpzLoad */ DIOpzLoad, - /* DEVconvTest */ DIOconvTest, - /* DEVsenSetup */ DIOsSetup, - /* DEVsenLoad */ DIOsLoad, - /* DEVsenUpdate */ DIOsUpdate, - /* DEVsenAcLoad */ DIOsAcLoad, - /* DEVsenPrint */ DIOsPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ DIOdisto, - /* DEVnoise */ DIOnoise, - /* DEVsoaCheck */ DIOsoaCheck, + .DEVparam = DIOparam, + .DEVmodParam = DIOmParam, + .DEVload = DIOload, + .DEVsetup = DIOsetup, + .DEVunsetup = DIOunsetup, + .DEVpzSetup = DIOsetup, + .DEVtemperature = DIOtemp, + .DEVtrunc = DIOtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = DIOacLoad, + .DEVaccept = NULL, + .DEVdestroy = DIOdestroy, + .DEVmodDelete = DIOmDelete, + .DEVdelete = DIOdelete, + .DEVsetic = DIOgetic, + .DEVask = DIOask, + .DEVmodAsk = DIOmAsk, + .DEVpzLoad = DIOpzLoad, + .DEVconvTest = DIOconvTest, + .DEVsenSetup = DIOsSetup, + .DEVsenLoad = DIOsLoad, + .DEVsenUpdate = DIOsUpdate, + .DEVsenAcLoad = DIOsAcLoad, + .DEVsenPrint = DIOsPrint, + .DEVsenTrunc = NULL, + .DEVdisto = DIOdisto, + .DEVnoise = DIOnoise, + .DEVsoaCheck = DIOsoaCheck, + .DEVinstSize = &DIOiSize, + .DEVmodSize = &DIOmSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &DIOiSize, - /* DEVmodSize */ &DIOmSize + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/hfet1/hfetinit.c b/src/spicelib/devices/hfet1/hfetinit.c index 8af00cbad..802eb0b00 100644 --- a/src/spicelib/devices/hfet1/hfetinit.c +++ b/src/spicelib/devices/hfet1/hfetinit.c @@ -8,73 +8,64 @@ SPICEdev HFETAinfo = { - { - "HFET1", - "HFET1 Model", - - &HFETAnSize, - &HFETAnSize, - HFETAnames, - - &HFETApTSize, - HFETApTable, - - &HFETAmPTSize, - HFETAmPTable, + .DEVpublic = { + .name = "HFET1", + .description = "HFET1 Model", + .terms = &HFETAnSize, + .numNames = &HFETAnSize, + .termNames = HFETAnames, + .numInstanceParms = &HFETApTSize, + .instanceParms = HFETApTable, + .numModelParms = &HFETAmPTSize, + .modelParms = HFETAmPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ HFETAparam, - /* DEVmodParam */ HFETAmParam, - /* DEVload */ HFETAload, - /* DEVsetup */ HFETAsetup, - /* DEVunsetup */ HFETAunsetup, - /* DEVpzSetup */ HFETAsetup, - /* DEVtemperature*/ HFETAtemp, - /* DEVtrunc */ HFETAtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ HFETAacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ HFETAdestroy, - /* DEVmodDelete */ HFETAmDelete, - /* DEVdelete */ HFETAdelete, - /* DEVsetic */ HFETAgetic, - /* DEVask */ HFETAask, - /* DEVmodAsk */ HFETAmAsk, - /* DEVpzLoad */ HFETApzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ NULL, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &HFETAiSize, - /* DEVmodSize */ &HFETAmSize + .DEVparam = HFETAparam, + .DEVmodParam = HFETAmParam, + .DEVload = HFETAload, + .DEVsetup = HFETAsetup, + .DEVunsetup = HFETAunsetup, + .DEVpzSetup = HFETAsetup, + .DEVtemperature = HFETAtemp, + .DEVtrunc = HFETAtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = HFETAacLoad, + .DEVaccept = NULL, + .DEVdestroy = HFETAdestroy, + .DEVmodDelete = HFETAmDelete, + .DEVdelete = HFETAdelete, + .DEVsetic = HFETAgetic, + .DEVask = HFETAask, + .DEVmodAsk = HFETAmAsk, + .DEVpzLoad = HFETApzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &HFETAiSize, + .DEVmodSize = &HFETAmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/hfet2/hfet2init.c b/src/spicelib/devices/hfet2/hfet2init.c index 7c1679970..1c8f3ca30 100644 --- a/src/spicelib/devices/hfet2/hfet2init.c +++ b/src/spicelib/devices/hfet2/hfet2init.c @@ -8,73 +8,64 @@ SPICEdev HFET2info = { - { - "HFET2", - "HFET2 Model", - - &HFET2nSize, - &HFET2nSize, - HFET2names, - - &HFET2pTSize, - HFET2pTable, - - &HFET2mPTSize, - HFET2mPTable, + .DEVpublic = { + .name = "HFET2", + .description = "HFET2 Model", + .terms = &HFET2nSize, + .numNames = &HFET2nSize, + .termNames = HFET2names, + .numInstanceParms = &HFET2pTSize, + .instanceParms = HFET2pTable, + .numModelParms = &HFET2mPTSize, + .modelParms = HFET2mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ HFET2param, - /* DEVmodParam */ HFET2mParam, - /* DEVload */ HFET2load, - /* DEVsetup */ HFET2setup, - /* DEVunsetup */ HFET2unsetup, - /* DEVpzSetup */ HFET2setup, - /* DEVtemperature*/ HFET2temp, - /* DEVtrunc */ HFET2trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ HFET2acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ HFET2destroy, - /* DEVmodDelete */ HFET2mDelete, - /* DEVdelete */ HFET2delete, - /* DEVsetic */ HFET2getic, - /* DEVask */ HFET2ask, - /* DEVmodAsk */ HFET2mAsk, - /* DEVpzLoad */ HFET2pzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ NULL, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &HFET2iSize, - /* DEVmodSize */ &HFET2mSize + .DEVparam = HFET2param, + .DEVmodParam = HFET2mParam, + .DEVload = HFET2load, + .DEVsetup = HFET2setup, + .DEVunsetup = HFET2unsetup, + .DEVpzSetup = HFET2setup, + .DEVtemperature = HFET2temp, + .DEVtrunc = HFET2trunc, + .DEVfindBranch = NULL, + .DEVacLoad = HFET2acLoad, + .DEVaccept = NULL, + .DEVdestroy = HFET2destroy, + .DEVmodDelete = HFET2mDelete, + .DEVdelete = HFET2delete, + .DEVsetic = HFET2getic, + .DEVask = HFET2ask, + .DEVmodAsk = HFET2mAsk, + .DEVpzLoad = HFET2pzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &HFET2iSize, + .DEVmodSize = &HFET2mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/hisim2/hsm2init.c b/src/spicelib/devices/hisim2/hsm2init.c index 1eefbd18b..c51b87549 100644 --- a/src/spicelib/devices/hisim2/hsm2init.c +++ b/src/spicelib/devices/hisim2/hsm2init.c @@ -6,73 +6,66 @@ #include "hsm2itf.h" #include "hsm2init.h" -SPICEdev HSM2info = { - { "HiSIM2", - "Hiroshima University STARC IGFET Model 2.8.0", - - &HSM2nSize, - &HSM2nSize, - HSM2names, - &HSM2pTSize, - HSM2pTable, - - &HSM2mPTSize, - HSM2mPTable, +SPICEdev HSM2info = { + .DEVpublic = { + .name = "HiSIM2", + .description = "Hiroshima University STARC IGFET Model 2.8.0", + .terms = &HSM2nSize, + .numNames = &HSM2nSize, + .termNames = HSM2names, + .numInstanceParms = &HSM2pTSize, + .instanceParms = HSM2pTable, + .numModelParms = &HSM2mPTSize, + .modelParms = HSM2mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif + }, - DEV_DEFAULT - }, + .DEVparam = HSM2param, + .DEVmodParam = HSM2mParam, + .DEVload = HSM2load, + .DEVsetup = HSM2setup, + .DEVunsetup = HSM2unsetup, + .DEVpzSetup = HSM2setup, + .DEVtemperature = HSM2temp, + .DEVtrunc = HSM2trunc, + .DEVfindBranch = NULL, + .DEVacLoad = HSM2acLoad, + .DEVaccept = NULL, + .DEVdestroy = HSM2destroy, + .DEVmodDelete = HSM2mDelete, + .DEVdelete = HSM2delete, + .DEVsetic = HSM2getic, + .DEVask = HSM2ask, + .DEVmodAsk = HSM2mAsk, + .DEVpzLoad = HSM2pzLoad, + .DEVconvTest = HSM2convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = HSM2noise, + .DEVsoaCheck = HSM2soaCheck, + .DEVinstSize = &HSM2iSize, + .DEVmodSize = &HSM2mSize, - /* DEVparam */ HSM2param, - /* DEVmodParam */ HSM2mParam, - /* DEVload */ HSM2load, - /* DEVsetup */ HSM2setup, - /* DEVunsetup */ HSM2unsetup, - /* DEVpzSetup */ HSM2setup, - /* DEVtemperature*/ HSM2temp, - /* DEVtrunc */ HSM2trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ HSM2acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ HSM2destroy, - /* DEVmodDelete */ HSM2mDelete, - /* DEVdelete */ HSM2delete, - /* DEVsetic */ HSM2getic, - /* DEVask */ HSM2ask, - /* DEVmodAsk */ HSM2mAsk, - /* DEVpzLoad */ HSM2pzLoad, - /* DEVconvTest */ HSM2convTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ HSM2noise, - /* DEVsoaCheck */ HSM2soaCheck, #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, + .DEVdump = NULL, + .DEVacct = NULL, #endif - /* DEVinstSize */ &HSM2iSize, - /* DEVmodSize */ &HSM2mSize - }; diff --git a/src/spicelib/devices/hisimhv1/hsmhvinit.c b/src/spicelib/devices/hisimhv1/hsmhvinit.c index 759348afc..40cd4a561 100644 --- a/src/spicelib/devices/hisimhv1/hsmhvinit.c +++ b/src/spicelib/devices/hisimhv1/hsmhvinit.c @@ -6,73 +6,66 @@ #include "hsmhvitf.h" #include "hsmhvinit.h" -SPICEdev HSMHVinfo = { - { "HiSIMHV1", - "Hiroshima University STARC IGFET Model - HiSIM_HV v.1", - - &HSMHVnSize, - &HSMHVnSize, - HSMHVnames, - &HSMHVpTSize, - HSMHVpTable, - - &HSMHVmPTSize, - HSMHVmPTable, +SPICEdev HSMHVinfo = { + .DEVpublic = { + .name = "HiSIMHV1", + .description = "Hiroshima University STARC IGFET Model - HiSIM_HV v.1", + .terms = &HSMHVnSize, + .numNames = &HSMHVnSize, + .termNames = HSMHVnames, + .numInstanceParms = &HSMHVpTSize, + .instanceParms = HSMHVpTable, + .numModelParms = &HSMHVmPTSize, + .modelParms = HSMHVmPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif + }, - DEV_DEFAULT - }, + .DEVparam = HSMHVparam, + .DEVmodParam = HSMHVmParam, + .DEVload = HSMHVload, + .DEVsetup = HSMHVsetup, + .DEVunsetup = HSMHVunsetup, + .DEVpzSetup = HSMHVsetup, + .DEVtemperature = HSMHVtemp, + .DEVtrunc = HSMHVtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = HSMHVacLoad, + .DEVaccept = NULL, + .DEVdestroy = HSMHVdestroy, + .DEVmodDelete = HSMHVmDelete, + .DEVdelete = HSMHVdelete, + .DEVsetic = HSMHVgetic, + .DEVask = HSMHVask, + .DEVmodAsk = HSMHVmAsk, + .DEVpzLoad = HSMHVpzLoad, + .DEVconvTest = HSMHVconvTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = HSMHVnoise, + .DEVsoaCheck = HSMHVsoaCheck, + .DEVinstSize = &HSMHViSize, + .DEVmodSize = &HSMHVmSize, - /* DEVparam */ HSMHVparam, - /* DEVmodParam */ HSMHVmParam, - /* DEVload */ HSMHVload, - /* DEVsetup */ HSMHVsetup, - /* DEVunsetup */ HSMHVunsetup, - /* DEVpzSetup */ HSMHVsetup, - /* DEVtemperature*/ HSMHVtemp, - /* DEVtrunc */ HSMHVtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ HSMHVacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ HSMHVdestroy, - /* DEVmodDelete */ HSMHVmDelete, - /* DEVdelete */ HSMHVdelete, - /* DEVsetic */ HSMHVgetic, - /* DEVask */ HSMHVask, - /* DEVmodAsk */ HSMHVmAsk, - /* DEVpzLoad */ HSMHVpzLoad, - /* DEVconvTest */ HSMHVconvTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ HSMHVnoise, - /* DEVsoaCheck */ HSMHVsoaCheck, #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, + .DEVdump = NULL, + .DEVacct = NULL, #endif - /* DEVinstSize */ &HSMHViSize, - /* DEVmodSize */ &HSMHVmSize - }; diff --git a/src/spicelib/devices/hisimhv2/hsmhv2init.c b/src/spicelib/devices/hisimhv2/hsmhv2init.c index 558687aaf..fdd9004e8 100644 --- a/src/spicelib/devices/hisimhv2/hsmhv2init.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2init.c @@ -6,73 +6,66 @@ #include "hsmhv2itf.h" #include "hsmhv2init.h" -SPICEdev HSMHV2info = { - { "HiSIMHV2", - "Hiroshima University STARC IGFET Model - HiSIM_HV v.2", - - &HSMHV2nSize, - &HSMHV2nSize, - HSMHV2names, - &HSMHV2pTSize, - HSMHV2pTable, - - &HSMHV2mPTSize, - HSMHV2mPTable, +SPICEdev HSMHV2info = { + .DEVpublic = { + .name = "HiSIMHV2", + .description = "Hiroshima University STARC IGFET Model - HiSIM_HV v.2", + .terms = &HSMHV2nSize, + .numNames = &HSMHV2nSize, + .termNames = HSMHV2names, + .numInstanceParms = &HSMHV2pTSize, + .instanceParms = HSMHV2pTable, + .numModelParms = &HSMHV2mPTSize, + .modelParms = HSMHV2mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif + }, - DEV_DEFAULT - }, + .DEVparam = HSMHV2param, + .DEVmodParam = HSMHV2mParam, + .DEVload = HSMHV2load, + .DEVsetup = HSMHV2setup, + .DEVunsetup = HSMHV2unsetup, + .DEVpzSetup = HSMHV2setup, + .DEVtemperature = HSMHV2temp, + .DEVtrunc = HSMHV2trunc, + .DEVfindBranch = NULL, + .DEVacLoad = HSMHV2acLoad, + .DEVaccept = NULL, + .DEVdestroy = HSMHV2destroy, + .DEVmodDelete = HSMHV2mDelete, + .DEVdelete = HSMHV2delete, + .DEVsetic = HSMHV2getic, + .DEVask = HSMHV2ask, + .DEVmodAsk = HSMHV2mAsk, + .DEVpzLoad = HSMHV2pzLoad, + .DEVconvTest = HSMHV2convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = HSMHV2noise, + .DEVsoaCheck = HSMHV2soaCheck, + .DEVinstSize = &HSMHV2iSize, + .DEVmodSize = &HSMHV2mSize, - /* DEVparam */ HSMHV2param, - /* DEVmodParam */ HSMHV2mParam, - /* DEVload */ HSMHV2load, - /* DEVsetup */ HSMHV2setup, - /* DEVunsetup */ HSMHV2unsetup, - /* DEVpzSetup */ HSMHV2setup, - /* DEVtemperature*/ HSMHV2temp, - /* DEVtrunc */ HSMHV2trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ HSMHV2acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ HSMHV2destroy, - /* DEVmodDelete */ HSMHV2mDelete, - /* DEVdelete */ HSMHV2delete, - /* DEVsetic */ HSMHV2getic, - /* DEVask */ HSMHV2ask, - /* DEVmodAsk */ HSMHV2mAsk, - /* DEVpzLoad */ HSMHV2pzLoad, - /* DEVconvTest */ HSMHV2convTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ HSMHV2noise, - /* DEVsoaCheck */ HSMHV2soaCheck, #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, + .DEVdump = NULL, + .DEVacct = NULL, #endif - /* DEVinstSize */ &HSMHV2iSize, - /* DEVmodSize */ &HSMHV2mSize - }; diff --git a/src/spicelib/devices/ind/indinit.c b/src/spicelib/devices/ind/indinit.c index 20c325543..517a79e3f 100644 --- a/src/spicelib/devices/ind/indinit.c +++ b/src/spicelib/devices/ind/indinit.c @@ -8,143 +8,126 @@ SPICEdev INDinfo = { - { - "Inductor", - "Fixed inductor", - - &INDnSize, - &INDnSize, - INDnames, - - &INDpTSize, - INDpTable, - - &INDmPTSize, - INDmPTable, + .DEVpublic = { + .name = "Inductor", + .description = "Fixed inductor", + .terms = &INDnSize, + .numNames = &INDnSize, + .termNames = INDnames, + .numInstanceParms = &INDpTSize, + .instanceParms = INDpTable, + .numModelParms = &INDmPTSize, + .modelParms = INDmPTable, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - 0 }, - /* DEVparam */ INDparam, - /* DEVmodParam */ INDmParam, - /* DEVload */ INDload, - /* DEVsetup */ INDsetup, - /* DEVunsetup */ INDunsetup, - /* DEVpzSetup */ INDsetup, - /* DEVtemperature*/ INDtemp, - /* DEVtrunc */ INDtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ INDacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ INDdestroy, - /* DEVmodDelete */ INDmDelete, - /* DEVdelete */ INDdelete, - /* DEVsetic */ NULL, - /* DEVask */ INDask, - /* DEVmodAsk */ INDmAsk, - /* DEVpzLoad */ INDpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ INDsSetup, - /* DEVsenLoad */ INDsLoad, - /* DEVsenUpdate */ INDsUpdate, - /* DEVsenAcLoad */ INDsAcLoad, - /* DEVsenPrint */ INDsPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &INDiSize, - /* DEVmodSize */ &INDmSize + .DEVparam = INDparam, + .DEVmodParam = INDmParam, + .DEVload = INDload, + .DEVsetup = INDsetup, + .DEVunsetup = INDunsetup, + .DEVpzSetup = INDsetup, + .DEVtemperature = INDtemp, + .DEVtrunc = INDtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = INDacLoad, + .DEVaccept = NULL, + .DEVdestroy = INDdestroy, + .DEVmodDelete = INDmDelete, + .DEVdelete = INDdelete, + .DEVsetic = NULL, + .DEVask = INDask, + .DEVmodAsk = INDmAsk, + .DEVpzLoad = INDpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = INDsSetup, + .DEVsenLoad = INDsLoad, + .DEVsenUpdate = INDsUpdate, + .DEVsenAcLoad = INDsAcLoad, + .DEVsenPrint = INDsPrint, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &INDiSize, + .DEVmodSize = &INDmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; SPICEdev MUTinfo = { - { - "mutual", - "Mutual inductors", - - NULL, - NULL, - NULL, - - &MUTpTSize, - MUTpTable, - - NULL, - NULL, + .DEVpublic = { + .name = "mutual", + .description = "Mutual inductors", + .terms = NULL, + .numNames = NULL, + .termNames = NULL, + .numInstanceParms = &MUTpTSize, + .instanceParms = MUTpTable, + .numModelParms = NULL, + .modelParms = NULL, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - 0 }, - /* DEVparam */ MUTparam, - /* DEVmodParam */ NULL, - /* DEVload */ NULL,/* load handled by INDload */ - /* DEVsetup */ MUTsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ MUTsetup, - /* DEVtemperature*/ MUTtemp, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ MUTacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ MUTdestroy, - /* DEVmodDelete */ MUTmDelete, - /* DEVdelete */ MUTdelete, - /* DEVsetic */ NULL, - /* DEVask */ MUTask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ MUTpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ MUTsSetup, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ MUTsPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - &MUTiSize, - &MUTmSize + .DEVparam = MUTparam, + .DEVmodParam = NULL, + .DEVload = NULL, + .DEVsetup = MUTsetup, + .DEVunsetup = NULL, + .DEVpzSetup = MUTsetup, + .DEVtemperature = MUTtemp, + .DEVtrunc = NULL, + .DEVfindBranch = NULL, + .DEVacLoad = MUTacLoad, + .DEVaccept = NULL, + .DEVdestroy = MUTdestroy, + .DEVmodDelete = MUTmDelete, + .DEVdelete = MUTdelete, + .DEVsetic = NULL, + .DEVask = MUTask, + .DEVmodAsk = NULL, + .DEVpzLoad = MUTpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = MUTsSetup, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = MUTsPrint, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &MUTiSize, + .DEVmodSize = &MUTmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/isrc/isrcinit.c b/src/spicelib/devices/isrc/isrcinit.c index 2d02d4ec5..f5a8a6744 100644 --- a/src/spicelib/devices/isrc/isrcinit.c +++ b/src/spicelib/devices/isrc/isrcinit.c @@ -8,72 +8,64 @@ SPICEdev ISRCinfo = { - { - "Isource", - "Independent current source", - - &ISRCnSize, - &ISRCnSize, - ISRCnames, - - &ISRCpTSize, - ISRCpTable, - - NULL, - NULL, + .DEVpublic = { + .name = "Isource", + .description = "Independent current source", + .terms = &ISRCnSize, + .numNames = &ISRCnSize, + .termNames = ISRCnames, + .numInstanceParms = &ISRCpTSize, + .instanceParms = ISRCpTable, + .numModelParms = NULL, + .modelParms = NULL, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ ISRCparam, - /* DEVmodParam */ NULL, - /* DEVload */ ISRCload, - /* DEVsetup */ NULL, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ NULL, - /* DEVtemperature*/ ISRCtemp, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ ISRCacLoad, - /* DEVaccept */ ISRCaccept, - /* DEVdestroy */ ISRCdestroy, - /* DEVmodDelete */ ISRCmDelete, - /* DEVdelete */ ISRCdelete, - /* DEVsetic */ NULL, - /* DEVask */ ISRCask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ NULL, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, + .DEVparam = ISRCparam, + .DEVmodParam = NULL, + .DEVload = ISRCload, + .DEVsetup = NULL, + .DEVunsetup = NULL, + .DEVpzSetup = NULL, + .DEVtemperature = ISRCtemp, + .DEVtrunc = NULL, + .DEVfindBranch = NULL, + .DEVacLoad = ISRCacLoad, + .DEVaccept = ISRCaccept, + .DEVdestroy = ISRCdestroy, + .DEVmodDelete = ISRCmDelete, + .DEVdelete = ISRCdelete, + .DEVsetic = NULL, + .DEVask = ISRCask, + .DEVmodAsk = NULL, + .DEVpzLoad = NULL, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &ISRCiSize, + .DEVmodSize = &ISRCmSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &ISRCiSize, - /* DEVmodSize */ &ISRCmSize + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/jfet/jfetinit.c b/src/spicelib/devices/jfet/jfetinit.c index 6c31d5fb4..0e47b487c 100644 --- a/src/spicelib/devices/jfet/jfetinit.c +++ b/src/spicelib/devices/jfet/jfetinit.c @@ -8,73 +8,64 @@ SPICEdev JFETinfo = { - { - "JFET", - "Junction Field effect transistor", - - &JFETnSize, - &JFETnSize, - JFETnames, - - &JFETpTSize, - JFETpTable, - - &JFETmPTSize, - JFETmPTable, + .DEVpublic = { + .name = "JFET", + .description = "Junction Field effect transistor", + .terms = &JFETnSize, + .numNames = &JFETnSize, + .termNames = JFETnames, + .numInstanceParms = &JFETpTSize, + .instanceParms = JFETpTable, + .numModelParms = &JFETmPTSize, + .modelParms = JFETmPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ JFETparam, - /* DEVmodParam */ JFETmParam, - /* DEVload */ JFETload, - /* DEVsetup */ JFETsetup, - /* DEVunsetup */ JFETunsetup, - /* DEVpzSetup */ JFETsetup, - /* DEVtemperature*/ JFETtemp, - /* DEVtrunc */ JFETtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ JFETacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ JFETdestroy, - /* DEVmodDelete */ JFETmDelete, - /* DEVdelete */ JFETdelete, - /* DEVsetic */ JFETgetic, - /* DEVask */ JFETask, - /* DEVmodAsk */ JFETmAsk, - /* DEVpzLoad */ JFETpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ JFETdisto, - /* DEVnoise */ JFETnoise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &JFETiSize, - /* DEVmodSize */ &JFETmSize + .DEVparam = JFETparam, + .DEVmodParam = JFETmParam, + .DEVload = JFETload, + .DEVsetup = JFETsetup, + .DEVunsetup = JFETunsetup, + .DEVpzSetup = JFETsetup, + .DEVtemperature = JFETtemp, + .DEVtrunc = JFETtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = JFETacLoad, + .DEVaccept = NULL, + .DEVdestroy = JFETdestroy, + .DEVmodDelete = JFETmDelete, + .DEVdelete = JFETdelete, + .DEVsetic = JFETgetic, + .DEVask = JFETask, + .DEVmodAsk = JFETmAsk, + .DEVpzLoad = JFETpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = JFETdisto, + .DEVnoise = JFETnoise, + .DEVsoaCheck = NULL, + .DEVinstSize = &JFETiSize, + .DEVmodSize = &JFETmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/jfet2/jfet2init.c b/src/spicelib/devices/jfet2/jfet2init.c index 4590c84bf..857706f4a 100644 --- a/src/spicelib/devices/jfet2/jfet2init.c +++ b/src/spicelib/devices/jfet2/jfet2init.c @@ -8,73 +8,64 @@ SPICEdev JFET2info = { - { - "JFET2", - "Short channel field effect transistor", - - &JFET2nSize, - &JFET2nSize, - JFET2names, - - &JFET2pTSize, - JFET2pTable, - - &JFET2mPTSize, - JFET2mPTable, + .DEVpublic = { + .name = "JFET2", + .description = "Short channel field effect transistor", + .terms = &JFET2nSize, + .numNames = &JFET2nSize, + .termNames = JFET2names, + .numInstanceParms = &JFET2pTSize, + .instanceParms = JFET2pTable, + .numModelParms = &JFET2mPTSize, + .modelParms = JFET2mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ JFET2param, - /* DEVmodParam */ JFET2mParam, - /* DEVload */ JFET2load, - /* DEVsetup */ JFET2setup, - /* DEVunsetup */ JFET2unsetup, - /* DEVpzSetup */ JFET2setup, - /* DEVtemperature*/ JFET2temp, - /* DEVtrunc */ JFET2trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ JFET2acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ JFET2destroy, - /* DEVmodDelete */ JFET2mDelete, - /* DEVdelete */ JFET2delete, - /* DEVsetic */ JFET2getic, - /* DEVask */ JFET2ask, - /* DEVmodAsk */ JFET2mAsk, - /* DEVpzLoad */ NULL, /* AN_pz */ - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* AN_disto */ - /* DEVnoise */ JFET2noise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &JFET2iSize, - /* DEVmodSize */ &JFET2mSize + .DEVparam = JFET2param, + .DEVmodParam = JFET2mParam, + .DEVload = JFET2load, + .DEVsetup = JFET2setup, + .DEVunsetup = JFET2unsetup, + .DEVpzSetup = JFET2setup, + .DEVtemperature = JFET2temp, + .DEVtrunc = JFET2trunc, + .DEVfindBranch = NULL, + .DEVacLoad = JFET2acLoad, + .DEVaccept = NULL, + .DEVdestroy = JFET2destroy, + .DEVmodDelete = JFET2mDelete, + .DEVdelete = JFET2delete, + .DEVsetic = JFET2getic, + .DEVask = JFET2ask, + .DEVmodAsk = JFET2mAsk, + .DEVpzLoad = NULL, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = JFET2noise, + .DEVsoaCheck = NULL, + .DEVinstSize = &JFET2iSize, + .DEVmodSize = &JFET2mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/ltra/ltrainit.c b/src/spicelib/devices/ltra/ltrainit.c index b2c30b76e..97988e7e2 100644 --- a/src/spicelib/devices/ltra/ltrainit.c +++ b/src/spicelib/devices/ltra/ltrainit.c @@ -8,73 +8,64 @@ SPICEdev LTRAinfo = { - { - "LTRA", - "Lossy transmission line", - - <RAnSize, - <RAnSize, - LTRAnames, - - <RApTSize, - LTRApTable, - - <RAmPTSize, - LTRAmPTable, + .DEVpublic = { + .name = "LTRA", + .description = "Lossy transmission line", + .terms = <RAnSize, + .numNames = <RAnSize, + .termNames = LTRAnames, + .numInstanceParms = <RApTSize, + .instanceParms = LTRApTable, + .numModelParms = <RAmPTSize, + .modelParms = LTRAmPTable, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - 0 }, - /* DEVparam */ LTRAparam, - /* DEVmodParam */ LTRAmParam, - /* DEVload */ LTRAload, - /* DEVsetup */ LTRAsetup, - /* DEVunsetup */ LTRAunsetup, - /* DEVpzSetup */ LTRAsetup, - /* DEVtemperature*/ LTRAtemp, - /* DEVtrunc */ LTRAtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ LTRAacLoad /*LTRAacLoad*/, - /* DEVaccept */ LTRAaccept, - /* DEVdestroy */ LTRAdestroy, - /* DEVmodDelete */ LTRAmDelete, - /* DEVdelete */ LTRAdelete, - /* DEVsetic */ NULL, /* getic */ - /* DEVask */ LTRAask, - /* DEVmodAsk */ LTRAmAsk, /* */ - /* DEVpzLoad */ NULL, /* pzLoad */ - /* DEVconvTest */ NULL, /* convTest */ - /* DEVsenSetup */ NULL, /* sSetup */ - /* DEVsenLoad */ NULL, /* sLoad */ - /* DEVsenUpdate */ NULL, /* sUpdate */ - /* DEVsenAcLoad */ NULL, /* sAcLoad */ - /* DEVsenPrint */ NULL, /* sPrint */ - /* DEVsenTrunc */ NULL, /* */ - /* DEVdisto */ NULL, /* disto */ - /* DEVnoise */ NULL, /* noise */ - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ <RAiSize, - /* DEVmodSize */ <RAmSize + .DEVparam = LTRAparam, + .DEVmodParam = LTRAmParam, + .DEVload = LTRAload, + .DEVsetup = LTRAsetup, + .DEVunsetup = LTRAunsetup, + .DEVpzSetup = LTRAsetup, + .DEVtemperature = LTRAtemp, + .DEVtrunc = LTRAtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = LTRAacLoad, + .DEVaccept = LTRAaccept, + .DEVdestroy = LTRAdestroy, + .DEVmodDelete = LTRAmDelete, + .DEVdelete = LTRAdelete, + .DEVsetic = NULL, + .DEVask = LTRAask, + .DEVmodAsk = LTRAmAsk, + .DEVpzLoad = NULL, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = <RAiSize, + .DEVmodSize = <RAmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/mes/mesinit.c b/src/spicelib/devices/mes/mesinit.c index 4eb612a68..151e5aafe 100644 --- a/src/spicelib/devices/mes/mesinit.c +++ b/src/spicelib/devices/mes/mesinit.c @@ -8,73 +8,64 @@ SPICEdev MESinfo = { - { - "MES", - "GaAs MESFET model", - - &MESnSize, - &MESnSize, - MESnames, - - &MESpTSize, - MESpTable, - - &MESmPTSize, - MESmPTable, + .DEVpublic = { + .name = "MES", + .description = "GaAs MESFET model", + .terms = &MESnSize, + .numNames = &MESnSize, + .termNames = MESnames, + .numInstanceParms = &MESpTSize, + .instanceParms = MESpTable, + .numModelParms = &MESmPTSize, + .modelParms = MESmPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ MESparam, - /* DEVmodParam */ MESmParam, - /* DEVload */ MESload, - /* DEVsetup */ MESsetup, - /* DEVunsetup */ MESunsetup, - /* DEVpzSetup */ MESsetup, - /* DEVtemperature*/ MEStemp, - /* DEVtrunc */ MEStrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ MESacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ MESdestroy, - /* DEVmodDelete */ MESmDelete, - /* DEVdelete */ MESdelete, - /* DEVsetic */ MESgetic, - /* DEVask */ MESask, - /* DEVmodAsk */ MESmAsk, - /* DEVpzLoad */ MESpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ MESdisto, - /* DEVnoise */ MESnoise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &MESiSize, - /* DEVmodSize */ &MESmSize + .DEVparam = MESparam, + .DEVmodParam = MESmParam, + .DEVload = MESload, + .DEVsetup = MESsetup, + .DEVunsetup = MESunsetup, + .DEVpzSetup = MESsetup, + .DEVtemperature = MEStemp, + .DEVtrunc = MEStrunc, + .DEVfindBranch = NULL, + .DEVacLoad = MESacLoad, + .DEVaccept = NULL, + .DEVdestroy = MESdestroy, + .DEVmodDelete = MESmDelete, + .DEVdelete = MESdelete, + .DEVsetic = MESgetic, + .DEVask = MESask, + .DEVmodAsk = MESmAsk, + .DEVpzLoad = MESpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = MESdisto, + .DEVnoise = MESnoise, + .DEVsoaCheck = NULL, + .DEVinstSize = &MESiSize, + .DEVmodSize = &MESmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/mesa/mesainit.c b/src/spicelib/devices/mesa/mesainit.c index c1a63a43b..8d632347d 100644 --- a/src/spicelib/devices/mesa/mesainit.c +++ b/src/spicelib/devices/mesa/mesainit.c @@ -8,73 +8,64 @@ SPICEdev MESAinfo = { - { - "MESA", - "GaAs MESFET model", - - &MESAnSize, - &MESAnSize, - MESAnames, - - &MESApTSize, - MESApTable, - - &MESAmPTSize, - MESAmPTable, + .DEVpublic = { + .name = "MESA", + .description = "GaAs MESFET model", + .terms = &MESAnSize, + .numNames = &MESAnSize, + .termNames = MESAnames, + .numInstanceParms = &MESApTSize, + .instanceParms = MESApTable, + .numModelParms = &MESAmPTSize, + .modelParms = MESAmPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ MESAparam, - /* DEVmodParam */ MESAmParam, - /* DEVload */ MESAload, - /* DEVsetup */ MESAsetup, - /* DEVunsetup */ MESAunsetup, - /* DEVpzSetup */ MESAsetup, - /* DEVtemperature*/ MESAtemp, - /* DEVtrunc */ MESAtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ MESAacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ MESAdestroy, - /* DEVmodDelete */ MESAmDelete, - /* DEVdelete */ MESAdelete, - /* DEVsetic */ MESAgetic, - /* DEVask */ MESAask, - /* DEVmodAsk */ MESAmAsk, - /* DEVpzLoad */ MESApzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ NULL, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &MESAiSize, - /* DEVmodSize */ &MESAmSize + .DEVparam = MESAparam, + .DEVmodParam = MESAmParam, + .DEVload = MESAload, + .DEVsetup = MESAsetup, + .DEVunsetup = MESAunsetup, + .DEVpzSetup = MESAsetup, + .DEVtemperature = MESAtemp, + .DEVtrunc = MESAtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = MESAacLoad, + .DEVaccept = NULL, + .DEVdestroy = MESAdestroy, + .DEVmodDelete = MESAmDelete, + .DEVdelete = MESAdelete, + .DEVsetic = MESAgetic, + .DEVask = MESAask, + .DEVmodAsk = MESAmAsk, + .DEVpzLoad = MESApzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &MESAiSize, + .DEVmodSize = &MESAmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/mos1/mos1init.c b/src/spicelib/devices/mos1/mos1init.c index a537f411c..6f1923164 100644 --- a/src/spicelib/devices/mos1/mos1init.c +++ b/src/spicelib/devices/mos1/mos1init.c @@ -8,72 +8,64 @@ SPICEdev MOS1info = { - { - "Mos1", - "Level 1 MOSfet model with Meyer capacitance model", - - &MOS1nSize, - &MOS1nSize, - MOS1names, - - &MOS1pTSize, - MOS1pTable, - - &MOS1mPTSize, - MOS1mPTable, + .DEVpublic = { + .name = "Mos1", + .description = "Level 1 MOSfet model with Meyer capacitance model", + .terms = &MOS1nSize, + .numNames = &MOS1nSize, + .termNames = MOS1names, + .numInstanceParms = &MOS1pTSize, + .instanceParms = MOS1pTable, + .numModelParms = &MOS1mPTSize, + .modelParms = MOS1mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ MOS1param, - /* DEVmodParam */ MOS1mParam, - /* DEVload */ MOS1load, - /* DEVsetup */ MOS1setup, - /* DEVunsetup */ MOS1unsetup, - /* DEVpzSetup */ MOS1setup, - /* DEVtemperature*/ MOS1temp, - /* DEVtrunc */ MOS1trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ MOS1acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ MOS1destroy, - /* DEVmodDelete */ MOS1mDelete, - /* DEVdelete */ MOS1delete, - /* DEVsetic */ MOS1getic, - /* DEVask */ MOS1ask, - /* DEVmodAsk */ MOS1mAsk, - /* DEVpzLoad */ MOS1pzLoad, - /* DEVconvTest */ MOS1convTest, - /* DEVsenSetup */ MOS1sSetup, - /* DEVsenLoad */ MOS1sLoad, - /* DEVsenUpdate */ MOS1sUpdate, - /* DEVsenAcLoad */ MOS1sAcLoad, - /* DEVsenPrint */ MOS1sPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ MOS1disto, - /* DEVnoise */ MOS1noise, - /* DEVsoaCheck */ NULL, + .DEVparam = MOS1param, + .DEVmodParam = MOS1mParam, + .DEVload = MOS1load, + .DEVsetup = MOS1setup, + .DEVunsetup = MOS1unsetup, + .DEVpzSetup = MOS1setup, + .DEVtemperature = MOS1temp, + .DEVtrunc = MOS1trunc, + .DEVfindBranch = NULL, + .DEVacLoad = MOS1acLoad, + .DEVaccept = NULL, + .DEVdestroy = MOS1destroy, + .DEVmodDelete = MOS1mDelete, + .DEVdelete = MOS1delete, + .DEVsetic = MOS1getic, + .DEVask = MOS1ask, + .DEVmodAsk = MOS1mAsk, + .DEVpzLoad = MOS1pzLoad, + .DEVconvTest = MOS1convTest, + .DEVsenSetup = MOS1sSetup, + .DEVsenLoad = MOS1sLoad, + .DEVsenUpdate = MOS1sUpdate, + .DEVsenAcLoad = MOS1sAcLoad, + .DEVsenPrint = MOS1sPrint, + .DEVsenTrunc = NULL, + .DEVdisto = MOS1disto, + .DEVnoise = MOS1noise, + .DEVsoaCheck = NULL, + .DEVinstSize = &MOS1iSize, + .DEVmodSize = &MOS1mSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &MOS1iSize, - /* DEVmodSize */ &MOS1mSize + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/mos2/mos2init.c b/src/spicelib/devices/mos2/mos2init.c index 1a6c9afbe..297a0edde 100644 --- a/src/spicelib/devices/mos2/mos2init.c +++ b/src/spicelib/devices/mos2/mos2init.c @@ -8,72 +8,64 @@ SPICEdev MOS2info = { - { - "Mos2", - "Level 2 MOSfet model with Meyer capacitance model", - - &MOS2nSize, - &MOS2nSize, - MOS2names, - - &MOS2pTSize, - MOS2pTable, - - &MOS2mPTSize, - MOS2mPTable, + .DEVpublic = { + .name = "Mos2", + .description = "Level 2 MOSfet model with Meyer capacitance model", + .terms = &MOS2nSize, + .numNames = &MOS2nSize, + .termNames = MOS2names, + .numInstanceParms = &MOS2pTSize, + .instanceParms = MOS2pTable, + .numModelParms = &MOS2mPTSize, + .modelParms = MOS2mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ MOS2param, - /* DEVmodParam */ MOS2mParam, - /* DEVload */ MOS2load, - /* DEVsetup */ MOS2setup, - /* DEVunsetup */ MOS2unsetup, - /* DEVpzSetup */ MOS2setup, - /* DEVtemperature*/ MOS2temp, - /* DEVtrunc */ MOS2trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ MOS2acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ MOS2destroy, - /* DEVmodDelete */ MOS2mDelete, - /* DEVdelete */ MOS2delete, - /* DEVsetic */ MOS2getic, - /* DEVask */ MOS2ask, - /* DEVmodAsk */ MOS2mAsk, - /* DEVpzLoad */ MOS2pzLoad, - /* DEVconvTest */ MOS2convTest, - /* DEVsenSetup */ MOS2sSetup, - /* DEVsenLoad */ MOS2sLoad, - /* DEVsenUpdate */ MOS2sUpdate, - /* DEVsenAcLoad */ MOS2sAcLoad, - /* DEVsenPrint */ MOS2sPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ MOS2disto, - /* DEVnoise */ MOS2noise, - /* DEVsoaCheck */ NULL, + .DEVparam = MOS2param, + .DEVmodParam = MOS2mParam, + .DEVload = MOS2load, + .DEVsetup = MOS2setup, + .DEVunsetup = MOS2unsetup, + .DEVpzSetup = MOS2setup, + .DEVtemperature = MOS2temp, + .DEVtrunc = MOS2trunc, + .DEVfindBranch = NULL, + .DEVacLoad = MOS2acLoad, + .DEVaccept = NULL, + .DEVdestroy = MOS2destroy, + .DEVmodDelete = MOS2mDelete, + .DEVdelete = MOS2delete, + .DEVsetic = MOS2getic, + .DEVask = MOS2ask, + .DEVmodAsk = MOS2mAsk, + .DEVpzLoad = MOS2pzLoad, + .DEVconvTest = MOS2convTest, + .DEVsenSetup = MOS2sSetup, + .DEVsenLoad = MOS2sLoad, + .DEVsenUpdate = MOS2sUpdate, + .DEVsenAcLoad = MOS2sAcLoad, + .DEVsenPrint = MOS2sPrint, + .DEVsenTrunc = NULL, + .DEVdisto = MOS2disto, + .DEVnoise = MOS2noise, + .DEVsoaCheck = NULL, + .DEVinstSize = &MOS2iSize, + .DEVmodSize = &MOS2mSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &MOS2iSize, - /* DEVmodSize */ &MOS2mSize + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/mos3/mos3init.c b/src/spicelib/devices/mos3/mos3init.c index bd3e8c26a..d962dd88a 100644 --- a/src/spicelib/devices/mos3/mos3init.c +++ b/src/spicelib/devices/mos3/mos3init.c @@ -8,73 +8,64 @@ SPICEdev MOS3info = { - { - "Mos3", - "Level 3 MOSfet model with Meyer capacitance model", - - &MOS3nSize, - &MOS3nSize, - MOS3names, - - &MOS3pTSize, - MOS3pTable, - - &MOS3mPTSize, - MOS3mPTable, + .DEVpublic = { + .name = "Mos3", + .description = "Level 3 MOSfet model with Meyer capacitance model", + .terms = &MOS3nSize, + .numNames = &MOS3nSize, + .termNames = MOS3names, + .numInstanceParms = &MOS3pTSize, + .instanceParms = MOS3pTable, + .numModelParms = &MOS3mPTSize, + .modelParms = MOS3mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ MOS3param, - /* DEVmodParam */ MOS3mParam, - /* DEVload */ MOS3load, - /* DEVsetup */ MOS3setup, - /* DEVunsetup */ MOS3unsetup, - /* DEVpzSetup */ MOS3setup, - /* DEVtemperature*/ MOS3temp, - /* DEVtrunc */ MOS3trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ MOS3acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ MOS3destroy, - /* DEVmodDelete */ MOS3mDelete, - /* DEVdelete */ MOS3delete, - /* DEVsetic */ MOS3getic, - /* DEVask */ MOS3ask, - /* DEVmodAsk */ MOS3mAsk, - /* DEVpzLoad */ MOS3pzLoad, - /* DEVconvTest */ MOS3convTest, - /* DEVsenSetup */ MOS3sSetup, - /* DEVsenLoad */ MOS3sLoad, - /* DEVsenUpdate */ MOS3sUpdate, - /* DEVsenAcLoad */ MOS3sAcLoad, - /* DEVsenPrint */ MOS3sPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ MOS3disto, - /* DEVnoise */ MOS3noise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &MOS3iSize, - /* DEVmodSize */ &MOS3mSize + .DEVparam = MOS3param, + .DEVmodParam = MOS3mParam, + .DEVload = MOS3load, + .DEVsetup = MOS3setup, + .DEVunsetup = MOS3unsetup, + .DEVpzSetup = MOS3setup, + .DEVtemperature = MOS3temp, + .DEVtrunc = MOS3trunc, + .DEVfindBranch = NULL, + .DEVacLoad = MOS3acLoad, + .DEVaccept = NULL, + .DEVdestroy = MOS3destroy, + .DEVmodDelete = MOS3mDelete, + .DEVdelete = MOS3delete, + .DEVsetic = MOS3getic, + .DEVask = MOS3ask, + .DEVmodAsk = MOS3mAsk, + .DEVpzLoad = MOS3pzLoad, + .DEVconvTest = MOS3convTest, + .DEVsenSetup = MOS3sSetup, + .DEVsenLoad = MOS3sLoad, + .DEVsenUpdate = MOS3sUpdate, + .DEVsenAcLoad = MOS3sAcLoad, + .DEVsenPrint = MOS3sPrint, + .DEVsenTrunc = NULL, + .DEVdisto = MOS3disto, + .DEVnoise = MOS3noise, + .DEVsoaCheck = NULL, + .DEVinstSize = &MOS3iSize, + .DEVmodSize = &MOS3mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/mos6/mos6init.c b/src/spicelib/devices/mos6/mos6init.c index c87370016..a4273df19 100644 --- a/src/spicelib/devices/mos6/mos6init.c +++ b/src/spicelib/devices/mos6/mos6init.c @@ -8,72 +8,64 @@ SPICEdev MOS6info = { - { - "Mos6", - "Level 6 MOSfet model with Meyer capacitance model", - - &MOS6nSize, - &MOS6nSize, - MOS6names, - - &MOS6pTSize, - MOS6pTable, - - &MOS6mPTSize, - MOS6mPTable, + .DEVpublic = { + .name = "Mos6", + .description = "Level 6 MOSfet model with Meyer capacitance model", + .terms = &MOS6nSize, + .numNames = &MOS6nSize, + .termNames = MOS6names, + .numInstanceParms = &MOS6pTSize, + .instanceParms = MOS6pTable, + .numModelParms = &MOS6mPTSize, + .modelParms = MOS6mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ MOS6param, - /* DEVmodParam */ MOS6mParam, - /* DEVload */ MOS6load, - /* DEVsetup */ MOS6setup, - /* DEVunsetup */ MOS6unsetup, - /* DEVpzSetup */ NULL, /* PZsetup routine */ - /* DEVtemperature*/ MOS6temp, - /* DEVtrunc */ MOS6trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ NULL, /* MOS6acLoad, XXX */ - /* DEVaccept */ NULL, - /* DEVdestroy */ MOS6destroy, - /* DEVmodDelete */ MOS6mDelete, - /* DEVdelete */ MOS6delete, - /* DEVsetic */ MOS6getic, - /* DEVask */ MOS6ask, - /* DEVmodAsk */ MOS6mAsk, - /* DEVpzLoad */ NULL, /*MOS6pzLoad, XXX */ - /* DEVconvTest */ MOS6convTest, - /* DEVsenSetup */ NULL /* MOS6sSetup */, - /* DEVsenLoad */ NULL /* MOS6sLoad */, - /* DEVsenUpdate */ NULL /* MOS6sUpdate */, - /* DEVsenAcLoad */ NULL /* MOS6sAcLoad */, - /* DEVsenPrint */ NULL /* MOS6sPrint */, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* Distortion routine */ - /* DEVnoise */ NULL, /* Noise routine */ - /* DEVsoaCheck */ NULL, + .DEVparam = MOS6param, + .DEVmodParam = MOS6mParam, + .DEVload = MOS6load, + .DEVsetup = MOS6setup, + .DEVunsetup = MOS6unsetup, + .DEVpzSetup = NULL, + .DEVtemperature = MOS6temp, + .DEVtrunc = MOS6trunc, + .DEVfindBranch = NULL, + .DEVacLoad = NULL, + .DEVaccept = NULL, + .DEVdestroy = MOS6destroy, + .DEVmodDelete = MOS6mDelete, + .DEVdelete = MOS6delete, + .DEVsetic = MOS6getic, + .DEVask = MOS6ask, + .DEVmodAsk = MOS6mAsk, + .DEVpzLoad = NULL, + .DEVconvTest = MOS6convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &MOS6iSize, + .DEVmodSize = &MOS6mSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &MOS6iSize, - /* DEVmodSize */ &MOS6mSize + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/mos9/mos9init.c b/src/spicelib/devices/mos9/mos9init.c index 9d0ab50bf..292c6bfc6 100644 --- a/src/spicelib/devices/mos9/mos9init.c +++ b/src/spicelib/devices/mos9/mos9init.c @@ -8,73 +8,64 @@ SPICEdev MOS9info = { - { - "Mos9", - "Modified Level 3 MOSfet model", - - &MOS9nSize, - &MOS9nSize, - MOS9names, - - &MOS9pTSize, - MOS9pTable, - - &MOS9mPTSize, - MOS9mPTable, + .DEVpublic = { + .name = "Mos9", + .description = "Modified Level 3 MOSfet model", + .terms = &MOS9nSize, + .numNames = &MOS9nSize, + .termNames = MOS9names, + .numInstanceParms = &MOS9pTSize, + .instanceParms = MOS9pTable, + .numModelParms = &MOS9mPTSize, + .modelParms = MOS9mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ MOS9param, - /* DEVmodParam */ MOS9mParam, - /* DEVload */ MOS9load, - /* DEVsetup */ MOS9setup, - /* DEVunsetup */ MOS9unsetup, - /* DEVpzSetup */ MOS9setup, - /* DEVtemperature*/ MOS9temp, - /* DEVtrunc */ MOS9trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ MOS9acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ MOS9destroy, - /* DEVmodDelete */ MOS9mDelete, - /* DEVdelete */ MOS9delete, - /* DEVsetic */ MOS9getic, - /* DEVask */ MOS9ask, - /* DEVmodAsk */ MOS9mAsk, - /* DEVpzLoad */ MOS9pzLoad, - /* DEVconvTest */ MOS9convTest, - /* DEVsenSetup */ MOS9sSetup, - /* DEVsenLoad */ MOS9sLoad, - /* DEVsenUpdate */ MOS9sUpdate, - /* DEVsenAcLoad */ MOS9sAcLoad, - /* DEVsenPrint */ MOS9sPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ MOS9disto, - /* DEVnoise */ MOS9noise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &MOS9iSize, - /* DEVmodSize */ &MOS9mSize + .DEVparam = MOS9param, + .DEVmodParam = MOS9mParam, + .DEVload = MOS9load, + .DEVsetup = MOS9setup, + .DEVunsetup = MOS9unsetup, + .DEVpzSetup = MOS9setup, + .DEVtemperature = MOS9temp, + .DEVtrunc = MOS9trunc, + .DEVfindBranch = NULL, + .DEVacLoad = MOS9acLoad, + .DEVaccept = NULL, + .DEVdestroy = MOS9destroy, + .DEVmodDelete = MOS9mDelete, + .DEVdelete = MOS9delete, + .DEVsetic = MOS9getic, + .DEVask = MOS9ask, + .DEVmodAsk = MOS9mAsk, + .DEVpzLoad = MOS9pzLoad, + .DEVconvTest = MOS9convTest, + .DEVsenSetup = MOS9sSetup, + .DEVsenLoad = MOS9sLoad, + .DEVsenUpdate = MOS9sUpdate, + .DEVsenAcLoad = MOS9sAcLoad, + .DEVsenPrint = MOS9sPrint, + .DEVsenTrunc = NULL, + .DEVdisto = MOS9disto, + .DEVnoise = MOS9noise, + .DEVsoaCheck = NULL, + .DEVinstSize = &MOS9iSize, + .DEVmodSize = &MOS9mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/nbjt/nbjtinit.c b/src/spicelib/devices/nbjt/nbjtinit.c index 45a9dbee0..af222ffe1 100644 --- a/src/spicelib/devices/nbjt/nbjtinit.c +++ b/src/spicelib/devices/nbjt/nbjtinit.c @@ -8,74 +8,64 @@ SPICEdev NBJTinfo = { - { - "NBJT", - "1D Numerical Bipolar Junction Transistor model", - - &NBJTnSize, - &NBJTnSize, - NBJTnames, - - &NBJTpTSize, - NBJTpTable, - - &NBJTmPTSize, - NBJTmPTable, + .DEVpublic = { + .name = "NBJT", + .description = "1D Numerical Bipolar Junction Transistor model", + .terms = &NBJTnSize, + .numNames = &NBJTnSize, + .termNames = NBJTnames, + .numInstanceParms = &NBJTpTSize, + .instanceParms = NBJTpTable, + .numModelParms = &NBJTmPTSize, + .modelParms = NBJTmPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ NBJTparam, - /* DEVmodParam */ NBJTmParam, - /* DEVload */ NBJTload, - /* DEVsetup */ NBJTsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ NBJTsetup, - /* DEVtemperature*/ NBJTtemp, - /* DEVtrunc */ NBJTtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ NBJTacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ NBJTdestroy, - /* DEVmodDelete */ NBJTmDelete, - /* DEVdelete */ NBJTdelete, - /* DEVsetic */ NULL, - /* DEVask */ NBJTask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ NBJTpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ NULL, - /* DEVsoaCheck */ NULL, + .DEVparam = NBJTparam, + .DEVmodParam = NBJTmParam, + .DEVload = NBJTload, + .DEVsetup = NBJTsetup, + .DEVunsetup = NULL, + .DEVpzSetup = NBJTsetup, + .DEVtemperature = NBJTtemp, + .DEVtrunc = NBJTtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = NBJTacLoad, + .DEVaccept = NULL, + .DEVdestroy = NBJTdestroy, + .DEVmodDelete = NBJTmDelete, + .DEVdelete = NBJTdelete, + .DEVsetic = NULL, + .DEVask = NBJTask, + .DEVmodAsk = NULL, + .DEVpzLoad = NBJTpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &NBJTiSize, + .DEVmodSize = &NBJTmSize, + #ifdef CIDER - /* DEVdump */ NBJTdump, - /* DEVacct */ NBJTacct, + .DEVdump = NBJTdump, + .DEVacct = NBJTacct, #endif - - /* DEVinstSize */ &NBJTiSize, - /* DEVmodSize */ &NBJTmSize - }; diff --git a/src/spicelib/devices/nbjt2/nbt2init.c b/src/spicelib/devices/nbjt2/nbt2init.c index 39eab292f..a0c9f8653 100644 --- a/src/spicelib/devices/nbjt2/nbt2init.c +++ b/src/spicelib/devices/nbjt2/nbt2init.c @@ -8,74 +8,64 @@ SPICEdev NBJT2info = { - { - "NBJT2", - "2D Numerical Bipolar Junction Transistor model", + .DEVpublic = { + .name = "NBJT2", + .description = "2D Numerical Bipolar Junction Transistor model", + .terms = &NBJT2nSize, + .numNames = &NBJT2nSize, + .termNames = NBJT2names, + .numInstanceParms = &NBJT2pTSize, + .instanceParms = NBJT2pTable, + .numModelParms = &NBJT2mPTSize, + .modelParms = NBJT2mPTable, + .flags = DEV_DEFAULT, - &NBJT2nSize, - &NBJT2nSize, - NBJT2names, - - &NBJT2pTSize, - NBJT2pTable, - - &NBJT2mPTSize, - NBJT2mPTable, - #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ NBJT2param, - /* DEVmodParam */ NBJT2mParam, - /* DEVload */ NBJT2load, - /* DEVsetup */ NBJT2setup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ NBJT2setup, - /* DEVtemperature*/ NBJT2temp, - /* DEVtrunc */ NBJT2trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ NBJT2acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ NBJT2destroy, - /* DEVmodDelete */ NBJT2mDelete, - /* DEVdelete */ NBJT2delete, - /* DEVsetic */ NULL, - /* DEVask */ NBJT2ask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ NBJT2pzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ NULL, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NBJT2dump, - /* DEVacct */ NBJT2acct, -#endif - - /* DEVinstSize */ &NBJT2iSize, - /* DEVmodSize */ &NBJT2mSize + .DEVparam = NBJT2param, + .DEVmodParam = NBJT2mParam, + .DEVload = NBJT2load, + .DEVsetup = NBJT2setup, + .DEVunsetup = NULL, + .DEVpzSetup = NBJT2setup, + .DEVtemperature = NBJT2temp, + .DEVtrunc = NBJT2trunc, + .DEVfindBranch = NULL, + .DEVacLoad = NBJT2acLoad, + .DEVaccept = NULL, + .DEVdestroy = NBJT2destroy, + .DEVmodDelete = NBJT2mDelete, + .DEVdelete = NBJT2delete, + .DEVsetic = NULL, + .DEVask = NBJT2ask, + .DEVmodAsk = NULL, + .DEVpzLoad = NBJT2pzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &NBJT2iSize, + .DEVmodSize = &NBJT2mSize, +#ifdef CIDER + .DEVdump = NBJT2dump, + .DEVacct = NBJT2acct, +#endif }; diff --git a/src/spicelib/devices/ndev/ndevinit.c b/src/spicelib/devices/ndev/ndevinit.c index 4a855c69c..f65046905 100644 --- a/src/spicelib/devices/ndev/ndevinit.c +++ b/src/spicelib/devices/ndev/ndevinit.c @@ -8,74 +8,64 @@ SPICEdev NDEVinfo = { - { - "NDEV", - "Numerical Device", + .DEVpublic = { + .name = "NDEV", + .description = "Numerical Device", + .terms = &NDEVnSize, + .numNames = &NDEVnSize, + .termNames = NDEVnames, + .numInstanceParms = &NDEVpTSize, + .instanceParms = NDEVpTable, + .numModelParms = &NDEVmPTSize, + .modelParms = NDEVmPTable, + .flags = DEV_DEFAULT, - &NDEVnSize, /* number of terminals */ - &NDEVnSize, - NDEVnames, /* the name of terminals*/ - - &NDEVpTSize, /*number of instance parameters */ - NDEVpTable, /*the array of instance parameters */ - - &NDEVmPTSize, /* number of model parameter, NDEV does not have this parameter */ - NDEVmPTable, /*the array of model parameters */ - #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ NDEVparam, - /* DEVmodParam */ NDEVmParam, - /* DEVload */ NDEVload, - /* DEVsetup */ NDEVsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ NDEVsetup, - /* DEVtemperature*/ NDEVtemp, - /* DEVtrunc */ NDEVtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ NDEVacLoad, - /* DEVaccept */ NDEVaccept, - /* DEVdestroy */ NDEVdestroy, - /* DEVmodDelete */ NDEVmDelete, - /* DEVdelete */ NDEVdelete, - /* DEVsetic */ NDEVgetic, - /* DEVask */ NDEVask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ NDEVpzLoad, - /* DEVconvTest */ NDEVconvTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ NULL, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - - /* DEVinstSize */ &NDEViSize, - /* DEVmodSize */ &NDEVmSize + .DEVparam = NDEVparam, + .DEVmodParam = NDEVmParam, + .DEVload = NDEVload, + .DEVsetup = NDEVsetup, + .DEVunsetup = NULL, + .DEVpzSetup = NDEVsetup, + .DEVtemperature = NDEVtemp, + .DEVtrunc = NDEVtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = NDEVacLoad, + .DEVaccept = NDEVaccept, + .DEVdestroy = NDEVdestroy, + .DEVmodDelete = NDEVmDelete, + .DEVdelete = NDEVdelete, + .DEVsetic = NDEVgetic, + .DEVask = NDEVask, + .DEVmodAsk = NULL, + .DEVpzLoad = NDEVpzLoad, + .DEVconvTest = NDEVconvTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &NDEViSize, + .DEVmodSize = &NDEVmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/numd/numdinit.c b/src/spicelib/devices/numd/numdinit.c index cd78dee31..bf036444a 100644 --- a/src/spicelib/devices/numd/numdinit.c +++ b/src/spicelib/devices/numd/numdinit.c @@ -8,74 +8,64 @@ SPICEdev NUMDinfo = { - { - "NUMD", - "1D Numerical Junction Diode model", + .DEVpublic = { + .name = "NUMD", + .description = "1D Numerical Junction Diode model", + .terms = &NUMDnSize, + .numNames = &NUMDnSize, + .termNames = NUMDnames, + .numInstanceParms = &NUMDpTSize, + .instanceParms = NUMDpTable, + .numModelParms = &NUMDmPTSize, + .modelParms = NUMDmPTable, + .flags = DEV_DEFAULT, - &NUMDnSize, - &NUMDnSize, - NUMDnames, - - &NUMDpTSize, - NUMDpTable, - - &NUMDmPTSize, - NUMDmPTable, - #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ NUMDparam, - /* DEVmodParam */ NUMDmParam, - /* DEVload */ NUMDload, - /* DEVsetup */ NUMDsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ NUMDsetup, - /* DEVtemperature*/ NUMDtemp, - /* DEVtrunc */ NUMDtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ NUMDacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ NUMDdestroy, - /* DEVmodDelete */ NUMDmDelete, - /* DEVdelete */ NUMDdelete, - /* DEVsetic */ NULL, - /* DEVask */ NUMDask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ NUMDpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ NULL, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NUMDdump, - /* DEVacct */ NUMDacct, -#endif - - /* DEVinstSize */ &NUMDiSize, - /* DEVmodSize */ &NUMDmSize + .DEVparam = NUMDparam, + .DEVmodParam = NUMDmParam, + .DEVload = NUMDload, + .DEVsetup = NUMDsetup, + .DEVunsetup = NULL, + .DEVpzSetup = NUMDsetup, + .DEVtemperature = NUMDtemp, + .DEVtrunc = NUMDtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = NUMDacLoad, + .DEVaccept = NULL, + .DEVdestroy = NUMDdestroy, + .DEVmodDelete = NUMDmDelete, + .DEVdelete = NUMDdelete, + .DEVsetic = NULL, + .DEVask = NUMDask, + .DEVmodAsk = NULL, + .DEVpzLoad = NUMDpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &NUMDiSize, + .DEVmodSize = &NUMDmSize, +#ifdef CIDER + .DEVdump = NUMDdump, + .DEVacct = NUMDacct, +#endif }; diff --git a/src/spicelib/devices/numd2/numd2init.c b/src/spicelib/devices/numd2/numd2init.c index dec78e566..9d22900b1 100644 --- a/src/spicelib/devices/numd2/numd2init.c +++ b/src/spicelib/devices/numd2/numd2init.c @@ -8,74 +8,64 @@ SPICEdev NUMD2info = { - { - "NUMD2", - "2D Numerical Junction Diode model", + .DEVpublic = { + .name = "NUMD2", + .description = "2D Numerical Junction Diode model", + .terms = &NUMD2nSize, + .numNames = &NUMD2nSize, + .termNames = NUMD2names, + .numInstanceParms = &NUMD2pTSize, + .instanceParms = NUMD2pTable, + .numModelParms = &NUMD2mPTSize, + .modelParms = NUMD2mPTable, + .flags = DEV_DEFAULT, - &NUMD2nSize, - &NUMD2nSize, - NUMD2names, - - &NUMD2pTSize, - NUMD2pTable, - - &NUMD2mPTSize, - NUMD2mPTable, - #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ NUMD2param, - /* DEVmodParam */ NUMD2mParam, - /* DEVload */ NUMD2load, - /* DEVsetup */ NUMD2setup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ NUMD2setup, - /* DEVtemperature*/ NUMD2temp, - /* DEVtrunc */ NUMD2trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ NUMD2acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ NUMD2destroy, - /* DEVmodDelete */ NUMD2mDelete, - /* DEVdelete */ NUMD2delete, - /* DEVsetic */ NULL, - /* DEVask */ NUMD2ask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ NUMD2pzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ NULL, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NUMD2dump, - /* DEVacct */ NUMD2acct, -#endif - - /* DEVinstSize */ &NUMD2iSize, - /* DEVmodSize */ &NUMD2mSize + .DEVparam = NUMD2param, + .DEVmodParam = NUMD2mParam, + .DEVload = NUMD2load, + .DEVsetup = NUMD2setup, + .DEVunsetup = NULL, + .DEVpzSetup = NUMD2setup, + .DEVtemperature = NUMD2temp, + .DEVtrunc = NUMD2trunc, + .DEVfindBranch = NULL, + .DEVacLoad = NUMD2acLoad, + .DEVaccept = NULL, + .DEVdestroy = NUMD2destroy, + .DEVmodDelete = NUMD2mDelete, + .DEVdelete = NUMD2delete, + .DEVsetic = NULL, + .DEVask = NUMD2ask, + .DEVmodAsk = NULL, + .DEVpzLoad = NUMD2pzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &NUMD2iSize, + .DEVmodSize = &NUMD2mSize, +#ifdef CIDER + .DEVdump = NUMD2dump, + .DEVacct = NUMD2acct, +#endif }; diff --git a/src/spicelib/devices/numos/numosinit.c b/src/spicelib/devices/numos/numosinit.c index 851685906..ee1ef902d 100644 --- a/src/spicelib/devices/numos/numosinit.c +++ b/src/spicelib/devices/numos/numosinit.c @@ -8,74 +8,64 @@ SPICEdev NUMOSinfo = { - { - "NUMOS", - "2D Numerical MOS Field Effect Transistor model", + .DEVpublic = { + .name = "NUMOS", + .description = "2D Numerical MOS Field Effect Transistor model", + .terms = &NUMOSnSize, + .numNames = &NUMOSnSize, + .termNames = NUMOSnames, + .numInstanceParms = &NUMOSpTSize, + .instanceParms = NUMOSpTable, + .numModelParms = &NUMOSmPTSize, + .modelParms = NUMOSmPTable, + .flags = DEV_DEFAULT, - &NUMOSnSize, - &NUMOSnSize, - NUMOSnames, - - &NUMOSpTSize, - NUMOSpTable, - - &NUMOSmPTSize, - NUMOSmPTable, - #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ NUMOSparam, - /* DEVmodParam */ NUMOSmParam, - /* DEVload */ NUMOSload, - /* DEVsetup */ NUMOSsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ NUMOSsetup, - /* DEVtemperature*/ NUMOStemp, - /* DEVtrunc */ NUMOStrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ NUMOSacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ NUMOSdestroy, - /* DEVmodDelete */ NUMOSmDelete, - /* DEVdelete */ NUMOSdelete, - /* DEVsetic */ NULL, - /* DEVask */ NUMOSask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ NUMOSpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ NULL, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NUMOSdump, - /* DEVacct */ NUMOSacct, -#endif - - /* DEVinstSize */ &NUMOSiSize, - /* DEVmodSize */ &NUMOSmSize + .DEVparam = NUMOSparam, + .DEVmodParam = NUMOSmParam, + .DEVload = NUMOSload, + .DEVsetup = NUMOSsetup, + .DEVunsetup = NULL, + .DEVpzSetup = NUMOSsetup, + .DEVtemperature = NUMOStemp, + .DEVtrunc = NUMOStrunc, + .DEVfindBranch = NULL, + .DEVacLoad = NUMOSacLoad, + .DEVaccept = NULL, + .DEVdestroy = NUMOSdestroy, + .DEVmodDelete = NUMOSmDelete, + .DEVdelete = NUMOSdelete, + .DEVsetic = NULL, + .DEVask = NUMOSask, + .DEVmodAsk = NULL, + .DEVpzLoad = NUMOSpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &NUMOSiSize, + .DEVmodSize = &NUMOSmSize, +#ifdef CIDER + .DEVdump = NUMOSdump, + .DEVacct = NUMOSacct, +#endif }; diff --git a/src/spicelib/devices/res/resinit.c b/src/spicelib/devices/res/resinit.c index d4096de8d..75dfc13be 100644 --- a/src/spicelib/devices/res/resinit.c +++ b/src/spicelib/devices/res/resinit.c @@ -8,73 +8,64 @@ SPICEdev RESinfo = { - { - "Resistor", - "Simple linear resistor", - - &RESnSize, - &RESnSize, - RESnames, - - &RESpTSize, - RESpTable, - - &RESmPTSize, - RESmPTable, + .DEVpublic = { + .name = "Resistor", + .description = "Simple linear resistor", + .terms = &RESnSize, + .numNames = &RESnSize, + .termNames = RESnames, + .numInstanceParms = &RESpTSize, + .instanceParms = RESpTable, + .numModelParms = &RESmPTSize, + .modelParms = RESmPTable, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - 0 }, - /* DEVparam */ RESparam, - /* DEVmodParam */ RESmParam, - /* DEVload */ RESload, - /* DEVsetup */ RESsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ RESsetup, - /* DEVtemperature*/ REStemp, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ RESacload, /* ac load and normal load are identical */ - /* DEVaccept */ NULL, - /* DEVdestroy */ RESdestroy, - /* DEVmodDelete */ RESmDelete, - /* DEVdelete */ RESdelete, - /* DEVsetic */ NULL, - /* DEVask */ RESask, - /* DEVmodAsk */ RESmodAsk, - /* DEVpzLoad */ RESpzLoad, - /* DEVconvTest */ NULL, /* RESconvTest, XXXX experimental */ - /* DEVsenSetup */ RESsSetup, - /* DEVsenLoad */ RESsLoad, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ RESsAcLoad, - /* DEVsenPrint */ RESsPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ RESnoise, - /* DEVsoaCheck */ RESsoaCheck, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &RESiSize, - /* DEVmodSize */ &RESmSize + .DEVparam = RESparam, + .DEVmodParam = RESmParam, + .DEVload = RESload, + .DEVsetup = RESsetup, + .DEVunsetup = NULL, + .DEVpzSetup = RESsetup, + .DEVtemperature = REStemp, + .DEVtrunc = NULL, + .DEVfindBranch = NULL, + .DEVacLoad = RESacload, + .DEVaccept = NULL, + .DEVdestroy = RESdestroy, + .DEVmodDelete = RESmDelete, + .DEVdelete = RESdelete, + .DEVsetic = NULL, + .DEVask = RESask, + .DEVmodAsk = RESmodAsk, + .DEVpzLoad = RESpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = RESsSetup, + .DEVsenLoad = RESsLoad, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = RESsAcLoad, + .DEVsenPrint = RESsPrint, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = RESnoise, + .DEVsoaCheck = RESsoaCheck, + .DEVinstSize = &RESiSize, + .DEVmodSize = &RESmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/soi3/soi3init.c b/src/spicelib/devices/soi3/soi3init.c index 8d07f800f..cb60a76ed 100644 --- a/src/spicelib/devices/soi3/soi3init.c +++ b/src/spicelib/devices/soi3/soi3init.c @@ -8,73 +8,64 @@ SPICEdev SOI3info = { - { - "SOI3", - "Basic Thick Film SOI3 model v2.7", - - &SOI3nSize, - &SOI3nSize, - SOI3names, - - &SOI3pTSize, - SOI3pTable, - - &SOI3mPTSize, - SOI3mPTable, + .DEVpublic = { + .name = "SOI3", + .description = "Basic Thick Film SOI3 model v2.7", + .terms = &SOI3nSize, + .numNames = &SOI3nSize, + .termNames = SOI3names, + .numInstanceParms = &SOI3pTSize, + .instanceParms = SOI3pTable, + .numModelParms = &SOI3mPTSize, + .modelParms = SOI3mPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ SOI3param, - /* DEVmodParam */ SOI3mParam, - /* DEVload */ SOI3load, - /* DEVsetup */ SOI3setup, - /* DEVunsetup */ SOI3unsetup, - /* DEVpzSetup */ SOI3setup, - /* DEVtemperature*/ SOI3temp, - /* DEVtrunc */ SOI3trunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ SOI3acLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ SOI3destroy, - /* DEVmodDelete */ SOI3mDelete, - /* DEVdelete */ SOI3delete, - /* DEVsetic */ SOI3getic, - /* DEVask */ SOI3ask, - /* DEVmodAsk */ SOI3mAsk, - /* DEVpzLoad */ NULL, - /* DEVconvTest */ SOI3convTest, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ SOI3noise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &SOI3iSize, - /* DEVmodSize */ &SOI3mSize + .DEVparam = SOI3param, + .DEVmodParam = SOI3mParam, + .DEVload = SOI3load, + .DEVsetup = SOI3setup, + .DEVunsetup = SOI3unsetup, + .DEVpzSetup = SOI3setup, + .DEVtemperature = SOI3temp, + .DEVtrunc = SOI3trunc, + .DEVfindBranch = NULL, + .DEVacLoad = SOI3acLoad, + .DEVaccept = NULL, + .DEVdestroy = SOI3destroy, + .DEVmodDelete = SOI3mDelete, + .DEVdelete = SOI3delete, + .DEVsetic = SOI3getic, + .DEVask = SOI3ask, + .DEVmodAsk = SOI3mAsk, + .DEVpzLoad = NULL, + .DEVconvTest = SOI3convTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = SOI3noise, + .DEVsoaCheck = NULL, + .DEVinstSize = &SOI3iSize, + .DEVmodSize = &SOI3mSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/sw/swinit.c b/src/spicelib/devices/sw/swinit.c index 34b3ebc4c..1222545f1 100644 --- a/src/spicelib/devices/sw/swinit.c +++ b/src/spicelib/devices/sw/swinit.c @@ -9,73 +9,64 @@ SPICEdev SWinfo = { - { - "Switch", - "Ideal voltage controlled switch", - - &SWnSize, - &SWnSize, - SWnames, - - &SWpTSize, - SWpTable, - - &SWmPTSize, - SWmPTable, + .DEVpublic = { + .name = "Switch", + .description = "Ideal voltage controlled switch", + .terms = &SWnSize, + .numNames = &SWnSize, + .termNames = SWnames, + .numInstanceParms = &SWpTSize, + .instanceParms = SWpTable, + .numModelParms = &SWmPTSize, + .modelParms = SWmPTable, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - 0 }, - /* DEVparam */ SWparam, - /* DEVmodParam */ SWmParam, - /* DEVload */ SWload, - /* DEVsetup */ SWsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ SWsetup, - /* DEVtemperature*/ NULL, - /* DEVtrunc */ SWtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ SWacLoad, - /* DEVaccept */ NULL, - /* DEVdestroy */ SWdestroy, - /* DEVmodDelete */ SWmDelete, - /* DEVdelete */ SWdelete, - /* DEVsetic */ NULL, - /* DEVask */ SWask, - /* DEVmodAsk */ SWmAsk, - /* DEVpzLoad */ SWpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ SWnoise, - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif /* CIDER */ - /* DEVinstSize */ &SWiSize, - /* DEVmodSize */ &SWmSize + .DEVparam = SWparam, + .DEVmodParam = SWmParam, + .DEVload = SWload, + .DEVsetup = SWsetup, + .DEVunsetup = NULL, + .DEVpzSetup = SWsetup, + .DEVtemperature = NULL, + .DEVtrunc = SWtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = SWacLoad, + .DEVaccept = NULL, + .DEVdestroy = SWdestroy, + .DEVmodDelete = SWmDelete, + .DEVdelete = SWdelete, + .DEVsetic = NULL, + .DEVask = SWask, + .DEVmodAsk = SWmAsk, + .DEVpzLoad = SWpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = SWnoise, + .DEVsoaCheck = NULL, + .DEVinstSize = &SWiSize, + .DEVmodSize = &SWmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/tra/trainit.c b/src/spicelib/devices/tra/trainit.c index 8543f08da..ff0853da3 100644 --- a/src/spicelib/devices/tra/trainit.c +++ b/src/spicelib/devices/tra/trainit.c @@ -8,73 +8,64 @@ SPICEdev TRAinfo = { - { - "Tranline", - "Lossless transmission line", - - &TRAnSize, - &TRAnSize, - TRAnames, - - &TRApTSize, - TRApTable, - - NULL, - NULL, + .DEVpublic = { + .name = "Tranline", + .description = "Lossless transmission line", + .terms = &TRAnSize, + .numNames = &TRAnSize, + .termNames = TRAnames, + .numInstanceParms = &TRApTSize, + .instanceParms = TRApTable, + .numModelParms = NULL, + .modelParms = NULL, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - 0 }, - /* DEVparam */ TRAparam, - /* DEVmodParam */ NULL, - /* DEVload */ TRAload, - /* DEVsetup */ TRAsetup, - /* DEVunsetup */ TRAunsetup, - /* DEVpzSetup */ TRAsetup, - /* DEVtemperature*/ TRAtemp, - /* DEVtrunc */ TRAtrunc, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ TRAacLoad, - /* DEVaccept */ TRAaccept, - /* DEVdestroy */ TRAdestroy, - /* DEVmodDelete */ TRAmDelete, - /* DEVdelete */ TRAdelete, - /* DEVsetic */ NULL, - /* DEVask */ TRAask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ NULL, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &TRAiSize, - /* DEVmodSize */ &TRAmSize + .DEVparam = TRAparam, + .DEVmodParam = NULL, + .DEVload = TRAload, + .DEVsetup = TRAsetup, + .DEVunsetup = TRAunsetup, + .DEVpzSetup = TRAsetup, + .DEVtemperature = TRAtemp, + .DEVtrunc = TRAtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = TRAacLoad, + .DEVaccept = TRAaccept, + .DEVdestroy = TRAdestroy, + .DEVmodDelete = TRAmDelete, + .DEVdelete = TRAdelete, + .DEVsetic = NULL, + .DEVask = TRAask, + .DEVmodAsk = NULL, + .DEVpzLoad = NULL, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &TRAiSize, + .DEVmodSize = &TRAmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/txl/txlinit.c b/src/spicelib/devices/txl/txlinit.c index 4c4e6d3f3..0a7c06b96 100644 --- a/src/spicelib/devices/txl/txlinit.c +++ b/src/spicelib/devices/txl/txlinit.c @@ -13,75 +13,67 @@ Author: 1992 Charles Hough SPICEdev TXLinfo = { - { - "TransLine", - "Simple Lossy Transmission Line", - - &TXLnSize, - &TXLnSize, - TXLnames, - - &TXLpTSize, - TXLpTable, - - &TXLmPTSize, - TXLmPTable, + .DEVpublic = { + .name = "TransLine", + .description = "Simple Lossy Transmission Line", + .terms = &TXLnSize, + .numNames = &TXLnSize, + .termNames = TXLnames, + .numInstanceParms = &TXLpTSize, + .instanceParms = TXLpTable, + .numModelParms = &TXLmPTSize, + .modelParms = TXLmPTable, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif + }, - 0 - }, + .DEVparam = TXLparam, + .DEVmodParam = TXLmParam, + .DEVload = TXLload, + .DEVsetup = TXLsetup, + .DEVunsetup = TXLunsetup, + .DEVpzSetup = NULL, + .DEVtemperature = NULL, + .DEVtrunc = NULL, + .DEVfindBranch = NULL, + .DEVacLoad = TXLload, + .DEVaccept = NULL, + .DEVdestroy = TXLdestroy, + .DEVmodDelete = TXLmDelete, + .DEVdelete = TXLdelete, + .DEVsetic = NULL, + .DEVask = TXLask, + .DEVmodAsk = TXLmodAsk, + .DEVpzLoad = NULL, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &TXLiSize, + .DEVmodSize = &TXLmSize, - /* DEVparam */ TXLparam, - /* DEVmodParam */ TXLmParam, - /* DEVload */ TXLload, - /* DEVsetup */ TXLsetup, - /* DEVunsetup */ TXLunsetup, - /* DEVpzSetup */ NULL, - /* DEVtemperature*/ NULL, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ NULL, /* TXLfindBranch default disabled */ - /* DEVacLoad */ TXLload, /* ac load */ - /* DEVaccept */ NULL, /* TXLaccept default disabled */ - /* DEVdestroy */ TXLdestroy, - /* DEVmodDelete */ TXLmDelete, - /* DEVdelete */ TXLdelete, - /* DEVsetic */ NULL, - /* DEVask */ TXLask, - /* DEVmodAsk */ TXLmodAsk, - /* DEVpzLoad */ NULL, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, - /* DEVnoise */ NULL, - /* DEVsoaCheck */ NULL, #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, + .DEVdump = NULL, + .DEVacct = NULL, #endif - &TXLiSize, - &TXLmSize - }; + SPICEdev * get_txl_info(void) { diff --git a/src/spicelib/devices/urc/urcinit.c b/src/spicelib/devices/urc/urcinit.c index 0211d14a0..181465191 100644 --- a/src/spicelib/devices/urc/urcinit.c +++ b/src/spicelib/devices/urc/urcinit.c @@ -8,73 +8,64 @@ SPICEdev URCinfo = { - { - "URC", /* MUST precede both resistors and capacitors */ - "Uniform R.C. line", - - &URCnSize, - &URCnSize, - URCnames, - - &URCpTSize, - URCpTable, - - &URCmPTSize, - URCmPTable, + .DEVpublic = { + .name = "URC", + .description = "Uniform R.C. line", + .terms = &URCnSize, + .numNames = &URCnSize, + .termNames = URCnames, + .numInstanceParms = &URCpTSize, + .instanceParms = URCpTable, + .numModelParms = &URCmPTSize, + .modelParms = URCmPTable, + .flags = 0, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - 0 }, - /* DEVparam */ URCparam, - /* DEVmodParam */ URCmParam, - /* DEVload */ NULL, - /* DEVsetup */ URCsetup, - /* DEVunsetup */ URCunsetup, - /* DEVpzSetup */ URCsetup, - /* DEVtemperature*/ NULL, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ NULL, - /* DEVaccept */ NULL, - /* DEVdestroy */ URCdestroy, - /* DEVmodDelete */ URCmDelete, - /* DEVdelete */ URCdelete, - /* DEVsetic */ NULL, - /* DEVask */ URCask, - /* DEVmodAsk */ URCmAsk, - /* DEVpzLoad */ NULL, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &URCiSize, - /* DEVmodSize */ &URCmSize + .DEVparam = URCparam, + .DEVmodParam = URCmParam, + .DEVload = NULL, + .DEVsetup = URCsetup, + .DEVunsetup = URCunsetup, + .DEVpzSetup = URCsetup, + .DEVtemperature = NULL, + .DEVtrunc = NULL, + .DEVfindBranch = NULL, + .DEVacLoad = NULL, + .DEVaccept = NULL, + .DEVdestroy = URCdestroy, + .DEVmodDelete = URCmDelete, + .DEVdelete = URCdelete, + .DEVsetic = NULL, + .DEVask = URCask, + .DEVmodAsk = URCmAsk, + .DEVpzLoad = NULL, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &URCiSize, + .DEVmodSize = &URCmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/vbic/vbicinit.c b/src/spicelib/devices/vbic/vbicinit.c index 9abc37049..77fd2531e 100644 --- a/src/spicelib/devices/vbic/vbicinit.c +++ b/src/spicelib/devices/vbic/vbicinit.c @@ -13,73 +13,64 @@ SPICEdev VBICinfo = { - { - "VBIC", - "Vertical Bipolar Inter-Company Model", - - &VBICnSize, - &VBICnSize, - VBICnames, - - &VBICpTSize, - VBICpTable, - - &VBICmPTSize, - VBICmPTable, + .DEVpublic = { + .name = "VBIC", + .description = "Vertical Bipolar Inter-Company Model", + .terms = &VBICnSize, + .numNames = &VBICnSize, + .termNames = VBICnames, + .numInstanceParms = &VBICpTSize, + .instanceParms = VBICpTable, + .numModelParms = &VBICmPTSize, + .modelParms = VBICmPTable, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - VBICparam, /* DEVparam */ - VBICmParam, /* DEVmodParam */ - VBICload, /* DEVload */ - VBICsetup, /* DEVsetup */ - VBICunsetup, /* DEVunsetup */ - VBICsetup, /* DEVpzSetup */ - VBICtemp, /* DEVtemperature */ - VBICtrunc, /* DEVtrunc */ - NULL, /* DEVfindBranch */ - VBICacLoad, /* DEVacLoad */ - NULL, /* DEVaccept */ - VBICdestroy, /* DEVdestroy */ - VBICmDelete, /* DEVmodDelete */ - VBICdelete, /* DEVdelete */ - VBICgetic, /* DEVsetic */ - VBICask, /* DEVask */ - VBICmAsk, /* DEVmodAsk */ - VBICpzLoad, /* DEVpzLoad */ - VBICconvTest, /* DEVconvTest */ - NULL, /* DEVsenSetup */ - NULL, /* DEVsenLoad */ - NULL, /* DEVsenUpdate */ - NULL, /* DEVsenAcLoad */ - NULL, /* DEVsenPrint */ - NULL, /* DEVsenTrunc */ - NULL, /* DEVdisto */ - VBICnoise, /* DEVnoise */ - VBICsoaCheck, /* DEVsoaCheck */ -#ifdef CIDER - NULL, /* DEVdump */ - NULL, /* DEVacct */ -#endif - &VBICiSize, /* DEVinstSize */ - &VBICmSize /* DEVmodSize */ + .DEVparam = VBICparam, + .DEVmodParam = VBICmParam, + .DEVload = VBICload, + .DEVsetup = VBICsetup, + .DEVunsetup = VBICunsetup, + .DEVpzSetup = VBICsetup, + .DEVtemperature = VBICtemp, + .DEVtrunc = VBICtrunc, + .DEVfindBranch = NULL, + .DEVacLoad = VBICacLoad, + .DEVaccept = NULL, + .DEVdestroy = VBICdestroy, + .DEVmodDelete = VBICmDelete, + .DEVdelete = VBICdelete, + .DEVsetic = VBICgetic, + .DEVask = VBICask, + .DEVmodAsk = VBICmAsk, + .DEVpzLoad = VBICpzLoad, + .DEVconvTest = VBICconvTest, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = VBICnoise, + .DEVsoaCheck = VBICsoaCheck, + .DEVinstSize = &VBICiSize, + .DEVmodSize = &VBICmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/vccs/vccsinit.c b/src/spicelib/devices/vccs/vccsinit.c index cdfa3c8dd..1e1ba8002 100644 --- a/src/spicelib/devices/vccs/vccsinit.c +++ b/src/spicelib/devices/vccs/vccsinit.c @@ -8,74 +8,64 @@ SPICEdev VCCSinfo = { - { - "VCCS", - "Voltage controlled current source", - - &VCCSnSize, - &VCCSnSize, - VCCSnames, - - &VCCSpTSize, - VCCSpTable, - - NULL, - NULL, + .DEVpublic = { + .name = "VCCS", + .description = "Voltage controlled current source", + .terms = &VCCSnSize, + .numNames = &VCCSnSize, + .termNames = VCCSnames, + .numInstanceParms = &VCCSpTSize, + .instanceParms = VCCSpTable, + .numModelParms = NULL, + .modelParms = NULL, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ VCCSparam, - /* DEVmodParam */ NULL, - /* DEVload */ VCCSload, - /* DEVsetup */ VCCSsetup, - /* DEVunsetup */ NULL, - /* DEVpzSetup */ VCCSsetup, - /* DEVtemperature*/ NULL, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ NULL, - /* DEVacLoad */ VCCSload, /* ac and normal loads are identical */ - /* DEVaccept */ NULL, - /* DEVdestroy */ VCCSdestroy, - /* DEVmodDelete */ VCCSmDelete, - /* DEVdelete */ VCCSdelete, - /* DEVsetic */ NULL, - /* DEVask */ VCCSask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ VCCSpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ VCCSsSetup, - /* DEVsenLoad */ VCCSsLoad, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ VCCSsAcLoad, - /* DEVsenPrint */ VCCSsPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, + .DEVparam = VCCSparam, + .DEVmodParam = NULL, + .DEVload = VCCSload, + .DEVsetup = VCCSsetup, + .DEVunsetup = NULL, + .DEVpzSetup = VCCSsetup, + .DEVtemperature = NULL, + .DEVtrunc = NULL, + .DEVfindBranch = NULL, + .DEVacLoad = VCCSload, + .DEVaccept = NULL, + .DEVdestroy = VCCSdestroy, + .DEVmodDelete = VCCSmDelete, + .DEVdelete = VCCSdelete, + .DEVsetic = NULL, + .DEVask = VCCSask, + .DEVmodAsk = NULL, + .DEVpzLoad = VCCSpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = VCCSsSetup, + .DEVsenLoad = VCCSsLoad, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = VCCSsAcLoad, + .DEVsenPrint = VCCSsPrint, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &VCCSiSize, + .DEVmodSize = &VCCSmSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &VCCSiSize, - /* DEVmodSize */ &VCCSmSize - - + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/vcvs/vcvsinit.c b/src/spicelib/devices/vcvs/vcvsinit.c index 5b16cbc1a..7b5147d88 100644 --- a/src/spicelib/devices/vcvs/vcvsinit.c +++ b/src/spicelib/devices/vcvs/vcvsinit.c @@ -8,73 +8,64 @@ SPICEdev VCVSinfo = { - { - "VCVS", - "Voltage controlled voltage source", - - &VCVSnSize, - &VCVSnSize, - VCVSnames, - - &VCVSpTSize, - VCVSpTable, - - NULL, - NULL, + .DEVpublic = { + .name = "VCVS", + .description = "Voltage controlled voltage source", + .terms = &VCVSnSize, + .numNames = &VCVSnSize, + .termNames = VCVSnames, + .numInstanceParms = &VCVSpTSize, + .instanceParms = VCVSpTable, + .numModelParms = NULL, + .modelParms = NULL, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ VCVSparam, - /* DEVmodParam */ NULL, - /* DEVload */ VCVSload, - /* DEVsetup */ VCVSsetup, - /* DEVunsetup */ VCVSunsetup, - /* DEVpzSetup */ VCVSsetup, - /* DEVtemperature*/ NULL, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ VCVSfindBr, - /* DEVacLoad */ VCVSload, /* AC and normal loads are identical */ - /* DEVaccept */ NULL, - /* DEVdestroy */ VCVSdestroy, - /* DEVmodDelete */ VCVSmDelete, - /* DEVdelete */ VCVSdelete, - /* DEVsetic */ NULL, - /* DEVask */ VCVSask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ VCVSpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ VCVSsSetup, - /* DEVsenLoad */ VCVSsLoad, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ VCVSsAcLoad, - /* DEVsenPrint */ VCVSsPrint, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, -#ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &VCVSiSize, - /* DEVmodSize */ &VCVSmSize + .DEVparam = VCVSparam, + .DEVmodParam = NULL, + .DEVload = VCVSload, + .DEVsetup = VCVSsetup, + .DEVunsetup = VCVSunsetup, + .DEVpzSetup = VCVSsetup, + .DEVtemperature = NULL, + .DEVtrunc = NULL, + .DEVfindBranch = VCVSfindBr, + .DEVacLoad = VCVSload, + .DEVaccept = NULL, + .DEVdestroy = VCVSdestroy, + .DEVmodDelete = VCVSmDelete, + .DEVdelete = VCVSdelete, + .DEVsetic = NULL, + .DEVask = VCVSask, + .DEVmodAsk = NULL, + .DEVpzLoad = VCVSpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = VCVSsSetup, + .DEVsenLoad = VCVSsLoad, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = VCVSsAcLoad, + .DEVsenPrint = VCVSsPrint, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &VCVSiSize, + .DEVmodSize = &VCVSmSize, +#ifdef CIDER + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/spicelib/devices/vsrc/vsrcinit.c b/src/spicelib/devices/vsrc/vsrcinit.c index 3c8285851..db0417a0d 100644 --- a/src/spicelib/devices/vsrc/vsrcinit.c +++ b/src/spicelib/devices/vsrc/vsrcinit.c @@ -8,72 +8,64 @@ SPICEdev VSRCinfo = { - { - "Vsource", - "Independent voltage source", - - &VSRCnSize, - &VSRCnSize, - VSRCnames, - - &VSRCpTSize, - VSRCpTable, - - NULL, - NULL, + .DEVpublic = { + .name = "Vsource", + .description = "Independent voltage source", + .terms = &VSRCnSize, + .numNames = &VSRCnSize, + .termNames = VSRCnames, + .numInstanceParms = &VSRCpTSize, + .instanceParms = VSRCpTable, + .numModelParms = NULL, + .modelParms = NULL, + .flags = DEV_DEFAULT, #ifdef XSPICE -/*---- Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration -----*/ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ - - 0, /* This is a SPICE device, it has no MIF info data */ - NULL, /* This is a SPICE device, it has no MIF info data */ -/*--------------------------- End of SDB fix -------------------------*/ + .cm_func = NULL, + .num_conn = 0, + .conn = NULL, + .num_param = 0, + .param = NULL, + .num_inst_var = 0, + .inst_var = NULL, #endif - - DEV_DEFAULT }, - /* DEVparam */ VSRCparam, - /* DEVmodParam */ NULL, - /* DEVload */ VSRCload, - /* DEVsetup */ VSRCsetup, - /* DEVunsetup */ VSRCunsetup, - /* DEVpzSetup */ VSRCpzSetup, - /* DEVtemperature*/ VSRCtemp, - /* DEVtrunc */ NULL, - /* DEVfindBranch */ VSRCfindBr, - /* DEVacLoad */ VSRCacLoad, - /* DEVaccept */ VSRCaccept, - /* DEVdestroy */ VSRCdestroy, - /* DEVmodDelete */ VSRCmDelete, - /* DEVdelete */ VSRCdelete, - /* DEVsetic */ NULL, - /* DEVask */ VSRCask, - /* DEVmodAsk */ NULL, - /* DEVpzLoad */ VSRCpzLoad, - /* DEVconvTest */ NULL, - /* DEVsenSetup */ NULL, - /* DEVsenLoad */ NULL, - /* DEVsenUpdate */ NULL, - /* DEVsenAcLoad */ NULL, - /* DEVsenPrint */ NULL, - /* DEVsenTrunc */ NULL, - /* DEVdisto */ NULL, /* DISTO */ - /* DEVnoise */ NULL, /* NOISE */ - /* DEVsoaCheck */ NULL, + .DEVparam = VSRCparam, + .DEVmodParam = NULL, + .DEVload = VSRCload, + .DEVsetup = VSRCsetup, + .DEVunsetup = VSRCunsetup, + .DEVpzSetup = VSRCpzSetup, + .DEVtemperature = VSRCtemp, + .DEVtrunc = NULL, + .DEVfindBranch = VSRCfindBr, + .DEVacLoad = VSRCacLoad, + .DEVaccept = VSRCaccept, + .DEVdestroy = VSRCdestroy, + .DEVmodDelete = VSRCmDelete, + .DEVdelete = VSRCdelete, + .DEVsetic = NULL, + .DEVask = VSRCask, + .DEVmodAsk = NULL, + .DEVpzLoad = VSRCpzLoad, + .DEVconvTest = NULL, + .DEVsenSetup = NULL, + .DEVsenLoad = NULL, + .DEVsenUpdate = NULL, + .DEVsenAcLoad = NULL, + .DEVsenPrint = NULL, + .DEVsenTrunc = NULL, + .DEVdisto = NULL, + .DEVnoise = NULL, + .DEVsoaCheck = NULL, + .DEVinstSize = &VSRCiSize, + .DEVmodSize = &VSRCmSize, + #ifdef CIDER - /* DEVdump */ NULL, - /* DEVacct */ NULL, -#endif - /* DEVinstSize */ &VSRCiSize, - /* DEVmodSize */ &VSRCmSize + .DEVdump = NULL, + .DEVacct = NULL, +#endif }; diff --git a/src/xspice/cmpp/writ_ifs.c b/src/xspice/cmpp/writ_ifs.c index 1ee3f0453..e9032e210 100644 --- a/src/xspice/cmpp/writ_ifs.c +++ b/src/xspice/cmpp/writ_ifs.c @@ -872,90 +872,87 @@ static void write_SPICEdev( /* Write the IFdevice structure */ - fprintf(fp, " { \"%s\",\n", ifs_table->name.model_name); - fprintf(fp, " \"%s\",\n", ifs_table->name.description); - fprintf(fp, " &val_terms,\n"); - fprintf(fp, " &val_numNames,\n"); - fprintf(fp, " NULL,\n"); + fprintf(fp, " .DEVpublic = {\n"); + fprintf(fp, " .name = \"%s\",\n", ifs_table->name.model_name); + fprintf(fp, " .description = \"%s\",\n", ifs_table->name.description); + fprintf(fp, " .terms = &val_terms,\n"); + fprintf(fp, " .numNames = &val_numNames,\n"); + fprintf(fp, " .termNames = NULL,\n"); - fprintf(fp, " &val_numInstanceParms,\n"); + fprintf(fp, " .numInstanceParms = &val_numInstanceParms,\n"); if(ifs_table->num_inst_var > 0) - fprintf(fp, " MIFpTable,\n"); + fprintf(fp, " .instanceParms = MIFpTable,\n"); else - fprintf(fp, " NULL,\n"); + fprintf(fp, " .instanceParms = NULL,\n"); - fprintf(fp, " &val_numModelParms,\n"); + fprintf(fp, " .numModelParms = &val_numModelParms,\n"); if(ifs_table->num_param > 0) - fprintf(fp, " MIFmPTable,\n"); + fprintf(fp, " .modelParms = MIFmPTable,\n"); else - fprintf(fp, " NULL,\n"); + fprintf(fp, " .modelParms = NULL,\n"); + fprintf(fp, " .flags = 0,\n\n"); - fprintf(fp, " %s,\n", ifs_table->name.c_fcn_name); + fprintf(fp, " .cm_func = %s,\n", ifs_table->name.c_fcn_name); - fprintf(fp, " %d,\n", ifs_table->num_conn); + fprintf(fp, " .num_conn = %d,\n", ifs_table->num_conn); if(ifs_table->num_conn > 0) - fprintf(fp, " MIFconnTable,\n"); + fprintf(fp, " .conn = MIFconnTable,\n"); else - fprintf(fp, " NULL,\n"); + fprintf(fp, " .conn = NULL,\n"); - fprintf(fp, " %d,\n", ifs_table->num_param); + fprintf(fp, " .num_param = %d,\n", ifs_table->num_param); if(ifs_table->num_param > 0) - fprintf(fp, " MIFparamTable,\n"); + fprintf(fp, " .param = MIFparamTable,\n"); else - fprintf(fp, " NULL,\n"); + fprintf(fp, " .param = NULL,\n"); - fprintf(fp, " %d,\n", ifs_table->num_inst_var); + fprintf(fp, " .num_inst_var = %d,\n", ifs_table->num_inst_var); if(ifs_table->num_inst_var > 0) - fprintf(fp, " MIFinst_varTable,\n"); + fprintf(fp, " .inst_var = MIFinst_varTable,\n"); else - fprintf(fp, " NULL,\n"); - fprintf(fp, " 0, /* flags */\n"); + fprintf(fp, " .inst_var = NULL,\n"); - fprintf(fp, " },\n"); + fprintf(fp, " },\n\n"); /* Write the names of the generic code model functions */ - fprintf(fp, "NULL, \n"); /* DEVparam */ - fprintf(fp, "MIFmParam, \n"); /* DEVmodParam */ - fprintf(fp, "MIFload, \n"); /* DEVload */ - fprintf(fp, "MIFsetup, \n"); /* DEVsetup */ - fprintf(fp, "MIFunsetup, \n"); /* DEVunsetup */ - fprintf(fp, "NULL, \n"); /* DEVpzSetup */ - fprintf(fp, "NULL, \n"); /* DEVtemperature */ - fprintf(fp, "MIFtrunc, \n"); /* DEVtrunc */ - fprintf(fp, "NULL, \n"); /* DEVfindBranch */ - fprintf(fp, "MIFload, \n"); /* DEVacLoad */ - fprintf(fp, "NULL, \n"); /* DEVaccept */ - fprintf(fp, "MIFdestroy, \n"); /* DEVdestroy */ - fprintf(fp, "MIFmDelete, \n"); /* DEVmodDelete */ - fprintf(fp, "MIFdelete, \n"); /* DEVdelete */ - fprintf(fp, "NULL, \n"); /* DEVsetic */ - fprintf(fp, "MIFask, \n"); /* DEVask */ - fprintf(fp, "MIFmAsk, \n"); /* DEVmodAsk */ - fprintf(fp, "NULL, \n"); /* DEVpzLoad */ - fprintf(fp, "MIFconvTest, \n"); /* DEVconvTest */ - fprintf(fp, "NULL, \n"); /* DEVsenSetup */ - fprintf(fp, "NULL, \n"); /* DEVsenLoad */ - fprintf(fp, "NULL, \n"); /* DEVSenUpdate */ - fprintf(fp, "NULL, \n"); /* DEVsenAcLoad */ - fprintf(fp, "NULL, \n"); /* DEVsenPrint */ - fprintf(fp, "NULL, \n"); /* DEVsenTrunc */ - fprintf(fp, "NULL, \n"); /* DEVdisto */ - fprintf(fp, "NULL, \n"); /* DEVnoise */ - fprintf(fp, "NULL, \n"); /* DEVsoaCheck */ - fprintf(fp, "#ifdef CIDER \n"); /* CIDER enhancements */ - fprintf(fp, "NULL, \n"); /* DEVdump */ - fprintf(fp, "NULL, \n"); /* DEVacct */ - fprintf(fp, "#endif \n"); /* CIDER enhancements */ - - /* Write the sizeof stuff used in dynamic allocation of inst/model structs */ - - fprintf(fp, "&val_sizeofMIFinstance,\n"); - fprintf(fp, "&val_sizeofMIFmodel,\n"); + fprintf(fp, " .DEVparam = NULL,\n"); + fprintf(fp, " .DEVmodParam = MIFmParam,\n"); + fprintf(fp, " .DEVload = MIFload,\n"); + fprintf(fp, " .DEVsetup = MIFsetup,\n"); + fprintf(fp, " .DEVunsetup = MIFunsetup,\n"); + fprintf(fp, " .DEVpzSetup = NULL,\n"); + fprintf(fp, " .DEVtemperature = NULL,\n"); + fprintf(fp, " .DEVtrunc = MIFtrunc,\n"); + fprintf(fp, " .DEVfindBranch = NULL,\n"); + fprintf(fp, " .DEVacLoad = MIFload,\n"); + fprintf(fp, " .DEVaccept = NULL,\n"); + fprintf(fp, " .DEVdestroy = MIFdestroy,\n"); + fprintf(fp, " .DEVmodDelete = MIFmDelete,\n"); + fprintf(fp, " .DEVdelete = MIFdelete,\n"); + fprintf(fp, " .DEVsetic = NULL,\n"); + fprintf(fp, " .DEVask = MIFask,\n"); + fprintf(fp, " .DEVmodAsk = MIFmAsk,\n"); + fprintf(fp, " .DEVpzLoad = NULL,\n"); + fprintf(fp, " .DEVconvTest = MIFconvTest,\n"); + fprintf(fp, " .DEVsenSetup = NULL,\n"); + fprintf(fp, " .DEVsenLoad = NULL,\n"); + fprintf(fp, " .DEVsenUpdate = NULL,\n"); + fprintf(fp, " .DEVsenAcLoad = NULL,\n"); + fprintf(fp, " .DEVsenPrint = NULL,\n"); + fprintf(fp, " .DEVsenTrunc = NULL,\n"); + fprintf(fp, " .DEVdisto = NULL,\n"); + fprintf(fp, " .DEVnoise = NULL,\n"); + fprintf(fp, " .DEVsoaCheck = NULL,\n"); + fprintf(fp, " .DEVinstSize = &val_sizeofMIFinstance,\n"); + fprintf(fp, " .DEVmodSize = &val_sizeofMIFmodel,\n"); fprintf(fp, "\n"); + fprintf(fp, "#ifdef CIDER\n"); + fprintf(fp, " .DEVdump = NULL,\n"); + fprintf(fp, " .DEVacct = NULL,\n"); + fprintf(fp, "#endif\n"); fprintf(fp, "};\n"); fprintf(fp, "\n"); - }