From 0f37a7e94361dba4ae0df7f82b95a90beb8e0a66 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Sun, 16 Nov 2008 09:53:55 +0000
Subject: [PATCH] bug fix dev info structure and correct version

---
 ChangeLog                             |  5 ++
 src/spicelib/devices/bsim4/b4check.c  |  6 +--
 src/spicelib/devices/bsim4/bsim4itf.h | 78 +--------------------------
 3 files changed, 9 insertions(+), 80 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fdd057277..84430d672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-16 Dietmar Warning
+ * src/spicelib/devices/bsim4/bsim4itf.h: adapting the ngspice scheme regarding info structure
+ * src/spicelib/devices/bsim4/b4check.c: This is really UCB version 4.6.3 - see below
+   (but will cover all 4.6.x versions)
+
 2008-11-09 Dietmar Warning
  * src/spicelib/devices/bsim4/*.c,*.h src/spicelib/parser/inpdomod.c: 
    This is the new and actual BSIM4 version 4.6.3 from UCB. All files are 4.6.2 except
diff --git a/src/spicelib/devices/bsim4/b4check.c b/src/spicelib/devices/bsim4/b4check.c
index 9e697812c..531f2f37f 100644
--- a/src/spicelib/devices/bsim4/b4check.c
+++ b/src/spicelib/devices/bsim4/b4check.c
@@ -45,9 +45,9 @@ FILE *fplog;
         fprintf(fplog, "\n");
 	fprintf(fplog, "++++++++++ BSIM4 PARAMETER CHECKING BELOW ++++++++++\n");
 
-        if (strcmp(model->BSIM4version, "4.6.1") != 0)
-        {  fprintf(fplog, "Warning: This model is BSIM4.6.1; you specified a wrong version number.\n");
-           printf("Warning: This model is BSIM4.6.1; you specified a wrong version number.\n");
+        if (strcmp(model->BSIM4version, "4.6.3") != 0)
+        {  fprintf(fplog, "Warning: This model is BSIM4.6.3; you specified a wrong version number.\n");
+           printf("Warning: This model is BSIM4.6.3; you specified a wrong version number.\n");
         }
 	fprintf(fplog, "Model = %s\n", model->BSIM4modName);
 
diff --git a/src/spicelib/devices/bsim4/bsim4itf.h b/src/spicelib/devices/bsim4/bsim4itf.h
index e37abbf87..b4dc51e7e 100644
--- a/src/spicelib/devices/bsim4/bsim4itf.h
+++ b/src/spicelib/devices/bsim4/bsim4itf.h
@@ -4,86 +4,10 @@ Author: 2000 Weidong Liu.
 Author: 2001- Xuemei Xi
 File: bsim4itf.h
 **********/
-#ifdef DEV_bsim4
 
 #ifndef DEV_BSIM4
 #define DEV_BSIM4
 
-#include "bsim4ext.h"
-
-extern IFparm BSIM4pTable[ ];
-extern IFparm BSIM4mPTable[ ];
-extern char *BSIM4names[ ];
-extern int BSIM4pTSize;
-extern int BSIM4mPTSize;
-extern int BSIM4nSize;
-extern int BSIM4iSize;
-extern int BSIM4mSize;
-
-SPICEdev B4info = {
-    {   "BSIM4",
-        "Berkeley Short Channel IGFET Model-4",
-
-        &BSIM4nSize,
-        &BSIM4nSize,
-        BSIM4names,
-
-        &BSIM4pTSize,
-        BSIM4pTable,
-
-        &BSIM4mPTSize,
-        BSIM4mPTable,
-        DEV_DEFAULT
-    },
-    BSIM4param,
-    BSIM4mParam,
-    BSIM4load,
-    BSIM4setup,
-    BSIM4unsetup,
-    BSIM4setup,
-    BSIM4temp,
-    BSIM4trunc,
-    NULL,
-    BSIM4acLoad,
-    NULL,
-    BSIM4destroy,
-#ifdef DELETES
-    BSIM4mDelete,
-    BSIM4delete, 
-#else /* DELETES */
-    NULL,
-    NULL,
-#endif /* DELETES */
-    BSIM4getic,
-    BSIM4ask,
-    BSIM4mAsk,
-#ifdef AN_pz
-    BSIM4pzLoad,
-#else /* AN_pz */
-    NULL,
-#endif /* AN_pz */
-#ifdef NEWCONV
-    BSIM4convTest,
-#else /* NEWCONV */
-    NULL,
-#endif /* NEWCONV */
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-
-#ifdef AN_noise
-    BSIM4noise,
-#else   /* AN_noise */
-    NULL,
-#endif  /* AN_noise */
-
-    &BSIM4iSize,
-    &BSIM4mSize
-};
+SPICEdev *get_bsim4_info(void);
 
 #endif
-#endif