From fa13ee77d6772a08ff561074beb53938411e8415 Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 13 May 2017 21:26:29 +0200 Subject: [PATCH] dev.c and inp2m.c, bsim6 is level 16 ?! --- src/spicelib/devices/dev.c | 4 +++- src/spicelib/parser/inp2m.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c index 6d9b9217f..b109e2bfb 100644 --- a/src/spicelib/devices/dev.c +++ b/src/spicelib/devices/dev.c @@ -126,6 +126,7 @@ int add_udn(int,Evt_Udn_Info_t **); #include "adms/mextram/bjt504titf.h" #include "adms/ekv/ekvitf.h" #include "adms/psp102/psp102itf.h" +#include "adms/bsim6/bsim6itf.h" #endif #ifdef CIDER /* Numerical devices (Cider integration) */ @@ -207,6 +208,7 @@ static SPICEdev *(*static_devices[])(void) = { (SPICEdev *(*)(void)) get_bjt504t_info, (SPICEdev *(*)(void)) get_ekv_info, (SPICEdev *(*)(void)) get_psp102_info, + (SPICEdev *(*)(void)) get_bsim6_info, #endif #ifdef NDEV @@ -291,7 +293,7 @@ SPICEdev ** devices(void) #define DEVICES_USED {"asrc", "bjt", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v5", "bsim4v6", "bsim4v7", \ "bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim2", "hisimhv1", "hisimhv2", \ "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", "bjt504t", "ekv", "psp102"} + "mos6", "mos9", "res", "soi3", "sw", "tra", "urc", "vccs", "vcvs", "vsrc", "hicum0", "hicum2", "bjt504t", "ekv", "psp102", "bsim6"} #else #define DEVICES_USED {"asrc", "bjt", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v32", "bsim3v2", "bsim3v1", "bsim4", "bsim4v5", "bsim4v6", "bsim4v7", \ "bsim4soi", "bsim3soipd", "bsim3soifd", "bsim3soidd", "hisim2", "hisimhv1", "hisimhv2", \ diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c index ec9c370d9..d8bf75c06 100644 --- a/src/spicelib/parser/inp2m.c +++ b/src/spicelib/parser/inp2m.c @@ -134,6 +134,7 @@ INP2M(CKTcircuit *ckt, INPtables *tab, struct card *current) #ifdef ADMS thismodel->INPmodType != INPtypelook("ekv") && thismodel->INPmodType != INPtypelook("psp102") && + thismodel->INPmodType != INPtypelook("bsim6") && #endif thismodel->INPmodType != INPtypelook("HiSIM2") && thismodel->INPmodType != INPtypelook("HiSIMHV1") &&