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

mostly unwanted whitespace changes

This commit is contained in:
Francesco Lannutti 2014-04-26 20:09:21 +02:00 committed by rlar
parent b9b1a33cca
commit b991345f2f
55 changed files with 43 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/spicelib/analysis/cktload.c
View File

@ -81,11 +81,11 @@ CKTload(CKTcircuit *ckt)
if (status != 0) if (status != 0)
return (E_NOMEM) ; return (E_NOMEM) ;
#else #else
size = SMPmatSize(ckt->CKTmatrix); size = SMPmatSize (ckt->CKTmatrix) ;
for (i = 0; i <= size; i++) { for (i = 0 ; i <= size ; i++)
ckt->CKTrhs[i] = 0; *(ckt->CKTrhs + i) = 0 ;
}
SMPclear(ckt->CKTmatrix); SMPclear (ckt->CKTmatrix) ;
#endif #endif
#ifdef STEPDEBUG #ifdef STEPDEBUG

6
src/spicelib/analysis/cktsetup.c
View File

@ -53,7 +53,8 @@ typedef struct sElement {
double val ; double val ;
} Element ; } Element ;
static int static
int
Compare (const void *a, const void *b) Compare (const void *a, const void *b)
{ {
Element *A, *B ; Element *A, *B ;
@ -62,7 +63,8 @@ Compare (const void *a, const void *b)
return (A->row - B->row) ; return (A->row - B->row) ;
} }
static int static
int
Compress (int *Ai, int *Bp, int num_rows, int n_COO) Compress (int *Ai, int *Bp, int num_rows, int n_COO)
{ {
int i, j ; int i, j ;

10
src/spicelib/analysis/dctran.c
View File

@ -354,8 +354,7 @@ DCtran(CKTcircuit *ckt,
if (status != 0) if (status != 0)
return (E_NOMEM) ; return (E_NOMEM) ;
#else #else
bcopy(ckt->CKTstate0, ckt->CKTstate1, bcopy (ckt->CKTstate0, ckt->CKTstate1, (size_t) ckt->CKTnumStates * sizeof(double)) ;
(size_t) ckt->CKTnumStates * sizeof(double));
#endif #endif
#ifdef WANT_SENSE2 #ifdef WANT_SENSE2
@ -807,9 +806,10 @@ resume:
if (status != 0) if (status != 0)
return (E_NOMEM) ; return (E_NOMEM) ;
#else #else
for(i=0;i<ckt->CKTnumStates;i++) { for (i = 0 ; i < ckt->CKTnumStates ; i++)
ckt->CKTstate2[i] = ckt->CKTstate1[i]; {
ckt->CKTstate3[i] = ckt->CKTstate1[i]; ckt->CKTstate2 [i] = ckt->CKTstate1 [i] ;
ckt->CKTstate3 [i] = ckt->CKTstate1 [i] ;
} }
#endif #endif

2
src/spicelib/devices/bsim3soi_dd/b3soiddinit.c
View File

@ -90,5 +90,3 @@ get_b3soidd_info (void)
{ {
return &B3SOIDDinfo; return &B3SOIDDinfo;
} }

5
src/spicelib/devices/bsim3soi_fd/b3soifdinit.c
View File

@ -86,11 +86,6 @@ SPICEdev B3SOIFDinfo = {
}; };
SPICEdev * SPICEdev *
get_b3soifd_info (void) get_b3soifd_info (void)
{ {

2
src/spicelib/devices/bsim4/b4getic.c
View File

@ -71,5 +71,5 @@ BSIM4instance *here;
#endif #endif
} }
return(OK); return (OK) ;
} }

2
src/spicelib/devices/bsim4/b4set.c
View File

@ -3169,7 +3169,7 @@ do { if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NUL
} }
#endif #endif
return(OK); return (OK) ;
} }
int int

2
src/spicelib/devices/bsim4/b4temp.c
View File

@ -2511,5 +2511,5 @@ int Size_Not_Found, i;
#endif #endif
} }
return(OK); return (OK) ;
} }

