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

type bistromatic

This commit is contained in:
rlar 2010-10-08 16:41:13 +00:00
parent bffcbad0e7
commit 7047535f96
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2010-10-08 Robert Larice
* src/frontend/spiceif.c ,
* src/spicelib/analysis/cktnewan.c ,
* src/spicelib/parser/inp2dot.c :
type bistromatic
in preparation for the next patches
Note: offsetof struct TSKtask.taskOptions === 0
2010-10-08 Robert Larice 2010-10-08 Robert Larice
* src/frontend/spiceif.c : * src/frontend/spiceif.c :
remove a redundant cast remove a redundant cast

6
src/frontend/spiceif.c
View File

@ -1257,7 +1257,7 @@ if_getstat(CKTcircuit *ckt, char *name)
break; break;
if (i == ft_sim->analyses[which]->numParms) if (i == ft_sim->analyses[which]->numParms)
return (NULL); return (NULL);
if ((*(ft_sim->askAnalysisQuest))(ckt, ft_curckt->ci_curTask, if ((*(ft_sim->askAnalysisQuest))(ckt, &(((TSKtask*)ft_curckt->ci_curTask)->taskOptions),
ft_sim->analyses[which]->analysisParms[i].id, &parm, ft_sim->analyses[which]->analysisParms[i].id, &parm,
(IFvalue *)NULL) == -1) { (IFvalue *)NULL) == -1) {
fprintf(cp_err, fprintf(cp_err,
@ -1271,7 +1271,7 @@ if_getstat(CKTcircuit *ckt, char *name)
if(!(ft_sim->analyses[which]->analysisParms[i].dataType&IF_ASK)) { if(!(ft_sim->analyses[which]->analysisParms[i].dataType&IF_ASK)) {
continue; continue;
} }
if ((*(ft_sim->askAnalysisQuest))(ckt, ft_curckt->ci_curTask, if ((*(ft_sim->askAnalysisQuest))(ckt, &(((TSKtask*)ft_curckt->ci_curTask)->taskOptions),
ft_sim->analyses[which]->analysisParms[i].id, ft_sim->analyses[which]->analysisParms[i].id,
&parm, (IFvalue *)NULL) == -1) { &parm, (IFvalue *)NULL) == -1) {
fprintf(cp_err, fprintf(cp_err,
@ -1503,7 +1503,7 @@ do {\
_foo(lname,TRANan,1); _foo(lname,TRANan,1);
} }
((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname = NULL; ((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname = NULL;
ckt->CKTcurJob = ((TSKtask *)ft_curckt->ci_curTask)->jobs; ckt->CKTcurJob = (&(((TSKtask *)ft_curckt->ci_curTask)->taskOptions))->jobs;
_foo(((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname,char,-1); _foo(((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname,char,-1);

2
src/spicelib/analysis/cktnewan.c
View File

@ -20,7 +20,7 @@ CKTnewAnal(CKTcircuit *ckt, int type, IFuid name, void **analPtr, void *taskPtr)
{ {
if(type==0) { if(type==0) {
/* special case for analysis type 0 == option card */ /* special case for analysis type 0 == option card */
*analPtr=taskPtr; /* pointer to the task itself */ *analPtr = &(((TSKtask *)taskPtr)->taskOptions); /* pointer to the task itself */
(*(JOB **)analPtr)->JOBname = name; (*(JOB **)analPtr)->JOBname = name;
(*(JOB **)analPtr)->JOBtype = type; (*(JOB **)analPtr)->JOBtype = type;
return(OK); /* doesn't need to be created */ return(OK); /* doesn't need to be created */

4
src/spicelib/parser/inp2dot.c
View File

@ -12,7 +12,7 @@ Modified: 2000 AlansFixes
#include "fteext.h" #include "fteext.h"
#include "inp.h" #include "inp.h"
#include "cpdefs.h" #include "cpdefs.h"
#include "tskdefs.h"
static int static int
dot_noise(char *line, CKTcircuit *ckt, INPtables *tab, card *current, dot_noise(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
@ -627,7 +627,7 @@ dot_options(char *line, CKTcircuit *ckt, INPtables *tab, card *current,
/* use a subroutine to handle all of them to keep this */ /* use a subroutine to handle all of them to keep this */
/* subroutine managable. */ /* subroutine managable. */
INPdoOpts(ckt,task,current,tab); INPdoOpts(ckt, &(((TSKtask *)task)->taskOptions), current, tab);
return (0); return (0);
} }