Code clean up.

This commit is contained in:
pnenzi 2004-01-20 13:04:36 +00:00
parent 877b8160c0
commit a03bd669f9
14 changed files with 14 additions and 77 deletions

View File

@ -4,7 +4,6 @@ Author: 1987 Thomas L. Quarles
**********/
#include "ngspice.h"
#include <stdio.h>
#include "ifsim.h"
#include "devdefs.h"
#include "cccsdefs.h"

View File

@ -9,7 +9,6 @@ Author: 1987
*/
#include "ngspice.h"
#include <stdio.h>
#include "cktdefs.h"
#include "devdefs.h"
#include "ifsim.h"
@ -20,12 +19,7 @@ Author: 1987
/* ARGSUSED */
int
CCCSask(ckt,inst,which,value,select)
CKTcircuit *ckt;
GENinstance *inst;
int which;
IFvalue *value;
IFvalue *select;
CCCSask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select)
{
CCCSinstance *here = (CCCSinstance*)inst;
double vr;

View File

@ -6,18 +6,13 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "cccsdefs.h"
#include "sperror.h"
#include "suffix.h"
int
CCCSdelete(inModel,name,inst)
GENmodel *inModel;
IFuid name;
GENinstance **inst;
CCCSdelete(GENmodel *inModel, IFuid name, GENinstance **inst)
{
CCCSmodel *model = (CCCSmodel*)inModel;

View File

@ -6,14 +6,12 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "cccsdefs.h"
#include "suffix.h"
void
CCCSdestroy(inModel)
GENmodel **inModel;
CCCSdestroy(GENmodel **inModel)
{
CCCSmodel **model = (CCCSmodel**)inModel;

View File

@ -3,7 +3,7 @@ Copyright 1990 Regents of the University of California. All rights reserved.
Author: 1985 Thomas L. Quarles
**********/
#ifdef __STDC__
extern int CCCSask(CKTcircuit*,GENinstance*,int,IFvalue*,IFvalue*);
extern int CCCSdelete(GENmodel*,IFuid,GENinstance**);
extern void CCCSdestroy(GENmodel**);
@ -16,17 +16,4 @@ extern int CCCSsLoad(GENmodel*,CKTcircuit*);
extern void CCCSsPrint(GENmodel*,CKTcircuit*);
extern int CCCSsSetup(SENstruct*,GENmodel*);
extern int CCCSsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
#else /* stdc */
extern int CCCSask();
extern int CCCSdelete();
extern void CCCSdestroy();
extern int CCCSload();
extern int CCCSmDelete();
extern int CCCSparam();
extern int CCCSpzLoad();
extern int CCCSsAcLoad();
extern int CCCSsLoad();
extern void CCCSsPrint();
extern int CCCSsSetup();
extern int CCCSsetup();
#endif /* stdc */

View File

@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "cktdefs.h"
#include "cccsdefs.h"
#include "sperror.h"
@ -15,10 +14,7 @@ Author: 1985 Thomas L. Quarles
/*ARGSUSED*/
int
CCCSload(inModel,ckt)
GENmodel *inModel;
CKTcircuit *ckt;
CCCSload(GENmodel *inModel, CKTcircuit *ckt)
/* actually load the current voltage value into the
* sparse matrix previously provided

View File

@ -6,18 +6,13 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "cccsdefs.h"
#include "sperror.h"
#include "suffix.h"
int
CCCSmDelete(inModel,modname,kill)
GENmodel **inModel;
IFuid modname;
GENmodel *kill;
CCCSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
{
CCCSmodel **model = (CCCSmodel**)inModel;

View File

@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "ifsim.h"
#include "cccsdefs.h"
#include "sperror.h"
@ -15,11 +14,7 @@ Author: 1985 Thomas L. Quarles
/* ARGSUSED */
int
CCCSparam(param,value,inst,select)
int param;
IFvalue *value;
GENinstance *inst;
IFvalue *select;
CCCSparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
{
CCCSinstance *here = (CCCSinstance*)inst;
switch(param) {

View File

@ -6,7 +6,6 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "cktdefs.h"
#include "complex.h"
#include "sperror.h"
@ -16,11 +15,7 @@ Author: 1985 Thomas L. Quarles
/*ARGSUSED*/
int
CCCSpzLoad(inModel,ckt,s)
GENmodel *inModel;
CKTcircuit *ckt;
SPcomplex *s;
CCCSpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
/* actually load the current voltage value into the
* sparse matrix previously provided

View File

@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "smpdefs.h"
#include "cktdefs.h"
#include "cccsdefs.h"
@ -19,9 +18,7 @@ Author: 1985 Thomas L. Quarles
int
CCCSsAcLoad(inModel,ckt)
GENmodel *inModel;
CKTcircuit *ckt;
CCCSsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
{
CCCSmodel *model = (CCCSmodel*)inModel;
CCCSinstance *here;

View File

@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "smpdefs.h"
#include "cktdefs.h"
#include "cccsdefs.h"
@ -20,11 +19,7 @@ Author: 1985 Thomas L. Quarles
/*ARGSUSED*/
int
CCCSsetup(matrix,inModel,ckt,states)
SMPmatrix *matrix;
GENmodel *inModel;
CKTcircuit *ckt;
int *states;
CCCSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
{
CCCSmodel *model = (CCCSmodel*)inModel;
CCCSinstance *here;

View File

@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "smpdefs.h"
#include "cktdefs.h"
#include "cccsdefs.h"
@ -19,9 +18,7 @@ Author: 1985 Thomas L. Quarles
int
CCCSsLoad(inModel,ckt)
GENmodel *inModel;
CKTcircuit *ckt;
CCCSsLoad(GENmodel *inModel, CKTcircuit *ckt)
{
CCCSmodel *model = (CCCSmodel*)inModel;
CCCSinstance *here;

View File

@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "smpdefs.h"
#include "cktdefs.h"
#include "cccsdefs.h"
@ -19,9 +18,7 @@ Author: 1985 Thomas L. Quarles
void
CCCSsPrint(inModel,ckt)
GENmodel *inModel;
CKTcircuit *ckt;
CCCSsPrint(GENmodel *inModel, CKTcircuit *ckt)
{
CCCSmodel *model = (CCCSmodel*)inModel;
CCCSinstance *here;

View File

@ -10,7 +10,6 @@ Author: 1985 Thomas L. Quarles
*/
#include "ngspice.h"
#include <stdio.h>
#include "smpdefs.h"
#include "cktdefs.h"
#include "cccsdefs.h"
@ -19,9 +18,7 @@ Author: 1985 Thomas L. Quarles
int
CCCSsSetup(info,inModel)
SENstruct *info;
GENmodel *inModel;
CCCSsSetup(SENstruct *info, GENmodel *inModel)
{
CCCSmodel *model = (CCCSmodel*)inModel;
CCCSinstance *here;