luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bad bug with name collapse between bsim3v32 and bsim3v32simd

This commit is contained in:
Florian Ballenegger 2020-07-26 00:42:28 +02:00
parent 06666cdad4
commit 7e7561c054
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/spicelib/devices/bsim3v32simd/b3v32.c
View File

@ -14,7 +14,7 @@
#include "bsim3v32def.h" #include "bsim3v32def.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
IFparm BSIM3v32pTable[] = { /* parameters */ IFparm BSIM3v32SIMDpTable[] = { /* parameters */
IOP( "l", BSIM3v32_L, IF_REAL , "Length"), IOP( "l", BSIM3v32_L, IF_REAL , "Length"),
IOP( "w", BSIM3v32_W, IF_REAL , "Width"), IOP( "w", BSIM3v32_W, IF_REAL , "Width"),
IOP( "m", BSIM3v32_M, IF_REAL , "Parallel multiplier"), IOP( "m", BSIM3v32_M, IF_REAL , "Parallel multiplier"),
@ -62,7 +62,7 @@ OP( "capbd", BSIM3v32_CAPBD, IF_REAL, "Capbd"),
OP( "capbs", BSIM3v32_CAPBS, IF_REAL, "Capbs"), OP( "capbs", BSIM3v32_CAPBS, IF_REAL, "Capbs"),
}; };
IFparm BSIM3v32mPTable[] = { /* model parameters */ IFparm BSIM3v32SIMDmPTable[] = { /* model parameters */
IOP( "capmod", BSIM3v32_MOD_CAPMOD, IF_INTEGER, "Capacitance model selector"), IOP( "capmod", BSIM3v32_MOD_CAPMOD, IF_INTEGER, "Capacitance model selector"),
IOP( "mobmod", BSIM3v32_MOD_MOBMOD, IF_INTEGER, "Mobility model selector"), IOP( "mobmod", BSIM3v32_MOD_MOBMOD, IF_INTEGER, "Mobility model selector"),
IOP( "noimod", BSIM3v32_MOD_NOIMOD, IF_INTEGER, "Noise model selector"), IOP( "noimod", BSIM3v32_MOD_NOIMOD, IF_INTEGER, "Noise model selector"),
@ -516,7 +516,7 @@ IP( "nmos", BSIM3v32_MOD_NMOS, IF_FLAG, "Flag to indicate NMOS"),
IP( "pmos", BSIM3v32_MOD_PMOS, IF_FLAG, "Flag to indicate PMOS"), IP( "pmos", BSIM3v32_MOD_PMOS, IF_FLAG, "Flag to indicate PMOS"),
}; };
char *BSIM3v32names[] = { char *BSIM3v32SIMDnames[] = {
"Drain", "Drain",
"Gate", "Gate",
"Source", "Source",
@ -524,11 +524,11 @@ char *BSIM3v32names[] = {
"Charge" "Charge"
}; };
int BSIM3v32nSize = NUMELEMS(BSIM3v32names); int BSIM3v32SIMDnSize = NUMELEMS(BSIM3v32SIMDnames);
int BSIM3v32pTSize = NUMELEMS(BSIM3v32pTable); int BSIM3v32SIMDpTSize = NUMELEMS(BSIM3v32SIMDpTable);
int BSIM3v32mPTSize = NUMELEMS(BSIM3v32mPTable); int BSIM3v32SIMDmPTSize = NUMELEMS(BSIM3v32SIMDmPTable);
int BSIM3v32iSize = sizeof(BSIM3v32instance); int BSIM3v32SIMDiSize = sizeof(BSIM3v32instance);
int BSIM3v32mSize = sizeof(BSIM3v32model); int BSIM3v32SIMDmSize = sizeof(BSIM3v32model);

18
src/spicelib/devices/bsim3v32simd/bsim3v32init.c
View File

@ -11,13 +11,13 @@ SPICEdev BSIM3v32simdinfo = {
.DEVpublic = { .DEVpublic = {
.name = "BSIM3v32simd", .name = "BSIM3v32simd",
.description = "Berkeley Short Channel IGFET Model Version-3", .description = "Berkeley Short Channel IGFET Model Version-3",
.terms = &BSIM3v32nSize, .terms = &BSIM3v32SIMDnSize,
.numNames = &BSIM3v32nSize, .numNames = &BSIM3v32SIMDnSize,
.termNames = BSIM3v32names, .termNames = BSIM3v32SIMDnames,
.numInstanceParms = &BSIM3v32pTSize, .numInstanceParms = &BSIM3v32SIMDpTSize,
.instanceParms = BSIM3v32pTable, .instanceParms = BSIM3v32SIMDpTable,
.numModelParms = &BSIM3v32mPTSize, .numModelParms = &BSIM3v32SIMDmPTSize,
.modelParms = BSIM3v32mPTable, .modelParms = BSIM3v32SIMDmPTable,
.flags = DEV_DEFAULT, .flags = DEV_DEFAULT,
#ifdef XSPICE #ifdef XSPICE
@ -63,8 +63,8 @@ SPICEdev BSIM3v32simdinfo = {
.DEVdisto = NULL, .DEVdisto = NULL,
.DEVnoise = BSIM3v32SIMDnoise, .DEVnoise = BSIM3v32SIMDnoise,
.DEVsoaCheck = BSIM3v32SIMDsoaCheck, .DEVsoaCheck = BSIM3v32SIMDsoaCheck,
.DEVinstSize = &BSIM3v32iSize, .DEVinstSize = &BSIM3v32SIMDiSize,
.DEVmodSize = &BSIM3v32mSize, .DEVmodSize = &BSIM3v32SIMDmSize,
#ifdef CIDER #ifdef CIDER
.DEVdump = NULL, .DEVdump = NULL,

16
src/spicelib/devices/bsim3v32simd/bsim3v32init.h
View File

@ -1,13 +1,13 @@
#ifndef _BSIM3v32INIT_H #ifndef _BSIM3v32INIT_H
#define _BSIM3v32INIT_H #define _BSIM3v32INIT_H
extern IFparm BSIM3v32pTable[ ]; extern IFparm BSIM3v32SIMDpTable[ ];
extern IFparm BSIM3v32mPTable[ ]; extern IFparm BSIM3v32SIMDmPTable[ ];
extern char *BSIM3v32names[ ]; extern char *BSIM3v32SIMDnames[ ];
extern int BSIM3v32pTSize; extern int BSIM3v32SIMDpTSize;
extern int BSIM3v32mPTSize; extern int BSIM3v32SIMDmPTSize;
extern int BSIM3v32nSize; extern int BSIM3v32SIMDnSize;
extern int BSIM3v32iSize; extern int BSIM3v32SIMDiSize;
extern int BSIM3v32mSize; extern int BSIM3v32SIMDmSize;
#endif #endif