luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mop up some fixme comments

This commit is contained in:
rlar 2011-05-08 12:52:58 +00:00
parent e973fb3e97
commit 2b66531eb4
18 changed files with 50 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2011-05-08 Robert Larice
* src/frontend/shyu.c ,
* src/frontend/spiceif.c ,
* src/spicelib/analysis/cktdest.c ,
* src/spicelib/analysis/cktdltm.c ,
* src/spicelib/analysis/cktdltn.c ,
* src/spicelib/analysis/cktdojob.c ,
* src/spicelib/analysis/cktfnda.c ,
* src/spicelib/analysis/cktgrnd.c ,
* src/spicelib/analysis/cktneweq.c ,
* src/spicelib/analysis/cktnewn.c ,
* src/spicelib/analysis/cktparam.c ,
* src/spicelib/analysis/ckttroub.c ,
* src/spicelib/devices/cktask.c ,
* src/spicelib/devices/cktbindnode.c ,
* src/spicelib/devices/cktcrte.c ,
* src/spicelib/devices/cktfinddev.c ,
* src/xspice/ipc/ipctiein.c :
mop up some fixme comments
2011-05-08 Robert Larice
* src/frontend/help/x11disp.c :
cleanup Xt usage

3
src/frontend/shyu.c
View File

@ -25,9 +25,8 @@ Copyright 1990 Regents of the University of California. All rights reserved.
int
if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab)
if_sens_run(CKTcircuit *ckt, wordlist *args, INPtables *tab)
{
CKTcircuit *ckt = /* fixme, drop that */ t;
JOB *senseJob;
JOB *acJob;
JOB *opJob;

27
src/frontend/spiceif.c
View File

@ -161,8 +161,7 @@ if_inpdeck(struct line *deck, INPtables **tab)
ft_curckt->ci_curTask = ft_curckt->ci_defTask;
INPpas1( ckt, (card *) deck->li_next, *tab);
INPpas2( ckt, (card *) deck->li_next,
(INPtables *) *tab,ft_curckt->ci_defTask);
INPpas2( ckt, (card *) deck->li_next, *tab, ft_curckt->ci_defTask);
INPkillMods();
/* INPpas2 has been modified to ignore .NODESET and .IC
@ -170,7 +169,7 @@ if_inpdeck(struct line *deck, INPtables **tab)
* nodeset/ic of non-existant nodes. */
INPpas3(ckt, (card *) deck->li_next,
(INPtables *) *tab,ft_curckt->ci_defTask, ft_sim->nodeParms,
*tab, ft_curckt->ci_defTask, ft_sim->nodeParms,
ft_sim->numNodeParms);
#ifdef XSPICE
@ -194,9 +193,8 @@ if_inpdeck(struct line *deck, INPtables **tab)
* typed at the keyboard, error in the simulation, etc). args should
* be the entire command line, e.g. "tran 1 10 20 uic" */
int
if_run(CKTcircuit *t, char *what, wordlist *args, INPtables *tab)
if_run(CKTcircuit *ckt, char *what, wordlist *args, INPtables *tab)
{
CKTcircuit *ckt = /* fixme, drop that */ t;
int err;
struct line deck;
char buf[BSIZE_SP];
@ -386,7 +384,6 @@ if_option(CKTcircuit *ckt, char *name, enum cp_types type, void *value)
{
IFvalue pval;
int err, i;
CKTcircuit *cc = /* fixme, drop that */ ckt;
char **vv;
int which = -1;
@ -494,12 +491,12 @@ if_option(CKTcircuit *ckt, char *name, enum cp_types type, void *value)
}
#if (0)
if ((err = ft_sim->setAnalysisParm (cc, ft_curckt->ci_curOpt,
if ((err = ft_sim->setAnalysisParm (ckt, ft_curckt->ci_curOpt,
ft_sim->analyses[which]->analysisParms[i].id, &pval,
NULL)) != OK)
ft_sperror(err, "setAnalysisParm(options) ci_curOpt");
#else /*CDHW*/
if ((err = ft_sim->setAnalysisParm (cc, ft_curckt->ci_defOpt,
if ((err = ft_sim->setAnalysisParm (ckt, ft_curckt->ci_defOpt,
ft_sim->analyses[which]->analysisParms[i].id, &pval,
NULL)) != OK)
ft_sperror(err, "setAnalysisParm(options) ci_curOpt");
@ -537,20 +534,14 @@ if_dump(CKTcircuit *ckt, FILE *file)
{
NG_IGNORE(ckt);
/*void *cc = (void *) ckt;*/
fprintf(file,"diagnostic output dump unavailable.");
return;
}
void
if_cktfree(CKTcircuit *ckt, INPtables *tab)
{
CKTcircuit *cc = /* fixme, drop that */ ckt;
ft_sim->deleteCircuit (cc);
ft_sim->deleteCircuit (ckt);
INPtabEnd(tab);
return;
}
/* Return a string describing an error code. */
@ -575,7 +566,7 @@ if_errstring(int code)
*/
static int
finddev_special(
CKTcircuit *ck,
CKTcircuit *ckt,
char *name,
GENinstance **devptr,
GENmodel **modptr,
@ -584,7 +575,7 @@ finddev_special(
int err;
int type = -1;
err = ft_sim->findInstance (ck, &type, devptr, name, NULL, NULL);
err = ft_sim->findInstance (ckt, &type, devptr, name, NULL, NULL);
if(err == OK)
{
*device_or_model=0;
@ -592,7 +583,7 @@ finddev_special(
}
type = -1;
*devptr = NULL;
err = ft_sim->findModel (ck, &type, modptr, name);
err = ft_sim->findModel (ckt, &type, modptr, name);
if(err == OK)
{
*device_or_model=1;

3
src/spicelib/analysis/cktdest.c
View File

@ -19,9 +19,8 @@ Author: 1985 Thomas L. Quarles
int
CKTdestroy(CKTcircuit *inCkt)
CKTdestroy(CKTcircuit *ckt)
{
CKTcircuit *ckt = /* fixme, drop that */ inCkt;
int i;
CKTnode *node;
CKTnode *nnode;

5
src/spicelib/analysis/cktdltm.c
View File

@ -16,10 +16,9 @@ Author: 1985 Thomas L. Quarles
/* ARGSUSED */
int
CKTdltMod(CKTcircuit *cktp, GENmodel *modPtr)
CKTdltMod(CKTcircuit *ckt, GENmodel *m)
{
CKTcircuit *ckt = /* fixme, drop that */ cktp;
GENmodel *m = /* fixme, drop that */ modPtr, *mod, **prevp;
GENmodel *mod, **prevp;
GENinstance *h, *next_i;
int error;

3
src/spicelib/analysis/cktdltn.c
View File

@ -18,9 +18,8 @@ CKTdltNod(CKTcircuit *ckt, CKTnode *node)
}
int
CKTdltNNum(CKTcircuit *cktp, int num)
CKTdltNNum(CKTcircuit *ckt, int num)
{
CKTcircuit *ckt = /* fixme, drop that */ cktp;
CKTnode *n, *prev, *node, *sprev;
int error;

4
src/spicelib/analysis/cktdojob.c
View File

@ -24,10 +24,8 @@ Modified: 2000 AlansFixes
extern SPICEanalysis *analInfo[];
int
CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask)
CKTdoJob(CKTcircuit *ckt, int reset, TSKtask *task)
{
CKTcircuit *ckt = /* fixme, drop that */ inCkt;
TSKtask *task = /* fixme, drop that */ inTask;
JOB *job;
double startTime;
int error, i, error2;

3
src/spicelib/analysis/cktfnda.c
View File

@ -20,9 +20,8 @@ Author: 1985 Thomas L. Quarles
/* ARGSUSED */
int
CKTfndAnal(CKTcircuit *ckt, int *analIndex, JOB **anal, IFuid name, TSKtask *inTask, IFuid taskName)
CKTfndAnal(CKTcircuit *ckt, int *analIndex, JOB **anal, IFuid name, TSKtask *task, IFuid taskName)
{
TSKtask *task = /* fixme, drop that */ inTask;
JOB *here;
NG_IGNORE(ckt);

4
src/spicelib/analysis/cktgrnd.c
View File

@ -17,10 +17,8 @@ Author: 1985 Thomas L. Quarles
int
CKTground(CKTcircuit *inCkt, CKTnode **node, IFuid name)
CKTground(CKTcircuit *ckt, CKTnode **node, IFuid name)
{
CKTcircuit *ckt = /* fixme, drop that */ inCkt;
if(ckt->CKTnodes) {
if(ckt->CKTnodes->name) {
/*already exists - keep old name, but return it */

3
src/spicelib/analysis/cktneweq.c
View File

@ -19,10 +19,9 @@ Author: 1985 Thomas L. Quarles
int
CKTnewEq(CKTcircuit *inCkt, CKTnode **node, IFuid name)
CKTnewEq(CKTcircuit *ckt, CKTnode **node, IFuid name)
{
CKTnode *mynode;
CKTcircuit *ckt = /* fixme, drop that */ inCkt;
int error;
error = CKTmkNode(ckt,&mynode);

3
src/spicelib/analysis/cktnewn.c
View File

@ -20,9 +20,8 @@ Author: 1985 Thomas L. Quarles
/* should just call CKTnewEQ and set node type afterwards */
int
CKTnewNode(CKTcircuit *inCkt, CKTnode **node, IFuid name)
CKTnewNode(CKTcircuit *ckt, CKTnode **node, IFuid name)
{
CKTcircuit *ckt = /* fixme, drop that */ inCkt;
if(!(ckt->CKTnodes)) { /* starting the list - allocate both ground and 1 */
ckt->CKTnodes = TMALLOC(CKTnode, 1);
if(ckt->CKTnodes == NULL) return(E_NOMEM);

5
src/spicelib/analysis/cktparam.c
View File

@ -19,13 +19,12 @@ int
CKTparam(CKTcircuit *ckt, GENinstance *fast, int param, IFvalue *val, IFvalue *selector)
{
int type;
GENinstance *myfast = /*fixme*/ fast;
NG_IGNORE(ckt);
type = myfast->GENmodPtr->GENmodType;
type = fast->GENmodPtr->GENmodType;
if(DEVices[type]->DEVparam) {
return(DEVices[type]->DEVparam (param, val, myfast, selector));
return(DEVices[type]->DEVparam (param, val, fast, selector));
} else {
return(E_BADPARM);
}

3
src/spicelib/analysis/ckttroub.c
View File

@ -16,9 +16,8 @@ Copyright 1990 Regents of the University of California. All rights reserved.
extern SPICEanalysis *analInfo[];
char *
CKTtrouble(CKTcircuit *cktp, char *optmsg)
CKTtrouble(CKTcircuit *ckt, char *optmsg)
{
CKTcircuit *ckt = /* fixme, drop that */ cktp;
char msg_buf[513];
char *emsg;
TRCV *cv;

5
src/spicelib/devices/cktask.c
View File

@ -15,9 +15,8 @@ Author: 1985 Thomas L. Quarles
int
CKTask(CKTcircuit *ckt, GENinstance *fast, int which, IFvalue *value, IFvalue *selector)
CKTask(CKTcircuit *ckt, GENinstance *instance, int which, IFvalue *value, IFvalue *selector)
{
GENinstance *instance = /*fixme*/ fast;
int type = instance->GENmodPtr->GENmodType;
int error;
#ifdef PARALLEL_ARCH
@ -29,7 +28,7 @@ CKTask(CKTcircuit *ckt, GENinstance *fast, int which, IFvalue *value, IFvalue *s
DEVices = devices();
if(DEVices[type]->DEVask) {
error = DEVices[type]->DEVask(ckt,
fast, which, value, selector);
instance, which, value, selector);
} else {
error = E_BADPARM;
}

3
src/spicelib/devices/cktbindnode.c
View File

@ -17,11 +17,10 @@ Author: 1985 Thomas L. Quarles
#include "dev.h"
int
CKTbindNode(CKTcircuit *ckt, GENinstance *fast, int term, CKTnode *node)
CKTbindNode(CKTcircuit *ckt, GENinstance *instance, int term, CKTnode *node)
{
int mappednode;
SPICEdev **devs;
GENinstance *instance = /*fixme*/ fast;
int type = instance->GENmodPtr->GENmodType;
NG_IGNORE(ckt);

7
src/spicelib/devices/cktcrte.c
View File

@ -16,10 +16,9 @@ Author: 1985 Thomas L. Quarles
#include "memory.h"
int
CKTcrtElt(CKTcircuit *ckt, GENmodel *inModPtr, GENinstance **inInstPtr, IFuid name)
CKTcrtElt(CKTcircuit *ckt, GENmodel *modPtr, GENinstance **inInstPtr, IFuid name)
{
GENinstance *instPtr = NULL; /* instPtr points to the data struct for per-instance data */
GENmodel *modPtr = /*fixme*/ inModPtr; /* modPtr points to the data struct for per-model data */
SPICEdev **DEVices;
int error;
@ -32,8 +31,8 @@ CKTcrtElt(CKTcircuit *ckt, GENmodel *inModPtr, GENinstance **inInstPtr, IFuid na
type = modPtr->GENmodType;
error = CKTfndDev(ckt, &type, &instPtr, name, inModPtr,
NULL );
error = CKTfndDev(ckt, &type, &instPtr, name, modPtr, NULL);
if (error == OK) {
if (inInstPtr)
*inInstPtr = instPtr;

3
src/spicelib/devices/cktfinddev.c
View File

@ -11,9 +11,8 @@ Author: 1985 Thomas L. Quarles
int
CKTfndDev(CKTcircuit *Ckt, int *type, GENinstance **fast, IFuid name, GENmodel *modfast, IFuid modname)
CKTfndDev(CKTcircuit *ckt, int *type, GENinstance **fast, IFuid name, GENmodel *modfast, IFuid modname)
{
CKTcircuit *ckt= /* fixme, drop that */ Ckt;
GENinstance *here;
GENmodel *mods;

4
src/xspice/ipc/ipctiein.c
View File

@ -374,7 +374,7 @@ determines what instances will have data returned over the IPC channel.
int ipc_get_devices(
CKTcircuit *circuit, /* The circuit structure */
CKTcircuit *ckt, /* The circuit structure */
char *device, /* The device name as it appears in the info struct */
char ***names, /* Array of name strings to be built */
double **modtypes) /* Array of types to be built */
@ -383,7 +383,6 @@ int ipc_get_devices(
int num_instances;
GENmodel *model;
GENinstance *here;
CKTcircuit *ckt;
char *inst_name;
int inst_name_len;
int i;
@ -395,7 +394,6 @@ int ipc_get_devices(
MOS3model *MOS3mod;
/* Initialize local variables */
ckt = /* fixme, drop that */ circuit;
num_instances = 0;
/* Get the index into the circuit structure linked list of models */