luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bjt2 merged to bjt model

This commit is contained in:
dwarning 2011-04-27 21:10:36 +00:00
parent 33fdd85ee2
commit 7132470c9a
7 changed files with 74 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-04-27 Dietmar Warning
* /devices/bjt2: removed - all GP extensions of this model are now in the bjt model, see
Changelog 2011-03-03 and 2011-03-10
2011-04-27 Robert Larice
* */** :
code cleanup

1
configure.ac
View File

@ -1007,7 +1007,6 @@ AC_CONFIG_FILES([Makefile
src/spicelib/devices/Makefile
src/spicelib/devices/asrc/Makefile
src/spicelib/devices/bjt/Makefile
src/spicelib/devices/bjt2/Makefile
src/spicelib/devices/bsim1/Makefile
src/spicelib/devices/bsim2/Makefile
src/spicelib/devices/bsim3/Makefile

1
src/Makefile.am
View File

@ -40,7 +40,6 @@ endif
DYNAMIC_DEVICELIBS = \
spicelib/devices/asrc/libasrc.la \
spicelib/devices/bjt/libbjt.la \
spicelib/devices/bjt2/libbjt2.la \
spicelib/devices/bsim1/libbsim1.la \
spicelib/devices/bsim2/libbsim2.la \
spicelib/devices/bsim3/libbsim3.la \

2
src/spicelib/devices/Makefile.am
View File

@ -3,7 +3,6 @@
SUBDIRS = \
asrc \
bjt \
bjt2 \
bsim1 \
bsim2 \
bsim3 \
@ -64,7 +63,6 @@ DIST_SUBDIRS = \
@VLADEVDIR@ \
asrc \
bjt \
bjt2 \
bsim1 \
bsim2 \
bsim3 \

134
src/spicelib/devices/dev.c
View File

@ -75,7 +75,6 @@ int add_udn(int,Evt_Udn_Info_t **);
#include "asrc/asrcitf.h"
#include "bjt/bjtitf.h"
#include "bjt2/bjt2itf.h"
#include "bsim1/bsim1itf.h"
#include "bsim2/bsim2itf.h"
#include "bsim3/bsim3itf.h"
@ -184,88 +183,87 @@ 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[ 4] = get_bsim1_info();
DEVices[ 5] = get_bsim2_info();
DEVices[ 6] = get_bsim3_info();
DEVices[ 7] = get_bsim3v0_info();
DEVices[ 8] = get_bsim3v1_info();
DEVices[ 9] = get_bsim3v32_info();
DEVices[10] = get_b4soi_info();
DEVices[11] = get_bsim4_info();
DEVices[12] = get_bsim4v2_info();
DEVices[13] = get_bsim4v3_info();
DEVices[14] = get_bsim4v4_info();
DEVices[15] = get_bsim4v5_info();
DEVices[16] = get_b3soipd_info();
DEVices[17] = get_b3soifd_info();
DEVices[18] = get_b3soidd_info();
DEVices[19] = get_cap_info();
DEVices[20] = get_cccs_info();
DEVices[21] = get_ccvs_info();
DEVices[22] = get_cpl_info();
DEVices[23] = get_csw_info();
DEVices[24] = get_dio_info();
DEVices[25] = get_hfeta_info();
DEVices[26] = get_hfet2_info();
DEVices[27] = get_hsm1_info();
DEVices[28] = get_ind_info();
DEVices[29] = get_mut_info();
DEVices[30] = get_isrc_info();
DEVices[31] = get_jfet_info();
DEVices[32] = get_jfet2_info();
DEVices[33] = get_ltra_info();
DEVices[34] = get_mes_info();
DEVices[35] = get_mesa_info();
DEVices[36] = get_mos1_info();
DEVices[37] = get_mos2_info();
DEVices[38] = get_mos3_info();
DEVices[39] = get_mos6_info();
DEVices[40] = get_mos9_info();
DEVices[41] = get_res_info();
DEVices[42] = get_soi3_info();
DEVices[43] = get_sw_info();
DEVices[44] = get_tra_info();
DEVices[45] = get_txl_info();
DEVices[46] = get_vbic_info();
DEVices[47] = get_vccs_info();
DEVices[48] = get_vcvs_info();
DEVices[49] = get_vsrc_info();
DEVices[ 3] = get_bsim1_info();
DEVices[ 4] = get_bsim2_info();
DEVices[ 5] = get_bsim3_info();
DEVices[ 6] = get_bsim3v0_info();
DEVices[ 7] = get_bsim3v1_info();
DEVices[ 8] = get_bsim3v32_info();
DEVices[ 9] = get_b4soi_info();
DEVices[10] = get_bsim4_info();
DEVices[11] = get_bsim4v2_info();
DEVices[12] = get_bsim4v3_info();
DEVices[13] = get_bsim4v4_info();
DEVices[14] = get_bsim4v5_info();
DEVices[15] = get_b3soipd_info();
DEVices[16] = get_b3soifd_info();
DEVices[17] = get_b3soidd_info();
DEVices[18] = get_cap_info();
DEVices[19] = get_cccs_info();
DEVices[20] = get_ccvs_info();
DEVices[21] = get_cpl_info();
DEVices[22] = get_csw_info();
DEVices[23] = get_dio_info();
DEVices[24] = get_hfeta_info();
DEVices[25] = get_hfet2_info();
DEVices[26] = get_hsm1_info();
DEVices[27] = get_ind_info();
DEVices[28] = get_mut_info();
DEVices[29] = get_isrc_info();
DEVices[30] = get_jfet_info();
DEVices[31] = get_jfet2_info();
DEVices[32] = get_ltra_info();
DEVices[33] = get_mes_info();
DEVices[34] = get_mesa_info();
DEVices[35] = get_mos1_info();
DEVices[36] = get_mos2_info();
DEVices[37] = get_mos3_info();
DEVices[38] = get_mos6_info();
DEVices[39] = get_mos9_info();
DEVices[40] = get_res_info();
DEVices[41] = get_soi3_info();
DEVices[42] = get_sw_info();
DEVices[43] = get_tra_info();
DEVices[44] = get_txl_info();
DEVices[45] = get_vbic_info();
DEVices[46] = get_vccs_info();
DEVices[47] = get_vcvs_info();
DEVices[48] = get_vsrc_info();
#ifdef CIDER
DEVices[50] = get_nbjt_info();
DEVices[51] = get_nbjt2_info();
DEVices[52] = get_numd_info();
DEVices[53] = get_numd2_info();
DEVices[54] = get_numos_info();
DEVices[49] = get_nbjt_info();
DEVices[50] = get_nbjt2_info();
DEVices[51] = get_numd_info();
DEVices[52] = get_numd2_info();
DEVices[53] = get_numos_info();
#else
DEVices[49] = NULL;
DEVices[50] = NULL;
DEVices[51] = NULL;
DEVices[52] = NULL;
DEVices[53] = NULL;
DEVices[54] = NULL;
DEVices[53] = NULL;
#endif
#ifdef ADMS
DEVices[55] = get_hicum0_info();
DEVices[56] = get_hicum2_info();
DEVices[57] = get_mextram_info();
DEVices[58] = get_ekv_info();
DEVices[59] = get_psp102_info();
DEVices[54] = get_hicum0_info();
DEVices[55] = get_hicum2_info();
DEVices[56] = get_mextram_info();
DEVices[57] = get_ekv_info();
DEVices[58] = get_psp102_info();
#else
DEVices[54] = NULL;
DEVices[55] = NULL;
DEVices[56] = NULL;
DEVices[57] = NULL;
DEVices[58] = NULL;
DEVices[59] = NULL;
#endif
#ifdef NDEV /* NDEV */
DEVices[69] = get_ndev_info();
DEVices[59] = get_ndev_info();
#else
DEVices[60] = NULL;
DEVices[59] = NULL;
#endif
DEVices[60] = NULL;
DEVices[61] = NULL;
DEVices[62] = NULL;
return;
}
@ -289,13 +287,13 @@ SPICEdev ** devices(void)
/*not yet usable*/
#ifdef ADMS
#define DEVICES_USED {"asrc", "bjt", "bjt2", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v2", "bsim4v3", "bsim4v4", "bsim4v5", \
"bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", \
#define DEVICES_USED {"asrc", "bjt", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v2", "bsim4v3", "bsim4v4", "bsim4v5", \
"bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim", \
"cap", "cccs", "ccvs", "csw", "dio", "hfet", "hfet2", "ind", "isrc", "jfet", "ltra", "mes", "mesa" ,"mos1", "mos2", "mos3", \
"mos6", "mos9", "res", "soi3", "sw", "tra", "urc", "vccs", "vcvs", "vsrc", "hicum0", "hicum2", "mextram", "ekv", "psp102"}
#else
#define DEVICES_USED {"asrc", "bjt", "bjt2", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v4", "bsim4v2", "bsim4v3", "bsim4v4", "bsim4v5", \
"bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", \
#define DEVICES_USED {"asrc", "bjt", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v4", "bsim4v2", "bsim4v3", "bsim4v4", "bsim4v5", \
"bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim", \
"cap", "cccs", "ccvs", "csw", "dio", "hfet", "hfet2", "ind", "isrc", "jfet", "ltra", "mes", "mesa" ,"mos1", "mos2", "mos3", \
"mos6", "mos9", "res", "soi3", "sw", "tra", "urc", "vccs", "vcvs", "vsrc"}
#endif

