From 5db715296d2c2fc8b77e0e30b27923fcad1edbaa Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Fri, 7 Feb 2025 14:03:51 +0100 Subject: [PATCH] Remove ADMS related code --- src/frontend/misccoms.c | 3 -- src/spicelib/devices/Makefile.am | 2 - src/spicelib/devices/dev.c | 30 +---------- src/spicelib/parser/inp2m.c | 15 ------ src/spicelib/parser/inp2q.c | 9 ---- src/spicelib/parser/inp2r.c | 7 +-- src/spicelib/parser/inpdomod.c | 77 ---------------------------- visualc/src/include/ngspice/config.h | 4 -- 8 files changed, 4 insertions(+), 143 deletions(-) diff --git a/src/frontend/misccoms.c b/src/frontend/misccoms.c index dd9551028..bf973a923 100644 --- a/src/frontend/misccoms.c +++ b/src/frontend/misccoms.c @@ -256,9 +256,6 @@ com_version(wordlist *wl) #ifdef NGDEBUG fprintf(cp_out, "** Debugging option (-g) enabled\n"); #endif -#ifdef ADMS - fprintf(cp_out, "** Adms interface enabled\n"); -#endif #ifdef USE_OMP fprintf(cp_out, "** OpenMP multithreading for BSIM3, BSIM4 enabled\n"); #endif diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am index a97f7c26c..e0d678cf1 100644 --- a/src/spicelib/devices/Makefile.am +++ b/src/spicelib/devices/Makefile.am @@ -137,8 +137,6 @@ libdev_la_SOURCES = \ cktsoachk.c \ limit.c -EXTRA_DIST = adms/admst - AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices AM_CFLAGS = $(STATIC) diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c index 2a32c3889..7b5268835 100644 --- a/src/spicelib/devices/dev.c +++ b/src/spicelib/devices/dev.c @@ -126,16 +126,6 @@ extern struct coreInfo_t coreInfo; /* cmexport.c */ #include "vcvs/vcvsitf.h" #include "vsrc/vsrcitf.h" #include "vdmos/vdmositf.h" -#ifdef ADMS -#include "adms/hicum0/hicum0itf.h" -#include "adms/mextram/bjt504titf.h" -#include "adms/ekv/ekvitf.h" -#include "adms/psp102/psp102itf.h" -#include "adms/psp103/psp103itf.h" -#include "adms/bsimbulk/bsimbulkitf.h" -#include "adms/bsimcmg/bsimcmgitf.h" -#include "adms/r2_cmc/r2_cmcitf.h" -#endif #ifdef CIDER /* Numerical devices (Cider integration) */ #include "nbjt/nbjtitf.h" @@ -211,17 +201,6 @@ static SPICEdev *(*static_devices[])(void) = { get_numos_info, #endif -#ifdef ADMS - (SPICEdev *(*)(void)) get_hicum0_info, - (SPICEdev *(*)(void)) get_bjt504t_info, - (SPICEdev *(*)(void)) get_ekv_info, - (SPICEdev *(*)(void)) get_psp102_info, - (SPICEdev *(*)(void)) get_psp103_info, - (SPICEdev *(*)(void)) get_bsimbulk_info, - (SPICEdev *(*)(void)) get_bsimcmg_info, - (SPICEdev *(*)(void)) get_r2_cmc_info, -#endif - #ifdef NDEV get_ndev_info, #endif @@ -303,17 +282,12 @@ SPICEdev ** devices(void) #ifdef DEVLIB /*not yet usable*/ -#ifdef ADMS -#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", "bjt504t", "ekv", "psp102", "psp103", "bsimbulk", "bsimcmg"} -#else + #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", "hicum2"} -#endif + int load_dev(char *name) { char *msg; char libname[50]; diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c index 496a5b621..75554b834 100644 --- a/src/spicelib/parser/inp2m.c +++ b/src/spicelib/parser/inp2m.c @@ -31,14 +31,6 @@ model_numnodes(int type) return 6; } -#ifdef ADMS - if (type == INPtypelook("BSIMBULK") || /* bsimbulk.va */ - type == INPtypelook("BSIMCMG")) /* bsimcmg.va */ - { - return 5; - } -#endif - if (type == INPtypelook("VDMOS")) /* 3 ; VDMOSnames */ { return 5; @@ -141,13 +133,6 @@ INP2M(CKTcircuit *ckt, INPtables *tab, struct card *current) thismodel->INPmodType != INPtypelook("SOI3") && #ifdef CIDER thismodel->INPmodType != INPtypelook("NUMOS") && -#endif -#ifdef ADMS - thismodel->INPmodType != INPtypelook("ekv") && - thismodel->INPmodType != INPtypelook("psp102") && - thismodel->INPmodType != INPtypelook("psp103") && - thismodel->INPmodType != INPtypelook("bsimbulk") && - thismodel->INPmodType != INPtypelook("bsimcmg") && #endif thismodel->INPmodType != INPtypelook("HiSIM2") && thismodel->INPmodType != INPtypelook("HiSIMHV1") && diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c index 363d1e9b3..aca5ce9d8 100644 --- a/src/spicelib/parser/inp2q.c +++ b/src/spicelib/parser/inp2q.c @@ -18,11 +18,6 @@ model_max_numnodes(int type) if (type == INPtypelook("VBIC") || type == INPtypelook("hicum2")) return 5; -#ifdef ADMS - if (type == INPtypelook("hicum0") || - type == INPtypelook("bjt504t")) - return 5; -#endif return 4; } @@ -96,10 +91,6 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, struct card *current, CKTnode *gnod #ifdef CIDER thismodel->INPmodType != INPtypelook("NBJT") && thismodel->INPmodType != INPtypelook("NBJT2") && -#endif -#ifdef ADMS - thismodel->INPmodType != INPtypelook("hicum0") && - thismodel->INPmodType != INPtypelook("bjt504t") && #endif thismodel->INPmodType != INPtypelook("hicum2") && thismodel->INPmodType != INPtypelook("VBIC")) diff --git a/src/spicelib/parser/inp2r.c b/src/spicelib/parser/inp2r.c index 5241b3035..bd9b98598 100644 --- a/src/spicelib/parser/inp2r.c +++ b/src/spicelib/parser/inp2r.c @@ -169,11 +169,8 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, struct card *current) INPinsert(&model, tab); current->error = INPgetMod(ckt, model, &thismodel, tab); if (thismodel != NULL) { - if ((INPtypelook("Resistor") != thismodel->INPmodType) -#ifdef ADMS - && (INPtypelook("r2_cmc") != thismodel->INPmodType) -#endif - ) { + if (INPtypelook("Resistor") != thismodel->INPmodType) + { LITERR("incorrect model type for resistor"); return; } diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c index 986e7f7f3..2b8bb6c77 100644 --- a/src/spicelib/parser/inpdomod.c +++ b/src/spicelib/parser/inpdomod.c @@ -63,22 +63,6 @@ char *INPdomodel(CKTcircuit *ckt, struct card *image, INPtables * tab) "Device type VBIC not available in this binary\n"); } break; -#ifdef ADMS - case 6: - type = INPtypelook("bjt504t"); - if(type < 0) { - err = INPmkTemp( - "Device type MEXTRAM not available in this binary\n"); - } - break; - case 7: - type = INPtypelook("hicum0"); - if(type < 0) { - err = INPmkTemp( - "Device type HICUM0 not available in this binary\n"); - } - break; -#endif case 8: type = INPtypelook("hicum2"); if(type < 0) { @@ -87,13 +71,8 @@ char *INPdomodel(CKTcircuit *ckt, struct card *image, INPtables * tab) } break; default: /* placeholder; use level 4 for the next model */ -#ifdef ADMS - err = INPmkTemp( - "Only BJT levels 1-2, 4, 6-9 are supported in this binary\n"); -#else err = INPmkTemp( "Only BJT levels 1-2, 4, 8, 9 are supported in this binary\n"); -#endif break; } @@ -341,48 +320,6 @@ char *INPdomodel(CKTcircuit *ckt, struct card *image, INPtables * tab) ("Device type BSIM5 not available in this binary\n"); } break; -#ifdef ADMS - case 16: - case 77: - type = INPtypelook("BSIMBULK"); - if (type < 0) { - err = - INPmkTemp - ("Device type BSIMBULK not available in this binary\n");} - break; - case 17: - case 72: - type = INPtypelook("BSIMCMG"); - if (type < 0) { - err = - INPmkTemp - ("Device type BSIMCMG not available in this binary\n");} - break; - case 44: - type = INPtypelook("ekv"); - if (type < 0) { - err = - INPmkTemp - ("Device type EKV not available in this binary\n"); - } - break; - case 45: - type = INPtypelook("psp102"); - if (type < 0) { - err = - INPmkTemp - ("Device type PSP102 not available in this binary\n"); - } - break; - case 69: - type = INPtypelook("psp103"); - if (type < 0) { - err = - INPmkTemp - ("Device type PSP103 not available in this binary\n"); - } - break; -#endif case 55: type = INPtypelook("B3SOIFD"); if (type < 0) { @@ -444,13 +381,8 @@ char *INPdomodel(CKTcircuit *ckt, struct card *image, INPtables * tab) } break; default: /* placeholder; use level xxx for the next model */ -#ifdef ADMS - err = INPmkTemp - ("Only MOS device levels 1-6,8-10,14,16,17,44,45,49,54-58,60,68,72,73,77 are supported in this binary\n"); -#else err = INPmkTemp ("Only MOS device levels 1-6,8-10,14,49,54-58,60,68,73 are supported in this binary\n"); -#endif break; } INPmakeMod(modname, type, image); @@ -481,15 +413,6 @@ char *INPdomodel(CKTcircuit *ckt, struct card *image, INPtables * tab) ("Device type Resistor not available in this binary\n"); } break; -#ifdef ADMS - case 2: - type = INPtypelook("r2_cmc"); - if (type < 0) { - err = INPmkTemp( - "Device type R2_CMC not available in this binary\n"); - } - break; -#endif } INPmakeMod(modname, type, image); } diff --git a/visualc/src/include/ngspice/config.h b/visualc/src/include/ngspice/config.h index df96c4ff9..8327d3716 100644 --- a/visualc/src/include/ngspice/config.h +++ b/visualc/src/include/ngspice/config.h @@ -38,10 +38,6 @@ #define CIDER 1 /* don't undef CIDER, otherwise compilation will fail */ -/* Support for Verilog-A(MS) models */ -/* #undef ADMS */ -/* ADMS compilation is not supported with MS Visual Studio */ - /* Define if we want debug sensitivity analysis */ /* #undef ASDEBUG */