From 5c0bccbd3645d8847200f0da6ea518a8428859f6 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Tue, 21 Apr 2009 20:22:13 +0000
Subject: [PATCH] Parameter declaration in new format

---
 src/spicelib/devices/bsim4/b4acld.c   |  4 +---
 src/spicelib/devices/bsim4/b4ask.c    |  7 +------
 src/spicelib/devices/bsim4/b4check.c  |  5 +----
 src/spicelib/devices/bsim4/b4cvtest.c |  4 +---
 src/spicelib/devices/bsim4/b4del.c    |  5 +----
 src/spicelib/devices/bsim4/b4dest.c   |  3 +--
 src/spicelib/devices/bsim4/b4geo.c    | 24 +++++-------------------
 src/spicelib/devices/bsim4/b4getic.c  |  4 +---
 src/spicelib/devices/bsim4/b4ld.c     |  4 +---
 src/spicelib/devices/bsim4/b4mask.c   |  6 +-----
 src/spicelib/devices/bsim4/b4mdel.c   |  5 +----
 src/spicelib/devices/bsim4/b4mpar.c   |  5 +----
 src/spicelib/devices/bsim4/b4noi.c    | 12 ++----------
 src/spicelib/devices/bsim4/b4par.c    |  6 +-----
 src/spicelib/devices/bsim4/b4pzld.c   |  5 +----
 src/spicelib/devices/bsim4/b4set.c    | 10 ++--------
 src/spicelib/devices/bsim4/b4temp.c   |  8 ++------
 src/spicelib/devices/bsim4/b4trunc.c  |  5 +----
 18 files changed, 25 insertions(+), 97 deletions(-)

diff --git a/src/spicelib/devices/bsim4/b4acld.c b/src/spicelib/devices/bsim4/b4acld.c
index df82e889b..29f1007fb 100644
--- a/src/spicelib/devices/bsim4/b4acld.c
+++ b/src/spicelib/devices/bsim4/b4acld.c
@@ -19,9 +19,7 @@
 
 
 int