1
src/spicelib/devices/bsim4v4/bsim4v4init.c
View File

@ -88,7 +88,6 @@ SPICEdev BSIM4v4info = {
}; };
SPICEdev * SPICEdev *
get_bsim4v4_info(void) get_bsim4v4_info(void)
{ {

1
src/spicelib/devices/bsim4v5/bsim4v5init.c
View File

@ -88,7 +88,6 @@ SPICEdev BSIM4v5info = {
}; };
SPICEdev * SPICEdev *
get_bsim4v5_info(void) get_bsim4v5_info(void)
{ {

1
src/spicelib/devices/bsim4v6/bsim4v6init.c
View File

@ -88,7 +88,6 @@ SPICEdev BSIM4v6info = {
}; };
SPICEdev * SPICEdev *
get_bsim4v6_info(void) get_bsim4v6_info(void)
{ {

2
src/spicelib/devices/bsimsoi/b4soiinit.c
View File

@ -91,5 +91,3 @@ get_b4soi_info (void)
{ {
return &B4SOIinfo; return &B4SOIinfo;
} }

2
src/spicelib/devices/cap/captemp.c
View File

@ -115,6 +115,6 @@ CAPtemp(GENmodel *inModel, CKTcircuit *ckt)
#endif #endif
} }
return(OK); return (OK) ;
} }

1
src/spicelib/devices/dio/dioinit.c
View File