1
src/spicelib/parser/inp2q.c
View File

@ -122,7 +122,6 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
if (thismodel != NULL) {
if ((thismodel->INPmodType != INPtypelook("BJT"))
&& (thismodel->INPmodType != INPtypelook("BJT2"))
#ifdef CIDER
&& (thismodel->INPmodType != INPtypelook("NBJT"))
&& (thismodel->INPmodType != INPtypelook("NBJT2"))

14
src/spicelib/parser/inpdomod.c
View File

@ -48,19 +48,13 @@ char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab)
switch(lev) {
case 0:
case 1:
case 2:
type = INPtypelook("BJT");
if (type < 0) {
err = INPmkTemp(
"Device type BJT not available in this binary\n");
}
break;
case 2:
type = INPtypelook("BJT2");
if(type < 0) {
err = INPmkTemp(
"Device type BJT2 not available in this binary\n");
}
break;
case 4:
type = INPtypelook("VBIC");
if(type < 0) {
@ -393,7 +387,7 @@ char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab)
}
break;
case 62:
case 61:
type = INPtypelook("SOI3");
if (type < 0) {
err =
@ -413,9 +407,9 @@ char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab)
err =
INPmkTemp
#ifdef ADMS
("Only MOS device levels 1-6,8-10,14,44,45,49,54-58,62,64 are supported in this binary\n");
("Only MOS device levels 1-6,8-10,14,44,45,49,54-58,61,64 are supported in this binary\n");
#else
("Only MOS device levels 1-6,8-10,14,49,54-58,62,64 are supported in this binary\n");
("Only MOS device levels 1-6,8-10,14,49,54-58,61,64 are supported in this binary\n");
#endif
break;
}