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

ansi style function args for some function pointers

This commit is contained in:
rlar 2010-07-02 17:00:21 +00:00
parent e0110f319d
commit 70420197e6
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-07-02 Robert Larice
* src/spicelib/analysis/cktsens.c ,
* src/xspice/mif/mifload.c :
ansi style function args for some function pointers
2010-07-02 Holger Vogt 2010-07-02 Holger Vogt
* src/frontend/inpcom.c : .TITLE line added * src/frontend/inpcom.c : .TITLE line added
* /bsim3soi/b4soild.c, b4soiset., b4soidef.h, DEVICES: OpenMP support for * /bsim3soi/b4soild.c, b4soiset., b4soidef.h, DEVICES: OpenMP support for

9
src/spicelib/analysis/cktsens.c
View File

@ -68,7 +68,7 @@ int sens_sens(CKTcircuit *ckt, int restart)
double *output_values; double *output_values;
IFcomplex *output_cvalues; IFcomplex *output_cvalues;
double delta_var; double delta_var;
int (*fn)( ); int (*fn) (SMPmatrix *, GENmodel *, CKTcircuit *, int *);
static int is_dc; static int is_dc;
int k, j, n; int k, j, n;
int num_vars, branch_eq=0; int num_vars, branch_eq=0;
@ -680,7 +680,7 @@ count_steps(int type, double low, double high, int steps, double *stepsize)
static int static int
sens_load(sgen *sg, CKTcircuit *ckt, int is_dc) sens_load(sgen *sg, CKTcircuit *ckt, int is_dc)
{ {
int (*fn)( ); int (*fn) (GENmodel *, CKTcircuit *);
error = 0; error = 0;
@ -701,7 +701,7 @@ sens_load(sgen *sg, CKTcircuit *ckt, int is_dc)
static int static int
sens_temp(sgen *sg, CKTcircuit *ckt) sens_temp(sgen *sg, CKTcircuit *ckt)
{ {
int (*fn)( ); int (*fn) (GENmodel *, CKTcircuit *);
error = 0; error = 0;
@ -762,12 +762,12 @@ sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
int int
sens_setp(sgen *sg, CKTcircuit *ckt, IFvalue *val) sens_setp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
{ {
int (*fn)( );
int pid; int pid;
error = 0; error = 0;
if (sg->is_instparam) { if (sg->is_instparam) {
int (*fn) (int, IFvalue *, GENinstance *, IFvalue *);
fn = DEVices[sg->dev]->DEVparam; fn = DEVices[sg->dev]->DEVparam;
pid = DEVices[sg->dev]->DEVpublic.instanceParms[sg->param].id; pid = DEVices[sg->dev]->DEVpublic.instanceParms[sg->param].id;
if (fn) if (fn)
@ -775,6 +775,7 @@ sens_setp(sgen *sg, CKTcircuit *ckt, IFvalue *val)
else else
return 1; return 1;
} else { } else {
int (*fn) (int, IFvalue *, GENmodel *);
fn = DEVices[sg->dev]->DEVmodParam; fn = DEVices[sg->dev]->DEVmodParam;
pid = DEVices[sg->dev]->DEVpublic.modelParms[sg->param].id; pid = DEVices[sg->dev]->DEVpublic.modelParms[sg->param].id;
if (fn) if (fn)

4
src/xspice/mif/mifload.c
View File

@ -71,7 +71,7 @@ extern SPICEdev **DEVices; /* info about all device types */
static void MIFauto_partial( static void MIFauto_partial(
MIFinstance *here, MIFinstance *here,
void (*cm_func)(), void (*cm_func) (Mif_Private_t *),
Mif_Private_t *cm_data Mif_Private_t *cm_data
); );
@ -692,7 +692,7 @@ are then computed by divided differences.
static void MIFauto_partial( static void MIFauto_partial(
MIFinstance *here, /* The instance structure */ MIFinstance *here, /* The instance structure */
void (*cm_func)(), /* The code model function to be called */ void (*cm_func) (Mif_Private_t *), /* The code model function to be called */
Mif_Private_t *cm_data) /* The data to be passed to the code model */ Mif_Private_t *cm_data) /* The data to be passed to the code model */
{ {