@ -89,7 +89,6 @@ SPICEdev DIOinfo = {
}; };
SPICEdev * SPICEdev *
get_dio_info(void) get_dio_info(void)
{ {

1
src/spicelib/devices/hfet2/hfet2init.c
View File

@ -88,7 +88,6 @@ SPICEdev HFET2info = {
}; };
SPICEdev * SPICEdev *
get_hfet2_info(void) get_hfet2_info(void)
{ {

1
src/spicelib/devices/hisim2/hsm2init.c
View File

@ -86,7 +86,6 @@ SPICEdev HSM2info = {
}; };
SPICEdev * SPICEdev *
get_hsm2_info(void) get_hsm2_info(void)
{ {

1
src/spicelib/devices/hisimhv1/hsmhvinit.c
View File

@ -86,7 +86,6 @@ SPICEdev HSMHVinfo = {
}; };
SPICEdev * SPICEdev *
get_hsmhv_info(void) get_hsmhv_info(void)
{ {

2
src/spicelib/devices/ind/inddefs.h
View File

@ -160,7 +160,6 @@ typedef struct sINDmodel { /* model structure for an inductor */
} INDmodel; } INDmodel;
/* structures used to describe mutual inductors */ /* structures used to describe mutual inductors */
@ -288,6 +287,7 @@ IFuid MUTmodName; /* pointer to character string naming this model */
#define IND_QUEST_SENS_CPLX 205 #define IND_QUEST_SENS_CPLX 205
#define IND_QUEST_SENS_DC 206 #define IND_QUEST_SENS_DC 206
/* device parameters */ /* device parameters */
#define MUT_COEFF 401 #define MUT_COEFF 401
#define MUT_IND1 402 #define MUT_IND1 402

1
src/spicelib/devices/ind/indload.c
View File

@ -29,6 +29,7 @@ INDload(GENmodel *inModel, CKTcircuit *ckt)
int ktype; int ktype;
int itype; int itype;
/* loop through all the inductor models */ /* loop through all the inductor models */
for( ; model != NULL; model = model->INDnextModel ) { for( ; model != NULL; model = model->INDnextModel ) {

3
src/spicelib/devices/ind/indsacl.c
View File

@ -22,6 +22,7 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
INDmodel *model = (INDmodel*)inModel; INDmodel *model = (INDmodel*)inModel;
INDinstance *here; INDinstance *here;
double cind,icind,val,ival; double cind,icind,val,ival;
MUTinstance *muthere; MUTinstance *muthere;
MUTmodel *mutmodel; MUTmodel *mutmodel;
double cind1; double cind1;
@ -47,6 +48,7 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
double k2; double k2;
int ktype; int ktype;
int itype; int itype;
SENstruct *info; SENstruct *info;
info = ckt->CKTsenInfo; info = ckt->CKTsenInfo;
@ -139,6 +141,7 @@ INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
/* loop through all the instances of the model */ /* loop through all the instances of the model */
for (here = model->INDinstances; here != NULL ; for (here = model->INDinstances; here != NULL ;
here=here->INDnextInstance) { here=here->INDnextInstance) {
if(here->INDsenParmNo){ if(here->INDsenParmNo){
cind = *(ckt->CKTrhsOld + here->INDbrEq); cind = *(ckt->CKTrhsOld + here->INDbrEq);
icind = *(ckt->CKTirhsOld + here->INDbrEq); icind = *(ckt->CKTirhsOld + here->INDbrEq);

6
src/spicelib/devices/ind/indsetup.c
View File

@ -26,8 +26,8 @@ INDsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
CKTnode *tmp; CKTnode *tmp;
/* loop through all the inductor models */ /* loop through all the inductor models */
for( ; model != NULL; model = model->INDnextModel ) { for ( ; model != NULL ; model = model->INDnextModel)
{
/* Default Value Processing for Model Parameters */ /* Default Value Processing for Model Parameters */
if (!model->INDmIndGiven) { if (!model->INDmIndGiven) {
model->INDmInd = 0.0; model->INDmInd = 0.0;
@ -194,7 +194,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
} }
#endif #endif
return(OK); return (OK) ;
} }
int int

3
src/spicelib/devices/ind/indsupd.c
View File

@ -28,6 +28,7 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt)
double dummy1; double dummy1;
double dummy2; double dummy2;
SENstruct *info; SENstruct *info;
MUTinstance *muthere; MUTinstance *muthere;
MUTmodel *mutmodel; MUTmodel *mutmodel;
double sxp1; double sxp1;
@ -37,6 +38,7 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt)
int ktype; int ktype;
int itype; int itype;
info = ckt->CKTsenInfo; info = ckt->CKTsenInfo;
if(ckt->CKTmode & MODEINITTRAN) return(OK); if(ckt->CKTmode & MODEINITTRAN) return(OK);
@ -123,6 +125,7 @@ INDsUpdate(GENmodel *inModel, CKTcircuit *ckt)
/* loop through all the instances of the model */ /* loop through all the instances of the model */
for (here = model->INDinstances; here != NULL ; for (here = model->INDinstances; here != NULL ;
here=here->INDnextInstance) { here=here->INDnextInstance) {
for(iparmno = 1;iparmno<=info->SENparms;iparmno++){ for(iparmno = 1;iparmno<=info->SENparms;iparmno++){
if(ckt->CKTmode&MODETRANOP){ if(ckt->CKTmode&MODETRANOP){

4
src/spicelib/devices/ind/indtemp.c
View File

@ -5,14 +5,12 @@ Author: 2003 Paolo Nenzi
/* /*
*/ */
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "inddefs.h" #include "inddefs.h"
#include "ngspice/sperror.h" #include "ngspice/sperror.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
#ifdef USE_CUSPICE #ifdef USE_CUSPICE
#include "ngspice/CUSPICE/CUSPICE.h" #include "ngspice/CUSPICE/CUSPICE.h"
#endif #endif
@ -101,6 +99,6 @@ INDtemp(GENmodel *inModel, CKTcircuit *ckt)
#endif #endif
} }
return(OK); return (OK) ;
} }

6
src/spicelib/devices/ind/mutsetup.c
View File

@ -30,8 +30,8 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
NG_IGNORE(states); NG_IGNORE(states);
/* loop through all the mutual inductor models */ /* loop through all the mutual inductor models */
for( ; model != NULL; model = model->MUTnextModel ) { for ( ; model != NULL ; model = model->MUTnextModel)
{
/* loop through all the instances of the model */ /* loop through all the instances of the model */
for (here = model->MUTinstances; here != NULL ; for (here = model->MUTinstances; here != NULL ;
here=here->MUTnextInstance) { here=here->MUTnextInstance) {
@ -164,5 +164,5 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
} }
#endif #endif
return(OK); return (OK) ;
} }

3
src/spicelib/devices/ind/muttemp.c
View File

@ -5,7 +5,6 @@ Author: 2003 Paolo Nenzi
/* /*
*/ */
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
#include "inddefs.h" #include "inddefs.h"
@ -70,5 +69,5 @@ MUTtemp(GENmodel *inModel, CKTcircuit *ckt)
#endif #endif
} }
return(OK); return (OK) ;
} }

1
src/spicelib/devices/isrc/Makefile.am
View File

@ -20,7 +20,6 @@ libisrc_la_SOURCES = \
isrctemp.c isrctemp.c
AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include
AM_CFLAGS = $(STATIC) AM_CFLAGS = $(STATIC)

2
src/spicelib/devices/isrc/isrctemp.c
View File

@ -89,5 +89,5 @@ ISRCtemp(GENmodel *inModel, CKTcircuit *ckt)
} }
return(OK); return (OK) ;
} }

1
src/spicelib/devices/jfet/jfetinit.c
View File

@ -88,7 +88,6 @@ SPICEdev JFETinfo = {
}; };
SPICEdev * SPICEdev *
get_jfet_info(void) get_jfet_info(void)
{ {

1
src/spicelib/devices/jfet2/jfet2init.c
View File

@ -88,7 +88,6 @@ SPICEdev JFET2info = {
}; };
SPICEdev * SPICEdev *
get_jfet2_info(void) get_jfet2_info(void)
{ {

1
src/spicelib/devices/ltra/ltrainit.c
View File

@ -88,7 +88,6 @@ SPICEdev LTRAinfo = {
}; };
SPICEdev * SPICEdev *
get_ltra_info(void) get_ltra_info(void)
{ {

1
src/spicelib/devices/mes/mesinit.c
View File

@ -88,7 +88,6 @@ SPICEdev MESinfo = {
}; };
SPICEdev * SPICEdev *
get_mes_info(void) get_mes_info(void)
{ {

1
src/spicelib/devices/mesa/mesainit.c
View File

@ -88,7 +88,6 @@ SPICEdev MESAinfo = {
}; };
SPICEdev * SPICEdev *
get_mesa_info(void) get_mesa_info(void)
{ {

1
src/spicelib/devices/mos1/mos1init.c
View File

@ -88,7 +88,6 @@ SPICEdev MOS1info = {
}; };
SPICEdev * SPICEdev *
get_mos1_info(void) get_mos1_info(void)
{ {

1
src/spicelib/devices/mos2/mos2init.c
View File

@ -88,7 +88,6 @@ SPICEdev MOS2info = {
}; };
SPICEdev * SPICEdev *
get_mos2_info(void) get_mos2_info(void)
{ {

1
src/spicelib/devices/mos3/mos3init.c
View File

@ -88,7 +88,6 @@ SPICEdev MOS3info = {
}; };
SPICEdev * SPICEdev *
get_mos3_info(void) get_mos3_info(void)
{ {

1
src/spicelib/devices/mos6/mos6init.c
View File

@ -88,7 +88,6 @@ SPICEdev MOS6info = {
}; };
SPICEdev * SPICEdev *
get_mos6_info(void) get_mos6_info(void)
{ {

1
src/spicelib/devices/mos9/mos9init.c
View File

@ -88,7 +88,6 @@ SPICEdev MOS9info = {
}; };
SPICEdev * SPICEdev *
get_mos9_info(void) get_mos9_info(void)
{ {

1
src/spicelib/devices/nbjt/nbjtinit.c
View File

@ -89,7 +89,6 @@ SPICEdev NBJTinfo = {
}; };
SPICEdev * SPICEdev *
get_nbjt_info(void) get_nbjt_info(void)
{ {

1
src/spicelib/devices/nbjt2/nbt2init.c
View File

@ -89,7 +89,6 @@ SPICEdev NBJT2info = {
}; };
SPICEdev * SPICEdev *
get_nbjt2_info(void) get_nbjt2_info(void)
{ {

1
src/spicelib/devices/ndev/ndevinit.c
View File

@ -89,7 +89,6 @@ SPICEdev NDEVinfo = {
}; };
SPICEdev * SPICEdev *
get_ndev_info(void) get_ndev_info(void)
{ {

1
src/spicelib/devices/numd/numdinit.c
View File

@ -89,7 +89,6 @@ SPICEdev NUMDinfo = {
}; };
SPICEdev * SPICEdev *
get_numd_info(void) get_numd_info(void)
{ {

1
src/spicelib/devices/numd2/numd2init.c
View File

@ -89,7 +89,6 @@ SPICEdev NUMD2info = {
}; };
SPICEdev * SPICEdev *
get_numd2_info(void) get_numd2_info(void)
{ {

1
src/spicelib/devices/numos/numosinit.c
View File

@ -89,7 +89,6 @@ SPICEdev NUMOSinfo = {
}; };
SPICEdev * SPICEdev *
get_numos_info(void) get_numos_info(void)
{ {

2
src/spicelib/devices/res/ressetup.c
View File

@ -116,5 +116,5 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
} }
#endif #endif
return(OK); return (OK) ;
} }

2
src/spicelib/devices/res/restemp.c
View File

@ -139,5 +139,5 @@ REStemp(GENmodel *inModel, CKTcircuit *ckt)
#endif #endif
} }
return(OK); return (OK) ;
} }

1
src/spicelib/devices/soi3/soi3init.c
View File

@ -88,7 +88,6 @@ SPICEdev SOI3info = {
}; };
SPICEdev * SPICEdev *
get_soi3_info(void) get_soi3_info(void)
{ {

1
src/spicelib/devices/sw/swinit.c
View File

@ -89,7 +89,6 @@ SPICEdev SWinfo = {
}; };
SPICEdev * SPICEdev *
get_sw_info(void) get_sw_info(void)
{ {

1
src/spicelib/devices/tra/trainit.c
View File

@ -88,7 +88,6 @@ SPICEdev TRAinfo = {
}; };
SPICEdev * SPICEdev *
get_tra_info(void) get_tra_info(void)
{ {

1
src/spicelib/devices/urc/urcinit.c
View File

@ -88,7 +88,6 @@ SPICEdev URCinfo = {
}; };
SPICEdev * SPICEdev *
get_urc_info(void) get_urc_info(void)
{ {

1
src/spicelib/devices/vbic/vbicinit.c
View File

@ -93,7 +93,6 @@ SPICEdev VBICinfo = {
}; };
SPICEdev * SPICEdev *
get_vbic_info(void) get_vbic_info(void)
{ {

1
src/spicelib/devices/vccs/vccsinit.c
View File

@ -88,7 +88,6 @@ SPICEdev VCCSinfo = {
}; };
SPICEdev * SPICEdev *
get_vccs_info(void) get_vccs_info(void)
{ {

1
src/spicelib/devices/vcvs/vcvsinit.c
View File

@ -88,7 +88,6 @@ SPICEdev VCVSinfo = {
}; };
SPICEdev * SPICEdev *
get_vcvs_info(void) get_vcvs_info(void)
{ {

2
src/spicelib/devices/vsrc/vsrcset.c
View File

@ -142,7 +142,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
} }
#endif #endif
return(OK); return (OK) ;
} }
int int

4
src/spicelib/devices/vsrc/vsrctemp.c
View File

@ -20,7 +20,7 @@ VSRCtemp(GENmodel *inModel, CKTcircuit *ckt)
/* Pre-process voltage source parameters /* Pre-process voltage source parameters
*/ */
{ {
VSRCmodel *model = (VSRCmodel *) inModel; VSRCmodel *model = (VSRCmodel *)inModel;
VSRCinstance *here; VSRCinstance *here;
double radians; double radians;
@ -90,5 +90,5 @@ VSRCtemp(GENmodel *inModel, CKTcircuit *ckt)
} }
return(OK); return (OK) ;
} }