diff --git a/ChangeLog b/ChangeLog index 078362817..0cb278326 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 * src/frontend/inpcom.c : .TITLE line added * /bsim3soi/b4soild.c, b4soiset., b4soidef.h, DEVICES: OpenMP support for diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c index d4c0b853c..d0f59b4ee 100644 --- a/src/spicelib/analysis/cktsens.c +++ b/src/spicelib/analysis/cktsens.c @@ -68,7 +68,7 @@ int sens_sens(CKTcircuit *ckt, int restart) double *output_values; IFcomplex *output_cvalues; double delta_var; - int (*fn)( ); + int (*fn) (SMPmatrix *, GENmodel *, CKTcircuit *, int *); static int is_dc; int k, j, n; int num_vars, branch_eq=0; @@ -680,7 +680,7 @@ count_steps(int type, double low, double high, int steps, double *stepsize) static int sens_load(sgen *sg, CKTcircuit *ckt, int is_dc) { - int (*fn)( ); + int (*fn) (GENmodel *, CKTcircuit *); error = 0; @@ -701,7 +701,7 @@ sens_load(sgen *sg, CKTcircuit *ckt, int is_dc) static int sens_temp(sgen *sg, CKTcircuit *ckt) { - int (*fn)( ); + int (*fn) (GENmodel *, CKTcircuit *); error = 0; @@ -762,12 +762,12 @@ sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val) int sens_setp(sgen *sg, CKTcircuit *ckt, IFvalue *val) { - int (*fn)( ); int pid; error = 0; if (sg->is_instparam) { + int (*fn) (int, IFvalue *, GENinstance *, IFvalue *); fn = DEVices[sg->dev]->DEVparam; pid = DEVices[sg->dev]->DEVpublic.instanceParms[sg->param].id; if (fn) @@ -775,6 +775,7 @@ sens_setp(sgen *sg, CKTcircuit *ckt, IFvalue *val) else return 1; } else { + int (*fn) (int, IFvalue *, GENmodel *); fn = DEVices[sg->dev]->DEVmodParam; pid = DEVices[sg->dev]->DEVpublic.modelParms[sg->param].id; if (fn) diff --git a/src/xspice/mif/mifload.c b/src/xspice/mif/mifload.c index 8202b1ca4..265f271d3 100755 --- a/src/xspice/mif/mifload.c +++ b/src/xspice/mif/mifload.c @@ -71,7 +71,7 @@ extern SPICEdev **DEVices; /* info about all device types */ static void MIFauto_partial( MIFinstance *here, - void (*cm_func)(), + void (*cm_func) (Mif_Private_t *), Mif_Private_t *cm_data ); @@ -692,7 +692,7 @@ are then computed by divided differences. static void MIFauto_partial( 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 */ {