cleanup, whitespace

This commit is contained in:
rlar 2012-10-06 12:30:31 +02:00
parent 7acc91157a
commit c7717e37fc
2 changed files with 61 additions and 53 deletions

View File

@ -7,16 +7,19 @@ Copyright 1990 Regents of the University of California. All rights reserved.
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#define CONFIG #define CONFIG
#include <stdio.h> #include <stdio.h>
#include "ngspice/ifsim.h" #include "ngspice/ifsim.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
IFsimulator SIMinfo = { IFsimulator SIMinfo = {
"ngnutmeg", /* my name */ "ngnutmeg", /* my name */
"data analysis and manipulation program", /* more about me */ "data analysis and manipulation program", /* more about me */
Spice_Version, /* my version */ Spice_Version, /* my version */
NULL, /* newCircuit function */
NULL, /* deleteCircuit function */ NULL, /* newCircuit function */
NULL, /* deleteCircuit function */
NULL, /* newNode function */ /* NEEDED */ NULL, /* newNode function */ /* NEEDED */
NULL, /* groundNode function */ NULL, /* groundNode function */
NULL, /* bindNode function */ NULL, /* bindNode function */
@ -43,7 +46,7 @@ IFsimulator SIMinfo = {
NULL, /* findTask function */ NULL, /* findTask function */
NULL, /* deleteTask function */ NULL, /* deleteTask function */
NULL, /* doAnalyses function */ NULL, /* doAnalyses function */
NULL, /* non-convergence message function */ NULL, /* non-convergence message function */
0, 0,
NULL, NULL,
0, 0,
@ -54,13 +57,18 @@ IFsimulator SIMinfo = {
NULL, NULL,
}; };
#ifdef CIDER
/* An ugly hack */ /* An ugly hack */
#ifdef CIDER
#include "ngspice/cktdefs.h" #include "ngspice/cktdefs.h"
void void
NDEVacct(CKTcircuit *ckt, FILE *file) NDEVacct(CKTcircuit *ckt, FILE *file)
{ {
NG_IGNORE(ckt); NG_IGNORE(ckt);
fprintf(file, "Ouch, you have called NDEV from ngnutmeg\n"); fprintf(file, "Ouch, you have called NDEV from ngnutmeg\n");
} }
#endif #endif

View File

@ -1,4 +1,4 @@
/* Configuration file for ng-spice */ /* Configuration file for ngspice */
/********** /**********
Copyright 1990 Regents of the University of California. All rights reserved. Copyright 1990 Regents of the University of California. All rights reserved.
@ -6,71 +6,71 @@ Copyright 1990 Regents of the University of California. All rights reserved.
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#define CONFIG #define CONFIG
#include "ngspice/devdefs.h" #include "ngspice/devdefs.h"
#include "ngspice/noisedef.h" #include "ngspice/noisedef.h"
#include "ngspice/suffix.h" #include "ngspice/suffix.h"
/* XXX Should be -1 ? There is always an extra null element at the end ? */ /* XXX Should be -1 ? There is always an extra null element at the end ? */
static char * specSigList[] = { static char *specSigList[] = {
"time" "time"
}; };
static IFparm nodeParms[] = { static IFparm nodeParms[] = {
IP( "nodeset",PARM_NS ,IF_REAL,"suggested initial voltage"), IP("nodeset", PARM_NS , IF_REAL, "suggested initial voltage"),
IP( "ic",PARM_IC ,IF_REAL,"initial voltage"), IP("ic", PARM_IC , IF_REAL, "initial voltage"),
IP( "type",PARM_NODETYPE ,IF_INTEGER,"output type of equation") IP("type", PARM_NODETYPE , IF_INTEGER, "output type of equation")
}; };
IFsimulator SIMinfo = { IFsimulator SIMinfo = {
"ngspice", /* name */ "ngspice", /* my name */
"Circuit level simulation program", /* more about me */ "Circuit level simulation program", /* more about me */
Spice_Version, /* version */ Spice_Version, /* my version */
CKTinit, /* newCircuit function */ CKTinit, /* newCircuit function */
CKTdestroy, /* deleteCircuit function */ CKTdestroy, /* deleteCircuit function */
CKTnewNode, /* newNode function */ CKTnewNode, /* newNode function */
CKTground, /* groundNode function */ CKTground, /* groundNode function */
CKTbindNode, /* bindNode function */ CKTbindNode, /* bindNode function */
CKTfndNode, /* findNode function */ CKTfndNode, /* findNode function */
(int(*)(CKTcircuit *,void *,int,void **,IFuid *)) /* va, type cast for CKTinst2Node */ (int(*)(CKTcircuit *,void *,int,void **,IFuid *)) /* va, type cast for CKTinst2Node */
CKTinst2Node, /* instToNode function */ CKTinst2Node, /* instToNode function */
CKTsetNodPm, /* setNodeParm function */ CKTsetNodPm, /* setNodeParm function */
CKTaskNodQst, /* askNodeQuest function */ CKTaskNodQst, /* askNodeQuest function */
CKTdltNod, /* deleteNode function */ CKTdltNod, /* deleteNode function */
CKTcrtElt, /* newInstance function */ CKTcrtElt, /* newInstance function */
CKTparam, /* setInstanceParm function */ CKTparam, /* setInstanceParm function */
CKTask, /* askInstanceQuest function */ CKTask, /* askInstanceQuest function */
CKTfndDev, /* findInstance funciton */ CKTfndDev, /* findInstance funciton */
CKTdltInst, /* deleteInstance function */ CKTdltInst, /* deleteInstance function */
CKTmodCrt, /* newModel function */ CKTmodCrt, /* newModel function */
CKTmodParam, /* setModelParm function */ CKTmodParam, /* setModelParm function */
CKTmodAsk, /* askModelQuest function */ CKTmodAsk, /* askModelQuest function */
CKTfndMod, /* findModel function */ CKTfndMod, /* findModel function */
CKTdltMod, /* deleteModel function */ CKTdltMod, /* deleteModel function */
CKTnewTask, /* newTask function */ CKTnewTask, /* newTask function */
CKTnewAnal, /* newAnalysis function */ CKTnewAnal, /* newAnalysis function */
CKTsetAnalPm, /* setAnalysisParm function */ CKTsetAnalPm, /* setAnalysisParm function */
CKTaskAnalQ, /* askAnalysisQuest function */ CKTaskAnalQ, /* askAnalysisQuest function */
CKTfndAnal, /* findAnalysis function */ CKTfndAnal, /* findAnalysis function */
CKTfndTask, /* findTask function */ CKTfndTask, /* findTask function */
CKTdelTask, /* deleteTask function */ CKTdelTask, /* deleteTask function */
CKTdoJob, /* doAnalyses function */ CKTdoJob, /* doAnalyses function */
CKTtrouble, /* non-convergence message function */ CKTtrouble, /* non-convergence message function */
0, /* Initialized in SIMinit() */ 0, /* Initialized in SIMinit() */
NULL, /* Initialized in SIMinit() */ NULL, /* Initialized in SIMinit() */
0, /* Initialized in SIMinit() */ 0, /* Initialized in SIMinit() */
NULL, /* Initialized in SIMinit() */ NULL, /* Initialized in SIMinit() */
NUMELEMS(nodeParms), NUMELEMS(nodeParms),
nodeParms, nodeParms,