devices/**/*defs*.h, fix adms too

This commit is contained in:
rlar 2018-01-09 16:18:49 +01:00
parent 43dacbc1bf
commit b335282094
9 changed files with 15 additions and 13 deletions

View File

@ -54,7 +54,7 @@ int $(module)acLoad(GENmodel *inModel, CKTcircuit *ckt)
for ( ; model != NULL; model = $(module)nextModel(model) )
{
/* loop through all the instances of the model */
for (here = $(module)instances(model); here != NULL ; here = here->$(module)nextInstance)
for (here = $(module)instances(model); here != NULL ; here = $(module)nextInstance(here))
{
<admst:for-each select="jacobian[static='yes']">
<admst:value-of select="column/name"/>

View File

@ -188,10 +188,12 @@ if(isinf((double) var)) \\
/* information needed for each instance */
typedef struct s$(module)instance {
struct s$(module)model *$(module)modPtr; /* pointer to model */
struct s$(module)instance *$(module)nextInstance; /* pointer to next instance of current model*/
IFuid $(module)name; /* pointer to character string naming this instance */
int $(module)state; /* index into state table for this device */
struct GENinstance gen;
#define $(module)modPtr(inst) ((struct s$(module)model*)((inst)-&gt;gen.GENmodPtr))
#define $(module)nextInstance(inst) ((struct s$(module)instance*)((inst)-&gt;gen.GENnextInstance))
#define $(module)name gen.GENname
#define $(module)states gen.GENstate
/* node */
<admst:for-each select="node[grounded='no']">

View File

@ -53,7 +53,7 @@ $(module)destroy(GENmodel **inModel)
$(module)model *next_mod = $(module)nextModel(mod);
$(module)instance *inst = $(module)instances(mod);
while (inst) {
$(module)instance *next_inst = inst-&gt;$(module)nextInstance;
$(module)instance *next_inst = $(module)nextInstance(inst);
FREE(inst);
inst = next_inst;
}

View File

@ -197,7 +197,7 @@ int $(module)load(GENmodel *inModel, CKTcircuit *ckt)
for ( ; model != NULL; model = $(module)nextModel(model) )
{
/* loop through all the instances of the model */
for (here = $(module)instances(model); here != NULL ; here = here->$(module)nextInstance)
for (here = $(module)instances(model); here != NULL ; here = $(module)nextInstance(here))
{
{
<admst:for-each select="jacobian[static='yes']">

View File

@ -50,7 +50,7 @@ $(module)noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Nd
$(module)instance *inst;
for (model=firstModel; model != NULL; model=$(module)nextModel(model))
{
for (inst=$(module)instances(model); inst != NULL; inst=inst->$(module)nextInstance)
for (inst=$(module)instances(model); inst != NULL; inst=$(module)nextInstance(inst))
{
switch (operation)
{

View File

@ -56,7 +56,7 @@ int $(module)pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
for ( ; model != NULL; model = $(module)nextModel(model) )
{
/* loop through all the instances of the model */
for (here = $(module)instances(model); here != NULL ; here = here->$(module)nextInstance)
for (here = $(module)instances(model); here != NULL ; here = $(module)nextInstance(here))
{
<admst:for-each select="jacobian[static='yes']">
<admst:value-of select="column/name"/>

View File

@ -79,7 +79,7 @@ int $(module)setup (SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *
<admst:text format="}\n"/>
</admst:if>
</admst:for-each>
for ( here = $(module)instances(model) ;here != NULL ; here = here->$(module)nextInstance )
for ( here = $(module)instances(model) ;here != NULL ; here = $(module)nextInstance(here) )
{
<admst:for-each select="variable[parametertype='instance' and input='yes']">
<admst:if test="default[not(nilled(function[class='builtin']))]">
@ -176,7 +176,7 @@ $(module)unsetup(GENmodel *inModel, CKTcircuit *ckt)
/* loop through all the $(module) device models */
for ( ;model != NULL ;model = $(module)nextModel(model) )
{
for ( here = $(module)instances(model) ;here != NULL ; here = here->$(module)nextInstance )
for ( here = $(module)instances(model) ;here != NULL ; here = $(module)nextInstance(here) )
{
<admst:for-each select="reverse(node[location='internal'])">
<admst:value-of select="name"/>

View File

@ -63,7 +63,7 @@ int $(module)temp(GENmodel *inModel, CKTcircuit *ckt)
<admst:apply-templates select="analog" match="analog:initial_model" required="yes"/>
/* loop through all the instances of the model */
for (here = $(module)instances(model); here != NULL ; here = here->$(module)nextInstance)
for (here = $(module)instances(model); here != NULL ; here = $(module)nextInstance(here))
{
<admst:apply-templates select="analog" match="analog:initial_instance" required="yes"/>

View File

@ -59,7 +59,7 @@ int $(module)trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
for ( ; model != NULL; model = $(module)nextModel(model) )
{
/* loop through all the instances of the model */
for (here = $(module)instances(model); here != NULL ; here = here->$(module)nextInstance)
for (here = $(module)instances(model); here != NULL ; here = $(module)nextInstance(here))
{
#ifdef STEPDEBUG
debugtemp = *timeStep;