From 0e52a0fcc201e76f4d94231a8c85d9ea37e371e5 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Wed, 16 Apr 2008 20:20:49 +0000
Subject: [PATCH] backup NEWCONV because of using original BSIM code

---
 src/include/macros.h                | 30 +++++++++++++++++------------
 src/spicelib/devices/hisim/hsm1ld.c |  5 +----
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/include/macros.h b/src/include/macros.h
index 857aab308..9592a8d3c 100644
--- a/src/include/macros.h
+++ b/src/include/macros.h
@@ -12,6 +12,12 @@
 #ifndef _MACROS_H_
 #define _MACROS_H_
 
+/*
+ *  #define-s that are always on
+ */
+
+#define NEWCONV
+
 #define	NUMELEMS(ARRAY)	(sizeof(ARRAY)/sizeof(*ARRAY))
 
 /* String macros */
@@ -77,16 +83,16 @@
     times(&buffer);					\
     time = buffer.user / 60.0;				\
 }
-
-#ifdef HAVE_SIGSETJMP
-# define SETJMP(env, save_signals) sigsetjmp(env, save_signals)
-# define LONGJMP(env, retval) siglongjmp(env, retval)
-# define JMP_BUF sigjmp_buf
-#else
-# define SETJMP(env, save_signals) setjmp(env)
-# define LONGJMP(env, retval) longjmp(env, retval)
-# define JMP_BUF jmp_buf
-#endif
-
-
+
+#ifdef HAVE_SIGSETJMP
+# define SETJMP(env, save_signals) sigsetjmp(env, save_signals)
+# define LONGJMP(env, retval) siglongjmp(env, retval)
+# define JMP_BUF sigjmp_buf
+#else
+# define SETJMP(env, save_signals) setjmp(env)
+# define LONGJMP(env, retval) longjmp(env, retval)
+# define JMP_BUF jmp_buf
+#endif
+
+
 #endif /* _MACROS_H_ */
diff --git a/src/spicelib/devices/hisim/hsm1ld.c b/src/spicelib/devices/hisim/hsm1ld.c
index f211fa322..4750c5813 100644
--- a/src/spicelib/devices/hisim/hsm1ld.c
+++ b/src/spicelib/devices/hisim/hsm1ld.c
@@ -169,11 +169,10 @@ int HSM1load(GENmodel *inModel, register CKTcircuit *ckt)
   double tempv;
 #endif /*NOBYPASS*/
   int tmp;
-/* spice3f4 defined NEWCONV by default, looking to niconv.c
 #ifndef NEWCONV
   double tol, tol2, tol3, tol4;
 #endif
-*/
+
   int ChargeComputationNeeded =  
     ((ckt->CKTmode & (MODEAC | MODETRAN | MODEINITSMSIG)) ||
      ((ckt->CKTmode & MODETRANOP) && (ckt->CKTmode & MODEUIC)))
@@ -911,7 +910,6 @@ int HSM1load(GENmodel *inModel, register CKTcircuit *ckt)
 	if (Check == 1) {
 	  ckt->CKTnoncon++;
 	  isConv = 0;
-/* spice3f4 defined NEWCONV by default, looking to niconv.c
 #ifndef NEWCONV
 	} 
 	else {
@@ -951,7 +949,6 @@ int HSM1load(GENmodel *inModel, register CKTcircuit *ckt)
 	  }
 	}
 #endif
-*/
       }
     }
     *(ckt->CKTstate0 + here->HSM1vbs) = vbs;