-BSIM4acLoad(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4acLoad(GENmodel *inModel, CKTcircuit *ckt)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4ask.c b/src/spicelib/devices/bsim4/b4ask.c
index 3666fefc2..0135d294d 100644
--- a/src/spicelib/devices/bsim4/b4ask.c
+++ b/src/spicelib/devices/bsim4/b4ask.c
@@ -23,12 +23,7 @@
 #include "suffix.h"
 
 int
-BSIM4ask(ckt,inst,which,value,select)
-CKTcircuit *ckt;
-GENinstance *inst;
-int which;
-IFvalue *value;
-IFvalue *select;
+BSIM4ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select)
 {
 BSIM4instance *here = (BSIM4instance*)inst;
 
diff --git a/src/spicelib/devices/bsim4/b4check.c b/src/spicelib/devices/bsim4/b4check.c
index 531f2f37f..fd86875e6 100644
--- a/src/spicelib/devices/bsim4/b4check.c
+++ b/src/spicelib/devices/bsim4/b4check.c
@@ -29,10 +29,7 @@
 #include "suffix.h"
 
 int
-BSIM4checkModel(model, here, ckt)
-BSIM4model *model;
-BSIM4instance *here;
-CKTcircuit *ckt;
+BSIM4checkModel(BSIM4model *model, BSIM4instance *here, CKTcircuit *ckt)
 {
 struct bsim4SizeDependParam *pParam;
 int Fatal_Flag = 0;
diff --git a/src/spicelib/devices/bsim4/b4cvtest.c b/src/spicelib/devices/bsim4/b4cvtest.c
index 4cbc2893a..a81aca0d3 100644
--- a/src/spicelib/devices/bsim4/b4cvtest.c
+++ b/src/spicelib/devices/bsim4/b4cvtest.c
@@ -24,9 +24,7 @@
 
 
 int
-BSIM4convTest(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4convTest(GENmodel *inModel, CKTcircuit *ckt)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4del.c b/src/spicelib/devices/bsim4/b4del.c
index ec4eb0aaf..6a29b1ac8 100644
--- a/src/spicelib/devices/bsim4/b4del.c
+++ b/src/spicelib/devices/bsim4/b4del.c
@@ -18,10 +18,7 @@
 
 
 int
-BSIM4delete(inModel,name,inInst)
-GENmodel *inModel;
-IFuid name;
-GENinstance **inInst;
+BSIM4delete(GENmodel *inModel, IFuid name, GENinstance **inInst)
 {
 BSIM4instance **fast = (BSIM4instance**)inInst;
 BSIM4model *model = (BSIM4model*)inModel;
diff --git a/src/spicelib/devices/bsim4/b4dest.c b/src/spicelib/devices/bsim4/b4dest.c
index 328a2de9a..b728fef46 100644
--- a/src/spicelib/devices/bsim4/b4dest.c
+++ b/src/spicelib/devices/bsim4/b4dest.c
@@ -15,8 +15,7 @@
 #include "suffix.h"
 
 void
-BSIM4destroy(inModel)
-GENmodel **inModel;
+BSIM4destroy(GENmodel **inModel)
 {
 BSIM4model **model = (BSIM4model**)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4geo.c b/src/spicelib/devices/bsim4/b4geo.c
index 522923477..20e1c56ab 100644
--- a/src/spicelib/devices/bsim4/b4geo.c
+++ b/src/spicelib/devices/bsim4/b4geo.c
@@ -25,9 +25,7 @@ int
 BSIM4RdsEndSha(double, double, double, double, double, double, int, int, double *);
 
 int
-BSIM4NumFingerDiff(nf, minSD, nuIntD, nuEndD, nuIntS, nuEndS)
-int minSD;
-double nf, *nuIntD, *nuEndD, *nuIntS, *nuEndS;
+BSIM4NumFingerDiff(double nf, int minSD, double *nuIntD, double *nuEndD, double *nuIntS, double *nuEndS)
 {
 int NF;
         NF = (int)nf;
@@ -54,10 +52,7 @@ return 0;
 
 
 int
-BSIM4PAeffGeo(nf, geo, minSD, Weffcj, DMCG, DMCI, DMDG, Ps, Pd, As, Ad)
-int geo, minSD; 
-double Weffcj, DMCG, DMCI, DMDG;
-double nf, *Ps, *Pd, *As, *Ad;
+BSIM4PAeffGeo(double nf, int geo, int minSD, double Weffcj, double DMCG, double DMCI, double DMDG, double *Ps, double *Pd, double *As, double *Ad)
 {
 double T0, T1, T2;
 double ADiso, ADsha, ADmer, ASiso, ASsha, ASmer;
@@ -154,10 +149,7 @@ return 0;
 
 
 int
-BSIM4RdseffGeo(nf, geo, rgeo, minSD, Weffcj, Rsh, DMCG, DMCI, DMDG, Type, Rtot)
-int geo, rgeo, minSD, Type;
-double nf, Weffcj, Rsh, DMCG, DMCI, DMDG;
-double *Rtot;
+BSIM4RdseffGeo(double nf, int geo, int rgeo, int minSD, double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG, int Type, double *Rtot)
 {
 double Rint = 0.0, Rend = 0.0;
 double nuIntD = 0.0, nuEndD = 0.0, nuIntS = 0.0, nuEndS = 0.0;
@@ -272,10 +264,7 @@ return 0;
 
 
 int
-BSIM4RdsEndIso(Weffcj, Rsh, DMCG, DMCI, DMDG, nuEnd, rgeo, Type, Rend)
-double Weffcj, Rsh, DMCG, DMCI, DMDG;
-int rgeo, Type;
-double nuEnd, *Rend;
+BSIM4RdsEndIso(double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG, double nuEnd, int rgeo, int Type, double *Rend)
 {	
 	if (Type == 1)
 	{   switch(rgeo)
@@ -330,10 +319,7 @@ return 0;
 
 
 int
-BSIM4RdsEndSha(Weffcj, Rsh, DMCG, DMCI, DMDG, nuEnd, rgeo, Type, Rend)
-double Weffcj, Rsh, DMCG, DMCI, DMDG;
-int rgeo, Type;
-double nuEnd, *Rend;
+BSIM4RdsEndSha(double Weffcj, double Rsh, double DMCG, double DMCI, double DMDG, double nuEnd, int rgeo, int Type, double *Rend)
 {
         if (Type == 1)
         {   switch(rgeo)
diff --git a/src/spicelib/devices/bsim4/b4getic.c b/src/spicelib/devices/bsim4/b4getic.c
index dbfdd4ab7..9ae43ca55 100644
--- a/src/spicelib/devices/bsim4/b4getic.c
+++ b/src/spicelib/devices/bsim4/b4getic.c
@@ -18,9 +18,7 @@
 
 
 int
-BSIM4getic(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4getic(GENmodel *inModel, CKTcircuit *ckt)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4ld.c b/src/spicelib/devices/bsim4/b4ld.c
index a578e429a..adec0c8ef 100644
--- a/src/spicelib/devices/bsim4/b4ld.c
+++ b/src/spicelib/devices/bsim4/b4ld.c
@@ -61,9 +61,7 @@
 int BSIM4polyDepletion(double phi, double ngate,double epsgate, double coxe, double Vgs, double *Vgs_eff, double *dVgs_eff_dVg);
 
 int
-BSIM4load(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4load(GENmodel *inModel, CKTcircuit *ckt)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4mask.c b/src/spicelib/devices/bsim4/b4mask.c
index a64171f5a..880a0dfae 100644
--- a/src/spicelib/devices/bsim4/b4mask.c
+++ b/src/spicelib/devices/bsim4/b4mask.c
@@ -27,11 +27,7 @@
 #include "suffix.h"
 
 int
-BSIM4mAsk(ckt,inst,which,value)
-CKTcircuit *ckt;
-GENmodel *inst;
-int which;
-IFvalue *value;
+BSIM4mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
     BSIM4model *model = (BSIM4model *)inst;
     switch(which) 
diff --git a/src/spicelib/devices/bsim4/b4mdel.c b/src/spicelib/devices/bsim4/b4mdel.c
index 581c1c5c4..eb31a77f2 100644
--- a/src/spicelib/devices/bsim4/b4mdel.c
+++ b/src/spicelib/devices/bsim4/b4mdel.c
@@ -16,10 +16,7 @@
 #include "suffix.h"
 
 int
-BSIM4mDelete(inModel,modname,kill)
-GENmodel **inModel;
-IFuid modname;
-GENmodel *kill;
+BSIM4mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
 BSIM4model **model = (BSIM4model**)inModel;
 BSIM4model *modfast = (BSIM4model*)kill;
diff --git a/src/spicelib/devices/bsim4/b4mpar.c b/src/spicelib/devices/bsim4/b4mpar.c
index efd6c472c..5553027d0 100644
--- a/src/spicelib/devices/bsim4/b4mpar.c
+++ b/src/spicelib/devices/bsim4/b4mpar.c
@@ -28,10 +28,7 @@
 #include "const.h"
 
 int
-BSIM4mParam(param,value,inMod)
-int param;
-IFvalue *value;
-GENmodel *inMod;
+BSIM4mParam(int param, IFvalue *value, GENmodel *inMod)
 {
     BSIM4model *mod = (BSIM4model*)inMod;
     switch(param)
diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c
index f33f8b4ba..8ddc6e3d6 100644
--- a/src/spicelib/devices/bsim4/b4noi.c
+++ b/src/spicelib/devices/bsim4/b4noi.c
@@ -37,10 +37,7 @@ extern double Nintegrate();
  */
 
 double
-Eval1ovFNoise(Vds, model, here, freq, temp)
-double Vds, freq, temp;
-BSIM4model *model;
-BSIM4instance *here;
+Eval1ovFNoise(double Vds, BSIM4model *model, BSIM4instance *here, double freq, double temp)
 {
 struct bsim4SizeDependParam *pParam;
 double cd, esat, DelClm, EffFreq, N0, Nl, Leff, Leffsq;
@@ -81,12 +78,7 @@ double T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, Ssi;
 
 
 int
-BSIM4noise (mode, operation, inModel, ckt, data, OnDens)
-int mode, operation;
-GENmodel *inModel;
-CKTcircuit *ckt;
-Ndata *data;
-double *OnDens;
+BSIM4noise(int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, Ndata *data, double *OnDens)
 {
 BSIM4model *model = (BSIM4model *)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4par.c b/src/spicelib/devices/bsim4/b4par.c
index 15d2b1263..231b90733 100644
--- a/src/spicelib/devices/bsim4/b4par.c
+++ b/src/spicelib/devices/bsim4/b4par.c
@@ -22,11 +22,7 @@
 #include "fteext.h"
 
 int
-BSIM4param(param,value,inst,select)
-int param;
-IFvalue *value;
-GENinstance *inst;
-IFvalue *select;
+BSIM4param(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
     double scale;
 
diff --git a/src/spicelib/devices/bsim4/b4pzld.c b/src/spicelib/devices/bsim4/b4pzld.c
index 4f0ece853..95c806fcb 100644
--- a/src/spicelib/devices/bsim4/b4pzld.c
+++ b/src/spicelib/devices/bsim4/b4pzld.c
@@ -19,10 +19,7 @@
 #include "suffix.h"
 
 int
-BSIM4pzLoad(inModel,ckt,s)
-GENmodel *inModel;
-CKTcircuit *ckt;
-SPcomplex *s;
+BSIM4pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c
index f6df1e307..725211c1d 100644
--- a/src/spicelib/devices/bsim4/b4set.c
+++ b/src/spicelib/devices/bsim4/b4set.c
@@ -44,11 +44,7 @@ int
 BSIM4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
-BSIM4setup(matrix,inModel,ckt,states)
-SMPmatrix *matrix;
-GENmodel *inModel;
-CKTcircuit *ckt;
-int *states;
+BSIM4setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;
@@ -2380,9 +2376,7 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\
 }  
 
 int
-BSIM4unsetup(inModel,ckt)
-    GENmodel *inModel;
-    CKTcircuit *ckt;
+BSIM4unsetup(GENmodel *inModel, CKTcircuit *ckt)
 {
 #ifndef HAS_BATCHSIM
     BSIM4model *model;
diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c
index db24b39e7..8b04b2959 100644
--- a/src/spicelib/devices/bsim4/b4temp.c
+++ b/src/spicelib/devices/bsim4/b4temp.c
@@ -56,9 +56,7 @@ int
 BSIM4RdseffGeo(double, int, int, int, double, double, double, double, double, int, double *);
 
 int
-BSIM4DioIjthVjmEval(Nvtm, Ijth, Isb, XExpBV, Vjm)
-double Nvtm, Ijth, Isb, XExpBV;
-double *Vjm;
+BSIM4DioIjthVjmEval(double Nvtm, double Ijth, double Isb, double XExpBV, double *Vjm)
 {
 double Tb, Tc, EVjmovNv;
 
@@ -72,9 +70,7 @@ return 0;
 
 
 int
-BSIM4temp(inModel,ckt)
-GENmodel *inModel;
-CKTcircuit *ckt;
+BSIM4temp(GENmodel *inModel, CKTcircuit *ckt)
 {
 BSIM4model *model = (BSIM4model*) inModel;
 BSIM4instance *here;
diff --git a/src/spicelib/devices/bsim4/b4trunc.c b/src/spicelib/devices/bsim4/b4trunc.c
index 20d4f434b..7074b799b 100644
--- a/src/spicelib/devices/bsim4/b4trunc.c
+++ b/src/spicelib/devices/bsim4/b4trunc.c
@@ -18,10 +18,7 @@
 
 
 int
-BSIM4trunc(inModel,ckt,timeStep)
-GENmodel *inModel;
-CKTcircuit *ckt;
-double *timeStep;
+BSIM4trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep)
 {
 BSIM4model *model = (BSIM4model*)inModel;
 BSIM4instance *here;