Browse Source

Code cleanup

pre-master-46
pnenzi 22 years ago
parent
commit
877b8160c0
  1. 1
      src/spicelib/devices/asrc/asrc.c
  2. 1
      src/spicelib/devices/asrc/asrcacld.c
  3. 8
      src/spicelib/devices/asrc/asrcask.c
  4. 5
      src/spicelib/devices/asrc/asrcconv.c
  5. 6
      src/spicelib/devices/asrc/asrcdel.c
  6. 4
      src/spicelib/devices/asrc/asrcdest.c
  7. 15
      src/spicelib/devices/asrc/asrcext.h
  8. 6
      src/spicelib/devices/asrc/asrcfbr.c
  9. 5
      src/spicelib/devices/asrc/asrcload.c
  10. 7
      src/spicelib/devices/asrc/asrcmdel.c
  11. 7
      src/spicelib/devices/asrc/asrcpar.c
  12. 7
      src/spicelib/devices/asrc/asrcpzld.c
  13. 7
      src/spicelib/devices/asrc/asrcset.c

1
src/spicelib/devices/asrc/asrc.c

@ -4,7 +4,6 @@ Author: 1987 Kanwar Jit Singh
**********/
#include "ngspice.h"
#include <stdio.h>
#include "ifsim.h"
#include "devdefs.h"
#include "asrcdefs.h"

1
src/spicelib/devices/asrc/asrcacld.c

@ -7,7 +7,6 @@ Author: 1988 Kanwar Jit Singh
*/
#include "ngspice.h"
#include <stdio.h>
#include "cktdefs.h"
#include "asrcdefs.h"
#include "sperror.h"

8
src/spicelib/devices/asrc/asrcask.c

