epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ciderlib, proper types for newCard(), setCardParm(), askCardQuest()

pre-master-46
rlar 13 years ago
parent
ccb600f3c1
commit
7381081226
15 changed files with 71 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/ciderlib/input/boundary.c
  2. 10
      src/ciderlib/input/contact.c
  3. 10
      src/ciderlib/input/domain.c
  4. 10
      src/ciderlib/input/doping.c
  5. 3
      src/ciderlib/input/dopset.c
  6. 10
      src/ciderlib/input/electrod.c
  7. 10
      src/ciderlib/input/material.c
  8. 16
      src/ciderlib/input/mesh.c
  9. 12
      src/ciderlib/input/method.c
  10. 10
      src/ciderlib/input/mobility.c
  11. 12
      src/ciderlib/input/models.c
  12. 12
      src/ciderlib/input/optionsc.c
  13. 12
      src/ciderlib/input/output.c
  14. 6
      src/include/ngspice/numcards.h
  15. 3
      src/spicelib/parser/inpgmod.c

10
src/ciderlib/input/boundary.c
View File

@ -14,8 +14,8 @@ Modified: 2001 Paolo Nenzi
#define UM_TO_CM 1.0e-4
extern int BDRYnewCard(void**,void*);
extern int BDRYparam(int,IFvalue*,void*);
extern int BDRYnewCard(GENcard**,GENmodel*);
extern int BDRYparam(int,IFvalue*,GENcard*);
IFparm BDRYpTable[] = {
IP("domain", BDRY_DOMAIN, IF_INTEGER, "Primary domain"),
@ -62,7 +62,7 @@ IFcardInfo INTFinfo = {
};
int
BDRYnewCard(void **inCard, void *inModel)
BDRYnewCard(GENcard **inCard, GENmodel *inModel)
{
BDRYcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -73,7 +73,7 @@ BDRYnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->BDRYnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
tmpCard = model->GENboundaries;
if (!tmpCard) { /* First in list */
@ -88,7 +88,7 @@ BDRYnewCard(void **inCard, void *inModel)
}
int
BDRYparam(int param, IFvalue *value, void *inCard)
BDRYparam(int param, IFvalue *value, GENcard *inCard)
{
BDRYcard *card = (BDRYcard *)inCard;

10
src/ciderlib/input/contact.c
View File

@ -12,8 +12,8 @@ Modified: 2001 Paolo Nenzi
#include "ngspice/sperror.h"
#include "ngspice/suffix.h"
extern int CONTnewCard(void**,void*);
extern int CONTparam(int,IFvalue*,void*);
extern int CONTnewCard(GENcard**,GENmodel*);
extern int CONTparam(int,IFvalue*,GENcard*);
IFparm CONTpTable[] = {
@ -37,7 +37,7 @@ IFcardInfo CONTinfo = {
};
int
CONTnewCard(void **inCard, void *inModel)
CONTnewCard(GENcard **inCard, GENmodel *inModel)
{
CONTcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -48,7 +48,7 @@ CONTnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->CONTnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
tmpCard = model->GENcontacts;
if (!tmpCard) { /* First in list */
@ -63,7 +63,7 @@ CONTnewCard(void **inCard, void *inModel)
}
int
CONTparam(int param, IFvalue *value, void *inCard)
CONTparam(int param, IFvalue *value, GENcard *inCard)
{
CONTcard *card = (CONTcard *)inCard;

10
src/ciderlib/input/domain.c
View File

@ -15,8 +15,8 @@ Modified: 2001 Paolo Nenzi
#define UM_TO_CM 1.0e-4
extern int DOMNnewCard(void**,void*);
extern int DOMNparam(int,IFvalue*,void*);
extern int DOMNnewCard(GENcard**,GENmodel*);
extern int DOMNparam(int,IFvalue*,GENcard*);
IFparm DOMNpTable[] = {
@ -54,7 +54,7 @@ IFcardInfo REGNinfo = {
};
int
DOMNnewCard(void **inCard, void *inModel)
DOMNnewCard(GENcard **inCard, GENmodel *inModel)
{
DOMNcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -65,7 +65,7 @@ DOMNnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->DOMNnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *)newCard;
tmpCard = model->GENdomains;
if (!tmpCard) { /* First in list */
@ -80,7 +80,7 @@ DOMNnewCard(void **inCard, void *inModel)
}
int
DOMNparam(int param, IFvalue *value, void *inCard)
DOMNparam(int param, IFvalue *value, GENcard *inCard)
{
DOMNcard *card = (DOMNcard *)inCard;

10
src/ciderlib/input/doping.c
View File

@ -14,8 +14,8 @@ Modified: 2001 Paolo Nenzi
#define UM_TO_CM 1.0e-4
extern int DOPnewCard(void**,void*);
extern int DOPparam(int,IFvalue*,void*);
extern int DOPnewCard(GENcard**,GENmodel*);
extern int DOPparam(int,IFvalue*,GENcard*);
IFparm DOPpTable[] = {
@ -71,7 +71,7 @@ IFcardInfo DOPinfo = {
};
int
DOPnewCard(void **inCard, void *inModel)
DOPnewCard(GENcard **inCard, GENmodel *inModel)
{
DOPcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -82,7 +82,7 @@ DOPnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->DOPnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
tmpCard = model->GENdopings;
if (!tmpCard) { /* First in list */
@ -98,7 +98,7 @@ DOPnewCard(void **inCard, void *inModel)
int
DOPparam(int param, IFvalue *value, void *inCard)
DOPparam(int param, IFvalue *value, GENcard *inCard)
{
int i;
DOPcard *card = (DOPcard *)inCard;

3
src/ciderlib/input/dopset.c
View File

@ -17,9 +17,6 @@ Modifed: 2001 Paolo Nenzi
#include "ngspice/carddefs.h"
#include "ngspice/ciderinp.h"
extern int DOPnewCard(void**,void*);
extern int DOPparam(int,IFvalue*,void*);
/*
* Name: DOPcheck

10
src/ciderlib/input/electrod.c
View File

@ -14,8 +14,8 @@ Modified: 2001 Paolo Nenzi
#define UM_TO_CM 1.0e-4
extern int ELCTnewCard(void**,void*);
extern int ELCTparam(int,IFvalue*,void*);
extern int ELCTnewCard(GENcard**,GENmodel*);
extern int ELCTparam(int,IFvalue*,GENcard*);
IFparm ELCTpTable[] = {
@ -42,7 +42,7 @@ IFcardInfo ELCTinfo = {
};
int
ELCTnewCard(void **inCard, void *inModel)
ELCTnewCard(GENcard **inCard, GENmodel *inModel)
{
ELCTcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -53,7 +53,7 @@ ELCTnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->ELCTnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
tmpCard = model->GENelectrodes;
if (!tmpCard) { /* First in list */
@ -69,7 +69,7 @@ ELCTnewCard(void **inCard, void *inModel)
int
ELCTparam(int param, IFvalue *value, void *inCard)
ELCTparam(int param, IFvalue *value, GENcard *inCard)
{
ELCTcard *card = (ELCTcard *)inCard;

10
src/ciderlib/input/material.c
View File

@ -14,8 +14,8 @@ Modified: 2001 Paolo Nenzi
#include "ngspice/suffix.h"
extern int MATLnewCard(void**,void *);
extern int MATLparam(int,IFvalue*,void *);
extern int MATLnewCard(GENcard**,GENmodel *);
extern int MATLparam(int,IFvalue*,GENcard *);
IFparm MATLpTable[] = {
@ -97,7 +97,7 @@ IFcardInfo PHYSinfo = {
};
int
MATLnewCard(void **inCard, void *inModel)
MATLnewCard(GENcard **inCard, GENmodel *inModel)
{
MATLcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -108,7 +108,7 @@ MATLnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->MATLnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
tmpCard = model->GENmaterials;
if (!tmpCard) { /* First in list */
@ -123,7 +123,7 @@ MATLnewCard(void **inCard, void *inModel)
}
int
MATLparam(int param, IFvalue *value, void *inCard)
MATLparam(int param, IFvalue *value, GENcard *inCard)
{
MATLcard *card = (MATLcard *)inCard;

16
src/ciderlib/input/mesh.c
View File

@ -12,9 +12,9 @@ Modified: 2001 Paolo Nenzi
#include "ngspice/sperror.h"
#include "ngspice/suffix.h"
extern int XMSHnewCard(void**,void*);
extern int YMSHnewCard(void**,void*);
extern int MESHparam(int,IFvalue*,void*);
extern int XMSHnewCard(GENcard**,GENmodel*);
extern int YMSHnewCard(GENcard**,GENmodel*);
extern int MESHparam(int,IFvalue*,GENcard*);
@ -55,7 +55,7 @@ IFcardInfo YMSHinfo = {
};
int
XMSHnewCard(void **inCard, void *inModel)
XMSHnewCard(GENcard **inCard, GENmodel *inModel)
{
MESHcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -66,7 +66,7 @@ XMSHnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->MESHnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
tmpCard = model->GENxMeshes;
if (!tmpCard) { /* First in list */
@ -81,7 +81,7 @@ XMSHnewCard(void **inCard, void *inModel)
}
int
YMSHnewCard(void **inCard, void *inModel)
YMSHnewCard(GENcard **inCard, GENmodel *inModel)
{
MESHcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -92,7 +92,7 @@ YMSHnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->MESHnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
tmpCard = model->GENyMeshes;
if (!tmpCard) { /* First in list */
@ -107,7 +107,7 @@ YMSHnewCard(void **inCard, void *inModel)
}
int
MESHparam(int param, IFvalue *value, void *inCard)
MESHparam(int param, IFvalue *value, GENcard *inCard)
{
MESHcard *card = (MESHcard *)inCard;

12
src/ciderlib/input/method.c
View File

@ -14,8 +14,8 @@ Modified: 2001 Paolo Nenzi
#include "ngspice/suffix.h"
extern int METHnewCard(void**,void*);
extern int METHparam(int,IFvalue*,void*);
extern int METHnewCard(GENcard**,GENmodel*);
extern int METHparam(int,IFvalue*,GENcard*);
IFparm METHpTable[] = {
@ -42,7 +42,7 @@ IFcardInfo METHinfo = {
};
int
METHnewCard(void **inCard, void *inModel)
METHnewCard(GENcard **inCard, GENmodel *inModel)
{
METHcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -55,16 +55,16 @@ METHnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->METHnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
model->GENmethods = newCard;
} else { /* Only one card of this type allowed */
*inCard = (void *)tmpCard;
*inCard = (GENcard *)tmpCard;
}
return(OK);
}
int
METHparam(int param, IFvalue *value, void *inCard)
METHparam(int param, IFvalue *value, GENcard *inCard)
{
METHcard *card = (METHcard *)inCard;

10
src/ciderlib/input/mobility.c
View File

@ -13,8 +13,8 @@ Modified: 2001 Paolo Nenzi
#include "ngspice/devdefs.h"
#include "ngspice/suffix.h"
extern int MOBnewCard(void**,void*);
extern int MOBparam(int,IFvalue*,void*);
extern int MOBnewCard(GENcard**,GENmodel*);
extern int MOBparam(int,IFvalue*,GENcard*);
@ -50,7 +50,7 @@ IFcardInfo MOBinfo = {
};
int
MOBnewCard(void **inCard, void *inModel)
MOBnewCard(GENcard **inCard, GENmodel *inModel)
{
MOBcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -61,7 +61,7 @@ MOBnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->MOBnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
tmpCard = model->GENmobility;
if (!tmpCard) { /* First in list */
@ -76,7 +76,7 @@ MOBnewCard(void **inCard, void *inModel)
}
int
MOBparam(int param, IFvalue *value, void *inCard)
MOBparam(int param, IFvalue *value, GENcard *inCard)
{
MOBcard *card = (MOBcard *)inCard;

12
src/ciderlib/input/models.c
View File

@ -12,8 +12,8 @@ Modified: 2001 Paolo Nenzi
#include "ngspice/sperror.h"
#include "ngspice/suffix.h"
extern int MODLnewCard(void**,void*);
extern int MODLparam(int,IFvalue*,void*);
extern int MODLnewCard(GENcard**,GENmodel*);
extern int MODLparam(int,IFvalue*,GENcard*);
IFparm MODLpTable[] = {
@ -54,7 +54,7 @@ IFcardInfo MODLinfo = {
};
int
MODLnewCard(void **inCard, void *inModel)
MODLnewCard(GENcard **inCard, GENmodel *inModel)
{
MODLcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -67,16 +67,16 @@ MODLnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->MODLnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
model->GENmodels = newCard;
} else { /* Only one card of this type allowed */
*inCard = (void *)tmpCard;
*inCard = (GENcard *) tmpCard;
}
return(OK);
}
int
MODLparam(int param, IFvalue *value, void *inCard)
MODLparam(int param, IFvalue *value, GENcard *inCard)
{
MODLcard *card = (MODLcard *)inCard;

12
src/ciderlib/input/optionsc.c
View File

@ -17,8 +17,8 @@ Modified: 2001 Paolo Nenzi
#define UM_TO_CM 1.0e-4
#define UM2_TO_CM2 (UM_TO_CM * UM_TO_CM)
extern int OPTNnewCard(void**,void*);
extern int OPTNparam(int,IFvalue*,void*);
extern int OPTNnewCard(GENcard**,GENmodel*);
extern int OPTNparam(int,IFvalue*,GENcard*);
@ -61,7 +61,7 @@ IFcardInfo OPTNinfo = {
};
int
OPTNnewCard(void **inCard, void *inModel)
OPTNnewCard(GENcard **inCard, GENmodel *inModel)
{
OPTNcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -74,16 +74,16 @@ OPTNnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->OPTNnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
model->GENoptions = newCard;
} else { /* Only one card of this type allowed */
*inCard = (void *)tmpCard;
*inCard = (GENcard *) tmpCard;
}
return(OK);
}
int
OPTNparam(int param, IFvalue *value, void *inCard)
OPTNparam(int param, IFvalue *value, GENcard *inCard)
{
OPTNcard *card = (OPTNcard *)inCard;

12
src/ciderlib/input/output.c
View File

@ -14,8 +14,8 @@ Modified: 2001 Paolo Nenzi
#include "ngspice/suffix.h"
#include "../misc/tilde.h"
extern int OUTPnewCard(void**,void*);
extern int OUTPparam(int,IFvalue*,void*);
extern int OUTPnewCard(GENcard**,GENmodel*);
extern int OUTPparam(int,IFvalue*,GENcard*);
IFparm OUTPpTable[] = {
@ -84,7 +84,7 @@ IFcardInfo OUTPinfo = {
};
int
OUTPnewCard(void **inCard, void *inModel)
OUTPnewCard(GENcard **inCard, GENmodel *inModel)
{
OUTPcard *tmpCard, *newCard;
GENnumModel *model = (GENnumModel *)inModel;
@ -97,16 +97,16 @@ OUTPnewCard(void **inCard, void *inModel)
return(E_NOMEM);
}
newCard->OUTPnextCard = NULL;
*inCard = (void *)newCard;
*inCard = (GENcard *) newCard;
model->GENoutputs = newCard;
} else { /* Only one card of this type allowed */
*inCard = (void *)tmpCard;
*inCard = (GENcard *) tmpCard;
}
return(OK);
}
int
OUTPparam(int param, IFvalue *value, void *inCard)
OUTPparam(int param, IFvalue *value, GENcard *inCard)
{
OUTPcard *card = (OUTPcard *)inCard;

6
src/include/ngspice/numcards.h
View File

@ -39,11 +39,11 @@ typedef struct sIFcardInfo {
int numParms; /* number of parameter descriptors */
IFparm *cardParms; /* array of parameter descriptors */
int (*newCard)(void**,void*);
int (*newCard)(GENcard**,GENmodel*);
/* routine to add a new card to a numerical device model */
int (*setCardParm)(int,IFvalue*,void*);
int (*setCardParm)(int,IFvalue*,GENcard*);
/* routine to input a parameter to a card instance */
int (*askCardQuest)(int,IFvalue*,void*);
int (*askCardQuest)(int,IFvalue*,GENcard*);
/* routine to find out about a card's details */
} IFcardInfo;

3
src/spicelib/parser/inpgmod.c
View File

@ -391,8 +391,7 @@ INPparseNumMod( CKTcircuit* ckt, INPmodel *model, INPtables *tab, char **errMess
if (cardType >= 0) {
/* Add card structure to model */
info = INPcardTab[cardType];
error = info->newCard ((void **) &tmpCard,
model->INPmodfast );
error = info->newCard (&tmpCard, model->INPmodfast );
if (error) return(error);
/* Handle parameter-less cards */
} else if (cinprefix( cardName, "title", 3 ) ) {

Write Preview
Loading…
Cancel
Save