From 82d05be244f62c633652d778c376889c4f16618e Mon Sep 17 00:00:00 2001 From: rlar Date: Wed, 22 Jun 2011 17:03:54 +0000 Subject: [PATCH] remove ancient artifact "ckt.h" --- ChangeLog | 13 ++- src/spicelib/analysis/Makefile.am | 3 +- src/spicelib/analysis/ckt.h | 131 ------------------------------ src/spicelib/analysis/cktdelt.c | 2 +- visualc/vngspice.vcproj | 4 - 5 files changed, 12 insertions(+), 141 deletions(-) delete mode 100644 src/spicelib/analysis/ckt.h diff --git a/ChangeLog b/ChangeLog index 835393717..23d978c68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,16 @@ +2011-06-22 Robert Larice + * src/spicelib/analysis/Makefile.am , + * src/spicelib/analysis/ckt.h , + * src/spicelib/analysis/cktdelt.c , + * visualc/vngspice.vcproj : + remove ancient artifact "ckt.h" + 2011-06-19 Dietmar Warning * Code merged into bsim4v4: Code diff's from formerly version 4v2 and 4v3 merged into 4v4, selectable by "version=4.x.0" model parameter (x=2,3 ... 4) - * Update to version 4.7.0: new code into bsim4 folder, Version 6 is now in + * Update to version 4.7.0: new code into bsim4 folder, Version 6 is now in new folder bsim4v6, OpenMP implemented, Update of tests/bsim4 to new version - * res/resnoise.c, analysis/nevalsrc.c: Name changed NevalSrc2 to NevalSrcInstanceTemp and + * res/resnoise.c, analysis/nevalsrc.c: Name changed NevalSrc2 to NevalSrcInstanceTemp and include new bsim4 function NevalSrc2 2011-06-18 Holger Vogt @@ -11,7 +18,7 @@ inpcom.c, defines.h: allow / and \ in file paths under MS Windows inp.c: some comment added /examples/measure/simple-meas-tran.sp: another .measure example - + 2011-06-11 Holger Vogt * onemesh.c misc.c com_compose.c com_fft.c evaluate.c hpgl.c linear.c misccoms.c options.c points.c rawfile.c diff --git a/src/spicelib/analysis/Makefile.am b/src/spicelib/analysis/Makefile.am index 9fa8ea42c..4966f667f 100644 --- a/src/spicelib/analysis/Makefile.am +++ b/src/spicelib/analysis/Makefile.am @@ -96,8 +96,7 @@ libckt_la_SOURCES = \ tranaskq.c \ traninit.c \ transetp.c \ - cluster.c \ - ckt.h + cluster.c AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices diff --git a/src/spicelib/analysis/ckt.h b/src/spicelib/analysis/ckt.h deleted file mode 100644 index 56823394b..000000000 --- a/src/spicelib/analysis/ckt.h +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 1985 Thomas L. Quarles - * Modified 1999 Paolo Nenzi - Removed non STDC definitions - * Kept only prototypes (structs defined in struct.h) ER - */ - - -#ifndef CKT_H_INCLUDED -#define CKT_H_INCLUDED - - -/* function prototypes */ - -int ACan( CKTcircuit *, int ); -int ACaskQuest( CKTcircuit *, JOB *, int , IFvalue *); -int ACsetParm( CKTcircuit *, JOB *, int , IFvalue *); -int CKTacDump( CKTcircuit *, double , void *); -int CKTacLoad( CKTcircuit *); -int CKTaccept( CKTcircuit *); -int CKTacct( CKTcircuit *, JOB *, int , IFvalue *); -int CKTask( CKTcircuit *, GENinstance *, int , IFvalue *, IFvalue *); -int CKTaskAnalQ( CKTcircuit *, JOB *, int , IFvalue *, IFvalue *); -int CKTaskNodQst( CKTcircuit *, CKTnode *, int , IFvalue *, IFvalue *); -int CKTbindNode( CKTcircuit *, GENinstance *, int , CKTnode *); -void CKTbreakDump( CKTcircuit *); -int CKTclrBreak( CKTcircuit *); -int CKTconvTest( CKTcircuit *); -int CKTcrtElt( CKTcircuit *, GENmodel *, GENinstance **, IFuid ); -int CKTdelTask( CKTcircuit *, TSKtask *); -int CKTdestroy( CKTcircuit *); -int CKTdltAnal( void *, void *, void *); -int CKTdltInst( CKTcircuit *, void *); -int CKTdltMod( CKTcircuit *, GENmodel *); -int CKTdltNod( CKTcircuit *, CKTnode *); -int CKTdoJob( CKTcircuit *, int , TSKtask *); -void CKTdump( CKTcircuit *, double, void *); -int CKTfndAnal( CKTcircuit *, int *, JOB **, IFuid , TSKtask *, IFuid ); -int CKTfndBranch( CKTcircuit *, IFuid); -int CKTfndDev( CKTcircuit *, int *, GENinstance **, IFuid , GENmodel *, IFuid ); -int CKTfndMod( CKTcircuit *, int *, GENmodel **, IFuid ); -int CKTfndNode( CKTcircuit *, CKTnode **, IFuid ); -int CKTfndTask( CKTcircuit *, TSKtask **, IFuid ); -int CKTground( CKTcircuit *, CKTnode **, IFuid ); -int CKTic( CKTcircuit *); -int CKTinit( CKTcircuit **); -int CKTinst2Node( CKTcircuit *, void *, int , CKTnode **, IFuid *); -int CKTlinkEq(CKTcircuit*,CKTnode*); -int CKTload( CKTcircuit *); -int CKTmapNode( CKTcircuit *, CKTnode **, IFuid ); -int CKTmkCur( CKTcircuit *, CKTnode **, IFuid , char *); -int CKTmkNode(CKTcircuit*,CKTnode**); -int CKTmkVolt( CKTcircuit *, CKTnode **, IFuid , char *); -int CKTmodAsk( CKTcircuit *, GENmodel *, int , IFvalue *, IFvalue *); -int CKTmodCrt( CKTcircuit *, int , GENmodel **, IFuid ); -int CKTmodParam( CKTcircuit *, GENmodel *, int , IFvalue *, IFvalue *); -int CKTnames(CKTcircuit *, int *, IFuid **); -int CKTdnames(CKTcircuit *); -int CKTnewAnal( CKTcircuit *, int , IFuid , JOB **, TSKtask *); -int CKTnewEq( CKTcircuit *, CKTnode **, IFuid ); -int CKTnewNode( CKTcircuit *, CKTnode **, IFuid ); -int CKTnewTask( CKTcircuit *, TSKtask **, IFuid, TSKtask **); -IFuid CKTnodName( CKTcircuit *, int ); -void CKTnodOut( CKTcircuit *); -CKTnode * CKTnum2nod( CKTcircuit *, int ); -int CKTop(CKTcircuit *, long, long, int ); -int CKTpModName( char *, IFvalue *, CKTcircuit *, int , IFuid , GENmodel **); -int CKTpName( char *, IFvalue *, CKTcircuit *, int , char *, GENinstance **); -int CKTparam( CKTcircuit *, GENinstance *, int , IFvalue *, IFvalue *); -int CKTpzFindZeros( CKTcircuit *, PZtrial **, int * ); -int CKTpzLoad( CKTcircuit *, SPcomplex * ); -int CKTpzSetup( CKTcircuit *, int); -int CKTsenAC( CKTcircuit *); -int CKTsenComp( CKTcircuit *); -int CKTsenDCtran( CKTcircuit *); -int CKTsenLoad( CKTcircuit *); -void CKTsenPrint( CKTcircuit *); -int CKTsenSetup( CKTcircuit *); -int CKTsenUpdate( CKTcircuit *); -int CKTsetAnalPm( CKTcircuit *, JOB *, int , IFvalue *, IFvalue *); -int CKTsetBreak( CKTcircuit *, double ); -int CKTsetNodPm( CKTcircuit *, CKTnode *, int , IFvalue *, IFvalue *); -int CKTsetOpt( CKTcircuit *, JOB *, int , IFvalue *); -int CKTsetup( CKTcircuit *); -int CKTunsetup(CKTcircuit *ckt); -int CKTtemp( CKTcircuit *); -char *CKTtrouble(CKTcircuit *, char *); -void CKTterr( int , CKTcircuit *, double *); -int CKTtrunc( CKTcircuit *, double *); -int CKTtypelook( char *); -int DCOaskQuest( CKTcircuit *, JOB *, int , IFvalue *); -int DCOsetParm( CKTcircuit *, JOB *, int , IFvalue *); -int DCTaskQuest( CKTcircuit *, JOB *, int , IFvalue *); -int DCTsetParm( CKTcircuit *, JOB *, int , IFvalue *); -int DCop( CKTcircuit *, int ); -int DCtrCurv( CKTcircuit *, int ); -int DCtran( CKTcircuit *, int ); -int DISTOan(CKTcircuit *, int); -int NOISEan(CKTcircuit *, int); -int PZan( CKTcircuit *, int ); -int PZinit( CKTcircuit * ); -int PZpost( CKTcircuit * ); -int PZaskQuest( CKTcircuit *, JOB *, int , IFvalue *); -int PZsetParm( CKTcircuit *, JOB *, int , IFvalue *); -int SENaskQuest( CKTcircuit *, JOB *, int , IFvalue *); -void SENdestroy( SENstruct *); -int SENsetParm( CKTcircuit *, JOB *, int , IFvalue *); -int SENstartup( CKTcircuit *); -int SPIinit( IFfrontEnd *, IFsimulator **); -char * SPerror( int ); -int TFanal( CKTcircuit *, int ); -int TFaskQuest( CKTcircuit *, JOB *, int , IFvalue *); -int TFsetParm( CKTcircuit *, JOB *, int , IFvalue *); -int TRANaskQuest( CKTcircuit *, JOB *, int , IFvalue *); -int TRANsetParm( CKTcircuit *, JOB *, int , IFvalue *); -int TRANinit(CKTcircuit *, JOB *); -int NIacIter( CKTcircuit * ); -int NIcomCof( CKTcircuit * ); -int NIconvTest(CKTcircuit * ); -void NIdestroy(CKTcircuit * ); -int NIinit( CKTcircuit * ); -int NIintegrate( CKTcircuit *, double *, double *, double , int ); -int NIiter( CKTcircuit * , int ); -int NIpzMuller(PZtrial **, PZtrial *); -int NIpzComplex(PZtrial **, PZtrial *); -int NIpzSym(PZtrial **, PZtrial *); -int NIpzSym2(PZtrial **, PZtrial *); -int NIreinit( CKTcircuit *); -int NIsenReinit( CKTcircuit *); -extern IFfrontEnd *SPfrontEnd; - -#endif /*CKT*/ diff --git a/src/spicelib/analysis/cktdelt.c b/src/spicelib/analysis/cktdelt.c index 7661fa697..71d11398d 100644 --- a/src/spicelib/analysis/cktdelt.c +++ b/src/spicelib/analysis/cktdelt.c @@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles #include "jobdefs.h" #include "ifsim.h" #include "iferrmsg.h" -#include "ckt.h" +#include "cktdefs.h" /* ARGSUSED */ diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj index 55dc48c82..52c1e06ce 100644 --- a/visualc/vngspice.vcproj +++ b/visualc/vngspice.vcproj @@ -1338,10 +1338,6 @@ RelativePath="..\src\frontend\circuits.h" > - -