Bug fixes from previous commit.

src/Makefile.am

@@ -18,7 +18,7 @@ initdata_DATA = spinit setplot spectrum
 DYNAMIC_DEVICELIBS = 			\
 	spicelib/devices/asrc/libasrc.la		\
 	spicelib/devices/bjt/libbjt.la		\
-	spicelib/devices/bjt2/libbjt2.la		\
+##	spicelib/devices/bjt2/libbjt2.la		\
 	spicelib/devices/bsim1/libbsim1.la	\
 	spicelib/devices/bsim2/libbsim2.la	\
 	spicelib/devices/bsim3/libbsim3.la	\

src/frontend/plotting/grid.c

@@ -1,5 +1,6 @@
 /**********
 Copyright 1990 Regents of the University of California.  All rights reserved.
+Modified: 2001 AlansFixes
 **********/
 
 /*

src/frontend/terminal.c

@@ -9,7 +9,6 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
  * can be written for every possible machine...
  */
 #include <config.h>
-#include <term.h>
 
 #ifdef HAVE_SGTTY_H
 #include <sgtty.h>

src/spicelib/analysis/cktncdump.c

@@ -3,11 +3,9 @@ Copyright 1999 AG inc.  All rights reserved.
 Author: 1999 Alan Gillespie
 **********/
 
-#include "spice.h"
+#include "ngspice.h"
 #include <stdio.h>
-#include "cktdefs.h"
-#include "util.h"
-#include "misc.h"
+#include "cktdefs.h"
 #include "suffix.h"
 
 void
@@ -29,13 +27,13 @@ CKTncDump(ckt)
       old =  *((ckt->CKTrhs) + i ) ;
       fprintf(stdout,"%-30s %20g %20g", node->name, new, old);
       if(node->type == 3) {
-          tol =  ckt->CKTreltol * (MAX(FABS(old),FABS(new))) +
+          tol =  ckt->CKTreltol * (MAX(fabs(old),fabs(new))) +
                   ckt->CKTvoltTol;
       } else {
-          tol =  ckt->CKTreltol * (MAX(FABS(old),FABS(new))) +
+          tol =  ckt->CKTreltol * (MAX(fabs(old),fabs(new))) +
                   ckt->CKTabstol;
       }
