hisimhv2: fix naming problems by MS linker

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"

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)

src/spicelib/devices/hisimhv2/hisimhv.h → 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

src/spicelib/devices/hisimhv2/hsmhv.c → 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 */

src/spicelib/devices/hisimhv2/hsmhvacld.c → 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,

src/spicelib/devices/hisimhv2/hsmhvask.c → 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"
 

src/spicelib/devices/hisimhv2/hsmhvcvtest.c → 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"

src/spicelib/devices/hisimhv2/hsmhvdef.h → 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*,

src/spicelib/devices/hisimhv2/hsmhvdel.c → 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"

src/spicelib/devices/hisimhv2/hsmhvdest.c → 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(

src/spicelib/devices/hisimhv2/hsmhveval.c → 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 ;

src/spicelib/devices/hisimhv2/hsmhveval_dio.c → 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;

src/spicelib/devices/hisimhv2/hsmhveval_rdrift.c → 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 ; }

src/spicelib/devices/hisimhv2/hsmhvgetic.c → 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"
 

src/spicelib/devices/hisimhv2/hsmhvinit.c → 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",

src/spicelib/devices/hisimhv2/hsmhvld.c → 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  */

src/spicelib/devices/hisimhv2/hsmhvmask.c → 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"
 

src/spicelib/devices/hisimhv2/hsmhvmdel.c → 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"
 

src/spicelib/devices/hisimhv2/hsmhvmpar.c → 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"

src/spicelib/devices/hisimhv2/hsmhvnoi.c → 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)

src/spicelib/devices/hisimhv2/hsmhvpar.c → 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"

src/spicelib/devices/hisimhv2/hsmhvpzld.c → 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(

src/spicelib/devices/hisimhv2/hsmhvset.c → 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"

src/spicelib/devices/hisimhv2/hsmhvsoachk.c → 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"

src/spicelib/devices/hisimhv2/hsmhvtemp.c → 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 ) */
 

src/spicelib/devices/hisimhv2/hsmhvtrunc.c → 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"
 

visualc-shared/sharedspice.vcproj

@@ -1204,6 +1204,10 @@
 				RelativePath="..\src\spicelib\devices\hisimhv1\hisimhv.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hisimhv2\hisimhv2.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\include\ngspice\hlpdefs.h"
 				>
@@ -1264,6 +1268,38 @@
 				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvtemp_eval.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2def.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2eval_qover.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2evalenv.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2ext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2init.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2itf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2ld_info_eval.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2temp_eval.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\include\ngspice\iferrmsg.h"
 				>
@@ -5116,6 +5152,86 @@
 				RelativePath="..\src\spicelib\devices\hisimhv1\hsmhvtrunc.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2acld.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2ask.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2cvtest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2del.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2dest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2eval.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2getic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2init.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2ld.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2mask.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2mdel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2mpar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2noi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2par.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2pzld.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2set.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2soachk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2temp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\spicelib\devices\hsmhv2\hsmhv2trunc.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\xspice\idn\idndig.c"
 				>

visualc/vngspice.vcxproj

@@ -1044,6 +1044,7 @@
     <ClInclude Include="..\src\spicelib\devices\hfet1\hfetitf.h" />
     <ClInclude Include="..\src\spicelib\devices\hisim2\hisim.h" />
     <ClInclude Include="..\src\spicelib\devices\hisimhv1\hisimhv.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hisimhv2.h" />
     <ClInclude Include="..\src\include\ngspice\hlpdefs.h" />
     <ClInclude Include="..\src\frontend\hpgl.h" />
     <ClInclude Include="..\src\spicelib\devices\hisim2\hsm2def.h" />