@ -12,7 +12,6 @@ Author: 1987 Kanwar Jit Singh
*/
#include "ngspice.h"
#include <stdio.h>
#include "cktdefs.h"
#include "devdefs.h"
#include "ifsim.h"
@ -23,12 +22,7 @@ Author: 1987 Kanwar Jit Singh
/* ARGSUSED */
int
ASRCask(ckt,instPtr,which,value,select)
CKTcircuit *ckt;
GENinstance *instPtr;
int which;
IFvalue *value;
IFvalue *select;
ASRCask(CKTcircuit *ckt, GENinstance *instPtr, int which, IFvalue *value, IFvalue *select)
{
ASRCinstance *here = (ASRCinstance*)instPtr;

5
src/spicelib/devices/asrc/asrcconv.c

@ -4,16 +4,13 @@ Author: 1988 Kanwar Jit Singh
**********/
#include "ngspice.h"
#include <stdio.h>
#include "cktdefs.h"
#include "asrcdefs.h"
#include "sperror.h"
#include "suffix.h"
int
ASRCconvTest( inModel, ckt)
GENmodel *inModel;
CKTcircuit *ckt;
ASRCconvTest(GENmodel *inModel, CKTcircuit *ckt)
{
ASRCmodel *model = (ASRCmodel *)inModel;
ASRCinstance *here;

6
src/spicelib/devices/asrc/asrcdel.c

@ -7,17 +7,13 @@ Author: 1987 Kanwar Jit Singh
*/
#include "ngspice.h"
#include <stdio.h>
#include "asrcdefs.h"
#include "sperror.h"
#include "suffix.h"
int
ASRCdelete(model,name,fast)
GENmodel *model;
IFuid name;
GENinstance **fast;
ASRCdelete(GENmodel *model, IFuid name, GENinstance **fast)
{
ASRCinstance **instPtr = (ASRCinstance**)fast;

4
src/spicelib/devices/asrc/asrcdest.c

@ -4,13 +4,11 @@ Author: 1987 Kanwar Jit Singh
**********/
#include "ngspice.h"
#include <stdio.h>
#include "asrcdefs.h"
#include "suffix.h"
void
ASRCdestroy(model)
GENmodel **model;
ASRCdestroy(GENmodel **model)
{
ASRCmodel **start = (ASRCmodel**)model; /* starting model */

15
src/spicelib/devices/asrc/asrcext.h

@ -3,7 +3,6 @@ Copyright 1990 Regents of the University of California. All rights reserved.
Author: 1985 Thomas L. Quarles
**********/
#ifdef __STDC__
extern int ASRCask(CKTcircuit*,GENinstance *,int,IFvalue *,IFvalue*);
extern int ASRCconvTest(GENmodel *,CKTcircuit*);
extern int ASRCdelete(GENmodel *,IFuid,GENinstance **);
@ -16,18 +15,4 @@ extern int ASRCpzLoad(GENmodel*,CKTcircuit*,SPcomplex*);
extern int ASRCacLoad(GENmodel*,CKTcircuit*);
extern int ASRCsetup(SMPmatrix*,GENmodel*,CKTcircuit*,int*);
extern int ASRCunsetup(GENmodel*,CKTcircuit*);
#else /* stdc */
extern int ASRCask();
extern int ASRCconvTest();
extern int ASRCdelete();
extern void ASRCdestroy();
extern int ASRCfindBr();
extern int ASRCload();
extern int ASRCmDelete();
extern int ASRCparam();
extern int ASRCpzLoad();
extern int ASRCacLoad();
extern int ASRCsetup();
extern int ASRCunsetup();
#endif /* stdc */

6
src/spicelib/devices/asrc/asrcfbr.c

@ -7,7 +7,6 @@ Author: 1987 Kanwar Jit Singh
*/
#include "ngspice.h"
#include <stdio.h>
#include "cktdefs.h"
#include "ifsim.h"
#include "asrcdefs.h"
@ -16,10 +15,7 @@ Author: 1987 Kanwar Jit Singh
int
ASRCfindBr(ckt,inputModel,name)
CKTcircuit *ckt;
GENmodel *inputModel;
IFuid name;
ASRCfindBr(CKTcircuit *ckt, GENmodel *inputModel, IFuid name)
{
ASRCinstance *here;
ASRCmodel *model = (ASRCmodel*)inputModel;

5
src/spicelib/devices/asrc/asrcload.c

@ -7,7 +7,6 @@ Author: 1987 Kanwar Jit Singh
*/
#include "ngspice.h"
#include <stdio.h>
#include "cktdefs.h"
#include "asrcdefs.h"
#include "sperror.h"
@ -18,9 +17,7 @@ int asrc_nvals;
/*ARGSUSED*/
int
ASRCload(inModel,ckt)
GENmodel *inModel;
CKTcircuit *ckt;
ASRCload(GENmodel *inModel, CKTcircuit *ckt)
{
/* actually load the current voltage value into the

7
src/spicelib/devices/asrc/asrcmdel.c

@ -7,18 +7,13 @@ Author: 1987 Kanwar Jit Singh
*/
#include "ngspice.h"
#include <stdio.h>
#include "asrcdefs.h"
#include "sperror.h"
#include "suffix.h"
int
ASRCmDelete(modList,modname,killModel)
GENmodel **modList;
IFuid modname;
GENmodel *killModel;
ASRCmDelete(GENmodel **modList, IFuid modname, GENmodel *killModel)
{
ASRCmodel **model = (ASRCmodel**)modList;

7
src/spicelib/devices/asrc/asrcpar.c

@ -7,7 +7,6 @@ Author: 1987 Kanwar Jit Singh
*/
#include "ngspice.h"
#include <stdio.h>
#include "ifsim.h"
#include "asrcdefs.h"
#include "sperror.h"
@ -16,11 +15,7 @@ Author: 1987 Kanwar Jit Singh
/* ARGSUSED */
int
ASRCparam(param,value,fast,select)
int param;
IFvalue *value;
GENinstance *fast;
IFvalue *select;
ASRCparam(int param, IFvalue *value, GENinstance *fast, IFvalue *select)
{
ASRCinstance *here = (ASRCinstance*)fast;
switch(param) {

7
src/spicelib/devices/asrc/asrcpzld.c

@ -4,7 +4,6 @@ Author: 1987 Kanwar Jit Singh
**********/
#include "ngspice.h"
#include <stdio.h>
#include "cktdefs.h"
#include "asrcdefs.h"
#include "sperror.h"
@ -13,11 +12,7 @@ Author: 1987 Kanwar Jit Singh
/*ARGSUSED*/
int
ASRCpzLoad(inModel,ckt,s)
GENmodel *inModel;
CKTcircuit *ckt;
SPcomplex *s;
ASRCpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
/* actually load the current voltage value into the
* sparse matrix previously provided

7
src/spicelib/devices/asrc/asrcset.c

@ -7,7 +7,6 @@ Author: 1987 Kanwar Jit Singh
*/
#include "ngspice.h"
#include <stdio.h>
#include "cktdefs.h"
#include "asrcdefs.h"
#include "sperror.h"
@ -16,11 +15,7 @@ Author: 1987 Kanwar Jit Singh
/*ARGSUSED*/
int
ASRCsetup(matrix,inModel,ckt,states)
SMPmatrix *matrix;
GENmodel *inModel;
CKTcircuit *ckt;
int *states;
ASRCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
/* load the voltage source structure with those
* pointers needed later for fast matrix loading
*/

Loading…
Cancel
Save