diff --git a/src/spicelib/devices/bsim3/b3.c b/src/spicelib/devices/bsim3/b3.c index 1f696d632..d807e76ad 100644 --- a/src/spicelib/devices/bsim3/b3.c +++ b/src/spicelib/devices/bsim3/b3.c @@ -512,11 +512,11 @@ IP( "pmos", BSIM3_MOD_PMOS, IF_FLAG, "Flag to indicate PMOS"), }; char *BSIM3names[] = { - "Drain", - "Gate", - "Source", - "Bulk", - "Charge" + "Drain", /* 1 */ + "Gate", /* 2 */ + "Source", /* 3 */ + "Bulk", /* 4 */ + "Charge" /* 5 */ }; int BSIM3nSize = NUMELEMS(BSIM3names); diff --git a/src/spicelib/devices/bsim3/bsim3def.h b/src/spicelib/devices/bsim3/bsim3def.h index 9b1b9503d..58a2c1be7 100644 --- a/src/spicelib/devices/bsim3/bsim3def.h +++ b/src/spicelib/devices/bsim3/bsim3def.h @@ -22,10 +22,15 @@ typedef struct sBSIM3instance struct sBSIM3instance *BSIM3nextInstance; IFuid BSIM3name; int BSIM3states; /* index into state table for this device */ + + /* GENnode[] { */ int BSIM3dNode; int BSIM3gNode; int BSIM3sNode; int BSIM3bNode; + // FIXME, BSIM3qNode must be moved up to here + /* } */ + int BSIM3dNodePrime; int BSIM3sNodePrime; int BSIM3qNode; /* MCJ */ diff --git a/src/spicelib/devices/bsim3v0/b3v0.c b/src/spicelib/devices/bsim3v0/b3v0.c index 8ab188fcf..ba8b4d54a 100644 --- a/src/spicelib/devices/bsim3v0/b3v0.c +++ b/src/spicelib/devices/bsim3v0/b3v0.c @@ -416,11 +416,11 @@ IP( "pmos", BSIM3v0_MOD_PMOS, IF_FLAG, "Flag to indicate PMOS"), }; char *BSIM3v0names[] = { - "Drain", - "Gate", - "Source", - "Bulk", - "Charge" + "Drain", /* 1 */ + "Gate", /* 2 */ + "Source", /* 3 */ + "Bulk", /* 4 */ + "Charge" /* 5 */ }; int BSIM3v0nSize = NUMELEMS(BSIM3v0names); diff --git a/src/spicelib/devices/bsim3v0/bsim3v0def.h b/src/spicelib/devices/bsim3v0/bsim3v0def.h index a72931e73..fff63d758 100644 --- a/src/spicelib/devices/bsim3v0/bsim3v0def.h +++ b/src/spicelib/devices/bsim3v0/bsim3v0def.h @@ -20,10 +20,14 @@ typedef struct sBSIM3v0instance IFuid BSIM3v0name; int BSIM3v0states; /* index into state table for this device */ + /* GENnode[] { */ int BSIM3v0dNode; int BSIM3v0gNode; int BSIM3v0sNode; int BSIM3v0bNode; + // FIXME, BSIM3v0qNode must be moved up to here + /* } */ + int BSIM3v0dNodePrime; int BSIM3v0sNodePrime; int BSIM3v0qNode; /* MCJ */ diff --git a/src/spicelib/devices/bsim3v1/b3v1.c b/src/spicelib/devices/bsim3v1/b3v1.c index 35324deb6..fe71f94fb 100644 --- a/src/spicelib/devices/bsim3v1/b3v1.c +++ b/src/spicelib/devices/bsim3v1/b3v1.c @@ -432,11 +432,11 @@ IOP( "hdif", BSIM3v1_MOD_HDIF, IF_REAL, "S/D junction extension"), }; char *BSIM3v1names[] = { - "Drain", - "Gate", - "Source", - "Bulk", - "Charge" + "Drain", /* 1 */ + "Gate", /* 2 */ + "Source", /* 3 */ + "Bulk", /* 4 */ + "Charge" /* 5 */ }; int BSIM3v1nSize = NUMELEMS(BSIM3v1names); diff --git a/src/spicelib/devices/bsim3v1/bsim3v1def.h b/src/spicelib/devices/bsim3v1/bsim3v1def.h index 3424582f2..549247104 100644 --- a/src/spicelib/devices/bsim3v1/bsim3v1def.h +++ b/src/spicelib/devices/bsim3v1/bsim3v1def.h @@ -21,10 +21,14 @@ typedef struct sBSIM3v1instance IFuid BSIM3v1name; int BSIM3v1states; /* index into state table for this device */ + /* GENnode[] { */ int BSIM3v1dNode; int BSIM3v1gNode; int BSIM3v1sNode; int BSIM3v1bNode; + // FIXME, BSIM3v1qNode must be moved up to here + /* } */ + int BSIM3v1dNodePrime; int BSIM3v1sNodePrime; int BSIM3v1qNode; /* MCJ */ diff --git a/src/spicelib/devices/bsim3v32/b3v32.c b/src/spicelib/devices/bsim3v32/b3v32.c index 2209f6a97..3240f84e7 100644 --- a/src/spicelib/devices/bsim3v32/b3v32.c +++ b/src/spicelib/devices/bsim3v32/b3v32.c @@ -512,11 +512,11 @@ IP( "pmos", BSIM3v32_MOD_PMOS, IF_FLAG, "Flag to indicate PMOS"), }; char *BSIM3v32names[] = { - "Drain", - "Gate", - "Source", - "Bulk", - "Charge" + "Drain", /* 1 */ + "Gate", /* 2 */ + "Source", /* 3 */ + "Bulk", /* 4 */ + "Charge" /* 5 */ }; int BSIM3v32nSize = NUMELEMS(BSIM3v32names); diff --git a/src/spicelib/devices/bsim3v32/bsim3v32def.h b/src/spicelib/devices/bsim3v32/bsim3v32def.h index dd784ae37..c95ac758a 100644 --- a/src/spicelib/devices/bsim3v32/bsim3v32def.h +++ b/src/spicelib/devices/bsim3v32/bsim3v32def.h @@ -22,10 +22,15 @@ typedef struct sBSIM3v32instance struct sBSIM3v32instance *BSIM3v32nextInstance; IFuid BSIM3v32name; int BSIM3v32states; /* index into state table for this device */ + + /* GENnode[] { */ int BSIM3v32dNode; int BSIM3v32gNode; int BSIM3v32sNode; int BSIM3v32bNode; + // FIXME, BSIM3v32qNode must be moved up to here + /* } */ + int BSIM3v32dNodePrime; int BSIM3v32sNodePrime; int BSIM3v32qNode; /* MCJ */ diff --git a/src/spicelib/devices/bsim4/b4.c b/src/spicelib/devices/bsim4/b4.c index 934e51e0e..9cf808828 100644 --- a/src/spicelib/devices/bsim4/b4.c +++ b/src/spicelib/devices/bsim4/b4.c @@ -1047,11 +1047,11 @@ IP( "pmos", BSIM4_MOD_PMOS, IF_FLAG, "Flag to indicate PMOS"), }; char *BSIM4names[] = { - "Drain", - "Gate", - "Source", - "Bulk", - "Charge" + "Drain", /* 1 */ + "Gate", /* 2 */ + "Source", /* 3 */ + "Bulk", /* 4 */ + "Charge" /* 5 */ }; int BSIM4nSize = NUMELEMS(BSIM4names); diff --git a/src/spicelib/devices/bsim4/bsim4def.h b/src/spicelib/devices/bsim4/bsim4def.h index 0b4efec63..96abafcd8 100644 --- a/src/spicelib/devices/bsim4/bsim4def.h +++ b/src/spicelib/devices/bsim4/bsim4def.h @@ -35,10 +35,15 @@ typedef struct sBSIM4instance struct sBSIM4instance *BSIM4nextInstance; IFuid BSIM4name; int BSIM4states; /* index into state table for this device */ + + /* GENnode[] { */ int BSIM4dNode; int BSIM4gNodeExt; int BSIM4sNode; int BSIM4bNode; + // FIXME, BSIM4qNode must be moved up to here + /* } */ + int BSIM4dNodePrime; int BSIM4gNodePrime; int BSIM4gNodeMid; diff --git a/src/spicelib/devices/bsim4v5/b4v5.c b/src/spicelib/devices/bsim4v5/b4v5.c index 2ce31148b..dfc3027d6 100644 --- a/src/spicelib/devices/bsim4v5/b4v5.c +++ b/src/spicelib/devices/bsim4v5/b4v5.c @@ -903,11 +903,11 @@ IP( "pmos", BSIM4v5_MOD_PMOS, IF_FLAG, "Flag to indicate PMOS"), }; char *BSIM4v5names[] = { - "Drain", - "Gate", - "Source", - "Bulk", - "Charge" + "Drain", /* 1 */ + "Gate", /* 2 */ + "Source", /* 3 */ + "Bulk", /* 4 */ + "Charge" /* 5 */ }; int BSIM4v5nSize = NUMELEMS(BSIM4v5names); diff --git a/src/spicelib/devices/bsim4v5/bsim4v5def.h b/src/spicelib/devices/bsim4v5/bsim4v5def.h index b860ef18d..dce959a4d 100644 --- a/src/spicelib/devices/bsim4v5/bsim4v5def.h +++ b/src/spicelib/devices/bsim4v5/bsim4v5def.h @@ -24,10 +24,15 @@ typedef struct sBSIM4v5instance struct sBSIM4v5instance *BSIM4v5nextInstance; IFuid BSIM4v5name; int BSIM4v5states; /* index into state table for this device */ + + /* GENnode[] { */ int BSIM4v5dNode; int BSIM4v5gNodeExt; int BSIM4v5sNode; int BSIM4v5bNode; + // FIXME, BSIM4v5qNode must be moved up to here + /* } */ + int BSIM4v5dNodePrime; int BSIM4v5gNodePrime; int BSIM4v5gNodeMid; diff --git a/src/spicelib/devices/bsim4v6/b4v6.c b/src/spicelib/devices/bsim4v6/b4v6.c index 1e45b95e2..96a98a474 100644 --- a/src/spicelib/devices/bsim4v6/b4v6.c +++ b/src/spicelib/devices/bsim4v6/b4v6.c @@ -987,11 +987,11 @@ IP( "pmos", BSIM4v6_MOD_PMOS, IF_FLAG, "Flag to indicate PMOS"), }; char *BSIM4v6names[] = { - "Drain", - "Gate", - "Source", - "Bulk", - "Charge" + "Drain", /* 1 */ + "Gate", /* 2 */ + "Source", /* 3 */ + "Bulk", /* 4 */ + "Charge" /* 5 */ }; int BSIM4v6nSize = NUMELEMS(BSIM4v6names); diff --git a/src/spicelib/devices/bsim4v6/bsim4v6def.h b/src/spicelib/devices/bsim4v6/bsim4v6def.h index 04a5b776b..01eed2824 100644 --- a/src/spicelib/devices/bsim4v6/bsim4v6def.h +++ b/src/spicelib/devices/bsim4v6/bsim4v6def.h @@ -33,10 +33,15 @@ typedef struct sBSIM4v6instance struct sBSIM4v6instance *BSIM4v6nextInstance; IFuid BSIM4v6name; int BSIM4v6states; /* index into state table for this device */ + + /* GENnode[] { */ int BSIM4v6dNode; int BSIM4v6gNodeExt; int BSIM4v6sNode; int BSIM4v6bNode; + // FIXME, BSIM4v6qNode must be moved up to here + /* } */ + int BSIM4v6dNodePrime; int BSIM4v6gNodePrime; int BSIM4v6gNodeMid; diff --git a/src/spicelib/devices/bsim4v7/b4v7.c b/src/spicelib/devices/bsim4v7/b4v7.c index 95407b61e..7f5dbf30f 100644 --- a/src/spicelib/devices/bsim4v7/b4v7.c +++ b/src/spicelib/devices/bsim4v7/b4v7.c @@ -1045,11 +1045,11 @@ IP( "pmos", BSIM4v7_MOD_PMOS, IF_FLAG, "Flag to indicate PMOS"), }; char *BSIM4v7names[] = { - "Drain", - "Gate", - "Source", - "Bulk", - "Charge" + "Drain", /* 1 */ + "Gate", /* 2 */ + "Source", /* 3 */ + "Bulk", /* 4 */ + "Charge" /* 5 */ }; int BSIM4v7nSize = NUMELEMS(BSIM4v7names); diff --git a/src/spicelib/devices/bsim4v7/bsim4v7def.h b/src/spicelib/devices/bsim4v7/bsim4v7def.h index 8ca3d86a4..fd65f0210 100644 --- a/src/spicelib/devices/bsim4v7/bsim4v7def.h +++ b/src/spicelib/devices/bsim4v7/bsim4v7def.h @@ -34,10 +34,15 @@ typedef struct sBSIM4v7instance struct sBSIM4v7instance *BSIM4v7nextInstance; IFuid BSIM4v7name; int BSIM4v7states; /* index into state table for this device */ + + /* GENnode[] { */ int BSIM4v7dNode; int BSIM4v7gNodeExt; int BSIM4v7sNode; int BSIM4v7bNode; + // FIXME, BSIM4v7qNode must be moved up to here + /* } */ + int BSIM4v7dNodePrime; int BSIM4v7gNodePrime; int BSIM4v7gNodeMid;