From 4fd732f450d09b67240764483e208e8f1e173112 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Mon, 27 Oct 2008 20:28:13 +0000
Subject: [PATCH] vbic was lost

---
 ChangeLog                             | 4 ++++
 src/spicelib/devices/vbic/vbicnoise.c | 4 ++--
 src/spicelib/parser/inp2q.c           | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a132a601..ae42a1f23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-27 Dietmar Warning
+ * src/spicelib/parser/inp2q.c VBIC is standard - not ADMS (yet)
+ * src/spicelib/devices/vbic/vbicnoise.c correct naming array order according vbicdefs.h
+
 2008-10-14 Dietmar Warning
  * src/main.c, src/misc/util.c polish to prevent warnings
 
diff --git a/src/spicelib/devices/vbic/vbicnoise.c b/src/spicelib/devices/vbic/vbicnoise.c
index e6afbf936..fa3ba5bf5 100644
--- a/src/spicelib/devices/vbic/vbicnoise.c
+++ b/src/spicelib/devices/vbic/vbicnoise.c
@@ -49,13 +49,13 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *
         "_rbi",             /* noise due to rbi */
         "_re",              /* noise due to re */
         "_rbp",             /* noise due to rbp */
+        "_rs",              /* noise due to rs */
         "_ic",              /* noise due to ic */
         "_ib",              /* noise due to ib */
         "_ibep",            /* noise due to ibep */
+        "_iccp",            /* noise due to iccp */
         "_1overfbe",        /* flicker (1/f) noise ibe */
         "_1overfbep",       /* flicker (1/f) noise ibep */
-        "_rs",              /* noise due to rs */
-        "_iccp",            /* noise due to iccp */
         ""                  /* total transistor noise */
     };
 
diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c
index 279c95566..53e6a484a 100644
--- a/src/spicelib/parser/inp2q.c
+++ b/src/spicelib/parser/inp2q.c
@@ -104,7 +104,7 @@ void INP2Q(void *ckt, INPtables * tab, card * current, void *gnode)
     printf("INP2Q: Looking up model\n");
 #endif
     if (thismodel != NULL) {
-	if((thismodel->INPmodType != INPtypelook("BJT"))
+           if((thismodel->INPmodType != INPtypelook("BJT"))
            && (thismodel->INPmodType != INPtypelook("BJT2"))
 #ifdef CIDER
            && (thismodel->INPmodType != INPtypelook("NBJT"))
@@ -114,8 +114,8 @@ void INP2Q(void *ckt, INPtables * tab, card * current, void *gnode)
            && (thismodel->INPmodType != INPtypelook("hicum0"))
            && (thismodel->INPmodType != INPtypelook("hicum2"))
            && (thismodel->INPmodType != INPtypelook("mextram"))
-           && (thismodel->INPmodType != INPtypelook("vbic"))
 #endif
+           && (thismodel->INPmodType != INPtypelook("VBIC"))
           ) {
             LITERR("incorrect model type")
             return;