patches by R. Larice

ChangeLog

@@ -1,5 +1,7 @@
 2010-01-17 Holger Vogt
  * subckt.c: .global bug  by R. Larice
+   various files: patches by Robert (Neval, Nintegtate from Jan 3 2010 and 
+   10 patches from Jan 16, 2010
 
 2010-01-16 Dietmar Warning
  * tests/transmission: Only few tests should be easier, more examples under 

src/conf.h

@@ -1,16 +1,16 @@
 #ifndef __CONF_H
 #define __CONF_H
 
-char Spice_Version[];
-char Spice_Notice[];
-char Spice_Build_Date[];
-char *Spice_Exec_Dir;
-char *Spice_Lib_Dir;
-char *Def_Editor;
-int AsciiRawFile;
+extern char Spice_Version[];
+extern char Spice_Notice[];
+extern char Spice_Build_Date[];
+extern char *Spice_Exec_Dir;
+extern char *Spice_Lib_Dir;
+extern char *Def_Editor;
+extern int AsciiRawFile;
 
-char *Bug_Addr;
-char *Spice_Host;
-char *Spiced_Log;
+extern char *Bug_Addr;
+extern char *Spice_Host;
+extern char *Spiced_Log;
 
 #endif

src/frontend/dotcards.c

@@ -93,7 +93,7 @@ ft_savedotargs(void)
    char *name;
    char *s;
    int some = 0;
-   static wordlist all = { "all", NULL };
+   static wordlist all = { "all", NULL, NULL };
    int isaplot;
    int i;
    int status;

src/frontend/inpcom.c

@@ -858,6 +858,9 @@ comment_out_unused_subckt_models( struct line *start_card )
    for ( i = 0; i < num_used_model_names;  i++ ) tfree(used_model_names[i]);
 }
 