@@ -1059,6 +1060,17 @@
     <ClInclude Include="..\src\spicelib\devices\hisimhv1\hsmhvitf.h" />
     <ClInclude Include="..\src\spicelib\devices\hisimhv1\hsmhvld_info_eval.h" />
     <ClInclude Include="..\src\spicelib\devices\hisimhv1\hsmhvtemp_eval.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2def.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2eval_dep.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2eval_qover.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2evalenv.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2ext.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2init.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2itf.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2ld_info_eval.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2temp_eval.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2temp_eval_dio.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2temp_eval_rdri.h" />
     <ClInclude Include="..\src\include\ngspice\iferrmsg.h" />
     <ClInclude Include="..\src\include\ngspice\ifsim.h" />
     <ClInclude Include="..\src\spicelib\devices\ind\inddefs.h" />
@@ -2020,6 +2032,28 @@
     <ClCompile Include="..\src\spicelib\devices\hisimhv1\hsmhvsoachk.c" />
     <ClCompile Include="..\src\spicelib\devices\hisimhv1\hsmhvtemp.c" />
     <ClCompile Include="..\src\spicelib\devices\hisimhv1\hsmhvtrunc.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2acld.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2ask.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2cvtest.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2del.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2dest.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2eval.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2eval_dio.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2eval_rdrift.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2getic.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2init.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2ld.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2mask.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2mdel.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2mpar.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2noi.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2par.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2pzld.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2set.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2soachk.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2temp.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2trunc.c" />
     <ClCompile Include="..\src\xspice\idn\idndig.c" />
     <ClCompile Include="..\src\spicelib\parser\ifeval.c" />
     <ClCompile Include="..\src\spicelib\parser\ifnewuid.c" />

visualc/vngspice_fftw_vc10.vcxproj

@@ -1027,6 +1027,7 @@
     <ClInclude Include="..\src\spicelib\devices\hfet1\hfetitf.h" />
     <ClInclude Include="..\src\spicelib\devices\hisim2\hisim.h" />
     <ClInclude Include="..\src\spicelib\devices\hisimhv1\hisimhv.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hisimhv2.h" />
     <ClInclude Include="..\src\include\ngspice\hlpdefs.h" />
     <ClInclude Include="..\src\frontend\hpgl.h" />
     <ClInclude Include="..\src\spicelib\devices\hisim2\hsm2def.h" />
@@ -1042,6 +1043,17 @@
     <ClInclude Include="..\src\spicelib\devices\hisimhv1\hsmhvitf.h" />
     <ClInclude Include="..\src\spicelib\devices\hisimhv1\hsmhvld_info_eval.h" />
     <ClInclude Include="..\src\spicelib\devices\hisimhv1\hsmhvtemp_eval.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2def.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2eval_dep.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2eval_qover.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2evalenv.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2ext.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2init.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2itf.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2ld_info_eval.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2temp_eval.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2temp_eval_dio.h" />
+    <ClInclude Include="..\src\spicelib\devices\hisimhv2\hsmhv2temp_eval_rdri.h" />
     <ClInclude Include="..\src\include\ngspice\iferrmsg.h" />
     <ClInclude Include="..\src\include\ngspice\ifsim.h" />
     <ClInclude Include="..\src\spicelib\devices\ind\inddefs.h" />
@@ -2003,6 +2015,28 @@
     <ClCompile Include="..\src\spicelib\devices\hisimhv1\hsmhvsoachk.c" />
     <ClCompile Include="..\src\spicelib\devices\hisimhv1\hsmhvtemp.c" />
     <ClCompile Include="..\src\spicelib\devices\hisimhv1\hsmhvtrunc.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2acld.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2ask.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2cvtest.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2del.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2dest.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2eval.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2eval_dio.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2eval_rdrift.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2getic.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2init.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2ld.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2mask.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2mdel.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2mpar.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2noi.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2par.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2pzld.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2set.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2soachk.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2temp.c" />
+    <ClCompile Include="..\src\spicelib\devices\hisimhv2\hsmhv2trunc.c" />
     <ClCompile Include="..\src\xspice\idn\idndig.c" />
     <ClCompile Include="..\src\spicelib\parser\ifeval.c" />
     <ClCompile Include="..\src\spicelib\parser\ifnewuid.c" />