From 933bd11c431ecfdfb2a6935537558d9ea490eaf1 Mon Sep 17 00:00:00 2001 From: rlar Date: Fri, 8 Oct 2010 16:49:18 +0000 Subject: [PATCH] use the type JOB, remove redundant casts --- ChangeLog | 38 ++++++++++++++++++++++++++++++ src/frontend/outitf.c | 12 +++++----- src/frontend/outitf.h | 4 ++-- src/frontend/spiceif.c | 4 ++-- src/frontend/spiceif.h | 2 +- src/include/cktdefs.h | 40 ++++++++++++++++---------------- src/include/distodef.h | 4 ++-- src/include/ifsim.h | 4 ++-- src/include/opdefs.h | 4 ++-- src/include/sensdefs.h | 4 ++-- src/include/tfdefs.h | 4 ++-- src/include/trandefs.h | 4 ++-- src/main.c | 4 ++-- src/spicelib/analysis/acan.c | 8 +++---- src/spicelib/analysis/acaskq.c | 2 +- src/spicelib/analysis/acsetp.c | 2 +- src/spicelib/analysis/analysis.h | 4 ++-- src/spicelib/analysis/ckt.h | 36 ++++++++++++++-------------- src/spicelib/analysis/cktacct.c | 2 +- src/spicelib/analysis/cktaskaq.c | 4 ++-- src/spicelib/analysis/cktfnda.c | 4 ++-- src/spicelib/analysis/cktsens.c | 2 +- src/spicelib/analysis/cktsopt.c | 2 +- src/spicelib/analysis/daskq.c | 2 +- src/spicelib/analysis/dcoaskq.c | 2 +- src/spicelib/analysis/dcop.c | 2 +- src/spicelib/analysis/dcosetp.c | 2 +- src/spicelib/analysis/dctaskq.c | 2 +- src/spicelib/analysis/dctran.c | 4 ++-- src/spicelib/analysis/dctrcurv.c | 4 ++-- src/spicelib/analysis/dctsetp.c | 2 +- src/spicelib/analysis/distoan.c | 12 +++++----- src/spicelib/analysis/dsetparm.c | 2 +- src/spicelib/analysis/naskq.c | 2 +- src/spicelib/analysis/noisean.c | 6 ++--- src/spicelib/analysis/nsetparm.c | 2 +- src/spicelib/analysis/pzan.c | 4 ++-- src/spicelib/analysis/pzaskq.c | 2 +- src/spicelib/analysis/pzsetp.c | 2 +- src/spicelib/analysis/sensaskq.c | 2 +- src/spicelib/analysis/senssetp.c | 2 +- src/spicelib/analysis/tfanal.c | 2 +- src/spicelib/analysis/tfaskq.c | 2 +- src/spicelib/analysis/tfsetp.c | 2 +- src/spicelib/analysis/tranaskq.c | 2 +- src/spicelib/analysis/transetp.c | 2 +- src/unsupported/sen2setp.c | 2 +- src/unsupported/snaskq.c | 2 +- 48 files changed, 151 insertions(+), 113 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92c1ea1a6..dd553b4b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +2010-10-08 Robert Larice + * src/frontend/spiceif.c , + * src/frontend/spiceif.h , + * src/include/cktdefs.h , + * src/include/distodef.h , + * src/include/ifsim.h , + * src/include/opdefs.h , + * src/include/sensdefs.h , + * src/include/tfdefs.h , + * src/include/trandefs.h , + * src/spicelib/analysis/acaskq.c , + * src/spicelib/analysis/acsetp.c , + * src/spicelib/analysis/analysis.h , + * src/spicelib/analysis/ckt.h , + * src/spicelib/analysis/cktacct.c , + * src/spicelib/analysis/cktaskaq.c , + * src/spicelib/analysis/cktfnda.c , + * src/spicelib/analysis/cktsopt.c , + * src/spicelib/analysis/daskq.c , + * src/spicelib/analysis/dcoaskq.c , + * src/spicelib/analysis/dcosetp.c , + * src/spicelib/analysis/dctaskq.c , + * src/spicelib/analysis/dctsetp.c , + * src/spicelib/analysis/dsetparm.c , + * src/spicelib/analysis/naskq.c , + * src/spicelib/analysis/nsetparm.c , + * src/spicelib/analysis/pzaskq.c , + * src/spicelib/analysis/pzsetp.c , + * src/spicelib/analysis/sensaskq.c , + * src/spicelib/analysis/senssetp.c , + * src/spicelib/analysis/tfaskq.c , + * src/spicelib/analysis/tfsetp.c , + * src/spicelib/analysis/tranaskq.c , + * src/spicelib/analysis/transetp.c , + * src/unsupported/sen2setp.c , + * src/unsupported/snaskq.c : + use the type JOB, remove redundant casts + 2010-10-08 Robert Larice * src/frontend/outitf.c , * src/frontend/outitf.h , diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c index c675102ea..b4497d374 100644 --- a/src/frontend/outitf.c +++ b/src/frontend/outitf.c @@ -37,7 +37,7 @@ extern char *spice_analysis_get_description(int index); /* static declarations */ -static int beginPlot(void *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analName, +static int beginPlot(JOB *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analName, char *refName, int refType, int numNames, char **dataNames, int dataType, bool windowed, runDesc **runp); static int addDataDesc(runDesc *run, char *name, int type, int ind); @@ -87,7 +87,7 @@ static bool shouldstop = FALSE; /* Tell simulator to stop next time it asks. */ /* The two "begin plot" routines share all their internals... */ int -OUTpBeginPlot(CKTcircuit *circuitPtr, void *analysisPtr, IFuid analName, IFuid refName, int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr) +OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, IFuid analName, IFuid refName, int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr) { char *name; @@ -108,7 +108,7 @@ if (ARCHme != 0) return(OK); } int -OUTwBeginPlot(CKTcircuit *circuitPtr, void *analysisPtr, IFuid analName, IFuid refName, int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr) +OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, IFuid analName, IFuid refName, int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr) { #ifdef PARALLEL_ARCH if (ARCHme != 0) return(OK); @@ -121,7 +121,7 @@ OUTwBeginPlot(CKTcircuit *circuitPtr, void *analysisPtr, IFuid analName, IFuid r } static int -beginPlot(void *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analName, char *refName, int refType, int numNames, char **dataNames, int dataType, bool windowed, runDesc **runp) +beginPlot(JOB *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analName, char *refName, int refType, int numNames, char **dataNames, int dataType, bool windowed, runDesc **runp) { runDesc *run; struct save_info *saves; @@ -158,7 +158,7 @@ beginPlot(void *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analNa run->windowed = windowed; run->numData = 0; - an_name = spice_analysis_get_name(((JOB *) analysisPtr)->JOBtype); + an_name = spice_analysis_get_name(analysisPtr->JOBtype); ft_curckt->ci_last_an = an_name; /* Now let's see which of these things we need. First toss in the @@ -350,7 +350,7 @@ beginPlot(void *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analNa || (run->numData == 0 && run->refIndex == -1)) ) /* va: suggested parentheses */ { fprintf(cp_err, "Error: no data saved for %s; analysis not run\n", - spice_analysis_get_description(((JOB *) analysisPtr)->JOBtype)); + spice_analysis_get_description(analysisPtr->JOBtype)); return E_NOTFOUND; } diff --git a/src/frontend/outitf.h b/src/frontend/outitf.h index 0940501ec..85434455e 100644 --- a/src/frontend/outitf.h +++ b/src/frontend/outitf.h @@ -39,9 +39,9 @@ typedef struct runDesc { int windowCount; } runDesc; -int OUTpBeginPlot(CKTcircuit *circuitPtr, void *analysisPtr, IFuid analName, IFuid refName, +int OUTpBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, IFuid analName, IFuid refName, int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr); -int OUTwBeginPlot(CKTcircuit *circuitPtr, void *analysisPtr, IFuid analName, IFuid refName, +int OUTwBeginPlot(CKTcircuit *circuitPtr, JOB *analysisPtr, IFuid analName, IFuid refName, int refType, int numNames, IFuid *dataNames, int dataType, void **plotPtr); int OUTpData(void *plotPtr, IFvalue *refValue, IFvalue *valuePtr); int OUTwReference(void *plotPtr, IFvalue *valuePtr, void **refPtr); diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c index 4107789cb..1184ac3d3 100644 --- a/src/frontend/spiceif.c +++ b/src/frontend/spiceif.c @@ -1174,7 +1174,7 @@ finddev(CKTcircuit *ck, char *name, GENinstance **devptr, GENmodel **modptr) /* get an analysis parameter by name instead of id */ int -if_analQbyName(CKTcircuit *ckt, int which, void *anal, char *name, IFvalue *parm) +if_analQbyName(CKTcircuit *ckt, int which, JOB *anal, char *name, IFvalue *parm) { int i; for(i=0;ianalyses[which]->numParms;i++) { @@ -1198,7 +1198,7 @@ if_tranparams(struct circ *ci, double *start, double *stop, double *step) int err; int which = -1; int i; - void *anal; + JOB *anal; IFuid tranUid; if(!ci->ci_curTask) return(FALSE); diff --git a/src/frontend/spiceif.h b/src/frontend/spiceif.h index f41ccf2cf..322a8a12e 100644 --- a/src/frontend/spiceif.h +++ b/src/frontend/spiceif.h @@ -17,7 +17,7 @@ struct variable * spif_getparam(CKTcircuit *ckt, char **name, char *param, int i struct variable * spif_getparam_special(CKTcircuit *ckt,char **name,char *param,int ind,int do_model); void if_setparam_model(CKTcircuit *ckt, char **name, char *val); void if_setparam(CKTcircuit *ckt, char **name, char *param, struct dvec *val, int do_model); -int if_analQbyName(CKTcircuit *ckt, int which, void *anal, char *name, IFvalue *parm); +int if_analQbyName(CKTcircuit *ckt, int which, JOB *anal, char *name, IFvalue *parm); bool if_tranparams(struct circ *ci, double *start, double *stop, double *step); struct variable * if_getstat(CKTcircuit *ckt, char *name); diff --git a/src/include/cktdefs.h b/src/include/cktdefs.h index 3f8d954c5..e2bdcd83e 100644 --- a/src/include/cktdefs.h +++ b/src/include/cktdefs.h @@ -269,14 +269,14 @@ struct CKTcircuit { /* Now function prottypes */ extern int ACan(CKTcircuit *, int); -extern int ACaskQuest(CKTcircuit *, void *, int , IFvalue *); -extern int ACsetParm(CKTcircuit *, void *, int , IFvalue *); +extern int ACaskQuest(CKTcircuit *, JOB *, int , IFvalue *); +extern int ACsetParm(CKTcircuit *, JOB *, int , IFvalue *); extern int CKTacDump(CKTcircuit *, double , void *); extern int CKTacLoad(CKTcircuit *); extern int CKTaccept(CKTcircuit *); -extern int CKTacct(CKTcircuit *, void *, int , IFvalue *); +extern int CKTacct(CKTcircuit *, JOB *, int , IFvalue *); extern int CKTask(CKTcircuit *, GENinstance *, int , IFvalue *, IFvalue *); -extern int CKTaskAnalQ(CKTcircuit *, void *, int , IFvalue *, IFvalue *); +extern int CKTaskAnalQ(CKTcircuit *, JOB *, int , IFvalue *, IFvalue *); extern int CKTaskNodQst(CKTcircuit *, CKTnode *, int , IFvalue *, IFvalue *); extern int CKTbindNode(CKTcircuit *, GENinstance *, int , CKTnode *); extern void CKTbreakDump(CKTcircuit *); @@ -296,7 +296,7 @@ extern void CKTdump(CKTcircuit *, double, void *); extern void NDEVacct(CKTcircuit *ckt, FILE *file); #endif /* CIDER */ extern void CKTncDump(CKTcircuit *); -extern int CKTfndAnal(CKTcircuit *, int *, void **, IFuid , TSKtask *, IFuid); +extern int CKTfndAnal(CKTcircuit *, int *, JOB **, IFuid , TSKtask *, IFuid); extern int CKTfndBranch(CKTcircuit *, IFuid); extern int CKTfndDev(CKTcircuit *, int *, GENinstance **, IFuid , GENmodel *, IFuid); extern int CKTfndMod(CKTcircuit *, int *, GENmodel **, IFuid); @@ -342,7 +342,7 @@ extern int CKTsenUpdate(CKTcircuit *); extern int CKTsetAnalPm(CKTcircuit *, JOB *, int , IFvalue *, IFvalue *); extern int CKTsetBreak(CKTcircuit *, double); extern int CKTsetNodPm(CKTcircuit *, CKTnode *, int , IFvalue *, IFvalue *); -extern int CKTsetOpt(CKTcircuit *, void *, int , IFvalue *); +extern int CKTsetOpt(CKTcircuit *, JOB *, int , IFvalue *); extern int CKTsetup(CKTcircuit *); extern int CKTunsetup(CKTcircuit *); extern int CKTtemp(CKTcircuit *); @@ -350,10 +350,10 @@ extern char *CKTtrouble(CKTcircuit *, char *); extern void CKTterr(int , CKTcircuit *, double *); extern int CKTtrunc(CKTcircuit *, double *); extern int CKTtypelook(char *); -extern int DCOaskQuest(CKTcircuit *, void *, int , IFvalue *); -extern int DCOsetParm(CKTcircuit *, void *, int , IFvalue *); -extern int DCTaskQuest(CKTcircuit *, void *, int , IFvalue *); -extern int DCTsetParm(CKTcircuit *, void *, int , IFvalue *); +extern int DCOaskQuest(CKTcircuit *, JOB *, int , IFvalue *); +extern int DCOsetParm(CKTcircuit *, JOB *, int , IFvalue *); +extern int DCTaskQuest(CKTcircuit *, JOB *, int , IFvalue *); +extern int DCTsetParm(CKTcircuit *, JOB *, int , IFvalue *); extern int DCop(CKTcircuit *ckt, int notused); /* va: notused avoids "init from incompatible pointer type" */ extern int DCtrCurv(CKTcircuit *, int); extern int DCtran(CKTcircuit *, int); @@ -362,21 +362,21 @@ extern int NOISEan(CKTcircuit *, int); extern int PZan(CKTcircuit *, int); extern int PZinit(CKTcircuit *); extern int PZpost(CKTcircuit *); -extern int PZaskQuest(CKTcircuit *, void *, int , IFvalue *); -extern int PZsetParm(CKTcircuit *, void *, int , IFvalue *); -extern int SENaskQuest(CKTcircuit *, void *, int , IFvalue *); +extern int PZaskQuest(CKTcircuit *, JOB *, int , IFvalue *); +extern int PZsetParm(CKTcircuit *, JOB *, int , IFvalue *); +extern int SENaskQuest(CKTcircuit *, JOB *, int , IFvalue *); extern void SENdestroy(SENstruct *); -extern int SENsetParm(CKTcircuit *, void *, int , IFvalue *); +extern int SENsetParm(CKTcircuit *, JOB *, int , IFvalue *); extern int SENstartup(CKTcircuit *); extern int SPIinit(IFfrontEnd *, IFsimulator **); extern int TFanal(CKTcircuit *, int); -extern int TFaskQuest(CKTcircuit *, void *, int , IFvalue *); -extern int TFsetParm(CKTcircuit *, void *, int , IFvalue *); -extern int TRANaskQuest(CKTcircuit *, void *, int , IFvalue *); -extern int TRANsetParm(CKTcircuit *, void *, int , IFvalue *); +extern int TFaskQuest(CKTcircuit *, JOB *, int , IFvalue *); +extern int TFsetParm(CKTcircuit *, JOB *, int , IFvalue *); +extern int TRANaskQuest(CKTcircuit *, JOB *, int , IFvalue *); +extern int TRANsetParm(CKTcircuit *, JOB *, int , IFvalue *); extern int TRANinit(CKTcircuit *, JOB *); -extern int NaskQuest(CKTcircuit *, void *, int, IFvalue *); -extern int NsetParm(CKTcircuit *, void *, int, IFvalue *); +extern int NaskQuest(CKTcircuit *, JOB *, int, IFvalue *); +extern int NsetParm(CKTcircuit *, JOB *, int, IFvalue *); extern int NIacIter(CKTcircuit *); extern int NIcomCof(CKTcircuit *); extern int NIconvTest(CKTcircuit *); diff --git a/src/include/distodef.h b/src/include/distodef.h index 6d7c5947d..41d636000 100644 --- a/src/include/distodef.h +++ b/src/include/distodef.h @@ -166,8 +166,8 @@ typedef struct { #define D_RHSF1 9 #define D_RHSF2 10 -extern int DsetParm(CKTcircuit*,void *,int,IFvalue*); -extern int DaskQuest(CKTcircuit*,void *,int,IFvalue*); +extern int DsetParm(CKTcircuit*,JOB *,int,IFvalue*); +extern int DaskQuest(CKTcircuit*,JOB *,int,IFvalue*); extern double D1i2F1(double, double, double); extern double D1i3F1(double, double, double, double, double, double); extern double D1iF12(double, double, double, double, double); diff --git a/src/include/ifsim.h b/src/include/ifsim.h index e6232d464..30dcf482c 100644 --- a/src/include/ifsim.h +++ b/src/include/ifsim.h @@ -392,9 +392,9 @@ struct IFsimulator { /* create new analysis within a task */ int (*setAnalysisParm) (CKTcircuit *, JOB *, int, IFvalue *, IFvalue *); /* set a parameter on an analysis */ - int (*askAnalysisQuest) (CKTcircuit *, void *, int, IFvalue *, IFvalue *); + int (*askAnalysisQuest) (CKTcircuit *, JOB *, int, IFvalue *, IFvalue *); /* ask a question about an analysis */ - int (*findAnalysis) (CKTcircuit *, int *, void **, IFuid, TSKtask *, IFuid); + int (*findAnalysis) (CKTcircuit *, int *, JOB **, IFuid, TSKtask *, IFuid); /* find a specific analysis */ int (*findTask) (CKTcircuit *, TSKtask **, IFuid); /* find a specific task */ diff --git a/src/include/opdefs.h b/src/include/opdefs.h index 0007b6c35..2859121b6 100644 --- a/src/include/opdefs.h +++ b/src/include/opdefs.h @@ -21,6 +21,6 @@ typedef struct { char *JOBname; } OP; -extern int DCOsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value); -extern int DCOaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value); +extern int DCOsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value); +extern int DCOaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value); #endif /*DCOP*/ diff --git a/src/include/sensdefs.h b/src/include/sensdefs.h index 7d7042cf4..52cfc56cf 100644 --- a/src/include/sensdefs.h +++ b/src/include/sensdefs.h @@ -67,8 +67,8 @@ struct st_devsenlist { }; /* va, with prototypes */ -extern int SENSask(CKTcircuit *,void *,int ,IFvalue *); -extern int SENSsetParam(CKTcircuit *,void *,int ,IFvalue *); +extern int SENSask(CKTcircuit *,JOB *,int ,IFvalue *); +extern int SENSsetParam(CKTcircuit *,JOB *,int ,IFvalue *); extern int sens_sens(CKTcircuit *,int); #define SENS_POS 2 diff --git a/src/include/tfdefs.h b/src/include/tfdefs.h index 675e8021d..67c69d706 100644 --- a/src/include/tfdefs.h +++ b/src/include/tfdefs.h @@ -36,7 +36,7 @@ struct TFan { #define TF_INSRC 4 #define TF_OUTNAME 5 -extern int TFsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value); -extern int TFaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value); +extern int TFsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value); +extern int TFaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value); #endif /*TF*/ diff --git a/src/include/trandefs.h b/src/include/trandefs.h index 4bda71ccb..0076d6a1f 100644 --- a/src/include/trandefs.h +++ b/src/include/trandefs.h @@ -32,6 +32,6 @@ typedef struct { #define TRAN_TSTEP 3 #define TRAN_TMAX 4 #define TRAN_UIC 5 -extern int TRANsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value); -extern int TRANaskQuest(CKTcircuit *ckt, void *anal, int which,IFvalue *value); +extern int TRANsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value); +extern int TRANaskQuest(CKTcircuit *ckt, JOB *anal, int which,IFvalue *value); #endif /*TRAN*/ diff --git a/src/main.c b/src/main.c index 88001fab5..8916376d2 100644 --- a/src/main.c +++ b/src/main.c @@ -200,9 +200,9 @@ bool ft_nutmeg = FALSE; extern struct comm spcp_coms[ ]; struct comm *cp_coms = spcp_coms; -extern int OUTpBeginPlot(CKTcircuit *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); +extern int OUTpBeginPlot(CKTcircuit *,JOB *,IFuid,IFuid,int,int,IFuid *,int,void **); extern int OUTpData(void *,IFvalue *,IFvalue *); -extern int OUTwBeginPlot(CKTcircuit *,void *,IFuid,IFuid,int,int,IFuid *,int,void **); +extern int OUTwBeginPlot(CKTcircuit *,JOB *,IFuid,IFuid,int,int,IFuid *,int,void **); extern int OUTwReference(void *,IFvalue *,void **); extern int OUTwData(void *,int,IFvalue *,void *), OUTwEnd(void *), OUTendPlot(void *); extern int OUTbeginDomain(void *,IFuid,int,IFvalue *); diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c index 9997110c2..6dc710e31 100644 --- a/src/spicelib/analysis/acan.c +++ b/src/spicelib/analysis/acan.c @@ -129,7 +129,7 @@ ACan(CKTcircuit *ckt, int restart) * Moreover the begin plot has not even been done yet at this * point... */ - (*(SPfrontEnd->OUTpBeginPlot))(ckt,(void*)ckt->CKTcurJob, + (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname,(IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&acPlot); tfree(nameList); @@ -153,7 +153,7 @@ ACan(CKTcircuit *ckt, int restart) if (ckt->CKTkeepOpInfo) { /* Dump operating point. */ error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob, "AC Operating Point", + ckt->CKTcurJob, "AC Operating Point", (IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&plot); if(error) return(error); CKTdump(ckt,(double)0,plot); @@ -164,7 +164,7 @@ ACan(CKTcircuit *ckt, int restart) (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, "frequency", UID_OTHER, NULL); error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob, + ckt->CKTcurJob, ckt->CKTcurJob->JOBname,freqUid,IF_REAL,numNames,nameList, IF_COMPLEX,&acPlot); tfree(nameList); @@ -181,7 +181,7 @@ ACan(CKTcircuit *ckt, int restart) ((ACAN*)ckt->CKTcurJob)->ACsaveFreq = 0; /* clear the 'old' frequency */ /* fix resume? saj*/ error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob, + ckt->CKTcurJob, ckt->CKTcurJob->JOBname,freqUid,IF_REAL,numNames,nameList, IF_COMPLEX,&acPlot); /* saj*/ diff --git a/src/spicelib/analysis/acaskq.c b/src/spicelib/analysis/acaskq.c index af659d165..696967614 100644 --- a/src/spicelib/analysis/acaskq.c +++ b/src/spicelib/analysis/acaskq.c @@ -14,7 +14,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -ACaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +ACaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/acsetp.c b/src/spicelib/analysis/acsetp.c index d6da75a33..9d8d6089f 100644 --- a/src/spicelib/analysis/acsetp.c +++ b/src/spicelib/analysis/acsetp.c @@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -ACsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +ACsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/analysis.h b/src/spicelib/analysis/analysis.h index 9b9271e00..7711ca800 100644 --- a/src/spicelib/analysis/analysis.h +++ b/src/spicelib/analysis/analysis.h @@ -6,8 +6,8 @@ typedef struct { int size; int domain; int do_ic; - int (*(setParm))(CKTcircuit *ckt, void *anal, int which, IFvalue *value); - int (*(askQuest))(CKTcircuit *ckt, void *anal, int which, IFvalue *value); + int (*(setParm))(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value); + int (*(askQuest))(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value); int (*an_init)(CKTcircuit *ckt, JOB *job); int (*an_func)(CKTcircuit *ckt, int restart); } SPICEanalysis; diff --git a/src/spicelib/analysis/ckt.h b/src/spicelib/analysis/ckt.h index 01f5cf021..047f3e36e 100644 --- a/src/spicelib/analysis/ckt.h +++ b/src/spicelib/analysis/ckt.h @@ -12,14 +12,14 @@ /* function prototypes */ int ACan( CKTcircuit *, int ); -int ACaskQuest( CKTcircuit *, void *, int , IFvalue *); -int ACsetParm( CKTcircuit *, void *, int , IFvalue *); +int ACaskQuest( CKTcircuit *, JOB *, int , IFvalue *); +int ACsetParm( CKTcircuit *, JOB *, int , IFvalue *); int CKTacDump( CKTcircuit *, double , void *); int CKTacLoad( CKTcircuit *); int CKTaccept( CKTcircuit *); -int CKTacct( CKTcircuit *, void *, int , IFvalue *); +int CKTacct( CKTcircuit *, JOB *, int , IFvalue *); int CKTask( CKTcircuit *, GENinstance *, int , IFvalue *, IFvalue *); -int CKTaskAnalQ( CKTcircuit *, void *, int , IFvalue *, IFvalue *); +int CKTaskAnalQ( CKTcircuit *, JOB *, int , IFvalue *, IFvalue *); int CKTaskNodQst( CKTcircuit *, CKTnode *, int , IFvalue *, IFvalue *); int CKTbindNode( CKTcircuit *, GENinstance *, int , CKTnode *); void CKTbreakDump( CKTcircuit *); @@ -34,7 +34,7 @@ int CKTdltMod( CKTcircuit *, GENmodel *); int CKTdltNod( CKTcircuit *, CKTnode *); int CKTdoJob( CKTcircuit *, int , TSKtask *); void CKTdump( CKTcircuit *, double, void *); -int CKTfndAnal( CKTcircuit *, int *, void **, IFuid , TSKtask *, IFuid ); +int CKTfndAnal( CKTcircuit *, int *, JOB **, IFuid , TSKtask *, IFuid ); int CKTfndBranch( CKTcircuit *, IFuid); int CKTfndDev( CKTcircuit *, int *, GENinstance **, IFuid , GENmodel *, IFuid ); int CKTfndMod( CKTcircuit *, int *, GENmodel **, IFuid ); @@ -78,7 +78,7 @@ int CKTsenUpdate( CKTcircuit *); int CKTsetAnalPm( CKTcircuit *, JOB *, int , IFvalue *, IFvalue *); int CKTsetBreak( CKTcircuit *, double ); int CKTsetNodPm( CKTcircuit *, CKTnode *, int , IFvalue *, IFvalue *); -int CKTsetOpt( CKTcircuit *, void *, int , IFvalue *); +int CKTsetOpt( CKTcircuit *, JOB *, int , IFvalue *); int CKTsetup( CKTcircuit *); int CKTunsetup(CKTcircuit *ckt); int CKTtemp( CKTcircuit *); @@ -86,10 +86,10 @@ char *CKTtrouble(CKTcircuit *, char *); void CKTterr( int , CKTcircuit *, double *); int CKTtrunc( CKTcircuit *, double *); int CKTtypelook( char *); -int DCOaskQuest( CKTcircuit *, void *, int , IFvalue *); -int DCOsetParm( CKTcircuit *, void *, int , IFvalue *); -int DCTaskQuest( CKTcircuit *, void *, int , IFvalue *); -int DCTsetParm( CKTcircuit *, void *, int , IFvalue *); +int DCOaskQuest( CKTcircuit *, JOB *, int , IFvalue *); +int DCOsetParm( CKTcircuit *, JOB *, int , IFvalue *); +int DCTaskQuest( CKTcircuit *, JOB *, int , IFvalue *); +int DCTsetParm( CKTcircuit *, JOB *, int , IFvalue *); int DCop( CKTcircuit *, int ); int DCtrCurv( CKTcircuit *, int ); int DCtran( CKTcircuit *, int ); @@ -98,19 +98,19 @@ int NOISEan(CKTcircuit *, int); int PZan( CKTcircuit *, int ); int PZinit( CKTcircuit * ); int PZpost( CKTcircuit * ); -int PZaskQuest( CKTcircuit *, void *, int , IFvalue *); -int PZsetParm( CKTcircuit *, void *, int , IFvalue *); -int SENaskQuest( CKTcircuit *, void *, int , IFvalue *); +int PZaskQuest( CKTcircuit *, JOB *, int , IFvalue *); +int PZsetParm( CKTcircuit *, JOB *, int , IFvalue *); +int SENaskQuest( CKTcircuit *, JOB *, int , IFvalue *); void SENdestroy( SENstruct *); -int SENsetParm( CKTcircuit *, void *, int , IFvalue *); +int SENsetParm( CKTcircuit *, JOB *, int , IFvalue *); int SENstartup( CKTcircuit *); int SPIinit( IFfrontEnd *, IFsimulator **); char * SPerror( int ); int TFanal( CKTcircuit *, int ); -int TFaskQuest( CKTcircuit *, void *, int , IFvalue *); -int TFsetParm( CKTcircuit *, void *, int , IFvalue *); -int TRANaskQuest( CKTcircuit *, void *, int , IFvalue *); -int TRANsetParm( CKTcircuit *, void *, int , IFvalue *); +int TFaskQuest( CKTcircuit *, JOB *, int , IFvalue *); +int TFsetParm( CKTcircuit *, JOB *, int , IFvalue *); +int TRANaskQuest( CKTcircuit *, JOB *, int , IFvalue *); +int TRANsetParm( CKTcircuit *, JOB *, int , IFvalue *); int TRANinit(CKTcircuit *, JOB *); int NIacIter( CKTcircuit * ); int NIcomCof( CKTcircuit * ); diff --git a/src/spicelib/analysis/cktacct.c b/src/spicelib/analysis/cktacct.c index 48e5335f4..410b9efbd 100644 --- a/src/spicelib/analysis/cktacct.c +++ b/src/spicelib/analysis/cktacct.c @@ -22,7 +22,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -CKTacct(CKTcircuit *ckt, void *anal, int which, IFvalue *val) +CKTacct(CKTcircuit *ckt, JOB *anal, int which, IFvalue *val) { switch(which) { diff --git a/src/spicelib/analysis/cktaskaq.c b/src/spicelib/analysis/cktaskaq.c index 69a94ebca..8cd4ff415 100644 --- a/src/spicelib/analysis/cktaskaq.c +++ b/src/spicelib/analysis/cktaskaq.c @@ -16,9 +16,9 @@ extern SPICEanalysis *analInfo[]; /* ARGSUSED */ int -CKTaskAnalQ(CKTcircuit *ckt, void *analPtr, int parm, IFvalue *value, IFvalue *selector) +CKTaskAnalQ(CKTcircuit *ckt, JOB *analPtr, int parm, IFvalue *value, IFvalue *selector) { - int type = ((JOB *)analPtr)->JOBtype; + int type = analPtr->JOBtype; if((analInfo[type]->askQuest) == NULL) return(E_BADPARM); return( (*(analInfo[type]->askQuest))(ckt,analPtr,parm,value)); diff --git a/src/spicelib/analysis/cktfnda.c b/src/spicelib/analysis/cktfnda.c index e0aee17a3..f6c29df2d 100644 --- a/src/spicelib/analysis/cktfnda.c +++ b/src/spicelib/analysis/cktfnda.c @@ -20,14 +20,14 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -CKTfndAnal(CKTcircuit *ckt, int *analIndex, void **anal, IFuid name, TSKtask *inTask, IFuid taskName) +CKTfndAnal(CKTcircuit *ckt, int *analIndex, JOB **anal, IFuid name, TSKtask *inTask, IFuid taskName) { TSKtask *task = /* fixme, drop that */ inTask; JOB *here; for (here = task->jobs; here; here = here->JOBnextJob) { if(strcmp(here->JOBname,name)==0) { - if(anal) *anal = (void *)here; + if(anal) *anal = here; return(OK); } } diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c index 377f8d4cc..2f3ec99dd 100644 --- a/src/spicelib/analysis/cktsens.c +++ b/src/spicelib/analysis/cktsens.c @@ -183,7 +183,7 @@ int sens_sens(CKTcircuit *ckt, int restart) } error = (*SPfrontEnd->OUTpBeginPlot)(ckt, - (void *) ckt->CKTcurJob, + ckt->CKTcurJob, ckt->CKTcurJob->JOBname, freq_name, IF_REAL, num_vars, output_names, type, (void **) &sen_data); if (error) diff --git a/src/spicelib/analysis/cktsopt.c b/src/spicelib/analysis/cktsopt.c index d66fda3f9..84ff8d5f4 100644 --- a/src/spicelib/analysis/cktsopt.c +++ b/src/spicelib/analysis/cktsopt.c @@ -28,7 +28,7 @@ Modified: 2000 AlansFixes /* ARGSUSED */ int -CKTsetOpt(CKTcircuit *ckt, void *anal, int opt, IFvalue *val) +CKTsetOpt(CKTcircuit *ckt, JOB *anal, int opt, IFvalue *val) { TSKtask *task = (TSKtask *)anal; diff --git a/src/spicelib/analysis/daskq.c b/src/spicelib/analysis/daskq.c index 200860fab..182274e3e 100644 --- a/src/spicelib/analysis/daskq.c +++ b/src/spicelib/analysis/daskq.c @@ -12,7 +12,7 @@ Author: 1988 Jaijeet S Roychowdhury /* ARGSUSED */ int -DaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +DaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/dcoaskq.c b/src/spicelib/analysis/dcoaskq.c index 370dae1b7..cd94a0551 100644 --- a/src/spicelib/analysis/dcoaskq.c +++ b/src/spicelib/analysis/dcoaskq.c @@ -12,7 +12,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -DCOaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +DCOaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { return(E_BADPARM); } diff --git a/src/spicelib/analysis/dcop.c b/src/spicelib/analysis/dcop.c index 51cb23214..10e732040 100644 --- a/src/spicelib/analysis/dcop.c +++ b/src/spicelib/analysis/dcop.c @@ -44,7 +44,7 @@ DCop(CKTcircuit *ckt, int notused) error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob, ckt->CKTcurJob->JOBname, + ckt->CKTcurJob, ckt->CKTcurJob->JOBname, (IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&plot); tfree(nameList); /* va: nameList not used any longer, it was a memory leak */ if(error) return(error); diff --git a/src/spicelib/analysis/dcosetp.c b/src/spicelib/analysis/dcosetp.c index dd6ded202..e1fbe5783 100644 --- a/src/spicelib/analysis/dcosetp.c +++ b/src/spicelib/analysis/dcosetp.c @@ -14,7 +14,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -DCOsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +DCOsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/dctaskq.c b/src/spicelib/analysis/dctaskq.c index 0a186add6..4ac0b04cf 100644 --- a/src/spicelib/analysis/dctaskq.c +++ b/src/spicelib/analysis/dctaskq.c @@ -12,7 +12,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -DCTaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +DCTaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c index f86070056..f6c987a42 100644 --- a/src/spicelib/analysis/dctran.c +++ b/src/spicelib/analysis/dctran.c @@ -141,7 +141,7 @@ DCtran(CKTcircuit *ckt, (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL, "time", UID_OTHER, NULL); error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob, + ckt->CKTcurJob, ckt->CKTcurJob->JOBname,timeUid,IF_REAL,numNames,nameList, IF_REAL,&(((TRANan*)ckt->CKTcurJob)->TRANplot)); tfree(nameList); @@ -333,7 +333,7 @@ DCtran(CKTcircuit *ckt, /* get timeUiD again */ (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL, "time", UID_OTHER, NULL); - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, (void*)ckt->CKTcurJob, + error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname,timeUid,IF_REAL,666,nameList, 666,&(((TRANan*)ckt->CKTcurJob)->TRANplot));/*magic 666 nums as flags */ tfree(nameList); diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c index c0bee3ceb..878e5a6f4 100644 --- a/src/spicelib/analysis/dctrcurv.c +++ b/src/spicelib/analysis/dctrcurv.c @@ -67,7 +67,7 @@ DCtrCurv(CKTcircuit *ckt, int restart) i = cv->TRCVnestState; /* resume to work? saj*/ error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob, ckt->CKTcurJob->JOBname, + ckt->CKTcurJob, ckt->CKTcurJob->JOBname, varUid,IF_REAL,666,nameList, 666,&plot); goto resume; } @@ -216,7 +216,7 @@ found:; } /* rcode*/ error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob, ckt->CKTcurJob->JOBname, + ckt->CKTcurJob, ckt->CKTcurJob->JOBname, varUid,IF_REAL,numNames,nameList, IF_REAL,&plot); if(error) return(error); diff --git a/src/spicelib/analysis/dctsetp.c b/src/spicelib/analysis/dctsetp.c index 621ab3856..4df4edcd9 100644 --- a/src/spicelib/analysis/dctsetp.c +++ b/src/spicelib/analysis/dctsetp.c @@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -DCTsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +DCTsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { TRCV* cv= (TRCV*)anal; switch(which) { diff --git a/src/spicelib/analysis/distoan.c b/src/spicelib/analysis/distoan.c index db0a78976..f334843ea 100644 --- a/src/spicelib/analysis/distoan.c +++ b/src/spicelib/analysis/distoan.c @@ -114,7 +114,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); if (ckt->CKTkeepOpInfo) { /* Dump operating point. */ error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob, "Distortion Operating Point", + ckt->CKTcurJob, "Distortion Operating Point", (IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&acPlot); if(error) return(error); CKTdump(ckt,(double)0,acPlot); @@ -523,7 +523,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, "frequency", UID_OTHER, NULL); (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob,"DISTORTION - 2nd harmonic", + ckt->CKTcurJob, "DISTORTION - 2nd harmonic", freqUid,IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); if (job->DstepType != LINEAR) { (*(SPfrontEnd->OUTattributes))((void *)acPlot,NULL, @@ -547,7 +547,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, "frequency", UID_OTHER, NULL); (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob,"DISTORTION - 3rd harmonic",freqUid,IF_REAL, + ckt->CKTcurJob, "DISTORTION - 3rd harmonic", freqUid, IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); for (i=0; i< displacement ; i++) { @@ -569,7 +569,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, "frequency", UID_OTHER, NULL); (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob,"DISTORTION - IM: f1+f2",freqUid,IF_REAL, + ckt->CKTcurJob, "DISTORTION - IM: f1+f2", freqUid, IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); for (i=0; i< displacement ; i++) { @@ -589,7 +589,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, "frequency", UID_OTHER, NULL); (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob,"DISTORTION - IM: f1-f2",freqUid,IF_REAL, + ckt->CKTcurJob, "DISTORTION - IM: f1-f2", freqUid, IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); for (i=0; i< displacement ; i++) { @@ -610,7 +610,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, "frequency", UID_OTHER, NULL); (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob,"DISTORTION - IM: 2f1-f2",freqUid,IF_REAL, + ckt->CKTcurJob, "DISTORTION - IM: 2f1-f2", freqUid, IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); for (i=0; i< displacement ; i++) { diff --git a/src/spicelib/analysis/dsetparm.c b/src/spicelib/analysis/dsetparm.c index 1884d41ff..df8de34dd 100644 --- a/src/spicelib/analysis/dsetparm.c +++ b/src/spicelib/analysis/dsetparm.c @@ -13,7 +13,7 @@ Author: 1988 Jaijeet S Roychowdhury /* ARGSUSED */ int -DsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +DsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/naskq.c b/src/spicelib/analysis/naskq.c index c56e3f980..1c697f756 100644 --- a/src/spicelib/analysis/naskq.c +++ b/src/spicelib/analysis/naskq.c @@ -11,7 +11,7 @@ Author: 1987 Gary W. Ng int -NaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +NaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c index ce62e43a6..b103d3e21 100644 --- a/src/spicelib/analysis/noisean.c +++ b/src/spicelib/analysis/noisean.c @@ -134,7 +134,7 @@ NOISEan (CKTcircuit *ckt, int restart) * plot */ - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,(void *)(ckt->CKTcurJob), + error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, "Noise Spectral Density Curves - (V^2 or A^2)/Hz", freqUid,IF_REAL,data->numPlots,data->namelist,IF_REAL, &(data->NplotPtr)); @@ -168,7 +168,7 @@ NOISEan (CKTcircuit *ckt, int restart) data->outNoiz = job->NsavOnoise; data->inNoise = job->NsavInoise; /* saj resume rawfile fix*/ - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,(void *)(ckt->CKTcurJob), + error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, "Noise Spectral Density Curves - (V^2 or A^2)/Hz", freqUid,IF_REAL,666,data->namelist,666, &(data->NplotPtr)); @@ -279,7 +279,7 @@ NOISEan (CKTcircuit *ckt, int restart) if (error) return(error); - (*(SPfrontEnd->OUTpBeginPlot))(ckt,(void *)(ckt->CKTcurJob), + (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, "Integrated Noise - V^2 or A^2", (IFuid)NULL,(int)0,data->numPlots,data->namelist,IF_REAL, &(data->NplotPtr)); diff --git a/src/spicelib/analysis/nsetparm.c b/src/spicelib/analysis/nsetparm.c index af1175ada..d7d60d18a 100644 --- a/src/spicelib/analysis/nsetparm.c +++ b/src/spicelib/analysis/nsetparm.c @@ -12,7 +12,7 @@ Author: 1987 Gary W. Ng #include "analysis.h" int -NsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +NsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/pzan.c b/src/spicelib/analysis/pzan.c index 1bf399286..cfbb8165d 100644 --- a/src/spicelib/analysis/pzan.c +++ b/src/spicelib/analysis/pzan.c @@ -44,7 +44,7 @@ PZan(CKTcircuit *ckt, int reset) error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, - (void*)ckt->CKTcurJob, "Distortion Operating Point", + ckt->CKTcurJob, "Distortion Operating Point", (IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&plot); if(error) return(error); CKTdump(ckt,(double)0,plot); @@ -147,7 +147,7 @@ PZpost(CKTcircuit *ckt) name, UID_OTHER, NULL); } - (*SPfrontEnd->OUTpBeginPlot)(ckt, (void *)pzan, pzan->JOBname, + (*SPfrontEnd->OUTpBeginPlot)(ckt, (JOB *)pzan, pzan->JOBname, (IFuid)NULL, (int)0, pzan->PZnPoles + pzan->PZnZeros, namelist, IF_COMPLEX, &pzPlotPtr); diff --git a/src/spicelib/analysis/pzaskq.c b/src/spicelib/analysis/pzaskq.c index a7c50b875..ea4e66a22 100644 --- a/src/spicelib/analysis/pzaskq.c +++ b/src/spicelib/analysis/pzaskq.c @@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -PZaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +PZaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/pzsetp.c b/src/spicelib/analysis/pzsetp.c index 858189e4b..46806f862 100644 --- a/src/spicelib/analysis/pzsetp.c +++ b/src/spicelib/analysis/pzsetp.c @@ -14,7 +14,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -PZsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +PZsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/sensaskq.c b/src/spicelib/analysis/sensaskq.c index 26deb597f..87d58fb24 100644 --- a/src/spicelib/analysis/sensaskq.c +++ b/src/spicelib/analysis/sensaskq.c @@ -11,7 +11,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. /* ARGSUSED */ int -SENSask(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +SENSask(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { SENS_AN *sinfo = (SENS_AN *) anal; diff --git a/src/spicelib/analysis/senssetp.c b/src/spicelib/analysis/senssetp.c index cd1bcbc39..3ddf4029e 100644 --- a/src/spicelib/analysis/senssetp.c +++ b/src/spicelib/analysis/senssetp.c @@ -12,7 +12,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. /* ARGSUSED */ int -SENSsetParam(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +SENSsetParam(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { SENS_AN *sinfo = (SENS_AN *) anal; diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c index 5d6a0bb96..44b36f2c2 100644 --- a/src/spicelib/analysis/tfanal.c +++ b/src/spicelib/analysis/tfanal.c @@ -111,7 +111,7 @@ TFanal(CKTcircuit *ckt, int restart) name, UID_OTHER, NULL); } - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt,(void *)(ckt->CKTcurJob), + error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, ((TFan*)(ckt->CKTcurJob))->JOBname,(IFuid)NULL,(int)0,3, uids,IF_REAL,&plotptr); if(error) return(error); diff --git a/src/spicelib/analysis/tfaskq.c b/src/spicelib/analysis/tfaskq.c index 75a2450cd..4a95c8604 100644 --- a/src/spicelib/analysis/tfaskq.c +++ b/src/spicelib/analysis/tfaskq.c @@ -12,7 +12,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -TFaskQuest(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +TFaskQuest(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/tfsetp.c b/src/spicelib/analysis/tfsetp.c index 41ba004c1..050dd9210 100644 --- a/src/spicelib/analysis/tfsetp.c +++ b/src/spicelib/analysis/tfsetp.c @@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -TFsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +TFsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/tranaskq.c b/src/spicelib/analysis/tranaskq.c index 964960b8a..38f4882f2 100644 --- a/src/spicelib/analysis/tranaskq.c +++ b/src/spicelib/analysis/tranaskq.c @@ -11,7 +11,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -TRANaskQuest(CKTcircuit *ckt, void *anal, int which,IFvalue *value) +TRANaskQuest(CKTcircuit *ckt, JOB *anal, int which,IFvalue *value) { switch(which) { diff --git a/src/spicelib/analysis/transetp.c b/src/spicelib/analysis/transetp.c index b3a4d553d..ffed19b5d 100644 --- a/src/spicelib/analysis/transetp.c +++ b/src/spicelib/analysis/transetp.c @@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles /* ARGSUSED */ int -TRANsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value) +TRANsetParm(CKTcircuit *ckt, JOB *anal, int which, IFvalue *value) { switch(which) { diff --git a/src/unsupported/sen2setp.c b/src/unsupported/sen2setp.c index 679d9325b..7bd66cc32 100644 --- a/src/unsupported/sen2setp.c +++ b/src/unsupported/sen2setp.c @@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles int SENsetParm(ckt,anal,which,value) CKTcircuit *ckt; - GENERIC *anal; + JOB *anal; int which; IFvalue *value; { diff --git a/src/unsupported/snaskq.c b/src/unsupported/snaskq.c index 99c855084..db5e9ee68 100644 --- a/src/unsupported/snaskq.c +++ b/src/unsupported/snaskq.c @@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles int SENaskQuest(ckt,anal,which,value) CKTcircuit *ckt; - GENERIC *anal; + JOB *anal; int which; IFvalue *value; {