-      if (FABS(new-old) >tol ) {
+      if (fabs(new-old) >tol ) {
            fprintf(stdout," *");
       }
       fprintf(stdout,"\n");

src/spicelib/analysis/cktsopt.c

@@ -231,7 +231,7 @@ static IFparm OPTtbl[] = {
  { "copynodesets", OPT_COPYNODESETS, IF_SET|IF_FLAG,
       "Copy nodesets from device terminals to internal nodes" },
  { "nodedamping", OPT_NODEDAMPING, IF_SET|IF_FLAG,
-	 "Limit iter-iter change in node voltages" },
+	 "Limit iteration to iteration node voltage change" },
  { "absdv", OPT_ABSDV, IF_SET|IF_REAL,
 	 "Maximum absolute iter-iter node voltage change" },
  { "reldv", OPT_RELDV, IF_SET|IF_REAL,

src/spicelib/devices/Makefile.am

@@ -3,7 +3,7 @@
 SUBDIRS = \
 	asrc	\
 	bjt	\
-	bjt2	\
+##	bjt2	\
 	bsim1	\
 	bsim2	\
 	bsim3	\

src/spicelib/devices/dev.c

@@ -55,7 +55,7 @@
 
 #include "asrc/asrcitf.h"
 #include "bjt/bjtitf.h"
-#include "bjt2/bjt2itf.h"
+/* #include "bjt2/bjt2itf.h" */
 #include "bsim1/bsim1itf.h"
 #include "bsim2/bsim2itf.h"
 #include "bsim3/bsim3itf.h"
@@ -102,7 +102,8 @@ spice_init_devices(void)
     DEVices[ 0] = get_urc_info();
     DEVices[ 1] = get_asrc_info();
     DEVices[ 2] = get_bjt_info();
-    DEVices[ 3] = get bjt2_info();
+    DEVices[ 3] = get_bjt_info(); /* Quick hack until bjt2 works */
+  /*  DEVices[ 3] = get bjt2_info(); */
     DEVices[ 4] = get_bsim1_info();
     DEVices[ 5] = get_bsim2_info();
     DEVices[ 6] = get_bsim3_info();

src/spicelib/devices/mos9/Makefile.am

@@ -4,10 +4,14 @@ pkglib_LTLIBRARIES = libmos9.la
 
 libmos9_la_SOURCES = 	\
 	mos9.c		\
+	mos9acld.c	\
 	mos9ask.c	\
 	mos9conv.c	\
 	mos9defs.h	\
+	mos9del.c	\
 	mos9dest.c	\
+	mos9dist.c	\
+	mos9dset.c	\
 	mos9ext.h	\
 	mos9ic.c	\
 	mos9init.c	\
@@ -15,9 +19,17 @@ libmos9_la_SOURCES = 	\
 	mos9itf.h	\
 	mos9load.c	\
 	mos9mask.c	\
+	mos9mdel.c	\
 	mos9mpar.c	\
+	mos9noi.c	\
 	mos9par.c	\
+	mos9pzld.c	\
+	mos9sacl.c	\
 	mos9set.c	\
+	mos9sld.c	\
+	mos9sprt.c	\
+	mos9sset.c	\
+	mos9supd.c	\
 	mos9temp.c	\
 	mos9trun.c
 

src/spicelib/devices/mos9/mos9dset.c

@@ -397,7 +397,8 @@ d_p.d3_pqr = 0.0;
 	    InvDeriv(&d_onfbdy,&d_onfbdy);
             qbonco =gammas*sqphbs+model->MOS9narrowFactor*phibs/EffectiveWidth;
 	    EqualDeriv(&d_dummy,&d_phibs);
-	    TimesDeriv(&d_dummy,&d_dummy,model->
+	    TimesDeriv(&d_dummy,&d_dummy,model->
+	    						MOS9narrowFactor*EffectiveWidth);
 	    MultDeriv(&d_qbonco,&d_gammas,&d_sqphbs);
 	    PlusDeriv(&d_qbonco,&d_qbonco,&d_dummy);
             /*

src/spicelib/devices/mos9/mos9noi.c

@@ -8,7 +8,6 @@ Modified: Alan Gillespie
 #include <stdio.h>
 #include "mos9defs.h"
 #include "cktdefs.h"
-#include "fteconst.h"
 #include "iferrmsg.h"
 #include "noisedef.h"
 #include "suffix.h"
@@ -76,7 +75,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s
 if (!data->namelist) return(E_NOMEM);
 		(*(SPfrontEnd->IFnewUid))(ckt,
 			&(data->namelist[data->numPlots++]),
-			(IFuid)NULL,name,UID_OTHER,(GENERIC **)NULL);
+			(IFuid)NULL,name,UID_OTHER,(void **)NULL);
 				/* we've added one more plot */
 
 
@@ -92,7 +91,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s
 if (!data->namelist) return(E_NOMEM);
 		(*(SPfrontEnd->IFnewUid))(ckt,
 			&(data->namelist[data->numPlots++]),
-			(IFuid)NULL,name,UID_OTHER,(GENERIC **)NULL);
+			(IFuid)NULL,name,UID_OTHER,(void **)NULL);
 				/* we've added one more plot */
 
 
@@ -103,7 +102,7 @@ data->namelist = (IFuid *)trealloc((char *)data->namelist,(data->numPlots + 1)*s
 if (!data->namelist) return(E_NOMEM);
 		(*(SPfrontEnd->IFnewUid))(ckt,
 			&(data->namelist[data->numPlots++]),
-			(IFuid)NULL,name,UID_OTHER,(GENERIC **)NULL);
+			(IFuid)NULL,name,UID_OTHER,(void **)NULL);
 				/* we've added one more plot */