diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c index 4e74d99e0..a4c7bc6b7 100644 --- a/src/spicelib/devices/dev.c +++ b/src/spicelib/devices/dev.c @@ -95,7 +95,7 @@ int add_udn(int,Evt_Udn_Info_t **); #include "hfet2/hfet2itf.h" #include "hisim2/hsm2itf.h" #include "hisimhv1/hsmhvitf.h" -#include "hisimhv2/hsmhvitf.h" +#include "hisimhv2/hsmhv2itf.h" #include "ind/inditf.h" #include "isrc/isrcitf.h" #include "jfet/jfetitf.h" diff --git a/src/spicelib/devices/hisimhv2/Makefile.am b/src/spicelib/devices/hisimhv2/Makefile.am index fcb58c9a1..520fb0f95 100644 --- a/src/spicelib/devices/hisimhv2/Makefile.am +++ b/src/spicelib/devices/hisimhv2/Makefile.am @@ -2,40 +2,40 @@ noinst_LTLIBRARIES = libhisimhv2.la -libhisimhv2_la_SOURCES = hisimhv.h \ - hsmhv.c \ - hsmhvacld.c \ - hsmhvask.c \ - hsmhvcvtest.c \ - hsmhvdef.h \ - hsmhvdel.c \ - hsmhvdest.c \ - hsmhveval.c \ - hsmhveval_dep.h \ - hsmhveval_dio.c \ - hsmhveval_qover.h \ - hsmhveval_rdrift.c \ - hsmhvevalenv.h \ - hsmhvext.h \ - hsmhvgetic.c \ - hsmhvinit.c \ - hsmhvinit.h \ - hsmhvitf.h \ - hsmhvld.c \ - hsmhvld_info_eval.h \ - hsmhvmask.c \ - hsmhvmdel.c \ - hsmhvmpar.c \ - hsmhvnoi.c \ - hsmhvpar.c \ - hsmhvpzld.c \ - hsmhvset.c \ - hsmhvsoachk.c \ - hsmhvtemp.c \ - hsmhvtemp_eval.h \ - hsmhvtemp_eval_dio.h \ - hsmhvtemp_eval_rdri.h \ - hsmhvtrunc.c +libhisimhv2_la_SOURCES = hisimhv2.h \ + hsmhv2.c \ + hsmhv2acld.c \ + hsmhv2ask.c \ + hsmhv2cvtest.c \ + hsmhv2def.h \ + hsmhv2del.c \ + hsmhv2dest.c \ + hsmhv2eval.c \ + hsmhv2eval_dep.h \ + hsmhv2eval_dio.c \ + hsmhv2eval_qover.h \ + hsmhv2eval_rdrift.c \ + hsmhv2evalenv.h \ + hsmhv2ext.h \ + hsmhv2getic.c \ + hsmhv2init.c \ + hsmhv2init.h \ + hsmhv2itf.h \ + hsmhv2ld.c \ + hsmhv2ld_info_eval.h \ + hsmhv2mask.c \ + hsmhv2mdel.c \ + hsmhv2mpar.c \ + hsmhv2noi.c \ + hsmhv2par.c \ + hsmhv2pzld.c \ + hsmhv2set.c \ + hsmhv2soachk.c \ + hsmhv2temp.c \ + hsmhv2temp_eval.h \ + hsmhv2temp_eval_dio.h \ + hsmhv2temp_eval_rdri.h \ + hsmhv2trunc.c AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include AM_CFLAGS = $(STATIC) diff --git a/src/spicelib/devices/hisimhv2/hisimhv.h b/src/spicelib/devices/hisimhv2/hisimhv2.h similarity index 99% rename from src/spicelib/devices/hisimhv2/hisimhv.h rename to src/spicelib/devices/hisimhv2/hisimhv2.h index 10863759b..3f1448cd4 100644 --- a/src/spicelib/devices/hisimhv2/hisimhv.h +++ b/src/spicelib/devices/hisimhv2/hisimhv2.h @@ -57,7 +57,7 @@ Katsuhiro Shimohigashi, President&CEO, STARC June 2008 (revised October 2011) *************************************************************************/ -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/cktdefs.h" #ifndef _HiSIMHV2_H diff --git a/src/spicelib/devices/hisimhv2/hsmhv.c b/src/spicelib/devices/hisimhv2/hsmhv2.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhv.c rename to src/spicelib/devices/hisimhv2/hsmhv2.c index 4a4a67585..465207142 100644 --- a/src/spicelib/devices/hisimhv2/hsmhv.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2.c @@ -60,7 +60,7 @@ June 2008 (revised October 2011) #include "ngspice/ngspice.h" #include "ngspice/devdefs.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/suffix.h" IFparm HSMHV2pTable[] = { /* parameters */ diff --git a/src/spicelib/devices/hisimhv2/hsmhvacld.c b/src/spicelib/devices/hisimhv2/hsmhv2acld.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvacld.c rename to src/spicelib/devices/hisimhv2/hsmhv2acld.c index d39bd3acf..06ff835aa 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvacld.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2acld.c @@ -61,7 +61,7 @@ June 2008 (revised October 2011) #include "ngspice/cktdefs.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" int HSMHV2acLoad( GENmodel *inModel, diff --git a/src/spicelib/devices/hisimhv2/hsmhvask.c b/src/spicelib/devices/hisimhv2/hsmhv2ask.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvask.c rename to src/spicelib/devices/hisimhv2/hsmhv2ask.c index 3a78b515b..d0ca72423 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvask.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2ask.c @@ -61,7 +61,7 @@ June 2008 (revised October 2011) #include "ngspice/ifsim.h" #include "ngspice/cktdefs.h" #include "ngspice/devdefs.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" diff --git a/src/spicelib/devices/hisimhv2/hsmhvcvtest.c b/src/spicelib/devices/hisimhv2/hsmhv2cvtest.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvcvtest.c rename to src/spicelib/devices/hisimhv2/hsmhv2cvtest.c index 9695f0101..4832de7a8 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvcvtest.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2cvtest.c @@ -59,7 +59,7 @@ June 2008 (revised October 2011) #include "ngspice/ngspice.h" #include "ngspice/cktdefs.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/trandefs.h" #include "ngspice/const.h" #include "ngspice/devdefs.h" diff --git a/src/spicelib/devices/hisimhv2/hsmhvdef.h b/src/spicelib/devices/hisimhv2/hsmhv2def.h similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvdef.h rename to src/spicelib/devices/hisimhv2/hsmhv2def.h index fe265ee6d..4f4c4abbf 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvdef.h +++ b/src/spicelib/devices/hisimhv2/hsmhv2def.h @@ -3470,7 +3470,7 @@ typedef struct sHSMHV2model { /* model structure for a resistor */ #define HSMHV2_MOD_VBS_MAX 4005 #define HSMHV2_MOD_VBD_MAX 4006 -#include "hsmhvext.h" +#include "hsmhv2ext.h" /* Prototype has to be adapted! extern void HSMHV2evaluate(double,double,double,HSMHV2instance*,HSMHV2model*, diff --git a/src/spicelib/devices/hisimhv2/hsmhvdel.c b/src/spicelib/devices/hisimhv2/hsmhv2del.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvdel.c rename to src/spicelib/devices/hisimhv2/hsmhv2del.c index 72b6162a2..1f6486713 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvdel.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2del.c @@ -58,7 +58,7 @@ June 2008 (revised October 2011) *************************************************************************/ #include "ngspice/ngspice.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/sperror.h" #include "ngspice/gendefs.h" #include "ngspice/suffix.h" diff --git a/src/spicelib/devices/hisimhv2/hsmhvdest.c b/src/spicelib/devices/hisimhv2/hsmhv2dest.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvdest.c rename to src/spicelib/devices/hisimhv2/hsmhv2dest.c index ac6d34ce9..5ef49828c 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvdest.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2dest.c @@ -58,7 +58,7 @@ June 2008 (revised October 2011) *************************************************************************/ #include "ngspice/ngspice.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/suffix.h" void HSMHV2destroy( diff --git a/src/spicelib/devices/hisimhv2/hsmhveval.c b/src/spicelib/devices/hisimhv2/hsmhv2eval.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhveval.c rename to src/spicelib/devices/hisimhv2/hsmhv2eval.c index 081a2e294..cda4d0e88 100644 --- a/src/spicelib/devices/hisimhv2/hsmhveval.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2eval.c @@ -127,8 +127,8 @@ June 2008 (revised October 2011) /*-----------------------------------* * HiSIM macros *-----------------*/ -#include "hisimhv.h" -#include "hsmhvevalenv.h" +#include "hisimhv2.h" +#include "hsmhv2evalenv.h" #define C_IDD_MIN 1.0e-15 #define C_sub_delta 0.1 /* CHECK! */ #define C_sub_delta2 1.0e-9 /* CHECK! */ @@ -1033,7 +1033,7 @@ int HSMHV2evaluate if ( here->HSMHV2tempNode > 0 && pParam->HSMHV2_rth0 != 0.0 ) { #define HSMHV2EVAL -#include "hsmhvtemp_eval.h" +#include "hsmhv2temp_eval.h" } else { beta = here->HSMHV2_beta ; @@ -2045,7 +2045,7 @@ int HSMHV2evaluate * depletion mode MOSFET *------------------*/ -#include "hsmhveval_dep.h" +#include "hsmhv2eval_dep.h" } else { @@ -5185,7 +5185,7 @@ start_of_mobility: cnst0over_func = ModeNML * here->HSMHV2_cnst0overs + ModeRVS * here->HSMHV2_cnst0over ; cnst0over_func_dT = ModeNML * cnst0overs_dT + ModeRVS * cnst0over_dT ; -#include "hsmhveval_qover.h" +#include "hsmhv2eval_qover.h" if (here->HSMHV2_mode != HiSIM_NORMAL_MODE) { @@ -5241,7 +5241,7 @@ start_of_mobility: Vxbgmt_dVds = 0.0 ; Vxbgmt_dVgs = 0.0 ; -#include "hsmhveval_qover.h" +#include "hsmhv2eval_qover.h" T4 = here->HSMHV2_weffcv_nf * Lovers * CVDSOVER ; Qovsext = T4 * QsuLD ; @@ -5340,7 +5340,7 @@ start_of_mobility: cnst0over_func = ModeNML * here->HSMHV2_cnst0over + ModeRVS * here->HSMHV2_cnst0overs ; cnst0over_func_dT = ModeNML * cnst0over_dT + ModeRVS * cnst0overs_dT ; -#include "hsmhveval_qover.h" +#include "hsmhv2eval_qover.h" if (here->HSMHV2_mode == HiSIM_NORMAL_MODE) { @@ -5395,7 +5395,7 @@ start_of_mobility: Vxbgmt_dVds = 1.0 ; Vxbgmt_dVgs = 0.0 ; -#include "hsmhveval_qover.h" +#include "hsmhv2eval_qover.h" T4 = here->HSMHV2_weffcv_nf * Loverd * CVDSOVER ; Qovdext = T4 * QsuLD ; diff --git a/src/spicelib/devices/hisimhv2/hsmhveval_dep.h b/src/spicelib/devices/hisimhv2/hsmhv2eval_dep.h similarity index 100% rename from src/spicelib/devices/hisimhv2/hsmhveval_dep.h rename to src/spicelib/devices/hisimhv2/hsmhv2eval_dep.h diff --git a/src/spicelib/devices/hisimhv2/hsmhveval_dio.c b/src/spicelib/devices/hisimhv2/hsmhv2eval_dio.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhveval_dio.c rename to src/spicelib/devices/hisimhv2/hsmhv2eval_dio.c index dcbb8d4bc..a8e3807d7 100644 --- a/src/spicelib/devices/hisimhv2/hsmhveval_dio.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2eval_dio.c @@ -72,8 +72,8 @@ June 2008 (revised October 2011) /*-----------------------------------* * HiSIM macros *-----------------*/ -#include "hisimhv.h" -#include "hsmhvevalenv.h" +#include "hisimhv2.h" +#include "hsmhv2evalenv.h" /*===========================================================* * Function HSMHV2dio @@ -153,7 +153,7 @@ int HSMHV2dio if ( here->HSMHV2tempNode > 0 && pParam->HSMHV2_rth0 != 0.0 ) { #define HSMHV2EVAL -#include "hsmhvtemp_eval_dio.h" +#include "hsmhv2temp_eval_dio.h" } else { TTEMP = ckt->CKTtemp; diff --git a/src/spicelib/devices/hisimhv2/hsmhveval_qover.h b/src/spicelib/devices/hisimhv2/hsmhv2eval_qover.h similarity index 100% rename from src/spicelib/devices/hisimhv2/hsmhveval_qover.h rename to src/spicelib/devices/hisimhv2/hsmhv2eval_qover.h diff --git a/src/spicelib/devices/hisimhv2/hsmhveval_rdrift.c b/src/spicelib/devices/hisimhv2/hsmhv2eval_rdrift.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhveval_rdrift.c rename to src/spicelib/devices/hisimhv2/hsmhv2eval_rdrift.c index 6045ae5bf..b07b0f3ca 100644 --- a/src/spicelib/devices/hisimhv2/hsmhveval_rdrift.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2eval_rdrift.c @@ -71,8 +71,8 @@ June 2008 (revised October 2011) /*-----------------------------------* * HiSIM macros *-----------------*/ -#include "hisimhv.h" -#include "hsmhvevalenv.h" +#include "hisimhv2.h" +#include "hsmhv2evalenv.h" /* local variables used in macro functions */ static double TMF0 , TMF1 , TMF2 , TMF3 ; @@ -285,7 +285,7 @@ int HSMHV2rdrift if ( here->HSMHV2tempNode > 0 && pParam->HSMHV2_rth0 != 0.0 ) { #define HSMHV2EVAL -#include "hsmhvtemp_eval_rdri.h" +#include "hsmhv2temp_eval_rdri.h" } else { if ( here->HSMHV2_dtemp_Given ) { TTEMP = TTEMP + here->HSMHV2_dtemp ; } diff --git a/src/spicelib/devices/hisimhv2/hsmhvevalenv.h b/src/spicelib/devices/hisimhv2/hsmhv2evalenv.h similarity index 100% rename from src/spicelib/devices/hisimhv2/hsmhvevalenv.h rename to src/spicelib/devices/hisimhv2/hsmhv2evalenv.h diff --git a/src/spicelib/devices/hisimhv2/hsmhvext.h b/src/spicelib/devices/hisimhv2/hsmhv2ext.h similarity index 100% rename from src/spicelib/devices/hisimhv2/hsmhvext.h rename to src/spicelib/devices/hisimhv2/hsmhv2ext.h diff --git a/src/spicelib/devices/hisimhv2/hsmhvgetic.c b/src/spicelib/devices/hisimhv2/hsmhv2getic.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvgetic.c rename to src/spicelib/devices/hisimhv2/hsmhv2getic.c index 474f888db..7c6adca28 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvgetic.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2getic.c @@ -59,7 +59,7 @@ June 2008 (revised October 2011) #include "ngspice/ngspice.h" #include "ngspice/cktdefs.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" diff --git a/src/spicelib/devices/hisimhv2/hsmhvinit.c b/src/spicelib/devices/hisimhv2/hsmhv2init.c similarity index 96% rename from src/spicelib/devices/hisimhv2/hsmhvinit.c rename to src/spicelib/devices/hisimhv2/hsmhv2init.c index a0da6ce5a..558687aaf 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvinit.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2init.c @@ -2,9 +2,9 @@ #include "ngspice/devdefs.h" -#include "hsmhvdef.h" -#include "hsmhvitf.h" -#include "hsmhvinit.h" +#include "hsmhv2def.h" +#include "hsmhv2itf.h" +#include "hsmhv2init.h" SPICEdev HSMHV2info = { { "HiSIMHV2", diff --git a/src/spicelib/devices/hisimhv2/hsmhvinit.h b/src/spicelib/devices/hisimhv2/hsmhv2init.h similarity index 100% rename from src/spicelib/devices/hisimhv2/hsmhvinit.h rename to src/spicelib/devices/hisimhv2/hsmhv2init.h diff --git a/src/spicelib/devices/hisimhv2/hsmhvitf.h b/src/spicelib/devices/hisimhv2/hsmhv2itf.h similarity index 100% rename from src/spicelib/devices/hisimhv2/hsmhvitf.h rename to src/spicelib/devices/hisimhv2/hsmhv2itf.h diff --git a/src/spicelib/devices/hisimhv2/hsmhvld.c b/src/spicelib/devices/hisimhv2/hsmhv2ld.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvld.c rename to src/spicelib/devices/hisimhv2/hsmhv2ld.c index 7c7d05443..13de99cbe 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvld.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2ld.c @@ -58,7 +58,7 @@ June 2008 (revised October 2011) *************************************************************************/ #include "ngspice/ngspice.h" -#include "hisimhv.h" +#include "hisimhv2.h" #include "ngspice/trandefs.h" #include "ngspice/const.h" #include "ngspice/sperror.h" @@ -1784,7 +1784,7 @@ line755: /* standard entry if HSMHV2evaluate is bypassed */ } } -#include "hsmhvld_info_eval.h" +#include "hsmhv2ld_info_eval.h" /* For standard Newton method (SPICE_rhs == 0): */ /* if currents (and charges) are limited -> extrapolate onto x-values */ diff --git a/src/spicelib/devices/hisimhv2/hsmhvld_info_eval.h b/src/spicelib/devices/hisimhv2/hsmhv2ld_info_eval.h similarity index 100% rename from src/spicelib/devices/hisimhv2/hsmhvld_info_eval.h rename to src/spicelib/devices/hisimhv2/hsmhv2ld_info_eval.h diff --git a/src/spicelib/devices/hisimhv2/hsmhvmask.c b/src/spicelib/devices/hisimhv2/hsmhv2mask.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvmask.c rename to src/spicelib/devices/hisimhv2/hsmhv2mask.c index 83445f784..e58dbc457 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvmask.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2mask.c @@ -61,7 +61,7 @@ June 2008 (revised October 2011) #include "ngspice/ifsim.h" #include "ngspice/cktdefs.h" #include "ngspice/devdefs.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" diff --git a/src/spicelib/devices/hisimhv2/hsmhvmdel.c b/src/spicelib/devices/hisimhv2/hsmhv2mdel.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvmdel.c rename to src/spicelib/devices/hisimhv2/hsmhv2mdel.c index a4ad5decc..de5d21173 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvmdel.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2mdel.c @@ -58,7 +58,7 @@ June 2008 (revised October 2011) *************************************************************************/ #include "ngspice/ngspice.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" diff --git a/src/spicelib/devices/hisimhv2/hsmhvmpar.c b/src/spicelib/devices/hisimhv2/hsmhv2mpar.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvmpar.c rename to src/spicelib/devices/hisimhv2/hsmhv2mpar.c index b76df7414..c74c0b92f 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvmpar.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2mpar.c @@ -58,7 +58,7 @@ June 2008 (revised October 2011) *************************************************************************/ #include "ngspice/ngspice.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/ifsim.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" diff --git a/src/spicelib/devices/hisimhv2/hsmhvnoi.c b/src/spicelib/devices/hisimhv2/hsmhv2noi.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvnoi.c rename to src/spicelib/devices/hisimhv2/hsmhv2noi.c index 3073ff719..d9d33edbf 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvnoi.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2noi.c @@ -58,14 +58,14 @@ June 2008 (revised October 2011) *************************************************************************/ #include "ngspice/ngspice.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/cktdefs.h" #include "ngspice/iferrmsg.h" #include "ngspice/noisedef.h" #include "ngspice/suffix.h" #include "ngspice/const.h" /* jwan */ -#include "hsmhvevalenv.h" -/* #include "hsmhvmacro.h" */ +#include "hsmhv2evalenv.h" +/* #include "hsmhv2macro.h" */ /* * HSMHV2noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/hisimhv2/hsmhvpar.c b/src/spicelib/devices/hisimhv2/hsmhv2par.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvpar.c rename to src/spicelib/devices/hisimhv2/hsmhv2par.c index 6dc42681e..a3fe1400b 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvpar.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2par.c @@ -59,7 +59,7 @@ June 2008 (revised October 2011) #include "ngspice/ngspice.h" #include "ngspice/ifsim.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" #include "ngspice/fteext.h" diff --git a/src/spicelib/devices/hisimhv2/hsmhvpzld.c b/src/spicelib/devices/hisimhv2/hsmhv2pzld.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvpzld.c rename to src/spicelib/devices/hisimhv2/hsmhv2pzld.c index ccfd67091..8c8562fa4 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvpzld.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2pzld.c @@ -61,7 +61,7 @@ June 2008 (revised October 2011) #include "ngspice/cktdefs.h" #include "ngspice/complex.h" #include "ngspice/sperror.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/suffix.h" int HSMHV2pzLoad( diff --git a/src/spicelib/devices/hisimhv2/hsmhvset.c b/src/spicelib/devices/hisimhv2/hsmhv2set.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvset.c rename to src/spicelib/devices/hisimhv2/hsmhv2set.c index 61b1c2b12..6f4256fb5 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvset.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2set.c @@ -60,8 +60,8 @@ June 2008 (revised October 2011) #include "ngspice/ngspice.h" #include "ngspice/smpdefs.h" #include "ngspice/cktdefs.h" -#include "hsmhvdef.h" -#include "hsmhvevalenv.h" +#include "hsmhv2def.h" +#include "hsmhv2evalenv.h" #include "ngspice/const.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" diff --git a/src/spicelib/devices/hisimhv2/hsmhvsoachk.c b/src/spicelib/devices/hisimhv2/hsmhv2soachk.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvsoachk.c rename to src/spicelib/devices/hisimhv2/hsmhv2soachk.c index f53316d46..c50e9cf74 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvsoachk.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2soachk.c @@ -5,7 +5,7 @@ Author: 2013 Dietmar Warning #include "ngspice/ngspice.h" #include "ngspice/cktdefs.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/trandefs.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" diff --git a/src/spicelib/devices/hisimhv2/hsmhvtemp.c b/src/spicelib/devices/hisimhv2/hsmhv2temp.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvtemp.c rename to src/spicelib/devices/hisimhv2/hsmhv2temp.c index 1a5e5dc06..accd3d69c 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvtemp.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2temp.c @@ -60,8 +60,8 @@ June 2008 (revised October 2011) #include "ngspice/ngspice.h" #include "ngspice/smpdefs.h" #include "ngspice/cktdefs.h" -#include "hsmhvdef.h" -#include "hsmhvevalenv.h" +#include "hsmhv2def.h" +#include "hsmhv2evalenv.h" #include "ngspice/const.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" @@ -488,9 +488,9 @@ int HSMHV2temp( *-----------------*/ if ( here->HSMHV2tempNode < 0 || pParam->HSMHV2_rth0 == 0.0 ) { -#include "hsmhvtemp_eval.h" -#include "hsmhvtemp_eval_rdri.h" -#include "hsmhvtemp_eval_dio.h" +#include "hsmhv2temp_eval.h" +#include "hsmhv2temp_eval_rdri.h" +#include "hsmhv2temp_eval_dio.h" } /* end of if ( here->HSMHV2tempNode < 0 || pParam->HSMHV2_rth0 == 0.0 ) */ diff --git a/src/spicelib/devices/hisimhv2/hsmhvtemp_eval.h b/src/spicelib/devices/hisimhv2/hsmhv2temp_eval.h similarity index 100% rename from src/spicelib/devices/hisimhv2/hsmhvtemp_eval.h rename to src/spicelib/devices/hisimhv2/hsmhv2temp_eval.h diff --git a/src/spicelib/devices/hisimhv2/hsmhvtemp_eval_dio.h b/src/spicelib/devices/hisimhv2/hsmhv2temp_eval_dio.h similarity index 100% rename from src/spicelib/devices/hisimhv2/hsmhvtemp_eval_dio.h rename to src/spicelib/devices/hisimhv2/hsmhv2temp_eval_dio.h diff --git a/src/spicelib/devices/hisimhv2/hsmhvtemp_eval_rdri.h b/src/spicelib/devices/hisimhv2/hsmhv2temp_eval_rdri.h similarity index 100% rename from src/spicelib/devices/hisimhv2/hsmhvtemp_eval_rdri.h rename to src/spicelib/devices/hisimhv2/hsmhv2temp_eval_rdri.h diff --git a/src/spicelib/devices/hisimhv2/hsmhvtrunc.c b/src/spicelib/devices/hisimhv2/hsmhv2trunc.c similarity index 99% rename from src/spicelib/devices/hisimhv2/hsmhvtrunc.c rename to src/spicelib/devices/hisimhv2/hsmhv2trunc.c index 2df9110a8..55ebf8e0f 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvtrunc.c +++ b/src/spicelib/devices/hisimhv2/hsmhv2trunc.c @@ -59,7 +59,7 @@ June 2008 (revised October 2011) #include "ngspice/ngspice.h" #include "ngspice/cktdefs.h" -#include "hsmhvdef.h" +#include "hsmhv2def.h" #include "ngspice/sperror.h" #include "ngspice/suffix.h" diff --git a/visualc-shared/sharedspice.vcproj b/visualc-shared/sharedspice.vcproj index cef4435d0..a867411ae 100644 --- a/visualc-shared/sharedspice.vcproj +++ b/visualc-shared/sharedspice.vcproj @@ -1204,6 +1204,10 @@ RelativePath="..\src\spicelib\devices\hisimhv1\hisimhv.h" > + + @@ -1264,6 +1268,38 @@ RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvtemp_eval.h" > + + + + + + + + + + + + + + + + @@ -5116,6 +5152,86 @@ RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvtrunc.c" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj index a138ad47b..c19dc68f7 100644 --- a/visualc/vngspice.vcxproj +++ b/visualc/vngspice.vcxproj @@ -1044,6 +1044,7 @@ + @@ -1059,6 +1060,17 @@ + + + + + + + + + + + @@ -2020,6 +2032,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/visualc/vngspice_fftw_vc10.vcxproj b/visualc/vngspice_fftw_vc10.vcxproj index 33d65ccb8..df76239b6 100644 --- a/visualc/vngspice_fftw_vc10.vcxproj +++ b/visualc/vngspice_fftw_vc10.vcxproj @@ -1027,6 +1027,7 @@ + @@ -1042,6 +1043,17 @@ + + + + + + + + + + + @@ -2003,6 +2015,28 @@ + + + + + + + + + + + + + + + + + + + + + +