From 844fd93f9210acf3293876f336e0eb47b80155ed Mon Sep 17 00:00:00 2001 From: dwarning Date: Wed, 9 May 2007 19:24:17 +0000 Subject: [PATCH] Only the ekv long channel version as a placeholder --- src/spicelib/devices/dev.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c index 1efc070f3..efbce71db 100644 --- a/src/spicelib/devices/dev.c +++ b/src/spicelib/devices/dev.c @@ -120,6 +120,7 @@ int add_udn(int,Evt_Udn_Info_t **); #include "adms/hicum0/hicum0itf.h" #include "adms/hicum2/hicum2itf.h" #include "adms/mextram/mextramitf.h" +#include "adms/ekv/ekvitf.h" #include "adms/psp102/psp102itf.h" #endif #ifdef CIDER @@ -135,8 +136,6 @@ int add_udn(int,Evt_Udn_Info_t **); #endif /*saj in xspice the DEVices size can be varied so DEVNUM is an int*/ -/* the following def is tooooo long, should have nice skill. */ - #ifdef CIDER #ifdef ADMS @@ -299,12 +298,13 @@ spice_init_devices(void) DEVices[52] = get_hicum0_info(); DEVices[53] = get_hicum2_info(); DEVices[54] = get_mextram_info(); - DEVices[55] = get_psp102_info(); + DEVices[55] = get_ekv_info(); + DEVices[56] = get_psp102_info(); #ifdef NDEV /* NDEV */ - DEVices[56] = get_ndev_info(); - assert(57 == DEVNUM); + DEVices[57] = get_ndev_info(); + assert(58 == DEVNUM); #else - assert(56 == DEVNUM); + assert(57 == DEVNUM); #endif #else /* NOT ADMS */ #ifdef NDEV /* NDEV */ @@ -319,12 +319,13 @@ spice_init_devices(void) DEVices[47] = get_hicum0_info(); DEVices[48] = get_hicum2_info(); DEVices[49] = get_mextram_info(); - DEVices[50] = get_psp102_info(); + DEVices[50] = get_ekv_info(); + DEVices[51] = get_psp102_info(); #ifdef NDEV /* NDEV */ - DEVices[51] = get_ndev_info(); - assert(52 == DEVNUM); + DEVices[52] = get_ndev_info(); + assert(53 == DEVNUM); #else - assert(51 == DEVNUM); + assert(52 == DEVNUM); #endif #else /* NOT ADMS */ #ifdef NDEV /* NDEV */ @@ -361,13 +362,13 @@ devices(void) /*not yet usable*/ #ifdef ADMS -#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", "hicum0", "hicum2", "mextram", "psp102"} +#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", "hicum0", "hicum2", "mextram", "ekv", "psp102"} #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"} +#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"} #endif int load_dev(char *name) { char *msg;