diff --git a/ChangeLog b/ChangeLog index 65092136c..8b6f4cdf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-16 Paolo Nenzi + + * src/spicelib/devices/dev.c: removed EKV ifdefs. In future versions of + ngspice EKV (and other models) will be introduced as verilog-a models. + + 2006-01-31 Paolo Nenzi : * Committed the admst tree from the adms system. Laurent Lamaitre diff --git a/autogen.sh b/autogen.sh index 5881b16ed..acac52b4a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -119,14 +119,14 @@ test $TEST_TYPE $FILE || { if test "$ADMS" -eq 1; then # Build admsXml arguments list - for xml in `ls $XMLPATH | grep .xml`; do - if [ "$xml" != "ngspiceVersion.xml" ]; then - XMLARG="$XMLARG -e ../admst/$xml" - fi +# for xml in `ls $XMLPATH | grep .xml`; do +# if [ "$xml" != "ngspiceVersion.xml" ]; then +# XMLARG="$XMLARG -e ../admst/$xml" +# fi done # Prepend ngspiceVersion.xml - XMLARG="-e ../admst/ngspiceVersion.xml $XMLARG" +# XMLARG="-e ../admst/ngspiceVersion.xml $XMLARG" for file in `ls $ADMSDIR` do @@ -148,7 +148,7 @@ do $ADMSXML admsva/$file.va -Iadmsva -e ../admst/ngspiceVersion.xml \ -e ../admst/ngspiceMakefile.am.xml - $ADMSXML admsva/$file.va -Iadmsva ${XMLARG} +# $ADMSXML admsva/$file.va -Iadmsva ${XMLARG} cd - ;; diff --git a/configure.in b/configure.in index a84be8c46..cb300cea4 100644 --- a/configure.in +++ b/configure.in @@ -134,10 +134,6 @@ dnl --enable-expdevices : Enable the compilation of experimental devices AC_ARG_ENABLE(expdevices, AS_HELP_STRING([--enable-expdevices],[Enable experimental devices (they do not compile)])) -dnl --enable-ekv: define HAVE_EKV in the code. This is for EKV model support -AC_ARG_ENABLE(ekv, - AS_HELP_STRING([--enable-ekv],[Enable ekv model *not in standard distribution*])) - dnl --enable-xspice: define XSPICE in the code. This is for xspice support AC_ARG_ENABLE(xspice, AS_HELP_STRING([--enable-xspice],[Enable XSpice enhancements, (experimental) ])) @@ -146,6 +142,10 @@ dnl --enable-cider: define CIDER in the code. This is for CIDER support AC_ARG_ENABLE(cider, AS_HELP_STRING([--enable-cider],[Enable CIDER enhancements, (experimental) ])) +dnl --enable-adms: define ADMS in the code. This is for adms scripts support +AC_ARG_ENABLE(adms, + AS_HELP_STRING([--enable-adms],[Enable ADMS code models, (experimental) ])) + dnl --enable-cluster: define CLUSTER in the code. This is for cluster support AC_ARG_ENABLE(cluster, AS_HELP_STRING([--enable-cluster],[Enable cluster support, (experimental) ])) @@ -532,20 +532,6 @@ fi AC_SUBST(XGRAPHDIR) AC_SUBST(NOTXGRAPH) -if test "$enable_ekv" = "yes"; then - AC_MSG_RESULT(Model EKV included) - AC_DEFINE(HAVE_EKV,[],[Define HAVE_EKV when you wank the EVK library (not included in the standard distribution)]) - EKVDIR="ekv" - EKVLIB="spicelib/devices/ekv/libekv.la" -else - EKVDIR="" - EKVLIB="" -fi - -AC_SUBST(EKVDIR) -AC_SUBST(EKVLIB) - - dnl Add new code models to the build by pointing to them here. if test "$enable_xspice" = "yes"; then AC_MSG_RESULT(X-Spice features included) @@ -627,6 +613,22 @@ AC_SUBST(NUMDEV) AC_SUBST(NUMDEVDIR) AC_SUBST(CIDERSCRIPTS) + +dnl adms option +if test "$enable_adms" = "yes"; then + AC_MSG_RESULT(********************************** +* ADMS support is experimental * +**********************************) + AC_CHECK_PROGS(ADMSXML, admsXml admsXml.exe,no) + + if test "$ADMSXML" = "no"; then + AC_MSG_ERROR(If you want adms models you should install admsXml) + fi + AC_DEFINE(ADMS,[],[Support for Verilog-A(MS) models]) + AC_SUBST(ADMSXML) + +fi + dnl Cluster option if test "$enable_cluster" = "yes"; then AC_MSG_RESULT(Cluster version is being compiled) @@ -705,6 +707,9 @@ src/spinit \ src/spicelib/Makefile \ src/spicelib/analysis/Makefile \ src/spicelib/devices/Makefile \ +src/spicelib/devices/adms/Makefile \ +src/spicelib/devices/adms/c/Makefile \ +src/spicelib/devices/adms/bjt504_va/Makefile \ src/spicelib/devices/asrc/Makefile \ src/spicelib/devices/bjt/Makefile \ src/spicelib/devices/bjt2/Makefile \ diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am index bcd72a911..5b618c6a0 100644 --- a/src/spicelib/devices/Makefile.am +++ b/src/spicelib/devices/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = \ + adms \ asrc \ bjt \ bjt2 \ @@ -22,7 +23,6 @@ SUBDIRS = \ cpl \ csw \ dio \ - @EKVDIR@ \ ind \ isrc \ hfet1 \ @@ -73,7 +73,6 @@ DIST_SUBDIRS = \ cpl \ csw \ dio \ - @EKVDIR@ \ ind \ isrc \ hfet1 \ diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c index 4d1f13872..4e739f415 100644 --- a/src/spicelib/devices/dev.c +++ b/src/spicelib/devices/dev.c @@ -148,43 +148,17 @@ int add_udn(int,Evt_Udn_Info_t **); /*saj in xspice the DEVices size can be varied so DEVNUM is an int*/ #ifdef CIDER - - #ifdef HAVE_EKV - #include "ekv/ekvitf.h" - - #ifdef XSPICE - static int DEVNUM = 53; - #else - #define DEVNUM 53 - #endif - - #else - - #ifdef XSPICE - static int DEVNUM = 52; - #else - #define DEVNUM 52 - #endif - - #endif - + #ifdef XSPICE + static int DEVNUM = 52; + #else + #define DEVNUM 52 + #endif #else /* NOT CIDER */ - - #ifdef HAVE_EKV - #include "ekv/ekvitf.h" - #ifdef XSPICE - static int DEVNUM = 48; - #else - #define DEVNUM 48 - #endif - #else - #ifdef XSPICE - static int DEVNUM = 47; - #else - #define DEVNUM 47 - #endif - #endif - + #ifdef XSPICE + static int DEVNUM = 47; + #else + #define DEVNUM 47 + #endif #endif /* CIDER */ /*Make this dynamic for later attempt to make all devices dynamic*/ @@ -276,19 +250,10 @@ spice_init_devices(void) DEVices[49] = get_numd_info(); DEVices[50] = get_numd2_info(); DEVices[51] = get_numos_info(); -#ifdef HAVE_EKV - DEVices[52] = get_ekv_info(); - assert(53 == DEVNUM); -#else /* NOT EKV */ + assert(52 == DEVNUM); -#endif /* HAVE_EKV */ #else /* NOT CIDER */ -#ifdef HAVE_EKV - DEVices[47] = get_ekv_info(); - assert(48 == DEVNUM); -#else assert(47 == DEVNUM); -#endif #endif /* CIDER */ return; } @@ -316,11 +281,7 @@ devices(void) #ifdef DEVLIB /*not yet usable*/ -#ifdef HAVE_EKV -#define DEVICES_USED {"asrc", "bjt", "bjt2", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v2", "bsim3v1", "bsim4", "bsim3soipd", "bsim3soifd", \ - "bsim3soidd", "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", "ekv" } -#else + #define DEVICES_USED {"asrc", "bjt", "bjt2", "vbic", "bsim1", "bsim2", "bsim3", "bsim3v2", "bsim3v1", "bsim4", "bsim3soipd", "bsim3soifd", \ "bsim3soidd", "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"}