+
+
+/* replace ternary operator ? : by fcn ternary_fcn() in .param, .func, and .meas lines */
 static char*
 inp_fix_ternary_operator_str( char *line )
 {
@@ -3127,7 +3130,7 @@ inp_sort_params( struct line *start_card, struct line *end_card, struct line *ca
 
           while ( ( param_ptr = strstr( param_str, param_name ) ) )
           {  
-            ioff = (strstr(param_ptr, "}") > 0 ? 1 : 0);  /* want prevent wrong memory access below */
+            ioff = (strstr(param_ptr, "}") != NULL ? 1 : 0);  /* want prevent wrong memory access below */
             /* looking for curly braces or other string limiter */
             if ( ( !isalnum( *(param_ptr-ioff) )               && *(param_ptr-ioff) != '_'         &&
                    !isalnum( *(param_ptr+strlen(param_name)) ) && *(param_ptr+strlen(param_name)) != '_' )

src/frontend/nutinp.c

@@ -33,7 +33,7 @@ inp_nutsource(FILE *fp, bool comfile, char *filename)
     wordlist *controls = NULL;
     FILE *lastin, *lastout, *lasterr;
     
-    inp_readall(fp, &deck, 0);
+    inp_readall(fp, &deck, 0, NULL) /* still to check if . or filename instead of NULL */;
     if (!deck)
         return;
 

src/frontend/outitf.c

@@ -669,7 +669,7 @@ OUTendPlot(void *plotPtr)
 
 /* ARGSUSED */ /* until some code gets written */
 int
-OUTbeginDomain(void *plotPtr, char *refName, int refType, IFvalue *outerRefValue)
+OUTbeginDomain(void *plotPtr, IFuid refName, int refType, IFvalue *outerRefValue)
 {
     return (OK);
 }
@@ -685,7 +685,7 @@ OUTendDomain(void *plotPtr)
 
 /* ARGSUSED */ /* until some code gets written */
 int
-OUTattributes(void *plotPtr, char *varName, int param, IFvalue *value)
+OUTattributes(void *plotPtr, IFuid varName, int param, IFvalue *value)
 {
     runDesc *run = (runDesc *) plotPtr;
     struct dvec *d;

src/frontend/outitf.h

@@ -48,9 +48,9 @@ int OUTwReference(void *plotPtr, IFvalue *valuePtr, void **refPtr);
 int OUTwData(void *plotPtr, int dataIndex, IFvalue *valuePtr, void *refPtr);
 int OUTwEnd(void *plotPtr);
 int OUTendPlot(void *plotPtr);
-int OUTbeginDomain(void *plotPtr, char *refName, int refType, IFvalue *outerRefValue);
+int OUTbeginDomain(void *plotPtr, IFuid refName, int refType, IFvalue *outerRefValue);
 int OUTendDomain(void *plotPtr);
-int OUTattributes(void *plotPtr, char *varName, int param, IFvalue *value);
+int OUTattributes(void *plotPtr, IFuid varName, int param, IFvalue *value);
 int OUTstopnow(void);
 void OUTerror(int flags, char *format, IFuid *names);
 

src/frontend/plotting/plotting.c

@@ -6,7 +6,7 @@
 
 struct plot constantplot = {
     "Constant values", "Sat Aug 16 10:55:15 PDT 1986", "constants",
-    "const", NULL, NULL, NULL, NULL, NULL, NULL, TRUE
+    "const", NULL, NULL, NULL, NULL, NULL, NULL, TRUE, 0
 } ;
 
 struct plot *plot_cur = &constantplot;

src/frontend/where.c

@@ -18,13 +18,13 @@ com_where(void)
 {
 	char	*msg;
 
-	/*CDHW typing where with no current circuit caused crashes CDHW*/
-    if (!ft_curckt) {
+   /*CDHW typing where with no current circuit caused crashes CDHW*/
+   if (!ft_curckt) {
       fprintf(cp_err, "There is no current circuit\n");
 	  return; }
-	else if (*ft_curckt->ci_ckt != 0) {
-      fprintf(cp_err, "No unconverged node found.\n");
-	  return;
+    else if (ft_curckt->ci_ckt != NULL) {
+       fprintf(cp_err, "No unconverged node found.\n");
+	   return;
 	}
 	msg = (*ft_sim->nonconvErr)((void *) (ft_curckt->ci_ckt), 0);
 

src/include/ifsim.h

@@ -453,7 +453,7 @@ typedef struct sIFfrontEnd {
                             /* start nested domain */
     int ((*OUTendDomain)(void*));    
                             /* end nested domain */
-    int ((*OUTattributes)(void *,IFuid*,int,IFvalue*));
+    int ((*OUTattributes)(void *,IFuid,int,IFvalue*));
                             /* specify output attributes of node */
 } IFfrontEnd;
 

src/main.c

@@ -197,7 +197,7 @@ extern int OUTwReference(void *,IFvalue *,void **);
 extern int OUTwData(void *,int,IFvalue *,void *), OUTwEnd(void *), OUTendPlot(void *); 
 extern int OUTbeginDomain(void *,IFuid,int,IFvalue *);
 extern int OUTendDomain(void *), OUTstopnow(void), OUTerror(int,char *,IFuid *); 
-extern int OUTattributes(void *,IFuid *,int,IFvalue *);
+extern int OUTattributes(void *,IFuid,int,IFvalue *);
 
 IFfrontEnd nutmeginfo = {
     IFnewUid,

src/misc/misc_time.c

@@ -99,11 +99,12 @@ seconds(void)
 {
 #ifdef HAVE_GETRUSAGE
     int ret;
-    struct rusage ruse = {{0, 0}};
+    struct rusage ruse;
 
 #ifdef PARALLEL_ARCH
     return (TCGTIME_());
 #else
+    memset(&ruse, 0, sizeof(ruse));
     ret = getrusage(RUSAGE_SELF, &ruse);
     if(ret == -1) {
       perror("getrusage(): ");

src/ngnutmeg.c

@@ -58,6 +58,8 @@ IFsimulator SIMinfo = {
     NULL,
     0,
     NULL,
+    0,
+    NULL,	
 };
 
 #ifdef CIDER

src/spicelib/devices/bjt/bjtnoise.c

@@ -20,8 +20,8 @@ Author: 1987 Gary W. Ng
  *    all of the BJT's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 BJTnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 

src/spicelib/devices/bjt2/bjt2noise.c

@@ -21,8 +21,8 @@ Modified: Alan Gillespie
  *    all of the BJT2's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 BJT2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 

src/spicelib/devices/bsim1/b1noi.c

@@ -19,8 +19,8 @@ Author: 2003 Paolo Nenzi
  *    all of the MOSFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 B1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 

src/spicelib/devices/bsim2/b2noi.c

@@ -19,8 +19,8 @@ Author: 2003 Paolo Nenzi
  *    all of the MOSFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 B2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 

src/spicelib/devices/bsim3/b3noi.c

@@ -49,8 +49,8 @@
     Flicker noise         = BSIM3 model
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 /*
  * JX: 1/f noise model is smoothed out 12/18/01.

src/spicelib/devices/bsim3soi/b4soinoi.c

@@ -43,8 +43,8 @@
     Flicker noise         = Unified model
 */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 double
 B4SOIEval1ovFNoise(

src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c

@@ -45,8 +45,8 @@ Modofied by Paolo Nenzi 2002
     Flicker noise         = SPICE2 model
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 double
 B3SOIDDStrongInversionNoiseEval(double vgs, double vds, B3SOIDDmodel *model, 

src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c

@@ -45,8 +45,8 @@ Modified by Paolo Nenzi 2002
     Flicker noise         = SPICE2 model
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 double
 B3SOIFDStrongInversionNoiseEval(double vgs, double vds, B3SOIFDmodel *model, 

src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c

@@ -45,8 +45,8 @@ Modified by Paolo Nenzi 2002
     Flicker noise         = SPICE2 model
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 double
 B3SOIPDStrongInversionNoiseEval(double vgs, double vds, B3SOIPDmodel *model, 

src/spicelib/devices/bsim3v0/b3v0noi.c

@@ -21,8 +21,8 @@ File:  b3v0noi.c
  *    all of the MOSFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 
 double

src/spicelib/devices/bsim3v1/b3v1noi.c

@@ -44,8 +44,8 @@
     Flicker noise         = SPICE2 model
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 double
 StrongInversionNoiseEval_b3v1(double vgs, double vds, BSIM3v1model *model, 

src/spicelib/devices/bsim3v1a/b3v1anoi.c

@@ -22,8 +22,8 @@ File:  b3v1anoi.c
  *    all of the MOSFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 
 double

src/spicelib/devices/bsim3v1s/b3v1snoi.c

@@ -39,8 +39,8 @@ File:  b3v1snoi.c
     Flicker noise         = SPICE2 model
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 double
 StrongInversionNoiseEval_b3v1s(double vgs, double vds, BSIM3v1Smodel *model, 

src/spicelib/devices/bsim3v32/b3v32noi.c

@@ -44,8 +44,8 @@
     Flicker noise         = SPICE2 model
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 /* 
  * The StrongInversionNoiseEval function has been modified in

src/spicelib/devices/bsim4/b4noi.c

@@ -27,8 +27,8 @@
 #include "const.h"
 
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 /*
  * WDL: 1/f noise model has been smoothed out and enhanced with

src/spicelib/devices/bsim4v2/b4v2noi.c

@@ -18,8 +18,8 @@
 #include "const.h"
 
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 /*
  * WDL: 1/f noise model has been smoothed out and enhanced with

src/spicelib/devices/bsim4v3/b4v3noi.c

@@ -20,8 +20,8 @@
 #include "const.h"
 
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 /*
  * WDL: 1/f noise model has been smoothed out and enhanced with

src/spicelib/devices/bsim4v4/b4v4noi.c

@@ -22,8 +22,8 @@
 #include "const.h"
 
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 /*
  * WDL: 1/f noise model has been smoothed out and enhanced with

src/spicelib/devices/bsim4v5/b4v5noi.c

@@ -23,8 +23,8 @@
 #include "const.h"
 
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 /*
  * WDL: 1/f noise model has been smoothed out and enhanced with

src/spicelib/devices/csw/cswnoise.c

@@ -20,8 +20,8 @@ Author: 1987 Gary W. Ng
  *    "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 CSWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)

src/spicelib/devices/dio/dionoise.c

@@ -21,8 +21,8 @@ Modified by Dietmar Warning 2003
  *     "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 

src/spicelib/devices/hisim/hsm1noi.c

@@ -45,8 +45,8 @@
     Flicker noise         = HiSIM1 model
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int 
 HSM1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt,

src/spicelib/devices/isrc/isrcload.c

@@ -257,7 +257,7 @@ ISRCload(GENmodel *inModel, CKTcircuit *ckt)
 		        ? here->ISRCcoeffs[3] : 0.0;
                    TD  = here->ISRCfunctionOrder > 4 
 		       && here->ISRCcoeffs[4]
-		        ? here->ISRCcoeffs[4] : 0,0;
+		        ? here->ISRCcoeffs[4] : 0.0;
 
                     time -= TD;
                     if (time <= 0) {

src/spicelib/devices/jfet/jfetnoi.c

@@ -19,8 +19,8 @@ Author: 1987 Gary W. Ng
  *    all of the JFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 JFETnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, 

src/spicelib/devices/jfet2/jfet2noi.c

@@ -23,8 +23,8 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker )
  *    all of the JFET2's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 JFET2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)

src/spicelib/devices/mes/mesnoise.c

@@ -19,8 +19,8 @@ Author: 1987 Gary W. Ng
  *    all of the MESFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 MESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data,

src/spicelib/devices/mos1/mos1noi.c

@@ -20,8 +20,8 @@ Modified: 2000 AlansFixes
  *    all of the MOSFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 MOS1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,

src/spicelib/devices/mos2/mos2noi.c

@@ -20,8 +20,8 @@ Modified: 2000 AlansFixes
  *    all of the MOSFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 MOS2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,

src/spicelib/devices/mos3/mos3noi.c

@@ -20,8 +20,8 @@ Modified: 2000 AlansFixes
  *    all of the MOSFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 MOS3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 

src/spicelib/devices/mos9/mos9noi.c

@@ -20,8 +20,8 @@ Modified: Alan Gillespie
  *    all of the MOSFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 MOS9noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,

src/spicelib/devices/res/resnoise.c

@@ -25,8 +25,9 @@ Modified: Apr 2000 - Paolo Nenzi
  *    Added "noisy" switch to simulate noiseless resistors.
  */
 
-extern void   NevalSrc2();
-extern double Nintegrate();
+extern void NevalSrc2 (double *noise, double *lnNoise, CKTcircuit *ckt, int type, 
+                         int node1, int node2, double param, double param2);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, 

src/spicelib/devices/soi3/soi3nois.c

@@ -38,8 +38,8 @@ ngspice integration
  *    all of the MOSFET's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 
 int

src/spicelib/devices/sw/swnoise.c

@@ -20,8 +20,8 @@ Author: 1987 Gary W. Ng
  *    "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 SWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)

src/spicelib/devices/vbic/vbicnoise.c

@@ -22,8 +22,8 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH
  *    all of the VBIC's is summed with the variable "OnDens".
  */
 
-extern void   NevalSrc();
-extern double Nintegrate();
+extern void   NevalSrc (double *noise, double *lnNoise, CKTcircuit *ckt, int type, int node1, int node2, double param);
+extern double Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data);
 
 int
 VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *data, double *OnDens)

src/spicelib/devices/vsrc/vsrcload.c

@@ -268,7 +268,7 @@ VSRCload(GENmodel *inModel, CKTcircuit *ckt)
 		        ? here->VSRCcoeffs[3] : 0.0;
                    TD  = here->VSRCfunctionOrder > 4 
 		       && here->VSRCcoeffs[4]
-		        ? here->VSRCcoeffs[4] : 0,0;
+		        ? here->VSRCcoeffs[4] : 0.0;
 
                     time -= TD;
                     if (time <= 0) {