From 10346e055cd19b96588ad8a5fb685b71b334726c Mon Sep 17 00:00:00 2001 From: rlar Date: Sun, 11 Dec 2011 18:05:00 +0000 Subject: [PATCH] #1/4 #include --> #include "ngspice/..." --- ChangeLog | 9 +++++ src/ciderlib/input/bdryset.c | 12 +++---- src/ciderlib/input/boundary.c | 14 ++++---- src/ciderlib/input/cards.c | 4 +-- src/ciderlib/input/contact.c | 14 ++++---- src/ciderlib/input/contset.c | 14 ++++---- src/ciderlib/input/domain.c | 16 ++++----- src/ciderlib/input/domnset.c | 18 +++++----- src/ciderlib/input/doping.c | 14 ++++---- src/ciderlib/input/dopset.c | 24 ++++++------- src/ciderlib/input/elctset.c | 16 ++++----- src/ciderlib/input/electrod.c | 14 ++++---- src/ciderlib/input/material.c | 16 ++++----- src/ciderlib/input/matlset.c | 18 +++++----- src/ciderlib/input/mesh.c | 14 ++++---- src/ciderlib/input/meshset.c | 14 ++++---- src/ciderlib/input/method.c | 16 ++++----- src/ciderlib/input/mobility.c | 16 ++++----- src/ciderlib/input/mobset.c | 18 +++++----- src/ciderlib/input/models.c | 14 ++++---- src/ciderlib/input/modlset.c | 10 +++--- src/ciderlib/input/optionsc.c | 14 ++++---- src/ciderlib/input/outpset.c | 12 +++---- src/ciderlib/input/output.c | 16 ++++----- src/ciderlib/oned/oneadmit.c | 20 +++++------ src/ciderlib/oned/oneaval.c | 10 +++--- src/ciderlib/oned/onecond.c | 14 ++++---- src/ciderlib/oned/onecont.c | 16 ++++----- src/ciderlib/oned/onedest.c | 12 +++---- src/ciderlib/oned/onedext.h | 12 +++---- src/ciderlib/oned/onedopng.c | 16 ++++----- src/ciderlib/oned/onefreez.c | 8 ++--- src/ciderlib/oned/onemesh.c | 12 +++---- src/ciderlib/oned/onepoiss.c | 12 +++---- src/ciderlib/oned/oneprint.c | 16 ++++----- src/ciderlib/oned/oneproj.c | 18 +++++----- src/ciderlib/oned/oneread.c | 14 ++++---- src/ciderlib/oned/onesetup.c | 16 ++++----- src/ciderlib/oned/onesolve.c | 20 +++++------ src/ciderlib/support/database.c | 6 ++-- src/ciderlib/support/devprint.c | 6 ++-- src/ciderlib/support/geominfo.c | 10 +++--- src/ciderlib/support/globals.c | 10 +++--- src/ciderlib/support/integset.c | 6 ++-- src/ciderlib/support/integuse.c | 10 +++--- src/ciderlib/support/logfile.c | 4 +-- src/ciderlib/support/mater.c | 12 +++---- src/ciderlib/support/misc.c | 10 +++--- src/ciderlib/support/mobil.c | 14 ++++---- src/ciderlib/support/recomb.c | 6 ++-- src/ciderlib/support/suprem.c | 6 ++-- src/ciderlib/support/suprmitf.c | 4 +-- src/ciderlib/twod/twoadmit.c | 24 ++++++------- src/ciderlib/twod/twoaval.c | 8 ++--- src/ciderlib/twod/twocond.c | 14 ++++---- src/ciderlib/twod/twocont.c | 16 ++++----- src/ciderlib/twod/twocurr.c | 8 ++--- src/ciderlib/twod/twodest.c | 12 +++---- src/ciderlib/twod/twodext.h | 12 +++---- src/ciderlib/twod/twodopng.c | 18 +++++----- src/ciderlib/twod/twoelect.c | 16 ++++----- src/ciderlib/twod/twofield.c | 8 ++--- src/ciderlib/twod/twomesh.c | 14 ++++---- src/ciderlib/twod/twomobdv.c | 8 ++--- src/ciderlib/twod/twomobfn.c | 12 +++---- src/ciderlib/twod/twomobil.c | 6 ++-- src/ciderlib/twod/twoncont.c | 16 ++++----- src/ciderlib/twod/twopcont.c | 16 ++++----- src/ciderlib/twod/twopoiss.c | 12 +++---- src/ciderlib/twod/twoprint.c | 18 +++++----- src/ciderlib/twod/twoproj.c | 16 ++++----- src/ciderlib/twod/tworead.c | 14 ++++---- src/ciderlib/twod/twosetbc.c | 10 +++--- src/ciderlib/twod/twosetup.c | 16 ++++----- src/ciderlib/twod/twosolve.c | 20 +++++------ src/frontend/arg.c | 8 ++--- src/frontend/aspice.c | 10 +++--- src/frontend/breakp.c | 10 +++--- src/frontend/breakp2.c | 10 +++--- src/frontend/circuits.c | 8 ++--- src/frontend/com_ahelp.c | 8 ++--- src/frontend/com_alias.c | 4 +-- src/frontend/com_asciiplot.c | 6 ++-- src/frontend/com_cdump.c | 6 ++-- src/frontend/com_chdir.c | 6 ++-- src/frontend/com_chdir.h | 2 +- src/frontend/com_compose.c | 16 ++++----- src/frontend/com_compose.h | 2 +- src/frontend/com_display.c | 10 +++--- src/frontend/com_display.h | 2 +- src/frontend/com_dl.c | 6 ++-- src/frontend/com_dump.c | 12 +++---- src/frontend/com_echo.c | 8 ++--- src/frontend/com_echo.h | 2 +- src/frontend/com_fft.c | 10 +++--- src/frontend/com_ghelp.c | 12 +++---- src/frontend/com_gnuplot.c | 6 ++-- src/frontend/com_hardcopy.c | 16 ++++----- src/frontend/com_help.c | 12 +++---- src/frontend/com_history.c | 4 +-- src/frontend/com_let.c | 8 ++--- src/frontend/com_let.h | 2 +- src/frontend/com_measure2.c | 8 ++--- src/frontend/com_option.c | 10 +++--- src/frontend/com_plot.c | 6 ++-- src/frontend/com_rehash.c | 6 ++-- src/frontend/com_rehash.h | 2 +- src/frontend/com_set.c | 6 ++-- src/frontend/com_setscale.c | 10 +++--- src/frontend/com_setscale.h | 2 +- src/frontend/com_shell.c | 6 ++-- src/frontend/com_shift.c | 8 ++--- src/frontend/com_state.c | 12 +++---- src/frontend/com_strcmp.c | 6 ++-- src/frontend/com_sysinfo.c | 6 ++-- src/frontend/com_unset.c | 6 ++-- src/frontend/com_unset.h | 2 +- src/frontend/com_xgraph.c | 6 ++-- src/frontend/commands.c | 8 ++--- src/frontend/control.c | 6 ++-- src/frontend/control.h | 2 +- src/frontend/cpitf.c | 10 +++--- src/frontend/define.c | 10 +++--- src/frontend/device.c | 12 +++---- src/frontend/diff.c | 8 ++--- src/frontend/diff.h | 2 +- src/frontend/dimens.c | 4 +-- src/frontend/display.c | 14 ++++---- src/frontend/display.h | 6 ++-- src/frontend/dotcards.c | 12 +++---- src/frontend/error.c | 6 ++-- src/frontend/evaluate.c | 8 ++--- src/frontend/evaluate.h | 4 +-- src/frontend/fourier.c | 14 ++++---- src/frontend/ftesopt.c | 10 +++--- src/frontend/gens.c | 18 +++++----- src/frontend/gens.h | 2 +- src/frontend/hcomp.c | 2 +- src/frontend/help/help.c | 8 ++--- src/frontend/help/provide.c | 8 ++--- src/frontend/help/readhelp.c | 8 ++--- src/frontend/help/textdisp.c | 8 ++--- src/frontend/help/x11disp.c | 6 ++-- src/frontend/help/xdisplay.c | 8 ++--- src/frontend/hpgl.c | 14 ++++---- src/frontend/init.c | 4 +-- src/frontend/inp.c | 16 ++++----- src/frontend/inpcom.c | 20 +++++------ src/frontend/interp.c | 8 ++--- src/frontend/inventory.c | 14 ++++---- src/frontend/linear.c | 8 ++--- src/frontend/measure.c | 10 +++--- src/frontend/misccoms.c | 10 +++--- src/frontend/miscvars.c | 10 +++--- src/frontend/mw_coms.c | 12 +++---- src/frontend/newcoms.c | 10 +++--- src/frontend/numparam/general.h | 4 +-- src/frontend/numparam/mystring.c | 4 +-- src/frontend/numparam/numparam.h | 2 +- src/frontend/numparam/spicenum.c | 2 +- src/frontend/numparam/xpressn.c | 10 +++--- src/frontend/nutinp.c | 10 +++--- src/frontend/nutmegif.c | 12 +++---- src/frontend/options.c | 10 +++--- src/frontend/outitf.c | 26 +++++++------- src/frontend/parse.c | 10 +++--- src/frontend/parse.h | 4 +-- src/frontend/parser/backq.c | 4 +-- src/frontend/parser/complete.c | 4 +-- src/frontend/parser/cshpar.c | 4 +-- src/frontend/parser/glob.c | 4 +-- src/frontend/parser/input.c | 6 ++-- src/frontend/parser/lexical.c | 6 ++-- src/frontend/parser/numparse.c | 6 ++-- src/frontend/parser/std.c | 4 +-- src/frontend/parser/unixcom.c | 4 +-- src/frontend/plotting/agraf.c | 10 +++--- src/frontend/plotting/agraf.h | 6 ++-- src/frontend/plotting/clip.c | 6 ++-- src/frontend/plotting/gnuplot.c | 10 +++--- src/frontend/plotting/graf.c | 24 ++++++------- src/frontend/plotting/graf.h | 2 +- src/frontend/plotting/graphdb.c | 10 +++--- src/frontend/plotting/grid.c | 10 +++--- src/frontend/plotting/plot5.c | 8 ++--- src/frontend/plotting/plotcurv.c | 12 +++---- src/frontend/plotting/plotit.c | 18 +++++----- src/frontend/plotting/plotting.c | 2 +- src/frontend/plotting/plotting.h | 2 +- src/frontend/plotting/pvec.c | 8 ++--- src/frontend/plotting/pvec.h | 2 +- src/frontend/plotting/x11.c | 14 ++++---- src/frontend/plotting/xgraph.c | 10 +++--- src/frontend/points.c | 12 +++---- src/frontend/postcoms.c | 16 ++++----- src/frontend/postsc.c | 14 ++++---- src/frontend/quote.c | 4 +-- src/frontend/rawfile.c | 8 ++--- src/frontend/resource.c | 10 +++--- src/frontend/runcoms.c | 14 ++++---- src/frontend/runcoms2.c | 14 ++++---- src/frontend/shyu.c | 18 +++++----- src/frontend/signal_handler.c | 12 +++---- src/frontend/spec.c | 10 +++--- src/frontend/spiceif.c | 28 +++++++-------- src/frontend/streams.c | 8 ++--- src/frontend/streams.h | 4 +-- src/frontend/subckt.c | 10 +++--- src/frontend/terminal.c | 4 +-- src/frontend/trannoise/1-f-code.c | 12 +++---- src/frontend/trannoise/1-f-code_d.c | 8 ++--- src/frontend/trannoise/FastNorm3.c | 6 ++-- src/frontend/trannoise/wallace.c | 8 ++--- src/frontend/typesdef.c | 8 ++--- src/frontend/variable.c | 20 +++++------ src/frontend/variable.h | 2 +- src/frontend/vectors.c | 10 +++--- src/frontend/wdisp/windisp.c | 12 +++---- src/frontend/wdisp/winprint.c | 12 +++---- src/frontend/where.c | 10 +++--- src/include/ngspice/acdefs.h | 2 +- src/include/ngspice/carddefs.h | 24 ++++++------- src/include/ngspice/cidersupt.h | 8 ++--- src/include/ngspice/cktdefs.h | 24 ++++++------- src/include/ngspice/cluster.h | 2 +- src/include/ngspice/cm.h | 8 ++--- src/include/ngspice/cmconstants.h | 2 +- src/include/ngspice/cmproto.h | 2 +- src/include/ngspice/cmtypes.h | 2 +- src/include/ngspice/cpdefs.h | 4 +-- src/include/ngspice/cpextern.h | 4 +-- src/include/ngspice/cpstd.h | 6 ++-- src/include/ngspice/devdefs.h | 12 +++---- src/include/ngspice/distodef.h | 6 ++-- src/include/ngspice/dllitf.h | 4 +-- src/include/ngspice/dvec.h | 4 +-- src/include/ngspice/enh.h | 4 +-- src/include/ngspice/evt.h | 6 ++-- src/include/ngspice/evtproto.h | 8 ++--- src/include/ngspice/evtudn.h | 2 +- src/include/ngspice/ftedefs.h | 8 ++--- src/include/ngspice/fteext.h | 14 ++++---- src/include/ngspice/fteinp.h | 2 +- src/include/ngspice/fteinput.h | 2 +- src/include/ngspice/fteparse.h | 8 ++--- src/include/ngspice/gendefs.h | 4 +-- src/include/ngspice/gendev.h | 2 +- src/include/ngspice/graph.h | 8 ++--- src/include/ngspice/hash.h | 2 +- src/include/ngspice/ifsim.h | 6 ++-- src/include/ngspice/inpdefs.h | 6 ++-- src/include/ngspice/inpptree.h | 2 +- src/include/ngspice/ipctiein.h | 4 +-- src/include/ngspice/jobdefs.h | 4 +-- src/include/ngspice/material.h | 2 +- src/include/ngspice/meshext.h | 4 +-- src/include/ngspice/mif.h | 6 ++-- src/include/ngspice/mifcmdat.h | 4 +-- src/include/ngspice/mifdefs.h | 4 +-- src/include/ngspice/mifparse.h | 2 +- src/include/ngspice/mifproto.h | 10 +++--- src/include/ngspice/ngspice.h | 16 ++++----- src/include/ngspice/noisedef.h | 2 +- src/include/ngspice/numcards.h | 2 +- src/include/ngspice/numgen.h | 8 ++--- src/include/ngspice/onedev.h | 4 +-- src/include/ngspice/onemesh.h | 2 +- src/include/ngspice/opdefs.h | 6 ++-- src/include/ngspice/plot.h | 6 ++-- src/include/ngspice/pssdefs.h | 4 +-- src/include/ngspice/pzdefs.h | 6 ++-- src/include/ngspice/sen2defs.h | 6 ++-- src/include/ngspice/sensdefs.h | 2 +- src/include/ngspice/smpdefs.h | 2 +- src/include/ngspice/sperror.h | 2 +- src/include/ngspice/spmatrix.h | 2 +- src/include/ngspice/tclspice.h | 6 ++-- src/include/ngspice/tfdefs.h | 8 ++--- src/include/ngspice/trandefs.h | 6 ++-- src/include/ngspice/trcvdefs.h | 6 ++-- src/include/ngspice/tskdefs.h | 4 +-- src/include/ngspice/twodev.h | 4 +-- src/include/ngspice/twomesh.h | 2 +- src/main.c | 22 ++++++------ src/makeidx.c | 6 ++-- src/maths/cmaths/cmath1.c | 8 ++--- src/maths/cmaths/cmath2.c | 6 ++-- src/maths/cmaths/cmath3.c | 6 ++-- src/maths/cmaths/cmath4.c | 10 +++--- src/maths/cmaths/test_cx_cph.c | 8 ++--- src/maths/cmaths/test_cx_j.c | 6 ++-- src/maths/cmaths/test_cx_mag.c | 6 ++-- src/maths/cmaths/test_cx_ph.c | 8 ++--- src/maths/deriv/atander.c | 6 ++-- src/maths/deriv/cosderiv.c | 6 ++-- src/maths/deriv/cubeder.c | 6 ++-- src/maths/deriv/divderiv.c | 6 ++-- src/maths/deriv/equalder.c | 6 ++-- src/maths/deriv/expderiv.c | 6 ++-- src/maths/deriv/invderiv.c | 6 ++-- src/maths/deriv/multder.c | 6 ++-- src/maths/deriv/plusder.c | 6 ++-- src/maths/deriv/powderiv.c | 6 ++-- src/maths/deriv/sqrtder.c | 6 ++-- src/maths/deriv/tanderiv.c | 6 ++-- src/maths/deriv/timesder.c | 6 ++-- src/maths/fft/fftext.c | 4 +-- src/maths/misc/accuracy.c | 2 +- src/maths/misc/bernoull.c | 2 +- src/maths/misc/equality.c | 2 +- src/maths/misc/erfc.c | 4 +-- src/maths/misc/isinf.c | 2 +- src/maths/misc/isnan.c | 2 +- src/maths/misc/logb.c | 2 +- src/maths/misc/norm.c | 2 +- src/maths/misc/randnumb.c | 6 ++-- src/maths/misc/scalb.c | 2 +- src/maths/ni/niaciter.c | 8 ++--- src/maths/ni/nicomcof.c | 6 ++-- src/maths/ni/niconv.c | 6 ++-- src/maths/ni/nidest.c | 4 +-- src/maths/ni/niditer.c | 8 ++--- src/maths/ni/niinit.c | 8 ++--- src/maths/ni/niinteg.c | 6 ++-- src/maths/ni/niiter.c | 10 +++--- src/maths/ni/niniter.c | 4 +-- src/maths/ni/nipred.c | 10 +++--- src/maths/ni/nipzmeth.c | 12 +++---- src/maths/ni/nireinit.c | 8 ++--- src/maths/ni/nisenre.c | 8 ++--- src/maths/poly/interpolate.c | 4 +-- src/maths/poly/interpolate.h | 2 +- src/maths/poly/polyfit.c | 2 +- src/maths/poly/polyfit.h | 2 +- src/maths/sparse/spalloc.c | 2 +- src/maths/sparse/spbuild.c | 2 +- src/maths/sparse/spcombin.c | 2 +- src/maths/sparse/spdefs.h | 2 +- src/maths/sparse/spextra.c | 2 +- src/maths/sparse/spfactor.c | 2 +- src/maths/sparse/spoutput.c | 2 +- src/maths/sparse/spsmp.c | 4 +-- src/maths/sparse/spsolve.c | 2 +- src/maths/sparse/sputils.c | 2 +- src/misc/alloc.c | 2 +- src/misc/dstring.c | 9 +++-- src/misc/dup2.c | 2 +- src/misc/getopt_long_bsd.c | 2 +- src/misc/hash.c | 4 +-- src/misc/ivars.c | 2 +- src/misc/misc_time.c | 2 +- src/misc/mktemp.c | 2 +- src/misc/printnum.c | 2 +- src/misc/string.c | 4 +-- src/misc/stringutil.h | 2 +- src/misc/tilde.c | 2 +- src/misc/util.c | 2 +- src/misc/wlist.c | 6 ++-- src/nghelp.c | 6 ++-- src/ngmultidec.c | 4 +-- src/ngnutmeg.c | 8 ++--- src/ngproc2mod.c | 6 ++-- src/ngsconvert.c | 12 +++---- src/ngspice.c | 8 ++--- src/spicelib/analysis/acan.c | 16 ++++----- src/spicelib/analysis/acaskq.c | 10 +++--- src/spicelib/analysis/acsetp.c | 10 +++--- src/spicelib/analysis/analysis.c | 6 ++-- src/spicelib/analysis/cktacct.c | 12 +++---- src/spicelib/analysis/cktacdum.c | 10 +++--- src/spicelib/analysis/cktaskaq.c | 12 +++---- src/spicelib/analysis/cktasknq.c | 8 ++--- src/spicelib/analysis/cktbkdum.c | 4 +-- src/spicelib/analysis/cktclrbk.c | 6 ++-- src/spicelib/analysis/cktdelt.c | 12 +++---- src/spicelib/analysis/cktdest.c | 10 +++--- src/spicelib/analysis/cktdisto.c | 12 +++---- src/spicelib/analysis/cktdlti.c | 8 ++--- src/spicelib/analysis/cktdltm.c | 8 ++--- src/spicelib/analysis/cktdltn.c | 8 ++--- src/spicelib/analysis/cktdojob.c | 14 ++++---- src/spicelib/analysis/cktdump.c | 10 +++--- src/spicelib/analysis/cktfbran.c | 6 ++-- src/spicelib/analysis/cktfnda.c | 12 +++---- src/spicelib/analysis/cktfndm.c | 10 +++--- src/spicelib/analysis/cktfnode.c | 8 ++--- src/spicelib/analysis/cktftask.c | 8 ++--- src/spicelib/analysis/cktgrnd.c | 8 ++--- src/spicelib/analysis/ckti2nod.c | 12 +++---- src/spicelib/analysis/cktic.c | 10 +++--- src/spicelib/analysis/cktlnkeq.c | 10 +++--- src/spicelib/analysis/cktload.c | 12 +++---- src/spicelib/analysis/cktmapn.c | 8 ++--- src/spicelib/analysis/cktmask.c | 10 +++--- src/spicelib/analysis/cktmcrt.c | 8 ++--- src/spicelib/analysis/cktmkcur.c | 8 ++--- src/spicelib/analysis/cktmknod.c | 10 +++--- src/spicelib/analysis/cktmkvol.c | 8 ++--- src/spicelib/analysis/cktmpar.c | 10 +++--- src/spicelib/analysis/cktnames.c | 8 ++--- src/spicelib/analysis/cktncdump.c | 6 ++-- src/spicelib/analysis/cktnewan.c | 12 +++---- src/spicelib/analysis/cktneweq.c | 10 +++--- src/spicelib/analysis/cktnewn.c | 10 +++--- src/spicelib/analysis/cktnodn.c | 4 +-- src/spicelib/analysis/cktnoise.c | 12 +++---- src/spicelib/analysis/cktntask.c | 10 +++--- src/spicelib/analysis/cktnum2n.c | 8 ++--- src/spicelib/analysis/cktop.c | 8 ++--- src/spicelib/analysis/cktparam.c | 10 +++--- src/spicelib/analysis/cktpartn.c | 12 +++---- src/spicelib/analysis/cktpmnam.c | 12 +++---- src/spicelib/analysis/cktpname.c | 12 +++---- src/spicelib/analysis/cktpzld.c | 14 ++++---- src/spicelib/analysis/cktpzset.c | 10 +++--- src/spicelib/analysis/cktpzstr.c | 12 +++---- src/spicelib/analysis/cktsens.c | 20 +++++------ src/spicelib/analysis/cktsetap.c | 12 +++---- src/spicelib/analysis/cktsetbk.c | 8 ++--- src/spicelib/analysis/cktsetnp.c | 8 ++--- src/spicelib/analysis/cktsetup.c | 10 +++--- src/spicelib/analysis/cktsgen.c | 12 +++---- src/spicelib/analysis/cktsopt.c | 16 ++++----- src/spicelib/analysis/ckttemp.c | 12 +++---- src/spicelib/analysis/cktterr.c | 4 +-- src/spicelib/analysis/ckttroub.c | 10 +++--- src/spicelib/analysis/ckttrunc.c | 10 +++--- src/spicelib/analysis/ckttyplk.c | 6 ++-- src/spicelib/analysis/cluster.c | 10 +++--- src/spicelib/analysis/daskq.c | 10 +++--- src/spicelib/analysis/dcoaskq.c | 10 +++--- src/spicelib/analysis/dcop.c | 16 ++++----- src/spicelib/analysis/dcosetp.c | 10 +++--- src/spicelib/analysis/dcpss.c | 36 +++++++++---------- src/spicelib/analysis/dctaskq.c | 10 +++--- src/spicelib/analysis/dctran.c | 26 +++++++------- src/spicelib/analysis/dctrcurv.c | 16 ++++----- src/spicelib/analysis/dctsetp.c | 10 +++--- src/spicelib/analysis/distoan.c | 8 ++--- src/spicelib/analysis/dkerproc.c | 8 ++--- src/spicelib/analysis/dloadfns.c | 4 +-- src/spicelib/analysis/dsetparm.c | 10 +++--- src/spicelib/analysis/naskq.c | 10 +++--- src/spicelib/analysis/nevalsrc.c | 8 ++--- src/spicelib/analysis/ninteg.c | 4 +-- src/spicelib/analysis/noisean.c | 12 +++---- src/spicelib/analysis/nsetparm.c | 10 +++--- src/spicelib/analysis/pssaskq.c | 10 +++--- src/spicelib/analysis/pssinit.c | 10 +++--- src/spicelib/analysis/psssetp.c | 10 +++--- src/spicelib/analysis/pzan.c | 14 ++++---- src/spicelib/analysis/pzaskq.c | 10 +++--- src/spicelib/analysis/pzsetp.c | 10 +++--- src/spicelib/analysis/sensaskq.c | 10 +++--- src/spicelib/analysis/senssetp.c | 10 +++--- src/spicelib/analysis/tfanal.c | 12 +++---- src/spicelib/analysis/tfaskq.c | 10 +++--- src/spicelib/analysis/tfsetp.c | 10 +++--- src/spicelib/analysis/tranaskq.c | 10 +++--- src/spicelib/analysis/traninit.c | 8 ++--- src/spicelib/analysis/transetp.c | 10 +++--- src/spicelib/devices/asrc/asrc.c | 8 ++--- src/spicelib/devices/asrc/asrcacld.c | 8 ++--- src/spicelib/devices/asrc/asrcask.c | 12 +++---- src/spicelib/devices/asrc/asrcconv.c | 8 ++--- src/spicelib/devices/asrc/asrcdefs.h | 6 ++-- src/spicelib/devices/asrc/asrcdel.c | 6 ++-- src/spicelib/devices/asrc/asrcdest.c | 4 +-- src/spicelib/devices/asrc/asrcfbr.c | 10 +++--- src/spicelib/devices/asrc/asrcinit.c | 2 +- src/spicelib/devices/asrc/asrcload.c | 8 ++--- src/spicelib/devices/asrc/asrcmdel.c | 6 ++-- src/spicelib/devices/asrc/asrcpar.c | 8 ++--- src/spicelib/devices/asrc/asrcpzld.c | 10 +++--- src/spicelib/devices/asrc/asrcset.c | 8 ++--- src/spicelib/devices/bjt/bjt.c | 6 ++-- src/spicelib/devices/bjt/bjtacld.c | 8 ++--- src/spicelib/devices/bjt/bjtask.c | 12 +++---- src/spicelib/devices/bjt/bjtconv.c | 8 ++--- src/spicelib/devices/bjt/bjtdefs.h | 10 +++--- src/spicelib/devices/bjt/bjtdel.c | 6 ++-- src/spicelib/devices/bjt/bjtdest.c | 4 +-- src/spicelib/devices/bjt/bjtdisto.c | 10 +++--- src/spicelib/devices/bjt/bjtdset.c | 14 ++++---- src/spicelib/devices/bjt/bjtgetic.c | 8 ++--- src/spicelib/devices/bjt/bjtinit.c | 2 +- src/spicelib/devices/bjt/bjtload.c | 14 ++++---- src/spicelib/devices/bjt/bjtmask.c | 14 ++++---- src/spicelib/devices/bjt/bjtmdel.c | 6 ++-- src/spicelib/devices/bjt/bjtmpar.c | 10 +++--- src/spicelib/devices/bjt/bjtnoise.c | 10 +++--- src/spicelib/devices/bjt/bjtparam.c | 10 +++--- src/spicelib/devices/bjt/bjtpzld.c | 10 +++--- src/spicelib/devices/bjt/bjtsacl.c | 14 ++++---- src/spicelib/devices/bjt/bjtsetup.c | 14 ++++---- src/spicelib/devices/bjt/bjtsload.c | 14 ++++---- src/spicelib/devices/bjt/bjtsprt.c | 14 ++++---- src/spicelib/devices/bjt/bjtsset.c | 14 ++++---- src/spicelib/devices/bjt/bjtsupd.c | 14 ++++---- src/spicelib/devices/bjt/bjttemp.c | 14 ++++---- src/spicelib/devices/bjt/bjttrunc.c | 8 ++--- src/spicelib/devices/bsim1/b1.c | 6 ++-- src/spicelib/devices/bsim1/b1acld.c | 8 ++--- src/spicelib/devices/bsim1/b1ask.c | 12 +++---- src/spicelib/devices/bsim1/b1cvtest.c | 14 ++++---- src/spicelib/devices/bsim1/b1del.c | 8 ++--- src/spicelib/devices/bsim1/b1dest.c | 4 +-- src/spicelib/devices/bsim1/b1disto.c | 10 +++--- src/spicelib/devices/bsim1/b1dset.c | 16 ++++----- src/spicelib/devices/bsim1/b1eval.c | 10 +++--- src/spicelib/devices/bsim1/b1getic.c | 8 ++--- src/spicelib/devices/bsim1/b1ld.c | 14 ++++---- src/spicelib/devices/bsim1/b1mask.c | 12 +++---- src/spicelib/devices/bsim1/b1mdel.c | 6 ++-- src/spicelib/devices/bsim1/b1moscap.c | 6 ++-- src/spicelib/devices/bsim1/b1mpar.c | 8 ++--- src/spicelib/devices/bsim1/b1noi.c | 10 +++--- src/spicelib/devices/bsim1/b1par.c | 8 ++--- src/spicelib/devices/bsim1/b1pzld.c | 10 +++--- src/spicelib/devices/bsim1/b1set.c | 12 +++---- src/spicelib/devices/bsim1/b1temp.c | 12 +++---- src/spicelib/devices/bsim1/b1trunc.c | 8 ++--- src/spicelib/devices/bsim1/bsim1def.h | 10 +++--- src/spicelib/devices/bsim1/bsim1init.c | 2 +- src/spicelib/devices/bsim2/b2.c | 6 ++-- src/spicelib/devices/bsim2/b2acld.c | 8 ++--- src/spicelib/devices/bsim2/b2ask.c | 12 +++---- src/spicelib/devices/bsim2/b2cvtest.c | 14 ++++---- src/spicelib/devices/bsim2/b2del.c | 8 ++--- src/spicelib/devices/bsim2/b2dest.c | 4 +-- src/spicelib/devices/bsim2/b2eval.c | 10 +++--- src/spicelib/devices/bsim2/b2getic.c | 8 ++--- src/spicelib/devices/bsim2/b2ld.c | 14 ++++---- src/spicelib/devices/bsim2/b2mask.c | 12 +++---- src/spicelib/devices/bsim2/b2mdel.c | 6 ++-- src/spicelib/devices/bsim2/b2moscap.c | 6 ++-- src/spicelib/devices/bsim2/b2mpar.c | 8 ++--- src/spicelib/devices/bsim2/b2noi.c | 10 +++--- src/spicelib/devices/bsim2/b2par.c | 8 ++--- src/spicelib/devices/bsim2/b2pzld.c | 10 +++--- src/spicelib/devices/bsim2/b2set.c | 12 +++---- src/spicelib/devices/bsim2/b2temp.c | 12 +++---- src/spicelib/devices/bsim2/b2trunc.c | 8 ++--- src/spicelib/devices/bsim2/bsim2def.h | 8 ++--- src/spicelib/devices/bsim2/bsim2init.c | 2 +- src/spicelib/devices/bsim3/b3.c | 6 ++-- src/spicelib/devices/bsim3/b3acld.c | 8 ++--- src/spicelib/devices/bsim3/b3ask.c | 12 +++---- src/spicelib/devices/bsim3/b3check.c | 14 ++++---- src/spicelib/devices/bsim3/b3cvtest.c | 14 ++++---- src/spicelib/devices/bsim3/b3del.c | 8 ++--- src/spicelib/devices/bsim3/b3dest.c | 4 +-- src/spicelib/devices/bsim3/b3getic.c | 8 ++--- src/spicelib/devices/bsim3/b3ld.c | 14 ++++---- src/spicelib/devices/bsim3/b3mask.c | 12 +++---- src/spicelib/devices/bsim3/b3mdel.c | 6 ++-- src/spicelib/devices/bsim3/b3mpar.c | 8 ++--- src/spicelib/devices/bsim3/b3noi.c | 12 +++---- src/spicelib/devices/bsim3/b3par.c | 10 +++--- src/spicelib/devices/bsim3/b3pzld.c | 10 +++--- src/spicelib/devices/bsim3/b3set.c | 14 ++++---- src/spicelib/devices/bsim3/b3temp.c | 12 +++---- src/spicelib/devices/bsim3/b3trunc.c | 8 ++--- src/spicelib/devices/bsim3/bsim3def.h | 10 +++--- src/spicelib/devices/bsim3/bsim3init.c | 2 +- src/spicelib/devices/bsim3soi/b4soi.c | 6 ++-- src/spicelib/devices/bsim3soi/b4soiacld.c | 8 ++--- src/spicelib/devices/bsim3soi/b4soiask.c | 12 +++---- src/spicelib/devices/bsim3soi/b4soicheck.c | 14 ++++---- src/spicelib/devices/bsim3soi/b4soicvtest.c | 14 ++++---- src/spicelib/devices/bsim3soi/b4soidef.h | 10 +++--- src/spicelib/devices/bsim3soi/b4soidel.c | 8 ++--- src/spicelib/devices/bsim3soi/b4soidest.c | 4 +-- src/spicelib/devices/bsim3soi/b4soigetic.c | 8 ++--- src/spicelib/devices/bsim3soi/b4soiinit.c | 2 +- src/spicelib/devices/bsim3soi/b4soild.c | 14 ++++---- src/spicelib/devices/bsim3soi/b4soimask.c | 12 +++---- src/spicelib/devices/bsim3soi/b4soimdel.c | 6 ++-- src/spicelib/devices/bsim3soi/b4soimpar.c | 8 ++--- src/spicelib/devices/bsim3soi/b4soinoi.c | 12 +++---- src/spicelib/devices/bsim3soi/b4soipar.c | 8 ++--- src/spicelib/devices/bsim3soi/b4soipzld.c | 10 +++--- src/spicelib/devices/bsim3soi/b4soiset.c | 14 ++++---- src/spicelib/devices/bsim3soi/b4soitemp.c | 12 +++---- src/spicelib/devices/bsim3soi/b4soitrunc.c | 8 ++--- src/spicelib/devices/bsim3soi_dd/b3soidd.c | 6 ++-- .../devices/bsim3soi_dd/b3soiddacld.c | 8 ++--- src/spicelib/devices/bsim3soi_dd/b3soiddask.c | 12 +++---- .../devices/bsim3soi_dd/b3soiddcheck.c | 14 ++++---- .../devices/bsim3soi_dd/b3soiddcvtest.c | 14 ++++---- src/spicelib/devices/bsim3soi_dd/b3soidddef.h | 10 +++--- src/spicelib/devices/bsim3soi_dd/b3soidddel.c | 8 ++--- .../devices/bsim3soi_dd/b3soidddest.c | 4 +-- .../devices/bsim3soi_dd/b3soiddgetic.c | 8 ++--- .../devices/bsim3soi_dd/b3soiddinit.c | 2 +- src/spicelib/devices/bsim3soi_dd/b3soiddld.c | 14 ++++---- .../devices/bsim3soi_dd/b3soiddmask.c | 12 +++---- .../devices/bsim3soi_dd/b3soiddmdel.c | 6 ++-- .../devices/bsim3soi_dd/b3soiddmpar.c | 8 ++--- src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c | 12 +++---- src/spicelib/devices/bsim3soi_dd/b3soiddpar.c | 8 ++--- .../devices/bsim3soi_dd/b3soiddpzld.c | 10 +++--- src/spicelib/devices/bsim3soi_dd/b3soiddset.c | 12 +++---- .../devices/bsim3soi_dd/b3soiddtemp.c | 12 +++---- .../devices/bsim3soi_dd/b3soiddtrunc.c | 8 ++--- src/spicelib/devices/bsim3soi_fd/b3soifd.c | 6 ++-- .../devices/bsim3soi_fd/b3soifdacld.c | 8 ++--- src/spicelib/devices/bsim3soi_fd/b3soifdask.c | 12 +++---- .../devices/bsim3soi_fd/b3soifdcheck.c | 14 ++++---- .../devices/bsim3soi_fd/b3soifdcvtest.c | 14 ++++---- src/spicelib/devices/bsim3soi_fd/b3soifddef.h | 10 +++--- src/spicelib/devices/bsim3soi_fd/b3soifddel.c | 8 ++--- .../devices/bsim3soi_fd/b3soifddest.c | 4 +-- .../devices/bsim3soi_fd/b3soifdgetic.c | 8 ++--- .../devices/bsim3soi_fd/b3soifdinit.c | 2 +- src/spicelib/devices/bsim3soi_fd/b3soifdld.c | 14 ++++---- .../devices/bsim3soi_fd/b3soifdmask.c | 12 +++---- .../devices/bsim3soi_fd/b3soifdmdel.c | 6 ++-- .../devices/bsim3soi_fd/b3soifdmpar.c | 8 ++--- src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c | 12 +++---- src/spicelib/devices/bsim3soi_fd/b3soifdpar.c | 8 ++--- .../devices/bsim3soi_fd/b3soifdpzld.c | 10 +++--- src/spicelib/devices/bsim3soi_fd/b3soifdset.c | 12 +++---- .../devices/bsim3soi_fd/b3soifdtemp.c | 12 +++---- .../devices/bsim3soi_fd/b3soifdtrunc.c | 8 ++--- src/spicelib/devices/bsim3soi_pd/b3soipd.c | 6 ++-- .../devices/bsim3soi_pd/b3soipdacld.c | 8 ++--- src/spicelib/devices/bsim3soi_pd/b3soipdask.c | 12 +++---- .../devices/bsim3soi_pd/b3soipdcheck.c | 14 ++++---- .../devices/bsim3soi_pd/b3soipdcvtest.c | 14 ++++---- src/spicelib/devices/bsim3soi_pd/b3soipddef.h | 10 +++--- src/spicelib/devices/bsim3soi_pd/b3soipddel.c | 8 ++--- .../devices/bsim3soi_pd/b3soipddest.c | 4 +-- .../devices/bsim3soi_pd/b3soipdgetic.c | 8 ++--- .../devices/bsim3soi_pd/b3soipdinit.c | 2 +- src/spicelib/devices/bsim3soi_pd/b3soipdld.c | 14 ++++---- .../devices/bsim3soi_pd/b3soipdmask.c | 12 +++---- .../devices/bsim3soi_pd/b3soipdmdel.c | 6 ++-- .../devices/bsim3soi_pd/b3soipdmpar.c | 8 ++--- src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c | 12 +++---- src/spicelib/devices/bsim3soi_pd/b3soipdpar.c | 8 ++--- .../devices/bsim3soi_pd/b3soipdpzld.c | 10 +++--- src/spicelib/devices/bsim3soi_pd/b3soipdset.c | 12 +++---- .../devices/bsim3soi_pd/b3soipdtemp.c | 12 +++---- .../devices/bsim3soi_pd/b3soipdtrunc.c | 8 ++--- src/spicelib/devices/bsim3v0/b3v0.c | 6 ++-- src/spicelib/devices/bsim3v0/b3v0acld.c | 8 ++--- src/spicelib/devices/bsim3v0/b3v0ask.c | 12 +++---- src/spicelib/devices/bsim3v0/b3v0cvtest.c | 14 ++++---- src/spicelib/devices/bsim3v0/b3v0del.c | 8 ++--- src/spicelib/devices/bsim3v0/b3v0dest.c | 4 +-- src/spicelib/devices/bsim3v0/b3v0getic.c | 8 ++--- src/spicelib/devices/bsim3v0/b3v0ld.c | 14 ++++---- src/spicelib/devices/bsim3v0/b3v0mask.c | 12 +++---- src/spicelib/devices/bsim3v0/b3v0mdel.c | 6 ++-- src/spicelib/devices/bsim3v0/b3v0mpar.c | 8 ++--- src/spicelib/devices/bsim3v0/b3v0noi.c | 12 +++---- src/spicelib/devices/bsim3v0/b3v0par.c | 10 +++--- src/spicelib/devices/bsim3v0/b3v0pzld.c | 10 +++--- src/spicelib/devices/bsim3v0/b3v0set.c | 12 +++---- src/spicelib/devices/bsim3v0/b3v0temp.c | 12 +++---- src/spicelib/devices/bsim3v0/b3v0trunc.c | 8 ++--- src/spicelib/devices/bsim3v0/bsim3v0def.h | 10 +++--- src/spicelib/devices/bsim3v0/bsim3v0init.c | 2 +- src/spicelib/devices/bsim3v1/b3v1.c | 6 ++-- src/spicelib/devices/bsim3v1/b3v1acld.c | 8 ++--- src/spicelib/devices/bsim3v1/b3v1ask.c | 12 +++---- src/spicelib/devices/bsim3v1/b3v1check.c | 14 ++++---- src/spicelib/devices/bsim3v1/b3v1cvtest.c | 14 ++++---- src/spicelib/devices/bsim3v1/b3v1del.c | 8 ++--- src/spicelib/devices/bsim3v1/b3v1dest.c | 4 +-- src/spicelib/devices/bsim3v1/b3v1getic.c | 8 ++--- src/spicelib/devices/bsim3v1/b3v1ld.c | 14 ++++---- src/spicelib/devices/bsim3v1/b3v1mask.c | 12 +++---- src/spicelib/devices/bsim3v1/b3v1mdel.c | 6 ++-- src/spicelib/devices/bsim3v1/b3v1mpar.c | 8 ++--- src/spicelib/devices/bsim3v1/b3v1noi.c | 12 +++---- src/spicelib/devices/bsim3v1/b3v1par.c | 10 +++--- src/spicelib/devices/bsim3v1/b3v1pzld.c | 10 +++--- src/spicelib/devices/bsim3v1/b3v1set.c | 12 +++---- src/spicelib/devices/bsim3v1/b3v1temp.c | 12 +++---- src/spicelib/devices/bsim3v1/b3v1trunc.c | 8 ++--- src/spicelib/devices/bsim3v1/bsim3v1def.h | 10 +++--- src/spicelib/devices/bsim3v1/bsim3v1init.c | 2 +- src/spicelib/devices/bsim3v32/b3v32.c | 6 ++-- src/spicelib/devices/bsim3v32/b3v32acld.c | 8 ++--- src/spicelib/devices/bsim3v32/b3v32ask.c | 12 +++---- src/spicelib/devices/bsim3v32/b3v32check.c | 14 ++++---- src/spicelib/devices/bsim3v32/b3v32cvtest.c | 14 ++++---- src/spicelib/devices/bsim3v32/b3v32del.c | 8 ++--- src/spicelib/devices/bsim3v32/b3v32dest.c | 4 +-- src/spicelib/devices/bsim3v32/b3v32getic.c | 8 ++--- src/spicelib/devices/bsim3v32/b3v32ld.c | 14 ++++---- src/spicelib/devices/bsim3v32/b3v32mask.c | 12 +++---- src/spicelib/devices/bsim3v32/b3v32mdel.c | 6 ++-- src/spicelib/devices/bsim3v32/b3v32mpar.c | 8 ++--- src/spicelib/devices/bsim3v32/b3v32noi.c | 12 +++---- src/spicelib/devices/bsim3v32/b3v32par.c | 10 +++--- src/spicelib/devices/bsim3v32/b3v32pzld.c | 10 +++--- src/spicelib/devices/bsim3v32/b3v32set.c | 12 +++---- src/spicelib/devices/bsim3v32/b3v32temp.c | 12 +++---- src/spicelib/devices/bsim3v32/b3v32trunc.c | 8 ++--- src/spicelib/devices/bsim3v32/bsim3v32def.h | 10 +++--- src/spicelib/devices/bsim3v32/bsim3v32init.c | 2 +- src/spicelib/devices/bsim4/b4.c | 6 ++-- src/spicelib/devices/bsim4/b4acld.c | 8 ++--- src/spicelib/devices/bsim4/b4ask.c | 12 +++---- src/spicelib/devices/bsim4/b4check.c | 14 ++++---- src/spicelib/devices/bsim4/b4cvtest.c | 14 ++++---- src/spicelib/devices/bsim4/b4del.c | 8 ++--- src/spicelib/devices/bsim4/b4dest.c | 4 +-- src/spicelib/devices/bsim4/b4geo.c | 2 +- src/spicelib/devices/bsim4/b4getic.c | 8 ++--- src/spicelib/devices/bsim4/b4ld.c | 14 ++++---- src/spicelib/devices/bsim4/b4mask.c | 12 +++---- src/spicelib/devices/bsim4/b4mdel.c | 6 ++-- src/spicelib/devices/bsim4/b4mpar.c | 10 +++--- src/spicelib/devices/bsim4/b4noi.c | 12 +++---- src/spicelib/devices/bsim4/b4par.c | 8 ++--- src/spicelib/devices/bsim4/b4pzld.c | 10 +++--- src/spicelib/devices/bsim4/b4set.c | 18 +++++----- src/spicelib/devices/bsim4/b4temp.c | 12 +++---- src/spicelib/devices/bsim4/b4trunc.c | 8 ++--- src/spicelib/devices/bsim4/bsim4def.h | 10 +++--- src/spicelib/devices/bsim4/bsim4init.c | 2 +- src/spicelib/devices/bsim4v4/b4v4.c | 6 ++-- src/spicelib/devices/bsim4v4/b4v4acld.c | 8 ++--- src/spicelib/devices/bsim4v4/b4v4ask.c | 12 +++---- src/spicelib/devices/bsim4v4/b4v4check.c | 12 +++---- src/spicelib/devices/bsim4v4/b4v4cvtest.c | 14 ++++---- src/spicelib/devices/bsim4v4/b4v4del.c | 8 ++--- src/spicelib/devices/bsim4v4/b4v4dest.c | 4 +-- src/spicelib/devices/bsim4v4/b4v4geo.c | 2 +- src/spicelib/devices/bsim4v4/b4v4getic.c | 8 ++--- src/spicelib/devices/bsim4v4/b4v4ld.c | 12 +++---- src/spicelib/devices/bsim4v4/b4v4mask.c | 12 +++---- src/spicelib/devices/bsim4v4/b4v4mdel.c | 6 ++-- src/spicelib/devices/bsim4v4/b4v4mpar.c | 10 +++--- src/spicelib/devices/bsim4v4/b4v4noi.c | 10 +++--- src/spicelib/devices/bsim4v4/b4v4par.c | 10 +++--- src/spicelib/devices/bsim4v4/b4v4pzld.c | 10 +++--- src/spicelib/devices/bsim4v4/b4v4set.c | 14 ++++---- src/spicelib/devices/bsim4v4/b4v4temp.c | 12 +++---- src/spicelib/devices/bsim4v4/b4v4trunc.c | 8 ++--- src/spicelib/devices/bsim4v4/bsim4v4def.h | 10 +++--- src/spicelib/devices/bsim4v4/bsim4v4init.c | 2 +- src/spicelib/devices/bsim4v5/b4v5.c | 6 ++-- src/spicelib/devices/bsim4v5/b4v5acld.c | 8 ++--- src/spicelib/devices/bsim4v5/b4v5ask.c | 12 +++---- src/spicelib/devices/bsim4v5/b4v5check.c | 14 ++++---- src/spicelib/devices/bsim4v5/b4v5cvtest.c | 14 ++++---- src/spicelib/devices/bsim4v5/b4v5del.c | 8 ++--- src/spicelib/devices/bsim4v5/b4v5dest.c | 4 +-- src/spicelib/devices/bsim4v5/b4v5geo.c | 2 +- src/spicelib/devices/bsim4v5/b4v5getic.c | 8 ++--- src/spicelib/devices/bsim4v5/b4v5ld.c | 14 ++++---- src/spicelib/devices/bsim4v5/b4v5mask.c | 12 +++---- src/spicelib/devices/bsim4v5/b4v5mdel.c | 6 ++-- src/spicelib/devices/bsim4v5/b4v5mpar.c | 10 +++--- src/spicelib/devices/bsim4v5/b4v5noi.c | 12 +++---- src/spicelib/devices/bsim4v5/b4v5par.c | 10 +++--- src/spicelib/devices/bsim4v5/b4v5pzld.c | 10 +++--- src/spicelib/devices/bsim4v5/b4v5set.c | 16 ++++----- src/spicelib/devices/bsim4v5/b4v5temp.c | 12 +++---- src/spicelib/devices/bsim4v5/b4v5trunc.c | 8 ++--- src/spicelib/devices/bsim4v5/bsim4v5def.h | 10 +++--- src/spicelib/devices/bsim4v5/bsim4v5init.c | 2 +- src/spicelib/devices/bsim4v6/b4v6.c | 6 ++-- src/spicelib/devices/bsim4v6/b4v6acld.c | 8 ++--- src/spicelib/devices/bsim4v6/b4v6ask.c | 12 +++---- src/spicelib/devices/bsim4v6/b4v6check.c | 14 ++++---- src/spicelib/devices/bsim4v6/b4v6cvtest.c | 14 ++++---- src/spicelib/devices/bsim4v6/b4v6del.c | 8 ++--- src/spicelib/devices/bsim4v6/b4v6dest.c | 4 +-- src/spicelib/devices/bsim4v6/b4v6geo.c | 2 +- src/spicelib/devices/bsim4v6/b4v6getic.c | 8 ++--- src/spicelib/devices/bsim4v6/b4v6ld.c | 14 ++++---- src/spicelib/devices/bsim4v6/b4v6mask.c | 12 +++---- src/spicelib/devices/bsim4v6/b4v6mdel.c | 6 ++-- src/spicelib/devices/bsim4v6/b4v6mpar.c | 10 +++--- src/spicelib/devices/bsim4v6/b4v6noi.c | 12 +++---- src/spicelib/devices/bsim4v6/b4v6par.c | 10 +++--- src/spicelib/devices/bsim4v6/b4v6pzld.c | 10 +++--- src/spicelib/devices/bsim4v6/b4v6set.c | 18 +++++----- src/spicelib/devices/bsim4v6/b4v6temp.c | 12 +++---- src/spicelib/devices/bsim4v6/b4v6trunc.c | 8 ++--- src/spicelib/devices/bsim4v6/bsim4v6def.h | 10 +++--- src/spicelib/devices/bsim4v6/bsim4v6init.c | 2 +- src/spicelib/devices/cap/cap.c | 6 ++-- src/spicelib/devices/cap/capacld.c | 8 ++--- src/spicelib/devices/cap/capask.c | 12 +++---- src/spicelib/devices/cap/capdefs.h | 8 ++--- src/spicelib/devices/cap/capdel.c | 6 ++-- src/spicelib/devices/cap/capdest.c | 4 +-- src/spicelib/devices/cap/capgetic.c | 8 ++--- src/spicelib/devices/cap/capinit.c | 2 +- src/spicelib/devices/cap/capload.c | 10 +++--- src/spicelib/devices/cap/capmask.c | 12 +++---- src/spicelib/devices/cap/capmdel.c | 6 ++-- src/spicelib/devices/cap/capmpar.c | 8 ++--- src/spicelib/devices/cap/capparam.c | 8 ++--- src/spicelib/devices/cap/cappzld.c | 10 +++--- src/spicelib/devices/cap/capsacl.c | 10 +++--- src/spicelib/devices/cap/capsetup.c | 8 ++--- src/spicelib/devices/cap/capsload.c | 10 +++--- src/spicelib/devices/cap/capsprt.c | 10 +++--- src/spicelib/devices/cap/capsset.c | 10 +++--- src/spicelib/devices/cap/capsupd.c | 10 +++--- src/spicelib/devices/cap/captemp.c | 8 ++--- src/spicelib/devices/cap/captrunc.c | 8 ++--- src/spicelib/devices/cccs/cccs.c | 8 ++--- src/spicelib/devices/cccs/cccsask.c | 12 +++---- src/spicelib/devices/cccs/cccsdefs.h | 8 ++--- src/spicelib/devices/cccs/cccsdel.c | 6 ++-- src/spicelib/devices/cccs/cccsdest.c | 4 +-- src/spicelib/devices/cccs/cccsinit.c | 2 +- src/spicelib/devices/cccs/cccsload.c | 8 ++--- src/spicelib/devices/cccs/cccsmdel.c | 6 ++-- src/spicelib/devices/cccs/cccspar.c | 8 ++--- src/spicelib/devices/cccs/cccspzld.c | 10 +++--- src/spicelib/devices/cccs/cccssacl.c | 10 +++--- src/spicelib/devices/cccs/cccsset.c | 10 +++--- src/spicelib/devices/cccs/cccssld.c | 10 +++--- src/spicelib/devices/cccs/cccssprt.c | 10 +++--- src/spicelib/devices/cccs/cccssset.c | 10 +++--- src/spicelib/devices/ccvs/ccvs.c | 8 ++--- src/spicelib/devices/ccvs/ccvsask.c | 12 +++---- src/spicelib/devices/ccvs/ccvsdefs.h | 8 ++--- src/spicelib/devices/ccvs/ccvsdel.c | 6 ++-- src/spicelib/devices/ccvs/ccvsdest.c | 4 +-- src/spicelib/devices/ccvs/ccvsfbr.c | 8 ++--- src/spicelib/devices/ccvs/ccvsinit.c | 2 +- src/spicelib/devices/ccvs/ccvsload.c | 8 ++--- src/spicelib/devices/ccvs/ccvsmdel.c | 6 ++-- src/spicelib/devices/ccvs/ccvspar.c | 8 ++--- src/spicelib/devices/ccvs/ccvspzld.c | 10 +++--- src/spicelib/devices/ccvs/ccvssacl.c | 8 ++--- src/spicelib/devices/ccvs/ccvsset.c | 8 ++--- src/spicelib/devices/ccvs/ccvssld.c | 8 ++--- src/spicelib/devices/ccvs/ccvssprt.c | 8 ++--- src/spicelib/devices/ccvs/ccvssset.c | 8 ++--- src/spicelib/devices/cktaccept.c | 8 ++--- src/spicelib/devices/cktask.c | 4 +-- src/spicelib/devices/cktbindnode.c | 6 ++-- src/spicelib/devices/cktcrte.c | 6 ++-- src/spicelib/devices/cktfinddev.c | 6 ++-- src/spicelib/devices/cktinit.c | 14 ++++---- src/spicelib/devices/cpl/cpl.c | 8 ++--- src/spicelib/devices/cpl/cplask.c | 14 ++++---- src/spicelib/devices/cpl/cpldefs.h | 12 +++---- src/spicelib/devices/cpl/cpldel.c | 6 ++-- src/spicelib/devices/cpl/cpldest.c | 4 +-- src/spicelib/devices/cpl/cplinit.c | 2 +- src/spicelib/devices/cpl/cplload.c | 6 ++-- src/spicelib/devices/cpl/cplmask.c | 14 ++++---- src/spicelib/devices/cpl/cplmdel.c | 6 ++-- src/spicelib/devices/cpl/cplmpar.c | 10 +++--- src/spicelib/devices/cpl/cplparam.c | 10 +++--- src/spicelib/devices/cpl/cplsetup.c | 10 +++--- src/spicelib/devices/csw/csw.c | 8 ++--- src/spicelib/devices/csw/cswacld.c | 8 ++--- src/spicelib/devices/csw/cswask.c | 12 +++---- src/spicelib/devices/csw/cswdefs.h | 10 +++--- src/spicelib/devices/csw/cswdel.c | 6 ++-- src/spicelib/devices/csw/cswdest.c | 4 +-- src/spicelib/devices/csw/cswinit.c | 2 +- src/spicelib/devices/csw/cswload.c | 12 +++---- src/spicelib/devices/csw/cswmask.c | 12 +++---- src/spicelib/devices/csw/cswmdel.c | 6 ++-- src/spicelib/devices/csw/cswmpar.c | 8 ++--- src/spicelib/devices/csw/cswnoise.c | 10 +++--- src/spicelib/devices/csw/cswparam.c | 8 ++--- src/spicelib/devices/csw/cswpzld.c | 10 +++--- src/spicelib/devices/csw/cswsetup.c | 8 ++--- src/spicelib/devices/csw/cswtrunc.c | 8 ++--- src/spicelib/devices/dev.c | 24 ++++++------- src/spicelib/devices/devsup.c | 8 ++--- src/spicelib/devices/dio/dio.c | 6 ++-- src/spicelib/devices/dio/dioacld.c | 8 ++--- src/spicelib/devices/dio/dioask.c | 14 ++++---- src/spicelib/devices/dio/dioconv.c | 14 ++++---- src/spicelib/devices/dio/diodefs.h | 10 +++--- src/spicelib/devices/dio/diodel.c | 6 ++-- src/spicelib/devices/dio/diodest.c | 4 +-- src/spicelib/devices/dio/diodisto.c | 10 +++--- src/spicelib/devices/dio/diodset.c | 10 +++--- src/spicelib/devices/dio/diogetic.c | 8 ++--- src/spicelib/devices/dio/dioinit.c | 4 +-- src/spicelib/devices/dio/dioload.c | 14 ++++---- src/spicelib/devices/dio/diomask.c | 12 +++---- src/spicelib/devices/dio/diomdel.c | 6 ++-- src/spicelib/devices/dio/diompar.c | 10 +++--- src/spicelib/devices/dio/dionoise.c | 10 +++--- src/spicelib/devices/dio/dioparam.c | 10 +++--- src/spicelib/devices/dio/diopzld.c | 10 +++--- src/spicelib/devices/dio/diosacl.c | 12 +++---- src/spicelib/devices/dio/diosetup.c | 10 +++--- src/spicelib/devices/dio/diosload.c | 10 +++--- src/spicelib/devices/dio/diosprt.c | 10 +++--- src/spicelib/devices/dio/diosset.c | 10 +++--- src/spicelib/devices/dio/diosupd.c | 10 +++--- src/spicelib/devices/dio/diotemp.c | 10 +++--- src/spicelib/devices/dio/diotrunc.c | 8 ++--- src/spicelib/devices/hfet1/hfet.c | 8 ++--- src/spicelib/devices/hfet1/hfetacl.c | 8 ++--- src/spicelib/devices/hfet1/hfetask.c | 12 +++---- src/spicelib/devices/hfet1/hfetdefs.h | 10 +++--- src/spicelib/devices/hfet1/hfetdel.c | 6 ++-- src/spicelib/devices/hfet1/hfetdest.c | 4 +-- src/spicelib/devices/hfet1/hfetgetic.c | 8 ++--- src/spicelib/devices/hfet1/hfetinit.c | 2 +- src/spicelib/devices/hfet1/hfetload.c | 14 ++++---- src/spicelib/devices/hfet1/hfetmask.c | 12 +++---- src/spicelib/devices/hfet1/hfetmdel.c | 6 ++-- src/spicelib/devices/hfet1/hfetmpar.c | 10 +++--- src/spicelib/devices/hfet1/hfetparam.c | 8 ++--- src/spicelib/devices/hfet1/hfetpzl.c | 10 +++--- src/spicelib/devices/hfet1/hfetsetup.c | 12 +++---- src/spicelib/devices/hfet1/hfettemp.c | 12 +++---- src/spicelib/devices/hfet1/hfettrunc.c | 8 ++--- src/spicelib/devices/hfet2/hfet2.c | 8 ++--- src/spicelib/devices/hfet2/hfet2acl.c | 8 ++--- src/spicelib/devices/hfet2/hfet2ask.c | 12 +++---- src/spicelib/devices/hfet2/hfet2defs.h | 10 +++--- src/spicelib/devices/hfet2/hfet2del.c | 6 ++-- src/spicelib/devices/hfet2/hfet2dest.c | 4 +-- src/spicelib/devices/hfet2/hfet2getic.c | 8 ++--- src/spicelib/devices/hfet2/hfet2init.c | 2 +- src/spicelib/devices/hfet2/hfet2load.c | 14 ++++---- src/spicelib/devices/hfet2/hfet2mask.c | 12 +++---- src/spicelib/devices/hfet2/hfet2mdel.c | 6 ++-- src/spicelib/devices/hfet2/hfet2mpar.c | 8 ++--- src/spicelib/devices/hfet2/hfet2param.c | 8 ++--- src/spicelib/devices/hfet2/hfet2pzl.c | 8 ++--- src/spicelib/devices/hfet2/hfet2setup.c | 12 +++---- src/spicelib/devices/hfet2/hfet2temp.c | 12 +++---- src/spicelib/devices/hfet2/hfet2trunc.c | 8 ++--- src/spicelib/devices/hisim2/hisim2.h | 2 +- src/spicelib/devices/hisim2/hsm2.c | 6 ++-- src/spicelib/devices/hisim2/hsm2acld.c | 8 ++--- src/spicelib/devices/hisim2/hsm2ask.c | 12 +++---- src/spicelib/devices/hisim2/hsm2cvtest.c | 14 ++++---- src/spicelib/devices/hisim2/hsm2def.h | 10 +++--- src/spicelib/devices/hisim2/hsm2del.c | 8 ++--- src/spicelib/devices/hisim2/hsm2dest.c | 4 +-- src/spicelib/devices/hisim2/hsm2eval.c | 4 +-- src/spicelib/devices/hisim2/hsm2getic.c | 8 ++--- src/spicelib/devices/hisim2/hsm2init.c | 2 +- src/spicelib/devices/hisim2/hsm2ld.c | 14 ++++---- src/spicelib/devices/hisim2/hsm2mask.c | 12 +++---- src/spicelib/devices/hisim2/hsm2mdel.c | 6 ++-- src/spicelib/devices/hisim2/hsm2mpar.c | 8 ++--- src/spicelib/devices/hisim2/hsm2noi.c | 12 +++---- src/spicelib/devices/hisim2/hsm2par.c | 8 ++--- src/spicelib/devices/hisim2/hsm2pzld.c | 10 +++--- src/spicelib/devices/hisim2/hsm2set.c | 12 +++---- src/spicelib/devices/hisim2/hsm2temp.c | 12 +++---- src/spicelib/devices/hisim2/hsm2trunc.c | 8 ++--- src/spicelib/devices/hisimhv/hisimhv.h | 2 +- src/spicelib/devices/hisimhv/hsmhv.c | 6 ++-- src/spicelib/devices/hisimhv/hsmhvacld.c | 8 ++--- src/spicelib/devices/hisimhv/hsmhvask.c | 12 +++---- src/spicelib/devices/hisimhv/hsmhvcvtest.c | 14 ++++---- src/spicelib/devices/hisimhv/hsmhvdef.h | 10 +++--- src/spicelib/devices/hisimhv/hsmhvdel.c | 8 ++--- src/spicelib/devices/hisimhv/hsmhvdest.c | 4 +-- src/spicelib/devices/hisimhv/hsmhveval.c | 2 +- src/spicelib/devices/hisimhv/hsmhvgetic.c | 8 ++--- src/spicelib/devices/hisimhv/hsmhvinit.c | 2 +- src/spicelib/devices/hisimhv/hsmhvld.c | 12 +++---- src/spicelib/devices/hisimhv/hsmhvmask.c | 12 +++---- src/spicelib/devices/hisimhv/hsmhvmdel.c | 6 ++-- src/spicelib/devices/hisimhv/hsmhvmpar.c | 8 ++--- src/spicelib/devices/hisimhv/hsmhvnoi.c | 12 +++---- src/spicelib/devices/hisimhv/hsmhvpar.c | 8 ++--- src/spicelib/devices/hisimhv/hsmhvpzld.c | 10 +++--- src/spicelib/devices/hisimhv/hsmhvset.c | 12 +++---- src/spicelib/devices/hisimhv/hsmhvtemp.c | 12 +++---- src/spicelib/devices/hisimhv/hsmhvtrunc.c | 8 ++--- src/spicelib/devices/ind/ind.c | 8 ++--- src/spicelib/devices/ind/indacld.c | 8 ++--- src/spicelib/devices/ind/indask.c | 10 +++--- src/spicelib/devices/ind/inddefs.h | 8 ++--- src/spicelib/devices/ind/inddel.c | 6 ++-- src/spicelib/devices/ind/inddest.c | 4 +-- src/spicelib/devices/ind/indinit.c | 2 +- src/spicelib/devices/ind/indload.c | 10 +++--- src/spicelib/devices/ind/indmask.c | 12 +++---- src/spicelib/devices/ind/indmdel.c | 6 ++-- src/spicelib/devices/ind/indmpar.c | 8 ++--- src/spicelib/devices/ind/indparam.c | 8 ++--- src/spicelib/devices/ind/indpzld.c | 10 +++--- src/spicelib/devices/ind/indsacl.c | 10 +++--- src/spicelib/devices/ind/indsetup.c | 10 +++--- src/spicelib/devices/ind/indsload.c | 10 +++--- src/spicelib/devices/ind/indsprt.c | 10 +++--- src/spicelib/devices/ind/indsset.c | 10 +++--- src/spicelib/devices/ind/indsupd.c | 10 +++--- src/spicelib/devices/ind/indtemp.c | 8 ++--- src/spicelib/devices/ind/indtrunc.c | 8 ++--- src/spicelib/devices/ind/mutacld.c | 8 ++--- src/spicelib/devices/ind/mutask.c | 10 +++--- src/spicelib/devices/ind/mutdel.c | 6 ++-- src/spicelib/devices/ind/mutdest.c | 4 +-- src/spicelib/devices/ind/mutmdel.c | 6 ++-- src/spicelib/devices/ind/mutparam.c | 8 ++--- src/spicelib/devices/ind/mutpzld.c | 10 +++--- src/spicelib/devices/ind/mutsetup.c | 12 +++---- src/spicelib/devices/ind/mutsprt.c | 10 +++--- src/spicelib/devices/ind/mutsset.c | 12 +++---- src/spicelib/devices/ind/muttemp.c | 8 ++--- src/spicelib/devices/isrc/isrc.c | 8 ++--- src/spicelib/devices/isrc/isrcacct.c | 14 ++++---- src/spicelib/devices/isrc/isrcacld.c | 8 ++--- src/spicelib/devices/isrc/isrcask.c | 12 +++---- src/spicelib/devices/isrc/isrcdefs.h | 8 ++--- src/spicelib/devices/isrc/isrcdel.c | 6 ++-- src/spicelib/devices/isrc/isrcdest.c | 4 +-- src/spicelib/devices/isrc/isrcinit.c | 2 +- src/spicelib/devices/isrc/isrcload.c | 14 ++++---- src/spicelib/devices/isrc/isrcmdel.c | 6 ++-- src/spicelib/devices/isrc/isrcpar.c | 10 +++--- src/spicelib/devices/isrc/isrctemp.c | 10 +++--- src/spicelib/devices/jfet/jfet.c | 8 ++--- src/spicelib/devices/jfet/jfetacld.c | 8 ++--- src/spicelib/devices/jfet/jfetask.c | 14 ++++---- src/spicelib/devices/jfet/jfetdefs.h | 10 +++--- src/spicelib/devices/jfet/jfetdel.c | 6 ++-- src/spicelib/devices/jfet/jfetdest.c | 4 +-- src/spicelib/devices/jfet/jfetdist.c | 10 +++--- src/spicelib/devices/jfet/jfetdset.c | 16 ++++----- src/spicelib/devices/jfet/jfetic.c | 8 ++--- src/spicelib/devices/jfet/jfetinit.c | 2 +- src/spicelib/devices/jfet/jfetload.c | 14 ++++---- src/spicelib/devices/jfet/jfetmask.c | 14 ++++---- src/spicelib/devices/jfet/jfetmdel.c | 6 ++-- src/spicelib/devices/jfet/jfetmpar.c | 10 +++--- src/spicelib/devices/jfet/jfetnoi.c | 10 +++--- src/spicelib/devices/jfet/jfetpar.c | 10 +++--- src/spicelib/devices/jfet/jfetpzld.c | 10 +++--- src/spicelib/devices/jfet/jfetset.c | 12 +++---- src/spicelib/devices/jfet/jfettemp.c | 12 +++---- src/spicelib/devices/jfet/jfettrun.c | 8 ++--- src/spicelib/devices/jfet2/jfet2.c | 8 ++--- src/spicelib/devices/jfet2/jfet2acld.c | 8 ++--- src/spicelib/devices/jfet2/jfet2ask.c | 14 ++++---- src/spicelib/devices/jfet2/jfet2defs.h | 10 +++--- src/spicelib/devices/jfet2/jfet2del.c | 6 ++-- src/spicelib/devices/jfet2/jfet2dest.c | 4 +-- src/spicelib/devices/jfet2/jfet2ic.c | 8 ++--- src/spicelib/devices/jfet2/jfet2init.c | 2 +- src/spicelib/devices/jfet2/jfet2load.c | 14 ++++---- src/spicelib/devices/jfet2/jfet2mask.c | 14 ++++---- src/spicelib/devices/jfet2/jfet2mdel.c | 6 ++-- src/spicelib/devices/jfet2/jfet2mpar.c | 10 +++--- src/spicelib/devices/jfet2/jfet2noi.c | 10 +++--- src/spicelib/devices/jfet2/jfet2par.c | 10 +++--- src/spicelib/devices/jfet2/jfet2set.c | 12 +++---- src/spicelib/devices/jfet2/jfet2temp.c | 12 +++---- src/spicelib/devices/jfet2/jfet2trun.c | 8 ++--- src/spicelib/devices/jfet2/psmodel.h | 4 +-- src/spicelib/devices/limit.c | 2 +- src/spicelib/devices/ltra/ltra.c | 8 ++--- src/spicelib/devices/ltra/ltraacct.c | 8 ++--- src/spicelib/devices/ltra/ltraacld.c | 10 +++--- src/spicelib/devices/ltra/ltraask.c | 12 +++---- src/spicelib/devices/ltra/ltradefs.h | 8 ++--- src/spicelib/devices/ltra/ltradel.c | 6 ++-- src/spicelib/devices/ltra/ltradest.c | 4 +-- src/spicelib/devices/ltra/ltrainit.c | 2 +- src/spicelib/devices/ltra/ltraload.c | 10 +++--- src/spicelib/devices/ltra/ltramask.c | 10 +++--- src/spicelib/devices/ltra/ltramdel.c | 6 ++-- src/spicelib/devices/ltra/ltramisc.c | 4 +-- src/spicelib/devices/ltra/ltrampar.c | 10 +++--- src/spicelib/devices/ltra/ltrapar.c | 8 ++--- src/spicelib/devices/ltra/ltraset.c | 10 +++--- src/spicelib/devices/ltra/ltratemp.c | 10 +++--- src/spicelib/devices/ltra/ltratrun.c | 8 ++--- src/spicelib/devices/mes/mes.c | 8 ++--- src/spicelib/devices/mes/mesacl.c | 8 ++--- src/spicelib/devices/mes/mesask.c | 12 +++---- src/spicelib/devices/mes/mesdefs.h | 10 +++--- src/spicelib/devices/mes/mesdel.c | 6 ++-- src/spicelib/devices/mes/mesdest.c | 4 +-- src/spicelib/devices/mes/mesdisto.c | 10 +++--- src/spicelib/devices/mes/mesdset.c | 14 ++++---- src/spicelib/devices/mes/mesgetic.c | 8 ++--- src/spicelib/devices/mes/mesinit.c | 2 +- src/spicelib/devices/mes/mesload.c | 14 ++++---- src/spicelib/devices/mes/mesmask.c | 12 +++---- src/spicelib/devices/mes/mesmdel.c | 6 ++-- src/spicelib/devices/mes/mesmpar.c | 8 ++--- src/spicelib/devices/mes/mesnoise.c | 10 +++--- src/spicelib/devices/mes/mesparam.c | 8 ++--- src/spicelib/devices/mes/mespzld.c | 10 +++--- src/spicelib/devices/mes/messetup.c | 12 +++---- src/spicelib/devices/mes/mestemp.c | 12 +++---- src/spicelib/devices/mes/mestrunc.c | 8 ++--- src/spicelib/devices/mesa/mesa.c | 8 ++--- src/spicelib/devices/mesa/mesaacl.c | 8 ++--- src/spicelib/devices/mesa/mesaask.c | 12 +++---- src/spicelib/devices/mesa/mesadefs.h | 10 +++--- src/spicelib/devices/mesa/mesadel.c | 6 ++-- src/spicelib/devices/mesa/mesadest.c | 4 +-- src/spicelib/devices/mesa/mesagetic.c | 8 ++--- src/spicelib/devices/mesa/mesainit.c | 2 +- src/spicelib/devices/mesa/mesaload.c | 14 ++++---- src/spicelib/devices/mesa/mesamask.c | 12 +++---- src/spicelib/devices/mesa/mesamdel.c | 6 ++-- src/spicelib/devices/mesa/mesamparam.c | 10 +++--- src/spicelib/devices/mesa/mesaparam.c | 10 +++--- src/spicelib/devices/mesa/mesapzl.c | 8 ++--- src/spicelib/devices/mesa/mesasetup.c | 12 +++---- src/spicelib/devices/mesa/mesatemp.c | 12 +++---- src/spicelib/devices/mesa/mesatrunc.c | 8 ++--- src/spicelib/devices/mos1/mos1.c | 8 ++--- src/spicelib/devices/mos1/mos1acld.c | 8 ++--- src/spicelib/devices/mos1/mos1ask.c | 14 ++++---- src/spicelib/devices/mos1/mos1conv.c | 8 ++--- src/spicelib/devices/mos1/mos1defs.h | 10 +++--- src/spicelib/devices/mos1/mos1del.c | 6 ++-- src/spicelib/devices/mos1/mos1dest.c | 4 +-- src/spicelib/devices/mos1/mos1dist.c | 10 +++--- src/spicelib/devices/mos1/mos1dset.c | 14 ++++---- src/spicelib/devices/mos1/mos1ic.c | 8 ++--- src/spicelib/devices/mos1/mos1init.c | 2 +- src/spicelib/devices/mos1/mos1load.c | 14 ++++---- src/spicelib/devices/mos1/mos1mask.c | 14 ++++---- src/spicelib/devices/mos1/mos1mdel.c | 6 ++-- src/spicelib/devices/mos1/mos1mpar.c | 10 +++--- src/spicelib/devices/mos1/mos1noi.c | 10 +++--- src/spicelib/devices/mos1/mos1par.c | 10 +++--- src/spicelib/devices/mos1/mos1pzld.c | 10 +++--- src/spicelib/devices/mos1/mos1sacl.c | 12 +++---- src/spicelib/devices/mos1/mos1set.c | 10 +++--- src/spicelib/devices/mos1/mos1sld.c | 10 +++--- src/spicelib/devices/mos1/mos1sprt.c | 10 +++--- src/spicelib/devices/mos1/mos1sset.c | 10 +++--- src/spicelib/devices/mos1/mos1supd.c | 10 +++--- src/spicelib/devices/mos1/mos1temp.c | 10 +++--- src/spicelib/devices/mos1/mos1trun.c | 8 ++--- src/spicelib/devices/mos2/mos2.c | 8 ++--- src/spicelib/devices/mos2/mos2acld.c | 8 ++--- src/spicelib/devices/mos2/mos2ask.c | 14 ++++---- src/spicelib/devices/mos2/mos2conv.c | 8 ++--- src/spicelib/devices/mos2/mos2defs.h | 10 +++--- src/spicelib/devices/mos2/mos2del.c | 6 ++-- src/spicelib/devices/mos2/mos2dest.c | 4 +-- src/spicelib/devices/mos2/mos2dist.c | 10 +++--- src/spicelib/devices/mos2/mos2dset.c | 16 ++++----- src/spicelib/devices/mos2/mos2ic.c | 8 ++--- src/spicelib/devices/mos2/mos2init.c | 2 +- src/spicelib/devices/mos2/mos2load.c | 14 ++++---- src/spicelib/devices/mos2/mos2mask.c | 10 +++--- src/spicelib/devices/mos2/mos2mdel.c | 6 ++-- src/spicelib/devices/mos2/mos2mpar.c | 10 +++--- src/spicelib/devices/mos2/mos2noi.c | 10 +++--- src/spicelib/devices/mos2/mos2par.c | 10 +++--- src/spicelib/devices/mos2/mos2pzld.c | 10 +++--- src/spicelib/devices/mos2/mos2sacl.c | 12 +++---- src/spicelib/devices/mos2/mos2set.c | 12 +++---- src/spicelib/devices/mos2/mos2sld.c | 10 +++--- src/spicelib/devices/mos2/mos2sprt.c | 10 +++--- src/spicelib/devices/mos2/mos2sset.c | 10 +++--- src/spicelib/devices/mos2/mos2supd.c | 10 +++--- src/spicelib/devices/mos2/mos2temp.c | 10 +++--- src/spicelib/devices/mos2/mos2trun.c | 8 ++--- src/spicelib/devices/mos3/mos3.c | 8 ++--- src/spicelib/devices/mos3/mos3acld.c | 8 ++--- src/spicelib/devices/mos3/mos3ask.c | 14 ++++---- src/spicelib/devices/mos3/mos3conv.c | 8 ++--- src/spicelib/devices/mos3/mos3defs.h | 10 +++--- src/spicelib/devices/mos3/mos3del.c | 6 ++-- src/spicelib/devices/mos3/mos3dest.c | 4 +-- src/spicelib/devices/mos3/mos3dist.c | 10 +++--- src/spicelib/devices/mos3/mos3dset.c | 16 ++++----- src/spicelib/devices/mos3/mos3ic.c | 8 ++--- src/spicelib/devices/mos3/mos3init.c | 2 +- src/spicelib/devices/mos3/mos3load.c | 14 ++++---- src/spicelib/devices/mos3/mos3mask.c | 14 ++++---- src/spicelib/devices/mos3/mos3mdel.c | 6 ++-- src/spicelib/devices/mos3/mos3mpar.c | 10 +++--- src/spicelib/devices/mos3/mos3noi.c | 10 +++--- src/spicelib/devices/mos3/mos3par.c | 10 +++--- src/spicelib/devices/mos3/mos3pzld.c | 10 +++--- src/spicelib/devices/mos3/mos3sacl.c | 12 +++---- src/spicelib/devices/mos3/mos3set.c | 12 +++---- src/spicelib/devices/mos3/mos3sld.c | 10 +++--- src/spicelib/devices/mos3/mos3sprt.c | 10 +++--- src/spicelib/devices/mos3/mos3sset.c | 10 +++--- src/spicelib/devices/mos3/mos3supd.c | 10 +++--- src/spicelib/devices/mos3/mos3temp.c | 10 +++--- src/spicelib/devices/mos3/mos3trun.c | 8 ++--- src/spicelib/devices/mos6/mos6.c | 8 ++--- src/spicelib/devices/mos6/mos6ask.c | 14 ++++---- src/spicelib/devices/mos6/mos6conv.c | 8 ++--- src/spicelib/devices/mos6/mos6defs.h | 8 ++--- src/spicelib/devices/mos6/mos6dest.c | 4 +-- src/spicelib/devices/mos6/mos6ic.c | 8 ++--- src/spicelib/devices/mos6/mos6init.c | 2 +- src/spicelib/devices/mos6/mos6load.c | 14 ++++---- src/spicelib/devices/mos6/mos6mask.c | 10 +++--- src/spicelib/devices/mos6/mos6mpar.c | 10 +++--- src/spicelib/devices/mos6/mos6par.c | 10 +++--- src/spicelib/devices/mos6/mos6set.c | 10 +++--- src/spicelib/devices/mos6/mos6temp.c | 10 +++--- src/spicelib/devices/mos6/mos6trun.c | 8 ++--- src/spicelib/devices/mos9/mos9.c | 8 ++--- src/spicelib/devices/mos9/mos9acld.c | 8 ++--- src/spicelib/devices/mos9/mos9ask.c | 14 ++++---- src/spicelib/devices/mos9/mos9conv.c | 8 ++--- src/spicelib/devices/mos9/mos9defs.h | 10 +++--- src/spicelib/devices/mos9/mos9del.c | 6 ++-- src/spicelib/devices/mos9/mos9dest.c | 4 +-- src/spicelib/devices/mos9/mos9dist.c | 10 +++--- src/spicelib/devices/mos9/mos9dset.c | 16 ++++----- src/spicelib/devices/mos9/mos9ic.c | 8 ++--- src/spicelib/devices/mos9/mos9init.c | 2 +- src/spicelib/devices/mos9/mos9load.c | 14 ++++---- src/spicelib/devices/mos9/mos9mask.c | 14 ++++---- src/spicelib/devices/mos9/mos9mdel.c | 6 ++-- src/spicelib/devices/mos9/mos9mpar.c | 10 +++--- src/spicelib/devices/mos9/mos9noi.c | 10 +++--- src/spicelib/devices/mos9/mos9par.c | 10 +++--- src/spicelib/devices/mos9/mos9pzld.c | 10 +++--- src/spicelib/devices/mos9/mos9sacl.c | 12 +++---- src/spicelib/devices/mos9/mos9set.c | 12 +++---- src/spicelib/devices/mos9/mos9sld.c | 10 +++--- src/spicelib/devices/mos9/mos9sprt.c | 10 +++--- src/spicelib/devices/mos9/mos9sset.c | 10 +++--- src/spicelib/devices/mos9/mos9supd.c | 10 +++--- src/spicelib/devices/mos9/mos9temp.c | 10 +++--- src/spicelib/devices/mos9/mos9trun.c | 8 ++--- src/spicelib/devices/nbjt/nbjt.c | 6 ++-- src/spicelib/devices/nbjt/nbjtacld.c | 14 ++++---- src/spicelib/devices/nbjt/nbjtask.c | 14 ++++---- src/spicelib/devices/nbjt/nbjtdefs.h | 16 ++++----- src/spicelib/devices/nbjt/nbjtdel.c | 6 ++-- src/spicelib/devices/nbjt/nbjtdest.c | 6 ++-- src/spicelib/devices/nbjt/nbjtdump.c | 8 ++--- src/spicelib/devices/nbjt/nbjtinit.c | 2 +- src/spicelib/devices/nbjt/nbjtload.c | 14 ++++---- src/spicelib/devices/nbjt/nbjtmdel.c | 6 ++-- src/spicelib/devices/nbjt/nbjtmpar.c | 10 +++--- src/spicelib/devices/nbjt/nbjtparm.c | 10 +++--- src/spicelib/devices/nbjt/nbjtpzld.c | 12 +++---- src/spicelib/devices/nbjt/nbjtset.c | 20 +++++------ src/spicelib/devices/nbjt/nbjttemp.c | 14 ++++---- src/spicelib/devices/nbjt/nbjttrun.c | 10 +++--- src/spicelib/devices/nbjt2/nbjt2def.h | 16 ++++----- src/spicelib/devices/nbjt2/nbt2.c | 6 ++-- src/spicelib/devices/nbjt2/nbt2acld.c | 12 +++---- src/spicelib/devices/nbjt2/nbt2ask.c | 14 ++++---- src/spicelib/devices/nbjt2/nbt2del.c | 6 ++-- src/spicelib/devices/nbjt2/nbt2dest.c | 4 +-- src/spicelib/devices/nbjt2/nbt2dump.c | 8 ++--- src/spicelib/devices/nbjt2/nbt2init.c | 2 +- src/spicelib/devices/nbjt2/nbt2load.c | 14 ++++---- src/spicelib/devices/nbjt2/nbt2mdel.c | 6 ++-- src/spicelib/devices/nbjt2/nbt2mpar.c | 10 +++--- src/spicelib/devices/nbjt2/nbt2parm.c | 10 +++--- src/spicelib/devices/nbjt2/nbt2pzld.c | 12 +++---- src/spicelib/devices/nbjt2/nbt2set.c | 20 +++++------ src/spicelib/devices/nbjt2/nbt2temp.c | 14 ++++---- src/spicelib/devices/nbjt2/nbt2trun.c | 10 +++--- src/spicelib/devices/ndev/ndev.c | 6 ++-- src/spicelib/devices/ndev/ndevaccept.c | 16 ++++----- src/spicelib/devices/ndev/ndevacld.c | 10 +++--- src/spicelib/devices/ndev/ndevask.c | 16 ++++----- src/spicelib/devices/ndev/ndevdefs.h | 8 ++--- src/spicelib/devices/ndev/ndevdel.c | 6 ++-- src/spicelib/devices/ndev/ndevdest.c | 4 +-- src/spicelib/devices/ndev/ndevdump.c | 6 ++-- src/spicelib/devices/ndev/ndevinit.c | 2 +- src/spicelib/devices/ndev/ndevload.c | 16 ++++----- src/spicelib/devices/ndev/ndevmdel.c | 6 ++-- src/spicelib/devices/ndev/ndevmpar.c | 10 +++--- src/spicelib/devices/ndev/ndevparm.c | 10 +++--- src/spicelib/devices/ndev/ndevpzld.c | 10 +++--- src/spicelib/devices/ndev/ndevset.c | 14 ++++---- src/spicelib/devices/ndev/ndevtemp.c | 12 +++---- src/spicelib/devices/ndev/ndevtrun.c | 8 ++--- src/spicelib/devices/numd/numd.c | 6 ++-- src/spicelib/devices/numd/numdacld.c | 14 ++++---- src/spicelib/devices/numd/numdask.c | 16 ++++----- src/spicelib/devices/numd/numddefs.h | 16 ++++----- src/spicelib/devices/numd/numddel.c | 6 ++-- src/spicelib/devices/numd/numddest.c | 6 ++-- src/spicelib/devices/numd/numddump.c | 8 ++--- src/spicelib/devices/numd/numdinit.c | 2 +- src/spicelib/devices/numd/numdload.c | 18 +++++----- src/spicelib/devices/numd/numdmdel.c | 6 ++-- src/spicelib/devices/numd/numdmpar.c | 10 +++--- src/spicelib/devices/numd/numdparm.c | 10 +++--- src/spicelib/devices/numd/numdpzld.c | 12 +++---- src/spicelib/devices/numd/numdset.c | 20 +++++------ src/spicelib/devices/numd/numdtemp.c | 14 ++++---- src/spicelib/devices/numd/numdtrun.c | 10 +++--- src/spicelib/devices/numd2/nud2.c | 6 ++-- src/spicelib/devices/numd2/nud2acld.c | 14 ++++---- src/spicelib/devices/numd2/nud2ask.c | 14 ++++---- src/spicelib/devices/numd2/nud2del.c | 6 ++-- src/spicelib/devices/numd2/nud2dest.c | 6 ++-- src/spicelib/devices/numd2/nud2dump.c | 8 ++--- src/spicelib/devices/numd2/nud2load.c | 14 ++++---- src/spicelib/devices/numd2/nud2mdel.c | 6 ++-- src/spicelib/devices/numd2/nud2mpar.c | 10 +++--- src/spicelib/devices/numd2/nud2parm.c | 10 +++--- src/spicelib/devices/numd2/nud2pzld.c | 12 +++---- src/spicelib/devices/numd2/nud2set.c | 20 +++++------ src/spicelib/devices/numd2/nud2temp.c | 14 ++++---- src/spicelib/devices/numd2/nud2trun.c | 10 +++--- src/spicelib/devices/numd2/numd2def.h | 16 ++++----- src/spicelib/devices/numd2/numd2init.c | 2 +- src/spicelib/devices/numos/numm.c | 6 ++-- src/spicelib/devices/numos/nummacld.c | 12 +++---- src/spicelib/devices/numos/nummask.c | 14 ++++---- src/spicelib/devices/numos/nummdel.c | 6 ++-- src/spicelib/devices/numos/nummdest.c | 4 +-- src/spicelib/devices/numos/nummdump.c | 8 ++--- src/spicelib/devices/numos/nummload.c | 14 ++++---- src/spicelib/devices/numos/nummmdel.c | 6 ++-- src/spicelib/devices/numos/nummmpar.c | 10 +++--- src/spicelib/devices/numos/nummparm.c | 10 +++--- src/spicelib/devices/numos/nummpzld.c | 12 +++---- src/spicelib/devices/numos/nummset.c | 20 +++++------ src/spicelib/devices/numos/nummtemp.c | 14 ++++---- src/spicelib/devices/numos/nummtrun.c | 10 +++--- src/spicelib/devices/numos/numosdef.h | 16 ++++----- src/spicelib/devices/numos/numosinit.c | 2 +- src/spicelib/devices/res/res.c | 6 ++-- src/spicelib/devices/res/resask.c | 10 +++--- src/spicelib/devices/res/resdefs.h | 10 +++--- src/spicelib/devices/res/resdel.c | 4 +-- src/spicelib/devices/res/resdest.c | 2 +- src/spicelib/devices/res/resinit.c | 2 +- src/spicelib/devices/res/resload.c | 6 ++-- src/spicelib/devices/res/resmask.c | 12 +++---- src/spicelib/devices/res/resmdel.c | 4 +-- src/spicelib/devices/res/resmpar.c | 8 ++--- src/spicelib/devices/res/resnoise.c | 8 ++--- src/spicelib/devices/res/resparam.c | 10 +++--- src/spicelib/devices/res/respzld.c | 8 ++--- src/spicelib/devices/res/ressacl.c | 6 ++-- src/spicelib/devices/res/ressetup.c | 6 ++-- src/spicelib/devices/res/ressload.c | 6 ++-- src/spicelib/devices/res/ressprt.c | 6 ++-- src/spicelib/devices/res/ressset.c | 8 ++--- src/spicelib/devices/res/restemp.c | 6 ++-- src/spicelib/devices/soi3/soi3.c | 8 ++--- src/spicelib/devices/soi3/soi3acld.c | 8 ++--- src/spicelib/devices/soi3/soi3ask.c | 14 ++++---- src/spicelib/devices/soi3/soi3cap.c | 10 +++--- src/spicelib/devices/soi3/soi3conv.c | 8 ++--- src/spicelib/devices/soi3/soi3defs.h | 10 +++--- src/spicelib/devices/soi3/soi3del.c | 6 ++-- src/spicelib/devices/soi3/soi3dest.c | 4 +-- src/spicelib/devices/soi3/soi3ic.c | 8 ++--- src/spicelib/devices/soi3/soi3init.c | 2 +- src/spicelib/devices/soi3/soi3load.c | 14 ++++---- src/spicelib/devices/soi3/soi3mask.c | 14 ++++---- src/spicelib/devices/soi3/soi3mdel.c | 6 ++-- src/spicelib/devices/soi3/soi3mpar.c | 10 +++--- src/spicelib/devices/soi3/soi3nois.c | 12 +++---- src/spicelib/devices/soi3/soi3par.c | 10 +++--- src/spicelib/devices/soi3/soi3set.c | 10 +++--- src/spicelib/devices/soi3/soi3temp.c | 10 +++--- src/spicelib/devices/soi3/soi3trun.c | 8 ++--- src/spicelib/devices/sw/sw.c | 8 ++--- src/spicelib/devices/sw/swacload.c | 8 ++--- src/spicelib/devices/sw/swask.c | 12 +++---- src/spicelib/devices/sw/swdefs.h | 10 +++--- src/spicelib/devices/sw/swdelete.c | 6 ++-- src/spicelib/devices/sw/swdest.c | 4 +-- src/spicelib/devices/sw/swinit.c | 2 +- src/spicelib/devices/sw/swload.c | 12 +++---- src/spicelib/devices/sw/swmask.c | 12 +++---- src/spicelib/devices/sw/swmdel.c | 6 ++-- src/spicelib/devices/sw/swmparam.c | 8 ++--- src/spicelib/devices/sw/swnoise.c | 10 +++--- src/spicelib/devices/sw/swparam.c | 8 ++--- src/spicelib/devices/sw/swpzload.c | 10 +++--- src/spicelib/devices/sw/swsetup.c | 10 +++--- src/spicelib/devices/sw/swtrunc.c | 8 ++--- src/spicelib/devices/tra/tra.c | 8 ++--- src/spicelib/devices/tra/traacct.c | 8 ++--- src/spicelib/devices/tra/traacld.c | 8 ++--- src/spicelib/devices/tra/traask.c | 12 +++---- src/spicelib/devices/tra/tradefs.h | 8 ++--- src/spicelib/devices/tra/tradel.c | 6 ++-- src/spicelib/devices/tra/tradest.c | 4 +-- src/spicelib/devices/tra/trainit.c | 2 +- src/spicelib/devices/tra/traload.c | 10 +++--- src/spicelib/devices/tra/tramdel.c | 6 ++-- src/spicelib/devices/tra/traparam.c | 8 ++--- src/spicelib/devices/tra/trasetup.c | 10 +++--- src/spicelib/devices/tra/tratemp.c | 10 +++--- src/spicelib/devices/tra/tratrunc.c | 8 ++--- src/spicelib/devices/txl/txl.c | 8 ++--- src/spicelib/devices/txl/txlacct.c | 8 ++--- src/spicelib/devices/txl/txlask.c | 12 +++---- src/spicelib/devices/txl/txldefs.h | 12 +++---- src/spicelib/devices/txl/txldel.c | 6 ++-- src/spicelib/devices/txl/txldest.c | 4 +-- src/spicelib/devices/txl/txlfbr.c | 8 ++--- src/spicelib/devices/txl/txlinit.c | 2 +- src/spicelib/devices/txl/txlload.c | 6 ++-- src/spicelib/devices/txl/txlmask.c | 16 ++++----- src/spicelib/devices/txl/txlmdel.c | 6 ++-- src/spicelib/devices/txl/txlmpar.c | 10 +++--- src/spicelib/devices/txl/txlparam.c | 10 +++--- src/spicelib/devices/txl/txlsetup.c | 8 ++--- src/spicelib/devices/urc/urc.c | 6 ++-- src/spicelib/devices/urc/urcask.c | 12 +++---- src/spicelib/devices/urc/urcdefs.h | 8 ++--- src/spicelib/devices/urc/urcdel.c | 6 ++-- src/spicelib/devices/urc/urcdest.c | 4 +-- src/spicelib/devices/urc/urcinit.c | 2 +- src/spicelib/devices/urc/urcmask.c | 12 +++---- src/spicelib/devices/urc/urcmdel.c | 6 ++-- src/spicelib/devices/urc/urcmpar.c | 8 ++--- src/spicelib/devices/urc/urcparam.c | 8 ++--- src/spicelib/devices/urc/urcsetup.c | 12 +++---- src/spicelib/devices/vbic/vbic.c | 6 ++-- src/spicelib/devices/vbic/vbicacld.c | 8 ++--- src/spicelib/devices/vbic/vbicask.c | 12 +++---- src/spicelib/devices/vbic/vbicconv.c | 8 ++--- src/spicelib/devices/vbic/vbicdefs.h | 10 +++--- src/spicelib/devices/vbic/vbicdel.c | 6 ++-- src/spicelib/devices/vbic/vbicdest.c | 4 +-- src/spicelib/devices/vbic/vbicgetic.c | 8 ++--- src/spicelib/devices/vbic/vbicinit.c | 2 +- src/spicelib/devices/vbic/vbicload.c | 12 +++---- src/spicelib/devices/vbic/vbicmask.c | 14 ++++---- src/spicelib/devices/vbic/vbicmdel.c | 6 ++-- src/spicelib/devices/vbic/vbicmpar.c | 10 +++--- src/spicelib/devices/vbic/vbicnoise.c | 10 +++--- src/spicelib/devices/vbic/vbicparam.c | 10 +++--- src/spicelib/devices/vbic/vbicpzld.c | 8 ++--- src/spicelib/devices/vbic/vbicsetup.c | 14 ++++---- src/spicelib/devices/vbic/vbictemp.c | 14 ++++---- src/spicelib/devices/vbic/vbictrunc.c | 8 ++--- src/spicelib/devices/vccs/vccs.c | 8 ++--- src/spicelib/devices/vccs/vccsask.c | 12 +++---- src/spicelib/devices/vccs/vccsdefs.h | 8 ++--- src/spicelib/devices/vccs/vccsdel.c | 6 ++-- src/spicelib/devices/vccs/vccsdest.c | 4 +-- src/spicelib/devices/vccs/vccsinit.c | 2 +- src/spicelib/devices/vccs/vccsload.c | 8 ++--- src/spicelib/devices/vccs/vccsmdel.c | 6 ++-- src/spicelib/devices/vccs/vccspar.c | 8 ++--- src/spicelib/devices/vccs/vccspzld.c | 10 +++--- src/spicelib/devices/vccs/vccssacl.c | 10 +++--- src/spicelib/devices/vccs/vccsset.c | 10 +++--- src/spicelib/devices/vccs/vccssld.c | 10 +++--- src/spicelib/devices/vccs/vccssprt.c | 10 +++--- src/spicelib/devices/vccs/vccssset.c | 10 +++--- src/spicelib/devices/vcvs/vcvs.c | 8 ++--- src/spicelib/devices/vcvs/vcvsask.c | 12 +++---- src/spicelib/devices/vcvs/vcvsdefs.h | 8 ++--- src/spicelib/devices/vcvs/vcvsdel.c | 6 ++-- src/spicelib/devices/vcvs/vcvsdest.c | 4 +-- src/spicelib/devices/vcvs/vcvsfbr.c | 10 +++--- src/spicelib/devices/vcvs/vcvsinit.c | 2 +- src/spicelib/devices/vcvs/vcvsload.c | 8 ++--- src/spicelib/devices/vcvs/vcvsmdel.c | 6 ++-- src/spicelib/devices/vcvs/vcvspar.c | 8 ++--- src/spicelib/devices/vcvs/vcvspzld.c | 10 +++--- src/spicelib/devices/vcvs/vcvssacl.c | 8 ++--- src/spicelib/devices/vcvs/vcvsset.c | 10 +++--- src/spicelib/devices/vcvs/vcvssld.c | 8 ++--- src/spicelib/devices/vcvs/vcvssprt.c | 8 ++--- src/spicelib/devices/vcvs/vcvssset.c | 10 +++--- src/spicelib/devices/vsrc/vsrc.c | 8 ++--- src/spicelib/devices/vsrc/vsrcacct.c | 14 ++++---- src/spicelib/devices/vsrc/vsrcacld.c | 8 ++--- src/spicelib/devices/vsrc/vsrcask.c | 12 +++---- src/spicelib/devices/vsrc/vsrcdefs.h | 8 ++--- src/spicelib/devices/vsrc/vsrcdel.c | 6 ++-- src/spicelib/devices/vsrc/vsrcdest.c | 4 +-- src/spicelib/devices/vsrc/vsrcfbr.c | 8 ++--- src/spicelib/devices/vsrc/vsrcinit.c | 2 +- src/spicelib/devices/vsrc/vsrcload.c | 14 ++++---- src/spicelib/devices/vsrc/vsrcmdel.c | 6 ++-- src/spicelib/devices/vsrc/vsrcpar.c | 10 +++--- src/spicelib/devices/vsrc/vsrcpzld.c | 10 +++--- src/spicelib/devices/vsrc/vsrcpzs.c | 10 +++--- src/spicelib/devices/vsrc/vsrcset.c | 10 +++--- src/spicelib/devices/vsrc/vsrctemp.c | 10 +++--- src/spicelib/parser/ifeval.c | 14 ++++---- src/spicelib/parser/ifnewuid.c | 16 ++++----- src/spicelib/parser/inp2b.c | 12 +++---- src/spicelib/parser/inp2c.c | 10 +++--- src/spicelib/parser/inp2d.c | 10 +++--- src/spicelib/parser/inp2dot.c | 14 ++++---- src/spicelib/parser/inp2e.c | 10 +++--- src/spicelib/parser/inp2f.c | 10 +++--- src/spicelib/parser/inp2g.c | 10 +++--- src/spicelib/parser/inp2h.c | 10 +++--- src/spicelib/parser/inp2i.c | 10 +++--- src/spicelib/parser/inp2j.c | 10 +++--- src/spicelib/parser/inp2k.c | 10 +++--- src/spicelib/parser/inp2l.c | 10 +++--- src/spicelib/parser/inp2m.c | 10 +++--- src/spicelib/parser/inp2n.c | 10 +++--- src/spicelib/parser/inp2o.c | 10 +++--- src/spicelib/parser/inp2p.c | 10 +++--- src/spicelib/parser/inp2q.c | 10 +++--- src/spicelib/parser/inp2r.c | 10 +++--- src/spicelib/parser/inp2s.c | 10 +++--- src/spicelib/parser/inp2t.c | 10 +++--- src/spicelib/parser/inp2u.c | 10 +++--- src/spicelib/parser/inp2v.c | 10 +++--- src/spicelib/parser/inp2w.c | 10 +++--- src/spicelib/parser/inp2y.c | 10 +++--- src/spicelib/parser/inp2z.c | 10 +++--- src/spicelib/parser/inpaname.c | 10 +++--- src/spicelib/parser/inpapnam.c | 10 +++--- src/spicelib/parser/inpcfix.c | 6 ++-- src/spicelib/parser/inpdomod.c | 6 ++-- src/spicelib/parser/inpdoopt.c | 10 +++--- src/spicelib/parser/inpdpar.c | 12 +++---- src/spicelib/parser/inperrc.c | 4 +-- src/spicelib/parser/inperror.c | 10 +++--- src/spicelib/parser/inpeval.c | 4 +-- src/spicelib/parser/inpfindl.c | 4 +-- src/spicelib/parser/inpfindv.c | 4 +-- src/spicelib/parser/inpgmod.c | 18 +++++----- src/spicelib/parser/inpgstr.c | 6 ++-- src/spicelib/parser/inpgtitl.c | 10 +++--- src/spicelib/parser/inpgtok.c | 6 ++-- src/spicelib/parser/inpgval.c | 8 ++--- src/spicelib/parser/inpkmods.c | 4 +-- src/spicelib/parser/inplist.c | 4 +-- src/spicelib/parser/inplkmod.c | 4 +-- src/spicelib/parser/inpmkmod.c | 6 ++-- src/spicelib/parser/inpmktmp.c | 4 +-- src/spicelib/parser/inppas1.c | 2 +- src/spicelib/parser/inppas1.h | 2 +- src/spicelib/parser/inppas2.c | 8 ++--- src/spicelib/parser/inppas2.h | 2 +- src/spicelib/parser/inppas3.c | 8 ++--- src/spicelib/parser/inppas3.h | 2 +- src/spicelib/parser/inppname.c | 10 +++--- src/spicelib/parser/inpptree.c | 10 +++--- src/spicelib/parser/inpsymt.c | 12 +++---- src/spicelib/parser/inptyplk.c | 10 +++--- src/spicelib/parser/ptfuncs.c | 8 ++--- src/spicelib/parser/sperror.c | 10 +++--- src/tclspice.c | 22 ++++++------ src/unsupported/cktsenac.c | 12 +++---- src/unsupported/cktsenup.c | 12 +++---- src/unsupported/cktsncom.c | 12 +++---- src/unsupported/cktsndct.c | 12 +++---- src/unsupported/cktsnld.c | 12 +++---- src/unsupported/cktsnprt.c | 12 +++---- src/unsupported/cktsnset.c | 12 +++---- src/unsupported/sen2dest.c | 10 +++--- src/unsupported/sen2setp.c | 10 +++--- src/unsupported/snaskq.c | 10 +++--- src/unsupported/snstart.c | 10 +++--- src/unsupported/spiced.c | 2 +- src/winmain.c | 2 +- src/xspice/cm/cm.c | 8 ++--- src/xspice/cm/cmevt.c | 12 +++---- src/xspice/cm/cmexport.c | 8 ++--- src/xspice/cm/cmmeters.c | 12 +++---- src/xspice/cm/cmutil.c | 4 +-- src/xspice/enh/enh.c | 2 +- src/xspice/enh/enhtrans.c | 12 +++---- src/xspice/evt/evtaccept.c | 8 ++--- src/xspice/evt/evtbackup.c | 10 +++--- src/xspice/evt/evtcall_hybrids.c | 8 ++--- src/xspice/evt/evtdeque.c | 12 +++---- src/xspice/evt/evtdump.c | 20 +++++------ src/xspice/evt/evtinit.c | 8 ++--- src/xspice/evt/evtiter.c | 14 ++++---- src/xspice/evt/evtload.c | 18 +++++----- src/xspice/evt/evtnext_time.c | 10 +++--- src/xspice/evt/evtnode_copy.c | 16 ++++----- src/xspice/evt/evtop.c | 14 ++++---- src/xspice/evt/evtplot.c | 18 +++++----- src/xspice/evt/evtprint.c | 12 +++---- src/xspice/evt/evtqueue.c | 12 +++---- src/xspice/evt/evtsetup.c | 16 ++++----- src/xspice/evt/evttermi.c | 14 ++++---- src/xspice/icm/dlmain.c | 8 ++--- src/xspice/icm/xtraevt/int/udnfunc.c | 4 +-- src/xspice/icm/xtraevt/real/udnfunc.c | 4 +-- src/xspice/idn/idndig.c | 6 ++-- src/xspice/ipc/ipc.c | 10 +++--- src/xspice/ipc/ipcaegis.c | 6 ++-- src/xspice/ipc/ipcsockets.c | 8 ++--- src/xspice/ipc/ipcstdio.c | 6 ++-- src/xspice/ipc/ipctiein.c | 14 ++++---- src/xspice/mif/mif.c | 2 +- src/xspice/mif/mif_inp2.c | 24 ++++++------- src/xspice/mif/mifask.c | 12 +++---- src/xspice/mif/mifconvt.c | 18 +++++----- src/xspice/mif/mifdelete.c | 12 +++---- src/xspice/mif/mifdestr.c | 4 +-- src/xspice/mif/mifgetmod.c | 20 +++++------ src/xspice/mif/mifgetvalue.c | 16 ++++----- src/xspice/mif/mifload.c | 22 ++++++------ src/xspice/mif/mifmask.c | 12 +++---- src/xspice/mif/mifmdelete.c | 10 +++--- src/xspice/mif/mifmpara.c | 16 ++++----- src/xspice/mif/mifsetup.c | 16 ++++----- src/xspice/mif/miftrunc.c | 14 ++++---- src/xspice/mif/mifutil.c | 8 ++--- src/xspice/xspice.c | 8 ++--- 1612 files changed, 7250 insertions(+), 7238 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7cf18d484..f8dbe106a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-12-11 Robert Larice + * **/* : + #1/4 #include --> #include "ngspice/..." + + use "" instead of <> to better express project membership + + <> includes might be skipped by dependency generator tools + assuming those being stable system include files + 2011-12-11 Robert Larice * src/spicelib/analysis/acan.c , * src/spicelib/analysis/dcpss.c , diff --git a/src/ciderlib/input/bdryset.c b/src/ciderlib/input/bdryset.c index 2d0f6ff8a..7a5050a82 100644 --- a/src/ciderlib/input/bdryset.c +++ b/src/ciderlib/input/bdryset.c @@ -4,12 +4,12 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/bdrydefs.h" +#include "ngspice/meshext.h" +#include "ngspice/gendev.h" +#include "ngspice/sperror.h" extern int BDRYcheck( BDRYcard *, DOMNdomain * ); extern int BDRYsetup( BDRYcard *, MESHcoord *, MESHcoord *, DOMNdomain * ); diff --git a/src/ciderlib/input/boundary.c b/src/ciderlib/input/boundary.c index afd62519a..a3141aa88 100644 --- a/src/ciderlib/input/boundary.c +++ b/src/ciderlib/input/boundary.c @@ -4,13 +4,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/bdrydefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define UM_TO_CM 1.0e-4 diff --git a/src/ciderlib/input/cards.c b/src/ciderlib/input/cards.c index 2d12e6f78..b9dc36802 100644 --- a/src/ciderlib/input/cards.c +++ b/src/ciderlib/input/cards.c @@ -4,8 +4,8 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" extern IFcardInfo CONTinfo; extern IFcardInfo DOPinfo; diff --git a/src/ciderlib/input/contact.c b/src/ciderlib/input/contact.c index fc7a7aedf..7449a9811 100644 --- a/src/ciderlib/input/contact.c +++ b/src/ciderlib/input/contact.c @@ -4,13 +4,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/contdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" extern int CONTnewCard(void**,void*); extern int CONTparam(int,IFvalue*,void*); diff --git a/src/ciderlib/input/contset.c b/src/ciderlib/input/contset.c index 98c6a2331..6584aee61 100644 --- a/src/ciderlib/input/contset.c +++ b/src/ciderlib/input/contset.c @@ -4,13 +4,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/contdefs.h" +#include "ngspice/meshext.h" +#include "ngspice/gendev.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" extern int CONTcheck( CONTcard * ); extern int CONTsetup( CONTcard *, ELCTelectrode * ); diff --git a/src/ciderlib/input/domain.c b/src/ciderlib/input/domain.c index f8c9c5d02..80a2fc95e 100644 --- a/src/ciderlib/input/domain.c +++ b/src/ciderlib/input/domain.c @@ -4,14 +4,14 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group\ Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/numenum.h" +#include "ngspice/domndefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define UM_TO_CM 1.0e-4 diff --git a/src/ciderlib/input/domnset.c b/src/ciderlib/input/domnset.c index 77ca2c35d..c519b11cc 100644 --- a/src/ciderlib/input/domnset.c +++ b/src/ciderlib/input/domnset.c @@ -4,15 +4,15 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modifed: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/numenum.h" +#include "ngspice/domndefs.h" +#include "ngspice/material.h" +#include "ngspice/meshext.h" +#include "ngspice/gendev.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" extern int DOMNcheck( DOMNcard *, MATLmaterial * ); diff --git a/src/ciderlib/input/doping.c b/src/ciderlib/input/doping.c index 94dc281d1..326fbb817 100644 --- a/src/ciderlib/input/doping.c +++ b/src/ciderlib/input/doping.c @@ -4,13 +4,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/dopdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define UM_TO_CM 1.0e-4 diff --git a/src/ciderlib/input/dopset.c b/src/ciderlib/input/dopset.c index 75c287d41..48148199d 100644 --- a/src/ciderlib/input/dopset.c +++ b/src/ciderlib/input/dopset.c @@ -5,18 +5,18 @@ Modifed: 2001 Paolo Nenzi $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/numenum.h" +#include "ngspice/dopdefs.h" +#include "ngspice/meshext.h" +#include "ngspice/profile.h" +#include "ngspice/gendev.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/cidersupt.h" +#include "ngspice/carddefs.h" +#include "ngspice/ciderinp.h" extern int DOPnewCard(void**,void*); extern int DOPparam(int,IFvalue*,void*); diff --git a/src/ciderlib/input/elctset.c b/src/ciderlib/input/elctset.c index 224a60bff..ca934a723 100644 --- a/src/ciderlib/input/elctset.c +++ b/src/ciderlib/input/elctset.c @@ -4,14 +4,14 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/elctdefs.h" +#include "ngspice/meshext.h" +#include "ngspice/twomesh.h" +#include "ngspice/gendev.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" extern int ELCTcheck( ELCTcard * ); diff --git a/src/ciderlib/input/electrod.c b/src/ciderlib/input/electrod.c index 4c8f7bee3..84983ba89 100644 --- a/src/ciderlib/input/electrod.c +++ b/src/ciderlib/input/electrod.c @@ -4,13 +4,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/elctdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define UM_TO_CM 1.0e-4 diff --git a/src/ciderlib/input/material.c b/src/ciderlib/input/material.c index 13c4556df..11d244592 100644 --- a/src/ciderlib/input/material.c +++ b/src/ciderlib/input/material.c @@ -4,14 +4,14 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/numenum.h" +#include "ngspice/matldefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" extern int MATLnewCard(void**,void *); diff --git a/src/ciderlib/input/matlset.c b/src/ciderlib/input/matlset.c index c4495fe68..14b030526 100644 --- a/src/ciderlib/input/matlset.c +++ b/src/ciderlib/input/matlset.c @@ -5,15 +5,15 @@ Modified: 2001 Paolo Nenzi $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/matldefs.h" +#include "ngspice/material.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/cidersupt.h" extern int MATLcheck( MATLcard * ); extern int MATLsetup( MATLcard *, MaterialInfo ** ); diff --git a/src/ciderlib/input/mesh.c b/src/ciderlib/input/mesh.c index e37873e6e..080623ecd 100644 --- a/src/ciderlib/input/mesh.c +++ b/src/ciderlib/input/mesh.c @@ -4,13 +4,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/meshdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" extern int XMSHnewCard(void**,void*); extern int YMSHnewCard(void**,void*); diff --git a/src/ciderlib/input/meshset.c b/src/ciderlib/input/meshset.c index 354caa2a4..b6eeba047 100644 --- a/src/ciderlib/input/meshset.c +++ b/src/ciderlib/input/meshset.c @@ -9,13 +9,13 @@ Mesh Setup & Query Routines. **********/ /* Imports */ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/meshdefs.h" +#include "ngspice/meshext.h" +#include "ngspice/gendev.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* Local Constants */ #define CMP_TOL 1.0e-9 /* Tolerance on (double) comparisons */ diff --git a/src/ciderlib/input/method.c b/src/ciderlib/input/method.c index 1f74cbfac..348f44513 100644 --- a/src/ciderlib/input/method.c +++ b/src/ciderlib/input/method.c @@ -4,14 +4,14 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/numenum.h" +#include "ngspice/methdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" extern int METHnewCard(void**,void*); diff --git a/src/ciderlib/input/mobility.c b/src/ciderlib/input/mobility.c index 1409aab80..c4e4b2785 100644 --- a/src/ciderlib/input/mobility.c +++ b/src/ciderlib/input/mobility.c @@ -4,14 +4,14 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/numenum.h" +#include "ngspice/mobdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" extern int MOBnewCard(void**,void*); extern int MOBparam(int,IFvalue*,void*); diff --git a/src/ciderlib/input/mobset.c b/src/ciderlib/input/mobset.c index 71eaaa6c3..47811e720 100644 --- a/src/ciderlib/input/mobset.c +++ b/src/ciderlib/input/mobset.c @@ -4,15 +4,15 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/mobdefs.h" +#include "ngspice/material.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/cidersupt.h" extern int MOBcheck( MOBcard *, MaterialInfo * ); extern int MOBsetup( MOBcard *, MaterialInfo * ); diff --git a/src/ciderlib/input/models.c b/src/ciderlib/input/models.c index 1d38fdf62..d950e600e 100644 --- a/src/ciderlib/input/models.c +++ b/src/ciderlib/input/models.c @@ -4,13 +4,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/modldefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" extern int MODLnewCard(void**,void*); extern int MODLparam(int,IFvalue*,void*); diff --git a/src/ciderlib/input/modlset.c b/src/ciderlib/input/modlset.c index 7582aad8d..d9bb27ad8 100644 --- a/src/ciderlib/input/modlset.c +++ b/src/ciderlib/input/modlset.c @@ -5,11 +5,11 @@ Modified: 2001 Paolo Nenzi $Id$ **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/modldefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" extern int MODLcheck( MODLcard * ); extern int MODLsetup( MODLcard * ); diff --git a/src/ciderlib/input/optionsc.c b/src/ciderlib/input/optionsc.c index cae3e83aa..990bd1d07 100644 --- a/src/ciderlib/input/optionsc.c +++ b/src/ciderlib/input/optionsc.c @@ -4,13 +4,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/optndefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define M_TO_CM 1.0e2 #define M2_TO_CM2 (M_TO_CM * M_TO_CM) diff --git a/src/ciderlib/input/outpset.c b/src/ciderlib/input/outpset.c index f60227022..c3679914a 100644 --- a/src/ciderlib/input/outpset.c +++ b/src/ciderlib/input/outpset.c @@ -5,12 +5,12 @@ Modified: 2001 Paolo Nenzi $Id$ **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/numenum.h" +#include "ngspice/outpdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" extern int OUTPcheck( OUTPcard * ); extern int OUTPsetup( OUTPcard * ); diff --git a/src/ciderlib/input/output.c b/src/ciderlib/input/output.c index f0d2ac63e..87283c56f 100644 --- a/src/ciderlib/input/output.c +++ b/src/ciderlib/input/output.c @@ -4,14 +4,14 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numcards.h" +#include "ngspice/numgen.h" +#include "ngspice/numenum.h" +#include "ngspice/outpdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "../misc/tilde.h" extern int OUTPnewCard(void**,void*); diff --git a/src/ciderlib/oned/oneadmit.c b/src/ciderlib/oned/oneadmit.c index a95a5b4c4..d91a2927b 100644 --- a/src/ciderlib/oned/oneadmit.c +++ b/src/ciderlib/oned/oneadmit.c @@ -6,19 +6,19 @@ $Id$ /* Functions to compute small-signal parameters of 1D devices */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/numconst.h" +#include "ngspice/onedev.h" +#include "ngspice/onemesh.h" +#include "ngspice/complex.h" +#include "ngspice/spmatrix.h" +#include "ngspice/ifsim.h" #include "onedext.h" #include "oneddefs.h" -#include +#include "ngspice/cidersupt.h" extern IFfrontEnd *SPfrontEnd; diff --git a/src/ciderlib/oned/oneaval.c b/src/ciderlib/oned/oneaval.c index 084a935af..ba05eac3d 100644 --- a/src/ciderlib/oned/oneaval.c +++ b/src/ciderlib/oned/oneaval.c @@ -3,11 +3,11 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/macros.h" #include "onedext.h" #include "oneddefs.h" diff --git a/src/ciderlib/oned/onecond.c b/src/ciderlib/oned/onecond.c index f08bfb672..4ca6a4820 100644 --- a/src/ciderlib/oned/onecond.c +++ b/src/ciderlib/oned/onecond.c @@ -6,13 +6,13 @@ $Id$ /* Functions to compute device conductances and currents */ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/macros.h" +#include "ngspice/spmatrix.h" #include "onedext.h" #include "oneddefs.h" diff --git a/src/ciderlib/oned/onecont.c b/src/ciderlib/oned/onecont.c index 2a2398e69..d1ccfd22c 100644 --- a/src/ciderlib/oned/onecont.c +++ b/src/ciderlib/oned/onecont.c @@ -4,16 +4,16 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/spmatrix.h" +#include "ngspice/macros.h" #include "onedext.h" #include "oneddefs.h" -#include +#include "ngspice/cidersupt.h" #include "../../maths/misc/bernoull.h" diff --git a/src/ciderlib/oned/onedest.c b/src/ciderlib/oned/onedest.c index 6cf4dce45..385f68299 100644 --- a/src/ciderlib/oned/onedest.c +++ b/src/ciderlib/oned/onedest.c @@ -3,12 +3,12 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/onedev.h" +#include "ngspice/onemesh.h" +#include "ngspice/spmatrix.h" #include "onedext.h" #include "oneddefs.h" diff --git a/src/ciderlib/oned/onedext.h b/src/ciderlib/oned/onedext.h index 0a4c55cb8..428b31bad 100644 --- a/src/ciderlib/oned/onedext.h +++ b/src/ciderlib/oned/onedext.h @@ -7,12 +7,12 @@ #ifndef _ONEDEXT_H #define _ONEDEXT_H -#include -#include -#include -#include -#include -#include +#include "ngspice/profile.h" +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/carddefs.h" +#include "ngspice/bool.h" +#include "ngspice/complex.h" /* oneadmit.c */ extern int NUMDadmittance(ONEdevice *, double, SPcomplex *); diff --git a/src/ciderlib/oned/onedopng.c b/src/ciderlib/oned/onedopng.c index 901a1c092..d7f388918 100644 --- a/src/ciderlib/oned/onedopng.c +++ b/src/ciderlib/oned/onedopng.c @@ -4,16 +4,16 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/profile.h" +#include "ngspice/macros.h" #include "onedext.h" #include "oneddefs.h" -#include +#include "ngspice/cidersupt.h" /* functions in this file are used to calculate the conc */ diff --git a/src/ciderlib/oned/onefreez.c b/src/ciderlib/oned/onefreez.c index 1e7410ad4..d4429a1ee 100644 --- a/src/ciderlib/oned/onefreez.c +++ b/src/ciderlib/oned/onefreez.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/onemesh.h" #include "../../maths/misc/accuracy.h" #include "onedext.h" #include "oneddefs.h" diff --git a/src/ciderlib/oned/onemesh.c b/src/ciderlib/oned/onemesh.c index d92bbf556..3665e62ed 100644 --- a/src/ciderlib/oned/onemesh.c +++ b/src/ciderlib/oned/onemesh.c @@ -4,12 +4,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/macros.h" #include "onedext.h" #include "oneddefs.h" diff --git a/src/ciderlib/oned/onepoiss.c b/src/ciderlib/oned/onepoiss.c index 0892e21c4..0a8f41d37 100644 --- a/src/ciderlib/oned/onepoiss.c +++ b/src/ciderlib/oned/onepoiss.c @@ -4,14 +4,14 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" #include "onedext.h" #include "oneddefs.h" -#include +#include "ngspice/spmatrix.h" /* Functions to setup and solve the 1D poisson equation. */ diff --git a/src/ciderlib/oned/oneprint.c b/src/ciderlib/oned/oneprint.c index ea0bd69be..3d5015531 100644 --- a/src/ciderlib/oned/oneprint.c +++ b/src/ciderlib/oned/oneprint.c @@ -5,14 +5,14 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/carddefs.h" +#include "ngspice/spmatrix.h" #include "onedext.h" #include "oneddefs.h" diff --git a/src/ciderlib/oned/oneproj.c b/src/ciderlib/oned/oneproj.c index 5306034d6..a0aa1df76 100644 --- a/src/ciderlib/oned/oneproj.c +++ b/src/ciderlib/oned/oneproj.c @@ -4,17 +4,17 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/macros.h" +#include "ngspice/spmatrix.h" +#include "ngspice/bool.h" #include "onedext.h" #include "oneddefs.h" -#include +#include "ngspice/cidersupt.h" /* diff --git a/src/ciderlib/oned/oneread.c b/src/ciderlib/oned/oneread.c index 611c9890f..7eb67792d 100644 --- a/src/ciderlib/oned/oneread.c +++ b/src/ciderlib/oned/oneread.c @@ -8,15 +8,15 @@ $Id$ * Functions needed to read solutions for 1D devices. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/onedev.h" +#include "ngspice/onemesh.h" +#include "ngspice/plot.h" #include "onedext.h" #include "oneddefs.h" -#include +#include "ngspice/cidersupt.h" int ONEreadState(ONEdevice *pDevice, char *fileName, int numVolts, diff --git a/src/ciderlib/oned/onesetup.c b/src/ciderlib/oned/onesetup.c index 5b4a0ddb4..ac83379cf 100644 --- a/src/ciderlib/oned/onesetup.c +++ b/src/ciderlib/oned/onesetup.c @@ -9,17 +9,17 @@ $Id$ One-Dimensional Numerical Device Setup Routines **********/ -#include -#include -#include -#include -#include -#include -#include /* XXX Not really modular if we need this. */ +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/carddefs.h" /* XXX Not really modular if we need this. */ /* #include "material.h" */ #include "onedext.h" #include "oneddefs.h" -#include +#include "ngspice/cidersupt.h" /* compute node parameters */ void diff --git a/src/ciderlib/oned/onesolve.c b/src/ciderlib/oned/onesolve.c index 2a9a8e0eb..bc35f60a5 100644 --- a/src/ciderlib/oned/onesolve.c +++ b/src/ciderlib/oned/onesolve.c @@ -9,20 +9,20 @@ $Id$ * Functions needed to calculate solutions for 1D devices. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/onedev.h" +#include "ngspice/onemesh.h" +#include "ngspice/spmatrix.h" +#include "ngspice/bool.h" +#include "ngspice/macros.h" #include "onedext.h" #include "oneddefs.h" -#include +#include "ngspice/cidersupt.h" #include "../../maths/misc/norm.h" -#include +#include "ngspice/ifsim.h" extern IFfrontEnd *SPfrontEnd; diff --git a/src/ciderlib/support/database.c b/src/ciderlib/support/database.c index 89522869a..03343fc75 100644 --- a/src/ciderlib/support/database.c +++ b/src/ciderlib/support/database.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1992 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/fteext.h" /* #include "ftedata.h" */ -#include +#include "ngspice/cidersupt.h" struct plot * DBread( char *fileName ) diff --git a/src/ciderlib/support/devprint.c b/src/ciderlib/support/devprint.c index 6a82a67a6..a7f86a1a8 100644 --- a/src/ciderlib/support/devprint.c +++ b/src/ciderlib/support/devprint.c @@ -5,9 +5,9 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group /* Device-type Dependent Printing Routines */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/optndefs.h" +#include "ngspice/cidersupt.h" void printVoltages(FILE *file, char *mName, char *iName, int devType, diff --git a/src/ciderlib/support/geominfo.c b/src/ciderlib/support/geominfo.c index a0b9cdf69..fb2dda26a 100644 --- a/src/ciderlib/support/geominfo.c +++ b/src/ciderlib/support/geominfo.c @@ -4,11 +4,11 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/gendev.h" +#include "ngspice/macros.h" +#include "ngspice/memory.h" +#include "ngspice/cidersupt.h" void printCoordInfo(CoordInfo *pFirstCoord) { diff --git a/src/ciderlib/support/globals.c b/src/ciderlib/support/globals.c index f536991e9..99e9c4434 100644 --- a/src/ciderlib/support/globals.c +++ b/src/ciderlib/support/globals.c @@ -4,11 +4,11 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/cidersupt.h" /* Global Variable Declarations char *LogFileName = "cider.log"; diff --git a/src/ciderlib/support/integset.c b/src/ciderlib/support/integset.c index edeefeab8..a4aa8e6fd 100644 --- a/src/ciderlib/support/integset.c +++ b/src/ciderlib/support/integset.c @@ -4,9 +4,9 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numenum.h" +#include "ngspice/cidersupt.h" /* compute the coefficient for the integration and predictor methods */ /* based on the Lagrange polynomial method in Liniger et. al. */ diff --git a/src/ciderlib/support/integuse.c b/src/ciderlib/support/integuse.c index a58292879..1c47e6827 100644 --- a/src/ciderlib/support/integuse.c +++ b/src/ciderlib/support/integuse.c @@ -3,11 +3,11 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/gendev.h" +#include "ngspice/cidersupt.h" /* function to compute the integrated variables discretization */ diff --git a/src/ciderlib/support/logfile.c b/src/ciderlib/support/logfile.c index ed58b6e40..ba42a1309 100644 --- a/src/ciderlib/support/logfile.c +++ b/src/ciderlib/support/logfile.c @@ -3,8 +3,8 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1992 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cidersupt.h" static char *LogFileName = "cider.log"; static int LogError = 0; diff --git a/src/ciderlib/support/mater.c b/src/ciderlib/support/mater.c index 538c3a118..8dec81d14 100644 --- a/src/ciderlib/support/mater.c +++ b/src/ciderlib/support/mater.c @@ -4,12 +4,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/material.h" +#include "ngspice/cidersupt.h" /* diff --git a/src/ciderlib/support/misc.c b/src/ciderlib/support/misc.c index df45db4cd..26bf61b77 100644 --- a/src/ciderlib/support/misc.c +++ b/src/ciderlib/support/misc.c @@ -9,11 +9,11 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group * code will run without having to compile the oned code */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/spmatrix.h" +#include "ngspice/cidersupt.h" /* Used in Solution Projection Calculations */ diff --git a/src/ciderlib/support/mobil.c b/src/ciderlib/support/mobil.c index fac4cae04..500a20888 100644 --- a/src/ciderlib/support/mobil.c +++ b/src/ciderlib/support/mobil.c @@ -4,13 +4,13 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/macros.h" +#include "ngspice/material.h" +#include "ngspice/cidersupt.h" void MOBdefaults(MaterialInfo *info , int carrier, int type, int concmodel, int fieldmodel ) diff --git a/src/ciderlib/support/recomb.c b/src/ciderlib/support/recomb.c index 2043fa499..279e6c012 100644 --- a/src/ciderlib/support/recomb.c +++ b/src/ciderlib/support/recomb.c @@ -3,9 +3,9 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/cidersupt.h" /* * function recomb calculates the recobination rates and the diff --git a/src/ciderlib/support/suprem.c b/src/ciderlib/support/suprem.c index 4087629ee..1bb0a230d 100644 --- a/src/ciderlib/support/suprem.c +++ b/src/ciderlib/support/suprem.c @@ -7,9 +7,9 @@ $Id$ /* Functions to read SUPREM (Binary or Ascii) & ASCII input files */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/profile.h" +#include "ngspice/cidersupt.h" void readAsciiData( char *fileName, int impType, DOPtable **ppTable ) diff --git a/src/ciderlib/support/suprmitf.c b/src/ciderlib/support/suprmitf.c index ae66f3aad..fd0245ecd 100644 --- a/src/ciderlib/support/suprmitf.c +++ b/src/ciderlib/support/suprmitf.c @@ -9,8 +9,8 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cidersupt.h" #define MAXMAT 10 #define MAXIMP 4 diff --git a/src/ciderlib/twod/twoadmit.c b/src/ciderlib/twod/twoadmit.c index b838763d0..8dc4db80e 100644 --- a/src/ciderlib/twod/twoadmit.c +++ b/src/ciderlib/twod/twoadmit.c @@ -6,20 +6,20 @@ $Id$ /* Functions to compute the ac admittances of a device. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/numconst.h" +#include "ngspice/twodev.h" +#include "ngspice/twomesh.h" +#include "ngspice/complex.h" +#include "ngspice/spmatrix.h" +#include "ngspice/bool.h" +#include "ngspice/macros.h" +#include "ngspice/ifsim.h" #include "twoddefs.h" #include "twodext.h" -#include +#include "ngspice/cidersupt.h" extern IFfrontEnd *SPfrontEnd; diff --git a/src/ciderlib/twod/twoaval.c b/src/ciderlib/twod/twoaval.c index 2b76b2344..274ccfb4b 100644 --- a/src/ciderlib/twod/twoaval.c +++ b/src/ciderlib/twod/twoaval.c @@ -4,10 +4,10 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1990 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twocond.c b/src/ciderlib/twod/twocond.c index 5841fd08e..178abc280 100644 --- a/src/ciderlib/twod/twocond.c +++ b/src/ciderlib/twod/twocond.c @@ -6,13 +6,13 @@ $Id$ /* Functions to compute terminal conductances & currents. */ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/bool.h" +#include "ngspice/spmatrix.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twocont.c b/src/ciderlib/twod/twocont.c index dabc92217..624934be6 100644 --- a/src/ciderlib/twod/twocont.c +++ b/src/ciderlib/twod/twocont.c @@ -5,16 +5,16 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/bool.h" +#include "ngspice/spmatrix.h" #include "twoddefs.h" #include "twodext.h" -#include +#include "ngspice/cidersupt.h" #include "../../maths/misc/bernoull.h" /* diff --git a/src/ciderlib/twod/twocurr.c b/src/ciderlib/twod/twocurr.c index 01e5ce34f..be87cf6c8 100644 --- a/src/ciderlib/twod/twocurr.c +++ b/src/ciderlib/twod/twocurr.c @@ -4,10 +4,10 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twodest.c b/src/ciderlib/twod/twodest.c index 15ac756e2..d51297f93 100644 --- a/src/ciderlib/twod/twodest.c +++ b/src/ciderlib/twod/twodest.c @@ -3,12 +3,12 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twodev.h" +#include "ngspice/twomesh.h" +#include "ngspice/spmatrix.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twodext.h b/src/ciderlib/twod/twodext.h index d520315e4..d8007e855 100644 --- a/src/ciderlib/twod/twodext.h +++ b/src/ciderlib/twod/twodext.h @@ -7,12 +7,12 @@ #ifndef _TWODEXT_H #define _TWODEXT_H -#include -#include -#include -#include -#include -#include +#include "ngspice/profile.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/carddefs.h" +#include "ngspice/bool.h" +#include "ngspice/complex.h" /* twoadmit.c */ extern int NUMD2admittance(TWOdevice *, double, SPcomplex *); diff --git a/src/ciderlib/twod/twodopng.c b/src/ciderlib/twod/twodopng.c index 339daf8ca..e3daf6203 100644 --- a/src/ciderlib/twod/twodopng.c +++ b/src/ciderlib/twod/twodopng.c @@ -4,17 +4,17 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/profile.h" +#include "ngspice/macros.h" +#include "ngspice/bool.h" #include "twoddefs.h" #include "twodext.h" -#include +#include "ngspice/cidersupt.h" /* functions in this file are used to calculate the conc */ diff --git a/src/ciderlib/twod/twoelect.c b/src/ciderlib/twod/twoelect.c index 1fdf33326..94da4fae7 100644 --- a/src/ciderlib/twod/twoelect.c +++ b/src/ciderlib/twod/twoelect.c @@ -4,13 +4,13 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/bool.h" #include "twoddefs.h" #include "twodext.h" @@ -19,7 +19,7 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group #define NEXT next #define SORT TWOssortElectrodes #define SORT1 TWOsortElectrodes -#include +#include "ngspice/lsort.h" #define ARG_MIN(a,b,c) ((a) > (b) ? 1 : ((a) < (b) ? -1 : (c))) diff --git a/src/ciderlib/twod/twofield.c b/src/ciderlib/twod/twofield.c index d9e1584e5..e8dd53679 100644 --- a/src/ciderlib/twod/twofield.c +++ b/src/ciderlib/twod/twofield.c @@ -4,10 +4,10 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twomesh.c b/src/ciderlib/twod/twomesh.c index c657d35e9..16ed2e144 100644 --- a/src/ciderlib/twod/twomesh.c +++ b/src/ciderlib/twod/twomesh.c @@ -5,13 +5,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/bool.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twomobdv.c b/src/ciderlib/twod/twomobdv.c index 54330bb84..7c18122df 100644 --- a/src/ciderlib/twod/twomobdv.c +++ b/src/ciderlib/twod/twomobdv.c @@ -3,10 +3,10 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/twomesh.h" +#include "ngspice/bool.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twomobfn.c b/src/ciderlib/twod/twomobfn.c index bcf727e48..e87631889 100644 --- a/src/ciderlib/twod/twomobfn.c +++ b/src/ciderlib/twod/twomobfn.c @@ -4,12 +4,12 @@ Author: 1990 David A. Gates, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/material.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twomobil.c b/src/ciderlib/twod/twomobil.c index 21446222a..159a80c99 100644 --- a/src/ciderlib/twod/twomobil.c +++ b/src/ciderlib/twod/twomobil.c @@ -3,9 +3,9 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1990 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/twomesh.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twoncont.c b/src/ciderlib/twod/twoncont.c index db96e2ae6..2092f997e 100644 --- a/src/ciderlib/twod/twoncont.c +++ b/src/ciderlib/twod/twoncont.c @@ -5,16 +5,16 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/bool.h" +#include "ngspice/spmatrix.h" #include "twoddefs.h" #include "twodext.h" -#include +#include "ngspice/cidersupt.h" #include "../../maths/misc/bernoull.h" diff --git a/src/ciderlib/twod/twopcont.c b/src/ciderlib/twod/twopcont.c index 55e030d69..1ab9f0ef8 100644 --- a/src/ciderlib/twod/twopcont.c +++ b/src/ciderlib/twod/twopcont.c @@ -5,16 +5,16 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/bool.h" +#include "ngspice/spmatrix.h" #include "twoddefs.h" #include "twodext.h" -#include +#include "ngspice/cidersupt.h" #include "../../maths/misc/bernoull.h" /* diff --git a/src/ciderlib/twod/twopoiss.c b/src/ciderlib/twod/twopoiss.c index e05fceb7b..8141a16bd 100644 --- a/src/ciderlib/twod/twopoiss.c +++ b/src/ciderlib/twod/twopoiss.c @@ -5,12 +5,12 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/spmatrix.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twoprint.c b/src/ciderlib/twod/twoprint.c index 629fe638e..ddf280e53 100644 --- a/src/ciderlib/twod/twoprint.c +++ b/src/ciderlib/twod/twoprint.c @@ -5,15 +5,15 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/carddefs.h" +#include "ngspice/spmatrix.h" +#include "ngspice/bool.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twoproj.c b/src/ciderlib/twod/twoproj.c index 364a89110..5eb89dfb9 100644 --- a/src/ciderlib/twod/twoproj.c +++ b/src/ciderlib/twod/twoproj.c @@ -9,16 +9,16 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group * two-level Newton scheme */ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/bool.h" +#include "ngspice/spmatrix.h" #include "twoddefs.h" #include "twodext.h" -#include +#include "ngspice/cidersupt.h" /* Forward Declarations */ diff --git a/src/ciderlib/twod/tworead.c b/src/ciderlib/twod/tworead.c index 43c1a8a45..5892c6c5b 100644 --- a/src/ciderlib/twod/tworead.c +++ b/src/ciderlib/twod/tworead.c @@ -8,15 +8,15 @@ $Id$ * Functions needed to read solutions for 2D devices. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/plot.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twodev.h" +#include "ngspice/twomesh.h" #include "twoddefs.h" #include "twodext.h" -#include +#include "ngspice/cidersupt.h" int diff --git a/src/ciderlib/twod/twosetbc.c b/src/ciderlib/twod/twosetbc.c index f6c6ae9db..dd9186ec4 100644 --- a/src/ciderlib/twod/twosetbc.c +++ b/src/ciderlib/twod/twosetbc.c @@ -3,11 +3,11 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" #include "twoddefs.h" #include "twodext.h" diff --git a/src/ciderlib/twod/twosetup.c b/src/ciderlib/twod/twosetup.c index e3560f8d2..daf917bcb 100644 --- a/src/ciderlib/twod/twosetup.c +++ b/src/ciderlib/twod/twosetup.c @@ -9,16 +9,16 @@ $Id$ Two-Dimensional Numerical Device Setup Routines **********/ -#include -#include -#include -#include -#include -#include -#include /* XXX Not really modular if we need this. */ +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/carddefs.h" /* XXX Not really modular if we need this. */ #include "twoddefs.h" #include "twodext.h" -#include +#include "ngspice/cidersupt.h" /* compute node parameters */ diff --git a/src/ciderlib/twod/twosolve.c b/src/ciderlib/twod/twosolve.c index 6a3aa00cd..f55d8ede2 100644 --- a/src/ciderlib/twod/twosolve.c +++ b/src/ciderlib/twod/twosolve.c @@ -5,21 +5,21 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numglobs.h" +#include "ngspice/numenum.h" +#include "ngspice/twodev.h" +#include "ngspice/twomesh.h" +#include "ngspice/spmatrix.h" +#include "ngspice/bool.h" +#include "ngspice/macros.h" #include "twoddefs.h" #include "twodext.h" -#include +#include "ngspice/cidersupt.h" #include "../../maths/misc/norm.h" -#include +#include "ngspice/ifsim.h" extern IFfrontEnd *SPfrontEnd; diff --git a/src/frontend/arg.c b/src/frontend/arg.c index d2429c909..d18c35a11 100644 --- a/src/frontend/arg.c +++ b/src/frontend/arg.c @@ -8,10 +8,10 @@ Author: 1987 Jeffrey M. Hsu and prompt the user if necessary. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/fteinput.h" +#include "ngspice/cpdefs.h" +#include "ngspice/fteext.h" #include "arg.h" #include "variable.h" diff --git a/src/frontend/aspice.c b/src/frontend/aspice.c index 474c31727..a82158fd7 100644 --- a/src/frontend/aspice.c +++ b/src/frontend/aspice.c @@ -8,9 +8,9 @@ $Id$ * Stuff for asynchronous spice runs, and also rspice. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" #include "aspice.h" #include "variable.h" @@ -33,8 +33,8 @@ $Id$ #include -#include -#include +#include "ngspice/fteinp.h" +#include "ngspice/dvec.h" #include "../misc/mktemp.h" diff --git a/src/frontend/breakp.c b/src/frontend/breakp.c index a788a63cb..f30728769 100644 --- a/src/frontend/breakp.c +++ b/src/frontend/breakp.c @@ -8,11 +8,11 @@ $Id$ * Code to deal with breakpoints and tracing. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/ftedebug.h" #include "breakp.h" #include "breakp2.h" #include "runcoms2.h" diff --git a/src/frontend/breakp2.c b/src/frontend/breakp2.c index 0faa6d27a..ed4418219 100644 --- a/src/frontend/breakp2.c +++ b/src/frontend/breakp2.c @@ -8,11 +8,11 @@ $Id$ * Code to deal with breakpoints and tracing. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/ftedebug.h" #include "quote.h" #include "breakp2.h" diff --git a/src/frontend/circuits.c b/src/frontend/circuits.c index 959836f30..25a44026c 100644 --- a/src/frontend/circuits.c +++ b/src/frontend/circuits.c @@ -6,10 +6,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group /* Routines for dealing with the circuit database. This is currently * unimplemented. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" #include "circuits.h" diff --git a/src/frontend/com_ahelp.c b/src/frontend/com_ahelp.c index af01c9e50..f3e55856f 100644 --- a/src/frontend/com_ahelp.c +++ b/src/frontend/com_ahelp.c @@ -1,9 +1,9 @@ #include -#include +#include "ngspice/ngspice.h" -#include -#include -#include +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" +#include "ngspice/fteext.h" #include "variable.h" #include "com_help.h" diff --git a/src/frontend/com_alias.c b/src/frontend/com_alias.c index bc6f8877c..561b11bd2 100644 --- a/src/frontend/com_alias.c +++ b/src/frontend/com_alias.c @@ -5,8 +5,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group /* Do alias substitution. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include "com_alias.h" struct alias *cp_aliases = NULL; diff --git a/src/frontend/com_asciiplot.c b/src/frontend/com_asciiplot.c index 448e0056f..7ca42831e 100644 --- a/src/frontend/com_asciiplot.c +++ b/src/frontend/com_asciiplot.c @@ -1,8 +1,8 @@ #include -#include +#include "ngspice/ngspice.h" -#include -#include +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" #include "plotting/plotit.h" diff --git a/src/frontend/com_cdump.c b/src/frontend/com_cdump.c index d73c459af..810714bac 100644 --- a/src/frontend/com_cdump.c +++ b/src/frontend/com_cdump.c @@ -1,12 +1,12 @@ /* Command cdump: dump the control structure to the console output */ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/wordlist.h" #include "control.h" -#include +#include "ngspice/cpextern.h" #include "com_cdump.h" diff --git a/src/frontend/com_chdir.c b/src/frontend/com_chdir.c index 5514076c7..71bd38f16 100644 --- a/src/frontend/com_chdir.c +++ b/src/frontend/com_chdir.c @@ -3,9 +3,9 @@ * $Id$ ************/ -#include +#include "ngspice/ngspice.h" -#include +#include "ngspice/wordlist.h" #ifdef HAVE_PWD_H #include @@ -13,7 +13,7 @@ #include "com_chdir.h" #include "quote.h" -#include +#include "ngspice/cpextern.h" void diff --git a/src/frontend/com_chdir.h b/src/frontend/com_chdir.h index bc34d9fe2..380979de3 100644 --- a/src/frontend/com_chdir.h +++ b/src/frontend/com_chdir.h @@ -6,7 +6,7 @@ #ifndef COM_CHDIR_H #define COM_CHDIR_H -#include +#include "ngspice/wordlist.h" void com_chdir(wordlist *wl); diff --git a/src/frontend/com_compose.c b/src/frontend/com_compose.c index 591f53926..e0041919f 100644 --- a/src/frontend/com_compose.c +++ b/src/frontend/com_compose.c @@ -1,13 +1,13 @@ /* The 'compose' command. This is a more powerful and convenient form * of the 'let' command. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/complex.h" +#include "ngspice/dvec.h" +#include "ngspice/bool.h" +#include "ngspice/sim.h" +#include "ngspice/pnode.h" +#include "ngspice/fteext.h" +#include "ngspice/cpextern.h" #include "quote.h" #include "com_compose.h" diff --git a/src/frontend/com_compose.h b/src/frontend/com_compose.h index b66e29f62..66caa69d9 100644 --- a/src/frontend/com_compose.h +++ b/src/frontend/com_compose.h @@ -2,7 +2,7 @@ #ifndef _COM_COMPOSE_H #define _COM_COMPOSE_H -#include +#include "ngspice/wordlist.h" void com_compose(wordlist *wl); diff --git a/src/frontend/com_display.c b/src/frontend/com_display.c index 29eddfa66..a360d9bc6 100644 --- a/src/frontend/com_display.c +++ b/src/frontend/com_display.c @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" +#include "ngspice/fteext.h" +#include "ngspice/cpextern.h" #include "com_display.h" #include "quote.h" diff --git a/src/frontend/com_display.h b/src/frontend/com_display.h index 00f8f9365..8831767c0 100644 --- a/src/frontend/com_display.h +++ b/src/frontend/com_display.h @@ -1,7 +1,7 @@ #ifndef _COM_DISPLAY_H #define _COM_DISPLAY_H -#include +#include "ngspice/wordlist.h" void com_display(wordlist *wl); diff --git a/src/frontend/com_dl.c b/src/frontend/com_dl.c index 8aef32c1d..e0a40bddf 100755 --- a/src/frontend/com_dl.c +++ b/src/frontend/com_dl.c @@ -1,6 +1,6 @@ -#include /* for wl */ -#include -#include /* solve deps in dev.h*/ +#include "ngspice/ngspice.h" /* for wl */ +#include "ngspice/ftedefs.h" +#include "ngspice/devdefs.h" /* solve deps in dev.h*/ #include <../spicelib/devices/dev.h> /*for load library commands*/ #include "com_dl.h" diff --git a/src/frontend/com_dump.c b/src/frontend/com_dump.c index 1964833ba..690088b19 100644 --- a/src/frontend/com_dump.c +++ b/src/frontend/com_dump.c @@ -1,12 +1,12 @@ #include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" +#include "ngspice/inpdefs.h" #include "circuits.h" #include "com_dump.h" -#include -#include +#include "ngspice/cpextern.h" +#include "ngspice/fteext.h" #include "spiceif.h" diff --git a/src/frontend/com_echo.c b/src/frontend/com_echo.c index fe2b2fd5f..d21f0491b 100644 --- a/src/frontend/com_echo.c +++ b/src/frontend/com_echo.c @@ -4,13 +4,13 @@ ************/ #include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/wordlist.h" +#include "ngspice/bool.h" #include "com_echo.h" #include "quote.h" -#include +#include "ngspice/cpextern.h" void com_echo(wordlist *wlist) diff --git a/src/frontend/com_echo.h b/src/frontend/com_echo.h index 55bae772f..ddf22b58a 100644 --- a/src/frontend/com_echo.h +++ b/src/frontend/com_echo.h @@ -6,7 +6,7 @@ #ifndef COM_ECHO_H #define COM_ECHO_H -#include +#include "ngspice/wordlist.h" void com_echo(wordlist *wlist); diff --git a/src/frontend/com_fft.c b/src/frontend/com_fft.c index 4113f68fb..de3f4535c 100644 --- a/src/frontend/com_fft.c +++ b/src/frontend/com_fft.c @@ -9,16 +9,16 @@ Author: 2008 Holger Vogt #define GREEN /* select fast Green's fft */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/sim.h" #include "com_fft.h" #include "variable.h" #include "parse.h" #include "../misc/misc_time.h" -#include +#include "ngspice/fftext.h" static void fftext(double*, double*, long int, long int, int); diff --git a/src/frontend/com_ghelp.c b/src/frontend/com_ghelp.c index 32aceec79..a2f32f814 100644 --- a/src/frontend/com_ghelp.c +++ b/src/frontend/com_ghelp.c @@ -1,13 +1,13 @@ #ifndef X_DISPLAY_MISSING -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/wordlist.h" +#include "ngspice/bool.h" #include #include "variable.h" -#include -#include -#include +#include "ngspice/cpextern.h" +#include "ngspice/cpextern.h" +#include "ngspice/hlpdefs.h" #endif #include "com_ghelp.h" diff --git a/src/frontend/com_gnuplot.c b/src/frontend/com_gnuplot.c index 36f208e31..3ba396393 100644 --- a/src/frontend/com_gnuplot.c +++ b/src/frontend/com_gnuplot.c @@ -1,8 +1,8 @@ #include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" #include "plotting/plotit.h" #include "../misc/mktemp.h" diff --git a/src/frontend/com_hardcopy.c b/src/frontend/com_hardcopy.c index 53a2a1bb0..b7c6fe175 100644 --- a/src/frontend/com_hardcopy.c +++ b/src/frontend/com_hardcopy.c @@ -1,14 +1,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/defines.h" +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" +#include "ngspice/cpdefs.h" +#include "ngspice/fteinput.h" +#include "ngspice/ftedev.h" +#include "ngspice/ftedbgra.h" #include "plotting/plotit.h" #include "plotting/graphdb.h" diff --git a/src/frontend/com_help.c b/src/frontend/com_help.c index fe4c790b1..327c5b444 100644 --- a/src/frontend/com_help.c +++ b/src/frontend/com_help.c @@ -1,14 +1,14 @@ #include -#include +#include "ngspice/ngspice.h" -#include -#include -#include -#include +#include "ngspice/macros.h" +#include "ngspice/wordlist.h" +#include "ngspice/cpdefs.h" +#include "ngspice/bool.h" #include "hcomp.h" #include "com_help.h" -#include +#include "ngspice/fteext.h" void diff --git a/src/frontend/com_history.c b/src/frontend/com_history.c index e12b507ce..05d6c32dc 100644 --- a/src/frontend/com_history.c +++ b/src/frontend/com_history.c @@ -6,8 +6,8 @@ $Id$ /* Do history substitutions. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include "com_history.h" diff --git a/src/frontend/com_let.c b/src/frontend/com_let.c index 0c9ee8df4..01289d6f3 100644 --- a/src/frontend/com_let.c +++ b/src/frontend/com_let.c @@ -1,9 +1,9 @@ #include -#include -#include -#include -#include +#include "ngspice/dvec.h" +#include "ngspice/ngspice.h" +#include "ngspice/fteext.h" +#include "ngspice/cpextern.h" #include "com_let.h" #include "com_display.h" diff --git a/src/frontend/com_let.h b/src/frontend/com_let.h index a81ea289d..82f2941de 100644 --- a/src/frontend/com_let.h +++ b/src/frontend/com_let.h @@ -1,7 +1,7 @@ #ifndef _COM_LET_H #define _COM_LET_H -#include +#include "ngspice/wordlist.h" void com_let(wordlist *wl); diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c index c99bdf9fc..e9ad396d8 100644 --- a/src/frontend/com_measure2.c +++ b/src/frontend/com_measure2.c @@ -6,11 +6,11 @@ $Id$ */ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/memory.h" -#include -#include +#include "ngspice/fteext.h" +#include "ngspice/wordlist.h" #include "vectors.h" #include diff --git a/src/frontend/com_option.c b/src/frontend/com_option.c index 24331180b..69fde79bf 100644 --- a/src/frontend/com_option.c +++ b/src/frontend/com_option.c @@ -1,9 +1,9 @@ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/bool.h" #include "circuits.h" -#include +#include "ngspice/wordlist.h" #include "variable.h" #include "com_option.h" diff --git a/src/frontend/com_plot.c b/src/frontend/com_plot.c index e685c3921..dce15e69d 100644 --- a/src/frontend/com_plot.c +++ b/src/frontend/com_plot.c @@ -1,8 +1,8 @@ #include -#include +#include "ngspice/ngspice.h" -#include -#include +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" #include "plotting/plotit.h" diff --git a/src/frontend/com_rehash.c b/src/frontend/com_rehash.c index 457125b2c..1f7d568ee 100644 --- a/src/frontend/com_rehash.c +++ b/src/frontend/com_rehash.c @@ -4,11 +4,11 @@ ************/ #include -#include +#include "ngspice/ngspice.h" -#include +#include "ngspice/wordlist.h" #include "com_rehash.h" -#include +#include "ngspice/cpextern.h" #include "control.h" #include "parser/unixcom.h" diff --git a/src/frontend/com_rehash.h b/src/frontend/com_rehash.h index 61744b2d6..d78e75210 100644 --- a/src/frontend/com_rehash.h +++ b/src/frontend/com_rehash.h @@ -6,7 +6,7 @@ #ifndef COM_REHASH_H #define COM_REHASH_H -#include +#include "ngspice/wordlist.h" void com_rehash(wordlist *wl); diff --git a/src/frontend/com_set.c b/src/frontend/com_set.c index bd829e598..694d45450 100644 --- a/src/frontend/com_set.c +++ b/src/frontend/com_set.c @@ -1,8 +1,8 @@ #include -#include +#include "ngspice/ngspice.h" -#include -#include +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" #include "variable.h" #include "com_set.h" diff --git a/src/frontend/com_setscale.c b/src/frontend/com_setscale.c index 77521c16c..cc4b3fe52 100644 --- a/src/frontend/com_setscale.c +++ b/src/frontend/com_setscale.c @@ -1,14 +1,14 @@ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/dvec.h" #include "com_setscale.h" #include "quote.h" -#include +#include "ngspice/cpextern.h" #include "vectors.h" #include "plotting/plotting.h" #include "plotting/pvec.h" -#include +#include "ngspice/fteext.h" /* Set the default scale to the named vector. If no vector named, diff --git a/src/frontend/com_setscale.h b/src/frontend/com_setscale.h index 29ece5825..2a502a19b 100644 --- a/src/frontend/com_setscale.h +++ b/src/frontend/com_setscale.h @@ -1,7 +1,7 @@ #ifndef _COM_SETSCALE_H #define _COM_SETSCALE_H -#include +#include "ngspice/wordlist.h" void com_setscale(wordlist *wl); diff --git a/src/frontend/com_shell.c b/src/frontend/com_shell.c index fbef07260..053892188 100644 --- a/src/frontend/com_shell.c +++ b/src/frontend/com_shell.c @@ -4,12 +4,12 @@ ************/ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/wordlist.h" #include "com_shell.h" #include "streams.h" -#include +#include "ngspice/cpextern.h" /* Fork a shell. */ diff --git a/src/frontend/com_shift.c b/src/frontend/com_shift.c index 9d9172280..7e7a70231 100644 --- a/src/frontend/com_shift.c +++ b/src/frontend/com_shift.c @@ -4,13 +4,13 @@ ************/ #include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" #include "com_shift.h" #include "variable.h" -#include +#include "ngspice/cpextern.h" /* Shift a list variable, by default argv, one to the left (or more if diff --git a/src/frontend/com_state.c b/src/frontend/com_state.c index 624cea712..74623bf25 100644 --- a/src/frontend/com_state.c +++ b/src/frontend/com_state.c @@ -1,13 +1,13 @@ #include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" +#include "ngspice/ftedefs.h" +#include "ngspice/inpdefs.h" #include "circuits.h" #include "com_state.h" -#include +#include "ngspice/cpextern.h" #include "plotting/plotting.h" diff --git a/src/frontend/com_strcmp.c b/src/frontend/com_strcmp.c index 905ea1920..9040c0f6f 100644 --- a/src/frontend/com_strcmp.c +++ b/src/frontend/com_strcmp.c @@ -1,8 +1,8 @@ #include -#include +#include "ngspice/ngspice.h" -#include -#include +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" #include "com_strcmp.h" #include "quote.h" diff --git a/src/frontend/com_sysinfo.c b/src/frontend/com_sysinfo.c index 6aa5a3c8f..3f1a43139 100644 --- a/src/frontend/com_sysinfo.c +++ b/src/frontend/com_sysinfo.c @@ -9,9 +9,9 @@ */ #include "config.h" -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/fteext.h" #include "com_commands.h" /* We might compile for Windows, but only as a console application (e.g. tcl) */ diff --git a/src/frontend/com_unset.c b/src/frontend/com_unset.c index 2ca47c483..857607fc9 100644 --- a/src/frontend/com_unset.c +++ b/src/frontend/com_unset.c @@ -4,10 +4,10 @@ ************/ #include -#include +#include "ngspice/ngspice.h" -#include -#include +#include "ngspice/macros.h" +#include "ngspice/bool.h" #include "com_unset.h" #include "variable.h" diff --git a/src/frontend/com_unset.h b/src/frontend/com_unset.h index ced9076fd..e9428e554 100644 --- a/src/frontend/com_unset.h +++ b/src/frontend/com_unset.h @@ -6,7 +6,7 @@ #ifndef COM_UNSET_H #define COM_UNSET_H -#include +#include "ngspice/wordlist.h" void com_unset(wordlist *wl); diff --git a/src/frontend/com_xgraph.c b/src/frontend/com_xgraph.c index 9db2291a7..8bc3a087e 100644 --- a/src/frontend/com_xgraph.c +++ b/src/frontend/com_xgraph.c @@ -1,8 +1,8 @@ #include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" #include "plotting/plotit.h" #include "../misc/mktemp.h" diff --git a/src/frontend/commands.c b/src/frontend/commands.c index 2d9e9c370..65b292d95 100644 --- a/src/frontend/commands.c +++ b/src/frontend/commands.c @@ -31,9 +31,9 @@ /* Table of available commands. Note that they're sorted so that the * commands that appear in the spiceinit file are at the top. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ftedefs.h" +#include "ngspice/cpdefs.h" #include "ftehelp.h" #include "commands.h" @@ -96,7 +96,7 @@ #ifdef XSPICE /* gtri - begin - wbk - add include files */ -#include +#include "ngspice/evtproto.h" /* gtri - end - wbk - add include files */ #endif diff --git a/src/frontend/control.c b/src/frontend/control.c index 09a095f40..fa3e72f88 100644 --- a/src/frontend/control.c +++ b/src/frontend/control.c @@ -5,13 +5,13 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group /* The front-end command loop. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include "control.h" #include "com_cdump.h" #include "variable.h" -#include +#include "ngspice/fteext.h" /* Return values from doblock(). I am assuming that nobody will use diff --git a/src/frontend/control.h b/src/frontend/control.h index 6a8b5b5ee..2403cbdff 100644 --- a/src/frontend/control.h +++ b/src/frontend/control.h @@ -6,7 +6,7 @@ #ifndef CONTROL_H #define CONTROL_H -#include +#include "ngspice/bool.h" /* Stuff to do control structures. We keep a history (seperate from * the cshpar history, for now at least) of commands and their event diff --git a/src/frontend/cpitf.c b/src/frontend/cpitf.c index ac99f7355..6478ccbf6 100644 --- a/src/frontend/cpitf.c +++ b/src/frontend/cpitf.c @@ -6,11 +6,11 @@ $Id$ */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteparse.h" #include "cpitf.h" #include "com_let.h" #include "com_set.h" diff --git a/src/frontend/define.c b/src/frontend/define.c index 58d8bb298..3a56d1039 100644 --- a/src/frontend/define.c +++ b/src/frontend/define.c @@ -15,11 +15,11 @@ $Id$ * with the same name and different arities. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteparse.h" #include "define.h" #include "completion.h" diff --git a/src/frontend/device.c b/src/frontend/device.c index 60196b051..3e139eefb 100644 --- a/src/frontend/device.c +++ b/src/frontend/device.c @@ -8,12 +8,12 @@ Modified: 2000 AlansFixes * Routines to query and alter devices. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dgen.h" #include "circuits.h" #include "device.h" diff --git a/src/frontend/diff.c b/src/frontend/diff.c index a6596884b..7f0deb15a 100644 --- a/src/frontend/diff.c +++ b/src/frontend/diff.c @@ -8,10 +8,10 @@ Modified: 2001 Paolo Nenzi (printnum) * Do a 'diff' of two plots. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/sim.h" #include "diff.h" #include "variable.h" diff --git a/src/frontend/diff.h b/src/frontend/diff.h index 6d7bebdd5..27568a740 100644 --- a/src/frontend/diff.h +++ b/src/frontend/diff.h @@ -6,7 +6,7 @@ #ifndef _DIFF_H #define _DIFF_H -#include +#include "ngspice/wordlist.h" void com_diff(wordlist *wl); diff --git a/src/frontend/dimens.c b/src/frontend/dimens.c index 855e58d37..ed61a4951 100644 --- a/src/frontend/dimens.c +++ b/src/frontend/dimens.c @@ -7,8 +7,8 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group * Read and write dimension/index arrays via strings. */ -#include -#include /* For MAXDIMS */ +#include "ngspice/ngspice.h" +#include "ngspice/dvec.h" /* For MAXDIMS */ #include "dimens.h" diff --git a/src/frontend/display.c b/src/frontend/display.c index 16296292d..c0908d99f 100644 --- a/src/frontend/display.c +++ b/src/frontend/display.c @@ -4,15 +4,15 @@ $Id$ **********/ -#include -#include -#include -#include -#include /* for CP_STRING */ -#include /* for mylog() */ +#include "ngspice/ngspice.h" +#include "ngspice/graph.h" +#include "ngspice/ftedev.h" +#include "ngspice/fteinput.h" +#include "ngspice/cpdefs.h" /* for CP_STRING */ +#include "ngspice/ftedefs.h" /* for mylog() */ #ifdef TCL_MODULE -#include +#include "ngspice/tclspice.h" #endif #include "display.h" diff --git a/src/frontend/display.h b/src/frontend/display.h index 5848d6210..1b7a7b9df 100644 --- a/src/frontend/display.h +++ b/src/frontend/display.h @@ -8,9 +8,9 @@ #define DISPLAY_H_INCLUDED /* Include a bunch of other stuff to make display.h work */ -#include -#include -#include +#include "ngspice/ftedev.h" +#include "ngspice/fteinput.h" +#include "ngspice/graph.h" DISPDEVICE *FindDev(char *name); void DevInit(void); diff --git a/src/frontend/dotcards.c b/src/frontend/dotcards.c index 3bb91fe4a..39872e420 100644 --- a/src/frontend/dotcards.c +++ b/src/frontend/dotcards.c @@ -9,13 +9,13 @@ $Id$ * Spice-2 compatibility stuff for .plot, .print, .four, and .width. */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include -#include +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteinp.h" +#include "ngspice/sim.h" #include "circuits.h" #include "dotcards.h" #include "variable.h" diff --git a/src/frontend/error.c b/src/frontend/error.c index fcd9d6823..8b910edd8 100644 --- a/src/frontend/error.c +++ b/src/frontend/error.c @@ -8,9 +8,9 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * Print out in more detail what a floating point error was. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" #include #include "error.h" diff --git a/src/frontend/evaluate.c b/src/frontend/evaluate.c index 9bca2b828..2837994e9 100644 --- a/src/frontend/evaluate.c +++ b/src/frontend/evaluate.c @@ -7,17 +7,17 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * Convert a parse tree to a list of data vectors. */ -#include +#include "ngspice/ngspice.h" #include #include -#include -#include +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" #include "evaluate.h" -#include /* To get SV_VOLTAGE definition */ +#include "ngspice/sim.h" /* To get SV_VOLTAGE definition */ /* static declarations */ static RETSIGTYPE sig_matherr(void); diff --git a/src/frontend/evaluate.h b/src/frontend/evaluate.h index b76e0ec88..24d3a3405 100644 --- a/src/frontend/evaluate.h +++ b/src/frontend/evaluate.h @@ -6,8 +6,8 @@ #ifndef _EVALUATE_H #define _EVALUATE_H -#include -#include +#include "ngspice/dvec.h" +#include "ngspice/pnode.h" struct dvec * op_plus(struct pnode *arg1, struct pnode *arg2); struct dvec * op_minus(struct pnode *arg1, struct pnode *arg2); diff --git a/src/frontend/fourier.c b/src/frontend/fourier.c index 5fc9fe455..e37159c7e 100644 --- a/src/frontend/fourier.c +++ b/src/frontend/fourier.c @@ -9,13 +9,13 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * is done. */ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteparse.h" +#include "ngspice/sperror.h" +#include "ngspice/const.h" #include "fourier.h" #include "variable.h" diff --git a/src/frontend/ftesopt.c b/src/frontend/ftesopt.c index d73e00c54..5c1a93ea4 100644 --- a/src/frontend/ftesopt.c +++ b/src/frontend/ftesopt.c @@ -4,12 +4,12 @@ Author: 2010 Paolo Nenzi **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ftedefs.h" +#include "ngspice/wordlist.h" #include "variable.h" -#include +#include "ngspice/sperror.h" struct FTEparm { diff --git a/src/frontend/gens.c b/src/frontend/gens.c index b22ce9027..6867485f7 100644 --- a/src/frontend/gens.c +++ b/src/frontend/gens.c @@ -1,12 +1,12 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/cpstd.h" +#include "ngspice/ftedefs.h" +#include "ngspice/fteext.h" +#include "ngspice/devdefs.h" +#include "ngspice/dgen.h" #include "gens.h" diff --git a/src/frontend/gens.h b/src/frontend/gens.h index fc0d0ac42..403db4201 100644 --- a/src/frontend/gens.h +++ b/src/frontend/gens.h @@ -6,7 +6,7 @@ #ifndef GENS_H_INCLUDED #define GENS_H_INCLUDED -#include +#include "ngspice/dgen.h" void wl_forall(wordlist *wl, void (*fn)(wordlist*, dgen*), dgen *data); int dgen_for_n(dgen *dg, int n, int (*fn) (dgen*, IFparm*, int), IFparm *data, int subindex); diff --git a/src/frontend/hcomp.c b/src/frontend/hcomp.c index 5e31fc1fc..bef3c8ef4 100644 --- a/src/frontend/hcomp.c +++ b/src/frontend/hcomp.c @@ -1,4 +1,4 @@ -#include +#include "ngspice/cpdefs.h" #include #include "hcomp.h" diff --git a/src/frontend/help/help.c b/src/frontend/help/help.c index fbf3d8967..4559403c0 100644 --- a/src/frontend/help/help.c +++ b/src/frontend/help/help.c @@ -9,10 +9,10 @@ Modified 1999 Emmanuel Rouat */ #include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpstd.h" +#include "ngspice/hlpdefs.h" +#include "ngspice/suffix.h" extern char *cp_tildexpand(char *string); diff --git a/src/frontend/help/provide.c b/src/frontend/help/provide.c index a25ef7f06..7fa2614ec 100644 --- a/src/frontend/help/provide.c +++ b/src/frontend/help/provide.c @@ -13,10 +13,10 @@ Modified 1999 Emmanuel Rouat */ #include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpstd.h" +#include "ngspice/hlpdefs.h" +#include "ngspice/suffix.h" bool hlp_usex = FALSE; diff --git a/src/frontend/help/readhelp.c b/src/frontend/help/readhelp.c index 74194fc05..c930d49ba 100644 --- a/src/frontend/help/readhelp.c +++ b/src/frontend/help/readhelp.c @@ -12,10 +12,10 @@ Modified 1999 Emmanuel Rouat */ #include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpstd.h" +#include "ngspice/hlpdefs.h" +#include "ngspice/suffix.h" #if defined (_MSC_VER) #define strncasecmp _strnicmp diff --git a/src/frontend/help/textdisp.c b/src/frontend/help/textdisp.c index e32884138..264edb698 100644 --- a/src/frontend/help/textdisp.c +++ b/src/frontend/help/textdisp.c @@ -11,10 +11,10 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/hlpdefs.h" +#include "ngspice/suffix.h" static topic *curtop; static bool quitflag; diff --git a/src/frontend/help/x11disp.c b/src/frontend/help/x11disp.c index 6c38dae44..1ce9dd9d1 100644 --- a/src/frontend/help/x11disp.c +++ b/src/frontend/help/x11disp.c @@ -6,12 +6,12 @@ $Id$ **********/ #include -#include +#include "ngspice/ngspice.h" #ifndef X_DISPLAY_MISSING -#include -#include +#include "ngspice/cpstd.h" +#include "ngspice/hlpdefs.h" #include #include #include diff --git a/src/frontend/help/xdisplay.c b/src/frontend/help/xdisplay.c index 1a8d743dd..e80576ac0 100644 --- a/src/frontend/help/xdisplay.c +++ b/src/frontend/help/xdisplay.c @@ -5,10 +5,10 @@ Modified 1999 Emmanuel Rouat **********/ #include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpstd.h" +#include "ngspice/hlpdefs.h" +#include "ngspice/suffix.h" char *hlp_boldfontname = BOLD_FONT; diff --git a/src/frontend/hpgl.c b/src/frontend/hpgl.c index 51d772b67..7794f5ebd 100644 --- a/src/frontend/hpgl.c +++ b/src/frontend/hpgl.c @@ -28,13 +28,13 @@ Author: Jim Groves */ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/graph.h" +#include "ngspice/ftedbgra.h" +#include "ngspice/ftedev.h" +#include "ngspice/fteinput.h" +#include "ngspice/fteext.h" #include "variable.h" #include "error.h" #include "plotting/graphdb.h" diff --git a/src/frontend/init.c b/src/frontend/init.c index 26251de1a..db3a04c0b 100644 --- a/src/frontend/init.c +++ b/src/frontend/init.c @@ -5,8 +5,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group /* Initialize io, cp_chars[], variable "history". */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include "init.h" #include "variable.h" diff --git a/src/frontend/inp.c b/src/frontend/inp.c index 3497f1d39..3a2847a17 100644 --- a/src/frontend/inp.c +++ b/src/frontend/inp.c @@ -9,13 +9,13 @@ $Id$ * the listing routines. */ -#include +#include "ngspice/ngspice.h" -#include -#include -#include -#include -#include +#include "ngspice/cpdefs.h" +#include "ngspice/inpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteinp.h" #include "inp.h" #include "runcoms.h" @@ -33,8 +33,8 @@ $Id$ #ifdef XSPICE /* include new stuff */ -#include -#include +#include "ngspice/ipctiein.h" +#include "ngspice/enh.h" /* */ #endif diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index 6fd848e02..f6268748e 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -10,25 +10,25 @@ $Id$ Central function is inp_readall() */ -#include +#include "ngspice/ngspice.h" -#include -#include -#include -#include -#include -#include +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/fteext.h" +#include "ngspice/dvec.h" +#include "ngspice/fteinp.h" +#include "ngspice/compatmode.h" #include "inpcom.h" #include "variable.h" #include "../misc/util.h" /* ngdirname() */ #include "../misc/stringutil.h" -#include +#include "ngspice/wordlist.h" #ifdef XSPICE /* gtri - add - 12/12/90 - wbk - include new stuff */ -#include -#include +#include "ngspice/ipctiein.h" +#include "ngspice/enh.h" /* gtri - end - 12/12/90 */ #endif diff --git a/src/frontend/interp.c b/src/frontend/interp.c index 0e2031fd8..3bc99a1fc 100644 --- a/src/frontend/interp.c +++ b/src/frontend/interp.c @@ -7,10 +7,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * Polynomial interpolation code. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" #include "interp.h" diff --git a/src/frontend/inventory.c b/src/frontend/inventory.c index b195ab528..9fc629781 100644 --- a/src/frontend/inventory.c +++ b/src/frontend/inventory.c @@ -3,14 +3,14 @@ Copyright 2010 Paolo Nenzi. All rights reserved. Author: 2010 Paolo Nenzi **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/optdefs.h" +#include "ngspice/dvec.h" #include "ftehelp.h" -#include +#include "ngspice/hlpdefs.h" #include "circuits.h" #include "where.h" diff --git a/src/frontend/linear.c b/src/frontend/linear.c index 110c36697..0c3130893 100644 --- a/src/frontend/linear.c +++ b/src/frontend/linear.c @@ -4,10 +4,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" #include "circuits.h" #include "linear.h" diff --git a/src/frontend/measure.c b/src/frontend/measure.c index 3a617aad9..dbfb2a2df 100644 --- a/src/frontend/measure.c +++ b/src/frontend/measure.c @@ -8,15 +8,15 @@ $Id$ */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" #include "rawfile.h" #include "variable.h" #include "numparam/numpaif.h" -#include +#include "ngspice/missing_math.h" #include "com_measure2.h" #include "com_let.h" #include "com_commands.h" diff --git a/src/frontend/misccoms.c b/src/frontend/misccoms.c index cdd7a6b16..7d330f77d 100644 --- a/src/frontend/misccoms.c +++ b/src/frontend/misccoms.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" #include "ftehelp.h" -#include +#include "ngspice/hlpdefs.h" #include "misccoms.h" #include "circuits.h" #include "variable.h" diff --git a/src/frontend/miscvars.c b/src/frontend/miscvars.c index 54c6ba9e1..065eb7b2f 100644 --- a/src/frontend/miscvars.c +++ b/src/frontend/miscvars.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteinp.h" #include "miscvars.h" diff --git a/src/frontend/mw_coms.c b/src/frontend/mw_coms.c index caf7654e4..2ab39d315 100644 --- a/src/frontend/mw_coms.c +++ b/src/frontend/mw_coms.c @@ -2,12 +2,12 @@ /* $Id$ */ /* New commands for unloading circuits */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/ftedev.h" +#include "ngspice/ftedebug.h" +#include "ngspice/dvec.h" #include "circuits.h" #include "mw_coms.h" diff --git a/src/frontend/newcoms.c b/src/frontend/newcoms.c index d9a15c70a..3c6d984fc 100644 --- a/src/frontend/newcoms.c +++ b/src/frontend/newcoms.c @@ -6,11 +6,11 @@ Copyright 1992 Regents of the University of California. All rights reserved. * Some new post-processor commands having to do with vectors. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/fteparse.h" +#include "ngspice/dvec.h" #include "newcoms.h" #include "quote.h" diff --git a/src/frontend/numparam/general.h b/src/frontend/numparam/general.h index ddf8a9477..bf05cc053 100644 --- a/src/frontend/numparam/general.h +++ b/src/frontend/numparam/general.h @@ -5,8 +5,8 @@ #include the function code is in 'mystring.c' . */ -#include -#include +#include "ngspice/dstring.h" +#include "ngspice/bool.h" typedef char string[258]; diff --git a/src/frontend/numparam/mystring.c b/src/frontend/numparam/mystring.c index 868a00650..e92f27df2 100644 --- a/src/frontend/numparam/mystring.c +++ b/src/frontend/numparam/mystring.c @@ -9,13 +9,13 @@ #include #include #include -#include +#include "ngspice/memory.h" #include #include #include "config.h" #ifdef HAS_WINDOWS -#include +#include "ngspice/wstdio.h" #endif #include "general.h" diff --git a/src/frontend/numparam/numparam.h b/src/frontend/numparam/numparam.h index 373e74758..df5c0d2d1 100644 --- a/src/frontend/numparam/numparam.h +++ b/src/frontend/numparam/numparam.h @@ -6,7 +6,7 @@ /*** interface to spice frontend subckt.c ***/ #include "numpaif.h" -#include +#include "ngspice/hash.h" /***** numparam internals ********/ diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c index 2966e6953..f336d501c 100644 --- a/src/frontend/numparam/spicenum.c +++ b/src/frontend/numparam/spicenum.c @@ -25,7 +25,7 @@ Todo: #include "general.h" #include "numparam.h" -#include +#include "ngspice/ngspice.h" #include "../error.h" /* controlled_exit() */ diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 2455a5aee..43c851177 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -10,12 +10,12 @@ #include "general.h" #include "numparam.h" -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" #include "../frontend/variable.h" -#include +#include "ngspice/compatmode.h" #include "../frontend/error.h" /* random numbers in /maths/misc/randnumb.c */ diff --git a/src/frontend/nutinp.c b/src/frontend/nutinp.c index 5724f43cb..b44226aea 100644 --- a/src/frontend/nutinp.c +++ b/src/frontend/nutinp.c @@ -8,11 +8,11 @@ $Id$ * For dealing with nutmeg input decks and command scripts */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteinp.h" #include "nutinp.h" #include "variable.h" #include "../misc/mktemp.h" diff --git a/src/frontend/nutmegif.c b/src/frontend/nutmegif.c index c95e4559c..f24418a3f 100644 --- a/src/frontend/nutmegif.c +++ b/src/frontend/nutmegif.c @@ -4,12 +4,12 @@ * making sure that nutmeg doesn't try to load spice in also. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/fteinp.h" #include "nutmegif.h" diff --git a/src/frontend/options.c b/src/frontend/options.c index 2eaf1904e..6c198ff65 100644 --- a/src/frontend/options.c +++ b/src/frontend/options.c @@ -11,11 +11,11 @@ $Id$ */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteinp.h" #include "circuits.h" #include "options.h" diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c index 2ba14a7bb..5653eb543 100644 --- a/src/frontend/outitf.c +++ b/src/frontend/outitf.c @@ -12,22 +12,22 @@ $Id$ * of nutmeg doesn't deal with OUT at all. */ -#include -#include -#include -#include -#include -#include -#include /* for INPtables */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/plot.h" +#include "ngspice/sim.h" +#include "ngspice/inpdefs.h" /* for INPtables */ +#include "ngspice/ifsim.h" +#include "ngspice/jobdefs.h" +#include "ngspice/iferrmsg.h" #include "circuits.h" #include "outitf.h" #include "variable.h" #include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/inpdefs.h" #include "breakp2.h" #include "runcoms.h" #include "plotting/graf.h" @@ -61,7 +61,7 @@ static void freeRun(runDesc *run); /*Output data to spice module saj*/ #ifdef TCL_MODULE -#include +#include "ngspice/tclspice.h" #endif /*saj*/ diff --git a/src/frontend/parse.c b/src/frontend/parse.c index 9c97d887e..1c58b991b 100644 --- a/src/frontend/parse.c +++ b/src/frontend/parse.c @@ -9,11 +9,11 @@ $Id$ * This also handles relational and logical expressions. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/fteparse.h" +#include "ngspice/fteext.h" +#include "ngspice/sim.h" #include "evaluate.h" #include "parse.h" diff --git a/src/frontend/parse.h b/src/frontend/parse.h index ddda4b3b8..a304bd500 100644 --- a/src/frontend/parse.h +++ b/src/frontend/parse.h @@ -7,8 +7,8 @@ #ifndef _PARSE_H #define _PARSE_H -#include -#include +#include "ngspice/pnode.h" +#include "ngspice/wordlist.h" #ifndef free_pnode #define free_pnode(ptr) free_pnode_x(ptr); ptr=NULL; diff --git a/src/frontend/parser/backq.c b/src/frontend/parser/backq.c index f1705b81f..d61f61875 100644 --- a/src/frontend/parser/backq.c +++ b/src/frontend/parser/backq.c @@ -10,8 +10,8 @@ $Id$ */ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include "backq.h" diff --git a/src/frontend/parser/complete.c b/src/frontend/parser/complete.c index 0100a654b..81e6b3ed6 100644 --- a/src/frontend/parser/complete.c +++ b/src/frontend/parser/complete.c @@ -14,8 +14,8 @@ Modified: 1999 Paolo Nenzi */ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include "complete.h" diff --git a/src/frontend/parser/cshpar.c b/src/frontend/parser/cshpar.c index 1dbeee7b7..daead537a 100644 --- a/src/frontend/parser/cshpar.c +++ b/src/frontend/parser/cshpar.c @@ -9,8 +9,8 @@ $Id$ */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include #include "cshpar.h" diff --git a/src/frontend/parser/glob.c b/src/frontend/parser/glob.c index 99d8728af..fd9b0b125 100644 --- a/src/frontend/parser/glob.c +++ b/src/frontend/parser/glob.c @@ -8,8 +8,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group */ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include "glob.h" #ifdef HAVE_SYS_DIR_H diff --git a/src/frontend/parser/input.c b/src/frontend/parser/input.c index ef22a7b3f..0fa40f4ea 100644 --- a/src/frontend/parser/input.c +++ b/src/frontend/parser/input.c @@ -8,13 +8,13 @@ $Id$ * Stand-alone input routine. */ #include -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/fteinput.h" #include "input.h" -#include +#include "ngspice/cpextern.h" #include "../display.h" #ifdef _MSC_VER #include "BaseTsd.h" /* for SSIZE_T */ diff --git a/src/frontend/parser/lexical.c b/src/frontend/parser/lexical.c index e60082aef..3853a12aa 100644 --- a/src/frontend/parser/lexical.c +++ b/src/frontend/parser/lexical.c @@ -8,8 +8,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group */ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include @@ -44,7 +44,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #define NEW_BSIZE_SP 2*BSIZE_SP -#include +#include "ngspice/fteinput.h" #include "lexical.h" static void prompt(void); diff --git a/src/frontend/parser/numparse.c b/src/frontend/parser/numparse.c index 8b26435b3..bd5f56340 100644 --- a/src/frontend/parser/numparse.c +++ b/src/frontend/parser/numparse.c @@ -6,9 +6,9 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group /* This routine parses a number. */ #include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/ftedefs.h" #include "numparse.h" diff --git a/src/frontend/parser/std.c b/src/frontend/parser/std.c index ea51d60a1..6ec6d1a3f 100644 --- a/src/frontend/parser/std.c +++ b/src/frontend/parser/std.c @@ -9,8 +9,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group */ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpstd.h" /* This might not be around. If not then forget about sorting. */ diff --git a/src/frontend/parser/unixcom.c b/src/frontend/parser/unixcom.c index b6fb3f713..0b8f04b0c 100644 --- a/src/frontend/parser/unixcom.c +++ b/src/frontend/parser/unixcom.c @@ -8,8 +8,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group */ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include "unixcom.h" #include "../frontend/streams.h" diff --git a/src/frontend/plotting/agraf.c b/src/frontend/plotting/agraf.c index 2273708d2..cf6a50d53 100644 --- a/src/frontend/plotting/agraf.c +++ b/src/frontend/plotting/agraf.c @@ -7,11 +7,11 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * Line-printer (ASCII) plots. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteparse.h" #include "agraf.h" diff --git a/src/frontend/plotting/agraf.h b/src/frontend/plotting/agraf.h index ef7de9287..409e46988 100644 --- a/src/frontend/plotting/agraf.h +++ b/src/frontend/plotting/agraf.h @@ -6,9 +6,9 @@ #ifndef _AGRAF_H #define _AGRAF_H -#include -#include -#include +#include "ngspice/dvec.h" +#include "ngspice/bool.h" +#include "ngspice/plot.h" void ft_agraf(double *xlims, double *ylims, struct dvec *xscale, struct plot *plot, struct dvec *vecs, diff --git a/src/frontend/plotting/clip.c b/src/frontend/plotting/clip.c index 8b1c9d9a9..64c4f9609 100644 --- a/src/frontend/plotting/clip.c +++ b/src/frontend/plotting/clip.c @@ -10,9 +10,9 @@ Author: 1982 Giles Billingsley * sccsid "@(#)mfbclip.c 1.2 12/21/83" */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" #include "clip.h" diff --git a/src/frontend/plotting/gnuplot.c b/src/frontend/plotting/gnuplot.c index 94c58ffd9..92e2ac107 100644 --- a/src/frontend/plotting/gnuplot.c +++ b/src/frontend/plotting/gnuplot.c @@ -10,11 +10,11 @@ * gnuplot plots. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteparse.h" #include "gnuplot.h" diff --git a/src/frontend/plotting/graf.c b/src/frontend/plotting/graf.c index c5e2cd514..b3d468180 100644 --- a/src/frontend/plotting/graf.c +++ b/src/frontend/plotting/graf.c @@ -10,21 +10,21 @@ $Id$ * */ -#include -#include /* for CP_ */ -#include -#include -#include /* for iplot */ -#include /* for struct dvec */ -#include /* for FTEextern.h and IPOINT{MIN,MAX} */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" /* for CP_ */ +#include "ngspice/cpextern.h" +#include "ngspice/plot.h" +#include "ngspice/ftedebug.h" /* for iplot */ +#include "ngspice/dvec.h" /* for struct dvec */ +#include "ngspice/ftedefs.h" /* for FTEextern.h and IPOINT{MIN,MAX} */ +#include "ngspice/fteinput.h" +#include "ngspice/graph.h" +#include "ngspice/ftedbgra.h" +#include "ngspice/ftedev.h" #include #include "graf.h" #include "graphdb.h" -#include +#include "ngspice/grid.h" #include "../terminal.h" #include "../breakp2.h" #include "../error.h" diff --git a/src/frontend/plotting/graf.h b/src/frontend/plotting/graf.h index de21a874d..5de4244bd 100644 --- a/src/frontend/plotting/graf.h +++ b/src/frontend/plotting/graf.h @@ -7,7 +7,7 @@ #ifndef GRAF_H #define GRAF_H -#include +#include "ngspice/graph.h" int gr_init(double *xlims, double *ylims, char *xname, char *plotname, diff --git a/src/frontend/plotting/graphdb.c b/src/frontend/plotting/graphdb.c index 35512ae16..102782ac8 100644 --- a/src/frontend/plotting/graphdb.c +++ b/src/frontend/plotting/graphdb.c @@ -7,12 +7,12 @@ $Id$ Manage graph data structure. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/graph.h" +#include "ngspice/ftedebug.h" +#include "ngspice/fteext.h" -#include +#include "ngspice/ftedbgra.h" #include "graphdb.h" #include "../breakp2.h" #include "../error.h" diff --git a/src/frontend/plotting/grid.c b/src/frontend/plotting/grid.c index 9bd2e06ee..9400d7aaa 100644 --- a/src/frontend/plotting/grid.c +++ b/src/frontend/plotting/grid.c @@ -9,12 +9,12 @@ $Id$ Routines to draw the various sorts of grids -- linear, log, polar. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/graph.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" -#include +#include "ngspice/grid.h" #include "../display.h" #define RAD_TO_DEG (180.0 / M_PI) diff --git a/src/frontend/plotting/plot5.c b/src/frontend/plotting/plot5.c index dad90e755..532df467c 100644 --- a/src/frontend/plotting/plot5.c +++ b/src/frontend/plotting/plot5.c @@ -3,13 +3,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. $Id$ **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/graph.h" +#include "ngspice/ftedev.h" #include "plot5.h" #include "graf.h" -#include +#include "ngspice/fteext.h" static FILE *plotfile; diff --git a/src/frontend/plotting/plotcurv.c b/src/frontend/plotting/plotcurv.c index 36883b6ab..64dfafb33 100644 --- a/src/frontend/plotting/plotcurv.c +++ b/src/frontend/plotting/plotcurv.c @@ -7,13 +7,13 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * Curve plotting routines and general (non-graphics) plotting things. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/graph.h" #include "graf.h" -#include +#include "ngspice/ftedbgra.h" #include "plotcurv.h" diff --git a/src/frontend/plotting/plotit.c b/src/frontend/plotting/plotit.c index a905ec7bb..b1ee9949b 100644 --- a/src/frontend/plotting/plotit.c +++ b/src/frontend/plotting/plotit.c @@ -1,13 +1,13 @@ /* $Id$ */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" +#include "ngspice/graph.h" +#include "ngspice/cpdefs.h" +#include "ngspice/pnode.h" +#include "ngspice/sim.h" +#include "ngspice/fteext.h" #include @@ -21,7 +21,7 @@ static wordlist *wl_root; static bool sameflag; #ifdef TCL_MODULE -#include +#include "ngspice/tclspice.h" #endif /* This routine gets parameters from the command line, which are of diff --git a/src/frontend/plotting/plotting.c b/src/frontend/plotting/plotting.c index 231589b6f..75cdab9ef 100644 --- a/src/frontend/plotting/plotting.c +++ b/src/frontend/plotting/plotting.c @@ -1,4 +1,4 @@ -#include +#include "ngspice/ngspice.h" #include "plotting.h" diff --git a/src/frontend/plotting/plotting.h b/src/frontend/plotting/plotting.h index f207efc3e..ba091abf4 100644 --- a/src/frontend/plotting/plotting.h +++ b/src/frontend/plotting/plotting.h @@ -1,7 +1,7 @@ #ifndef _PLOTTING_H #define _PLOTTING_H -#include +#include "ngspice/plot.h" extern struct plot constantplot; diff --git a/src/frontend/plotting/pvec.c b/src/frontend/plotting/pvec.c index 4ef150fb7..3ac6fb302 100644 --- a/src/frontend/plotting/pvec.c +++ b/src/frontend/plotting/pvec.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/dvec.h" +#include "ngspice/plot.h" +#include "ngspice/fteext.h" #include "pvec.h" #include "dimens.h" diff --git a/src/frontend/plotting/pvec.h b/src/frontend/plotting/pvec.h index 4fcc0a808..0e2f30c58 100644 --- a/src/frontend/plotting/pvec.h +++ b/src/frontend/plotting/pvec.h @@ -1,7 +1,7 @@ #ifndef _PVEC_H #define _PVEC_H -#include +#include "ngspice/dvec.h" void pvec(struct dvec *d); diff --git a/src/frontend/plotting/x11.c b/src/frontend/plotting/x11.c index 42ab69ec5..9a2566d3b 100644 --- a/src/frontend/plotting/x11.c +++ b/src/frontend/plotting/x11.c @@ -8,7 +8,7 @@ $Id$ X11 drivers. */ -#include +#include "ngspice/ngspice.h" #ifndef X_DISPLAY_MISSING @@ -16,12 +16,12 @@ $Id$ # include /* PN */ # include /* PN */ -# include -# include -# include -# include -# include -# include +# include "ngspice/graph.h" +# include "ngspice/ftedbgra.h" +# include "ngspice/ftedev.h" +# include "ngspice/fteinput.h" +# include "ngspice/cpdefs.h" +# include "ngspice/ftedefs.h" # include # include "../com_hardcopy.h" diff --git a/src/frontend/plotting/xgraph.c b/src/frontend/plotting/xgraph.c index fa2e4df66..98c1dcb7a 100644 --- a/src/frontend/plotting/xgraph.c +++ b/src/frontend/plotting/xgraph.c @@ -7,11 +7,11 @@ Author: 1992 David A. Gates, U. C. Berkeley CAD Group * Xgraph-11 plots. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/fteparse.h" #include "xgraph.h" diff --git a/src/frontend/points.c b/src/frontend/points.c index ae6f2cb4e..adf738168 100644 --- a/src/frontend/points.c +++ b/src/frontend/points.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/graph.h" +#include "ngspice/ftedbgra.h" #include "points.h" diff --git a/src/frontend/postcoms.c b/src/frontend/postcoms.c index f57a30e69..5fbb61fc0 100644 --- a/src/frontend/postcoms.c +++ b/src/frontend/postcoms.c @@ -7,14 +7,14 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * Various post-processor commands having to do with vectors. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/sim.h" +#include "ngspice/plot.h" +#include "ngspice/graph.h" +#include "ngspice/ftedbgra.h" #include "com_display.h" #include "completion.h" diff --git a/src/frontend/postsc.c b/src/frontend/postsc.c index 74d964927..314bc7e87 100644 --- a/src/frontend/postsc.c +++ b/src/frontend/postsc.c @@ -8,13 +8,13 @@ $Id$ Postscript driver */ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/graph.h" +#include "ngspice/ftedbgra.h" +#include "ngspice/ftedev.h" +#include "ngspice/fteinput.h" +#include "ngspice/fteext.h" #include "postsc.h" #include "variable.h" diff --git a/src/frontend/quote.c b/src/frontend/quote.c index 0cac38651..25433806f 100644 --- a/src/frontend/quote.c +++ b/src/frontend/quote.c @@ -10,8 +10,8 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * your IBM machine and buy a vax. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include "quote.h" diff --git a/src/frontend/rawfile.c b/src/frontend/rawfile.c index 74603a8e3..537baa9b5 100644 --- a/src/frontend/rawfile.c +++ b/src/frontend/rawfile.c @@ -8,11 +8,11 @@ $Id$ * Read and write the ascii and binary rawfile formats. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" #include "dimens.h" -#include +#include "ngspice/dvec.h" #include "rawfile.h" #include "variable.h" diff --git a/src/frontend/resource.c b/src/frontend/resource.c index f79c94d09..65f783b2e 100644 --- a/src/frontend/resource.c +++ b/src/frontend/resource.c @@ -14,15 +14,15 @@ $Id$ */ #include "config.h" -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" #include "circuits.h" #include "quote.h" #include "resource.h" #include "variable.h" -#include +#include "ngspice/cktdefs.h" #include @@ -30,7 +30,7 @@ $Id$ #ifdef XSPICE /* gtri - add - 12/12/90 - wbk - include ipc stuff */ -#include +#include "ngspice/ipctiein.h" /* gtri - end - 12/12/90 */ #endif diff --git a/src/frontend/runcoms.c b/src/frontend/runcoms.c index f3afb1a62..b64611f32 100644 --- a/src/frontend/runcoms.c +++ b/src/frontend/runcoms.c @@ -9,12 +9,12 @@ $Id$ * Circuit simulation commands. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/ftedev.h" +#include "ngspice/ftedebug.h" +#include "ngspice/dvec.h" #include "circuits.h" #include "completion.h" @@ -25,7 +25,7 @@ $Id$ #ifdef XSPICE /* gtri - add - 12/12/90 - wbk - include ipc stuff */ -#include +#include "ngspice/ipctiein.h" /* gtri - end - 12/12/90 */ #endif diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c index 8c7762c8b..a28fd8c1e 100644 --- a/src/frontend/runcoms2.c +++ b/src/frontend/runcoms2.c @@ -8,12 +8,12 @@ $Id$ * Circuit simulation commands. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/ftedev.h" +#include "ngspice/ftedebug.h" +#include "ngspice/dvec.h" #include "circuits.h" #include "runcoms2.h" @@ -23,7 +23,7 @@ $Id$ #include "plotting/graf.h" #include "spiceif.h" -#include +#include "ngspice/inpdefs.h" #define RAWBUF_SIZE 32768 extern char rawfileBuf[RAWBUF_SIZE]; diff --git a/src/frontend/shyu.c b/src/frontend/shyu.c index bb44e7579..723b41d79 100644 --- a/src/frontend/shyu.c +++ b/src/frontend/shyu.c @@ -10,15 +10,15 @@ Copyright 1990 Regents of the University of California. All rights reserved. * e.g. "tran 1 10 20 uic" */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/fteinp.h" +#include "ngspice/sim.h" +#include "ngspice/devdefs.h" +#include "ngspice/inpdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/ifsim.h" #include "circuits.h" #include "shyu.h" diff --git a/src/frontend/signal_handler.c b/src/frontend/signal_handler.c index 2039922e6..8a21fe85b 100644 --- a/src/frontend/signal_handler.c +++ b/src/frontend/signal_handler.c @@ -7,12 +7,12 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * The signal routines for spice 3 and nutmeg. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/ftedev.h" #include #include #include "signal_handler.h" diff --git a/src/frontend/spec.c b/src/frontend/spec.c index 534c3ab9c..2a52468b3 100644 --- a/src/frontend/spec.c +++ b/src/frontend/spec.c @@ -8,15 +8,15 @@ $Id$ * Code to do fourier transforms on data. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/sim.h" #include "spec.h" #include "parse.h" #include "variable.h" -#include +#include "ngspice/missing_math.h" #include "../misc/misc_time.h" void diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c index 048bf6d4d..09a807599 100644 --- a/src/frontend/spiceif.c +++ b/src/frontend/spiceif.c @@ -46,15 +46,15 @@ they should be fairly 'safe'. However, ... CDHW*/ -#include -#include -#include -#include /* Is really needed ? */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/cpdefs.h" +#include "ngspice/tskdefs.h" /* Is really needed ? */ +#include "ngspice/ftedefs.h" +#include "ngspice/fteinp.h" +#include "ngspice/inpdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/ifsim.h" #include "circuits.h" #include "spiceif.h" @@ -64,12 +64,12 @@ CDHW*/ #ifdef XSPICE /* gtri - add - wbk - 11/9/90 - include MIF function prototypes */ -#include +#include "ngspice/mifproto.h" /* gtri - end - wbk - 11/9/90 */ /* gtri - evt - wbk - 5/20/91 - Add stuff for user-defined nodes */ -#include -#include +#include "ngspice/evtproto.h" +#include "ngspice/evtudn.h" /* gtri - end - wbk - 5/20/91 - Add stuff for user-defined nodes */ #endif @@ -1310,8 +1310,8 @@ if_getstat(CKTcircuit *ckt, char *name) { #ifdef EXPERIMENTAL_CODE -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/trandefs.h" /* arg0: circuit file, arg1: data file */ void com_loadsnap(wordlist *wl) diff --git a/src/frontend/streams.c b/src/frontend/streams.c index 8924cee2f..2a1bf6d2f 100644 --- a/src/frontend/streams.c +++ b/src/frontend/streams.c @@ -4,14 +4,14 @@ ************/ #include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/wordlist.h" +#include "ngspice/bool.h" #include "variable.h" #include "terminal.h" #include "quote.h" -#include +#include "ngspice/cpextern.h" #include "streams.h" bool cp_debug = FALSE; diff --git a/src/frontend/streams.h b/src/frontend/streams.h index 3bc4473e6..73e1c1777 100644 --- a/src/frontend/streams.h +++ b/src/frontend/streams.h @@ -6,8 +6,8 @@ #ifndef STREAMS_H #define STREAMS_H -#include -#include +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" void fixdescriptors(void); diff --git a/src/frontend/subckt.c b/src/frontend/subckt.c index c1f7e94f9..33d7a2863 100644 --- a/src/frontend/subckt.c +++ b/src/frontend/subckt.c @@ -56,16 +56,16 @@ $Id$ * so we have to keep track of model names. *======================================================================*/ /*#define TRACE*/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/fteinp.h" #include #ifdef XSPICE /* gtri - add - wbk - 11/9/90 - include MIF function prototypes */ -#include +#include "ngspice/mifproto.h" /* gtri - end - wbk - 11/9/90 */ #endif diff --git a/src/frontend/terminal.c b/src/frontend/terminal.c index 26ea075c2..3a1cd3006 100644 --- a/src/frontend/terminal.c +++ b/src/frontend/terminal.c @@ -9,7 +9,7 @@ $Id$ * dependencies in here, and it isn't clear that versions of this stuff * can be written for every possible machine... */ -#include +#include "ngspice/ngspice.h" #include "config.h" #include @@ -47,7 +47,7 @@ extern int vasprintf(char **out, const char *fmt, va_list ap); #include #endif -#include +#include "ngspice/cpdefs.h" #include "variable.h" #include "terminal.h" diff --git a/src/frontend/trannoise/1-f-code.c b/src/frontend/trannoise/1-f-code.c index e087bf27a..d6544088c 100644 --- a/src/frontend/trannoise/1-f-code.c +++ b/src/frontend/trannoise/1-f-code.c @@ -12,13 +12,13 @@ #include #include #include // var. argumente -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpextern.h" +#include "ngspice/cktdefs.h" +#include "ngspice/1-f-code.h" -#include -#include +#include "ngspice/fftext.h" +#include "ngspice/wallace.h" void f_alpha(int n_pts, int n_exp, double X[], double Q_d, diff --git a/src/frontend/trannoise/1-f-code_d.c b/src/frontend/trannoise/1-f-code_d.c index 0eb49f688..70451761e 100644 --- a/src/frontend/trannoise/1-f-code_d.c +++ b/src/frontend/trannoise/1-f-code_d.c @@ -11,11 +11,11 @@ #include #include #include // var. argumente -#include -#include +#include "ngspice/1-f-code.h" +#include "ngspice/ngspice.h" -#include -#include +#include "ngspice/fftext.h" +#include "ngspice/wallace.h" void f_alpha(int n_pts, int n_exp, double X[], double Q_d, diff --git a/src/frontend/trannoise/FastNorm3.c b/src/frontend/trannoise/FastNorm3.c index 2d6cb492c..2fb0201ff 100644 --- a/src/frontend/trannoise/FastNorm3.c +++ b/src/frontend/trannoise/FastNorm3.c @@ -61,9 +61,9 @@ Normal (a very fast routine) /* ----------------- inclusions and some definitions ------------ */ #include #ifndef NOSPICE -#include +#include "ngspice/ngspice.h" #endif -#include +#include "ngspice/FastNorm3.h" /* --------------- (Uniform) c7rand, irandm, urandm ---------- */ @@ -828,7 +828,7 @@ Sf fastnorm (void) /* --------------------- (test) main ------------------------- */ #ifdef Main -#include +#include "ngspice/FastNorm3.h" int main() { Sf x; Sw i; diff --git a/src/frontend/trannoise/wallace.c b/src/frontend/trannoise/wallace.c index a598c5eef..6d5c74b27 100644 --- a/src/frontend/trannoise/wallace.c +++ b/src/frontend/trannoise/wallace.c @@ -14,14 +14,14 @@ #include #endif #include -#include -#include +#include "ngspice/wallace.h" +#include "ngspice/FastNorm3.h" #ifdef HasMain #include #else #ifndef NOSPICE -#include +#include "ngspice/ngspice.h" #endif #endif @@ -478,7 +478,7 @@ float NewWa_not(void) /* --------------------- (test) main ------------------------- */ /* gcc -Wall -g -DHasMain -I../../include wallace.c CombTaus.o -o watest.exe */ #ifdef HasMain -#include +#include "ngspice/wallace.h" struct timeb timenow; struct timeb timebegin; diff --git a/src/frontend/typesdef.c b/src/frontend/typesdef.c index 1b7d482fd..5f06a510e 100644 --- a/src/frontend/typesdef.c +++ b/src/frontend/typesdef.c @@ -7,10 +7,10 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group * Stuff to deal with nutmeg "types" for vectors and plots. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" #include "typesdef.h" diff --git a/src/frontend/variable.c b/src/frontend/variable.c index 34fa32d7b..a665fdc08 100644 --- a/src/frontend/variable.c +++ b/src/frontend/variable.c @@ -7,20 +7,20 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" +#include "ngspice/defines.h" +#include "ngspice/macros.h" +#include "ngspice/cpdefs.h" +#include "ngspice/memory.h" +#include "ngspice/inpdefs.h" +#include "ngspice/fteext.h" #include "circuits.h" #include "com_history.h" #include "quote.h" -#include +#include "ngspice/cpextern.h" #include "variable.h" diff --git a/src/frontend/variable.h b/src/frontend/variable.h index 811eaf4d8..5f919120b 100644 --- a/src/frontend/variable.h +++ b/src/frontend/variable.h @@ -6,7 +6,7 @@ #ifndef _VARIABLE_H #define _VARIABLE_H -#include +#include "ngspice/cpextern.h" /* Variables that are accessible to the parser via $varname * expansions. If the type is CP_LIST the value is a pointer to a diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c index 2cb59da22..8a1da9c37 100644 --- a/src/frontend/vectors.c +++ b/src/frontend/vectors.c @@ -8,11 +8,11 @@ $Id$ * Routines for dealing with the vector database. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/sim.h" #include "circuits.h" #include "completion.h" diff --git a/src/frontend/wdisp/windisp.c b/src/frontend/wdisp/windisp.c index 05e8db5e8..d815e832a 100644 --- a/src/frontend/wdisp/windisp.c +++ b/src/frontend/wdisp/windisp.c @@ -7,14 +7,14 @@ */ #define STRICT -#include +#include "ngspice/ngspice.h" #ifdef HAS_WINDOWS -#include -#include -#include -#include +#include "ngspice/graph.h" +#include "ngspice/ftedev.h" +#include "ngspice/ftedbgra.h" +#include "ngspice/fteext.h" #include "../plotting/graf.h" #include "../plotting/graphdb.h" #include "windisp.h" @@ -30,7 +30,7 @@ #include #include -#include +#include "ngspice/suffix.h" /* Typen */ typedef struct { /* Extra window data */ diff --git a/src/frontend/wdisp/winprint.c b/src/frontend/wdisp/winprint.c index 46d463d0d..102fa73cb 100644 --- a/src/frontend/wdisp/winprint.c +++ b/src/frontend/wdisp/winprint.c @@ -5,14 +5,14 @@ */ #define STRICT -#include +#include "ngspice/ngspice.h" #ifdef HAS_WINDOWS -#include -#include -#include -#include +#include "ngspice/graph.h" +#include "ngspice/ftedev.h" +#include "ngspice/ftedbgra.h" +#include "ngspice/fteext.h" /* * The ngspice.h file included above defines BOOLEAN (via bool.h) and this @@ -26,7 +26,7 @@ #include #include -#include +#include "ngspice/suffix.h" #ifdef _MSC_VER #pragma hdrstop #endif /* _MSC_VER */ diff --git a/src/frontend/where.c b/src/frontend/where.c index 093b6611c..0b4b1e1b8 100644 --- a/src/frontend/where.c +++ b/src/frontend/where.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" #include "ftehelp.h" -#include +#include "ngspice/hlpdefs.h" #include "circuits.h" #include "where.h" diff --git a/src/include/ngspice/acdefs.h b/src/include/ngspice/acdefs.h index 7e6439c5f..3807a2681 100644 --- a/src/include/ngspice/acdefs.h +++ b/src/include/ngspice/acdefs.h @@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles #ifndef ACDEFS #define ACDEFS -#include +#include "ngspice/jobdefs.h" /* structure used to describe an AC analysis to be performed */ diff --git a/src/include/ngspice/carddefs.h b/src/include/ngspice/carddefs.h index 103ac6904..605361f71 100644 --- a/src/include/ngspice/carddefs.h +++ b/src/include/ngspice/carddefs.h @@ -11,17 +11,17 @@ Authors : 1991 David Gates #define CARDDEFS_H /* Data Structures and Definitions for Device Simulation Cards */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/bdrydefs.h" +#include "ngspice/contdefs.h" +#include "ngspice/domndefs.h" +#include "ngspice/dopdefs.h" +#include "ngspice/elctdefs.h" +#include "ngspice/meshdefs.h" +#include "ngspice/methdefs.h" +#include "ngspice/matldefs.h" +#include "ngspice/mobdefs.h" +#include "ngspice/modldefs.h" +#include "ngspice/optndefs.h" +#include "ngspice/outpdefs.h" #endif /* CARDDEFS_H */ diff --git a/src/include/ngspice/cidersupt.h b/src/include/ngspice/cidersupt.h index 8fc2c0354..8c4ff265f 100644 --- a/src/include/ngspice/cidersupt.h +++ b/src/include/ngspice/cidersupt.h @@ -8,10 +8,10 @@ #ifndef _CIDERSUPT_H #define _CIDERSUPT_H -#include -#include -#include -#include +#include "ngspice/numglobs.h" +#include "ngspice/material.h" +#include "ngspice/gendev.h" +#include "ngspice/profile.h" /* externals for database.c */ extern struct plot* DBread( char *); diff --git a/src/include/ngspice/cktdefs.h b/src/include/ngspice/cktdefs.h index 9bcdc670c..1a6cae197 100644 --- a/src/include/ngspice/cktdefs.h +++ b/src/include/ngspice/cktdefs.h @@ -7,13 +7,13 @@ #ifndef CKT #define CKT "CKTdefs.h $Revision$ on $Date$ " -#include +#include "ngspice/typedefs.h" /* gtri - evt - wbk - 5/20/91 - add event-driven and enhancements data */ #ifdef XSPICE -#include -#include +#include "ngspice/evt.h" +#include "ngspice/enh.h" #endif /* gtri - evt - wbk - 5/20/91 - add event-driven and enhancements data */ @@ -22,15 +22,15 @@ #define MAXNUMDEVNODES 4 /* Max No. of nodes per device */ /* Need to change for SOI devs ? */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/smpdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/acdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/trcvdefs.h" +#include "ngspice/optdefs.h" +#include "ngspice/sen2defs.h" +#include "ngspice/pzdefs.h" +#include "ngspice/noisedef.h" diff --git a/src/include/ngspice/cluster.h b/src/include/ngspice/cluster.h index edcb4d093..8a3c719b0 100644 --- a/src/include/ngspice/cluster.h +++ b/src/include/ngspice/cluster.h @@ -1,6 +1,6 @@ #ifndef _CLUSTER_H_ #define _CLUSTER_H_ -#include +#include "ngspice/cktdefs.h" /* Cluster definitions */ #define PORT 1234 diff --git a/src/include/ngspice/cm.h b/src/include/ngspice/cm.h index b2bbbb79e..b8406ad10 100755 --- a/src/include/ngspice/cm.h +++ b/src/include/ngspice/cm.h @@ -41,11 +41,11 @@ NON-STANDARD FEATURES =========================================================================== */ -#include -#include /* K.A. wrong name */ +#include "ngspice/cmtypes.h" +#include "ngspice/cmconstants.h" /* K.A. wrong name */ /*#include "Cmconsta.h" */ -#include -#include +#include "ngspice/cmproto.h" +#include "ngspice/mifcmdat.h" #endif /* CM_DEFINED */ diff --git a/src/include/ngspice/cmconstants.h b/src/include/ngspice/cmconstants.h index 1e86cb01f..ebac0605c 100644 --- a/src/include/ngspice/cmconstants.h +++ b/src/include/ngspice/cmconstants.h @@ -39,7 +39,7 @@ NON-STANDARD FEATURES =========================================================================== */ -#include +#include "ngspice/miftypes.h" /***** Define Constants *******************************************/ diff --git a/src/include/ngspice/cmproto.h b/src/include/ngspice/cmproto.h index 303fb3d74..6d9db0edb 100644 --- a/src/include/ngspice/cmproto.h +++ b/src/include/ngspice/cmproto.h @@ -46,7 +46,7 @@ NON-STANDARD FEATURES #include -#include +#include "ngspice/cmtypes.h" void cm_climit_fcn(double in, double in_offset, double cntl_upper, diff --git a/src/include/ngspice/cmtypes.h b/src/include/ngspice/cmtypes.h index cf1ddf7a0..536bf6909 100644 --- a/src/include/ngspice/cmtypes.h +++ b/src/include/ngspice/cmtypes.h @@ -39,7 +39,7 @@ NON-STANDARD FEATURES =========================================================================== */ -#include +#include "ngspice/miftypes.h" /***** Define Typedefs ********************************************/ diff --git a/src/include/ngspice/cpdefs.h b/src/include/ngspice/cpdefs.h index 0dd7ad67b..42155b3f8 100644 --- a/src/include/ngspice/cpdefs.h +++ b/src/include/ngspice/cpdefs.h @@ -11,7 +11,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #ifndef CPDEFS #define CPDEFS -#include +#include "ngspice/cpstd.h" #define MAXWORDS 512 @@ -94,6 +94,6 @@ struct alias { /* Get all the extern definitions... */ -#include +#include "ngspice/cpextern.h" #endif /*CPDEFS*/ diff --git a/src/include/ngspice/cpextern.h b/src/include/ngspice/cpextern.h index 9fdbdece6..ba609494d 100644 --- a/src/include/ngspice/cpextern.h +++ b/src/include/ngspice/cpextern.h @@ -11,8 +11,8 @@ Modified: 2000 AlansFixes #ifndef CPEXTERN_H #define CPEXTERN_H -#include -#include +#include "ngspice/wordlist.h" +#include "ngspice/bool.h" /* com_alias.c */ diff --git a/src/include/ngspice/cpstd.h b/src/include/ngspice/cpstd.h index 9bd18f516..1ca3095d8 100644 --- a/src/include/ngspice/cpstd.h +++ b/src/include/ngspice/cpstd.h @@ -22,9 +22,9 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group #warning "Please use bool.h, wordlist.h or complex.h rather than cpstd.h" #endif -#include -#include -#include +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" +#include "ngspice/complex.h" /* Externs defined in std.c */ diff --git a/src/include/ngspice/devdefs.h b/src/include/ngspice/devdefs.h index dc3168e30..fb5ba6771 100644 --- a/src/include/ngspice/devdefs.h +++ b/src/include/ngspice/devdefs.h @@ -6,12 +6,12 @@ Author: 1985 Thomas L. Quarles #ifndef DEV #define DEV -#include -#include -#include -#include -#include -#include +#include "ngspice/optdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/noisedef.h" +#include "ngspice/complex.h" double DEVlimvds(double,double); double DEVpnjlim(double,double,double,double,int*); diff --git a/src/include/ngspice/distodef.h b/src/include/ngspice/distodef.h index 8f5ad68b8..bed82aacc 100644 --- a/src/include/ngspice/distodef.h +++ b/src/include/ngspice/distodef.h @@ -12,9 +12,9 @@ Modified: 2000 AlansFixes #define D_DBG_SMALLTIMES #endif -#include -#include -#include +#include "ngspice/jobdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" /* structure for passing a large number of values */ typedef struct { diff --git a/src/include/ngspice/dllitf.h b/src/include/ngspice/dllitf.h index 39b95e231..9ba3fd205 100755 --- a/src/include/ngspice/dllitf.h +++ b/src/include/ngspice/dllitf.h @@ -7,8 +7,8 @@ #ifndef __DLLITF_H #define __DLLITF_H -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/cmproto.h" /* This structure contains pointers to core SPICE OPUS functions used in CMs and UDNs. diff --git a/src/include/ngspice/dvec.h b/src/include/ngspice/dvec.h index b64980ac4..02c971a6c 100644 --- a/src/include/ngspice/dvec.h +++ b/src/include/ngspice/dvec.h @@ -1,8 +1,8 @@ #ifndef _DVEC_H #define _DVEC_H -#include -#include +#include "ngspice/complex.h" +#include "ngspice/grid.h" /* Dvec flags. */ diff --git a/src/include/ngspice/enh.h b/src/include/ngspice/enh.h index 731839609..c6abc279d 100644 --- a/src/include/ngspice/enh.h +++ b/src/include/ngspice/enh.h @@ -40,8 +40,8 @@ NON-STANDARD FEATURES =========================================================================== */ -#include -#include +#include "ngspice/miftypes.h" +#include "ngspice/fteinp.h" /* The following data is used in implementing various enhancements made to the diff --git a/src/include/ngspice/evt.h b/src/include/ngspice/evt.h index a7c649b44..08040a614 100644 --- a/src/include/ngspice/evt.h +++ b/src/include/ngspice/evt.h @@ -43,9 +43,9 @@ NON-STANDARD FEATURES =========================================================================== */ -#include -#include -#include +#include "ngspice/mifdefs.h" +#include "ngspice/mifcmdat.h" +#include "ngspice/miftypes.h" diff --git a/src/include/ngspice/evtproto.h b/src/include/ngspice/evtproto.h index fb233d7cf..0b15a21db 100644 --- a/src/include/ngspice/evtproto.h +++ b/src/include/ngspice/evtproto.h @@ -40,10 +40,10 @@ NON-STANDARD FEATURES =========================================================================== */ -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/cpstd.h" +#include "ngspice/mifdefs.h" +#include "ngspice/ipc.h" /* ******************* */ diff --git a/src/include/ngspice/evtudn.h b/src/include/ngspice/evtudn.h index fb561974e..f440b79f0 100644 --- a/src/include/ngspice/evtudn.h +++ b/src/include/ngspice/evtudn.h @@ -60,7 +60,7 @@ NON-STANDARD FEATURES =========================================================================== */ -#include /* for Mif_Boolean_t used in udn_..._compare */ +#include "ngspice/miftypes.h" /* for Mif_Boolean_t used in udn_..._compare */ #define MALLOCED_PTR (*evt_struct_ptr) #define STRUCT_PTR evt_struct_ptr diff --git a/src/include/ngspice/ftedefs.h b/src/include/ngspice/ftedefs.h index fbf9997c7..15de882c6 100644 --- a/src/include/ngspice/ftedefs.h +++ b/src/include/ngspice/ftedefs.h @@ -13,9 +13,9 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #define DEF_WIDTH 80 /* Line printer width. */ #define DEF_HEIGHT 60 /* Line printer height. */ #define IPOINTMIN 20 /* When we start plotting incremental plots. */ -#include -#include -#include +#include "ngspice/fteparse.h" +#include "ngspice/fteinp.h" +#include "ngspice/fteoptdefs.h" struct save_info { char *name; @@ -56,6 +56,6 @@ struct circ { #define mylog10(xx) (((xx) > 0.0) ? log10(xx) : (- log10(HUGE))) -#include +#include "ngspice/fteext.h" #endif /* FTEdefs_h */ diff --git a/src/include/ngspice/fteext.h b/src/include/ngspice/fteext.h index f02b647ea..b66939b73 100644 --- a/src/include/ngspice/fteext.h +++ b/src/include/ngspice/fteext.h @@ -14,13 +14,13 @@ Modified: 1999 Paolo Nenzi - 2000 AlansFixes #include /* needed to find out what the interface structures look like */ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/typedefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/dvec.h" +#include "ngspice/plot.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/fteinp.h" /* aspice.c */ diff --git a/src/include/ngspice/fteinp.h b/src/include/ngspice/fteinp.h index 4caef768b..ee21abc51 100644 --- a/src/include/ngspice/fteinp.h +++ b/src/include/ngspice/fteinp.h @@ -11,7 +11,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #ifndef FTEinput_h #define FTEinput_h -#include +#include "ngspice/inpdefs.h" /* This struct defines a linked list of lines from a SPICE file. */ struct line { diff --git a/src/include/ngspice/fteinput.h b/src/include/ngspice/fteinput.h index 3e3718399..688c0015e 100644 --- a/src/include/ngspice/fteinput.h +++ b/src/include/ngspice/fteinput.h @@ -20,7 +20,7 @@ Author: 1988 Jeffrey M. Hsu #include -#include +#include "ngspice/graph.h" typedef enum { error_option, /* a reply option only */ diff --git a/src/include/ngspice/fteparse.h b/src/include/ngspice/fteparse.h index 8e53afd8e..2cd1d45cc 100644 --- a/src/include/ngspice/fteparse.h +++ b/src/include/ngspice/fteparse.h @@ -12,15 +12,15 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #define FTEPARSE -#include -#include -#include +#include "ngspice/cpstd.h" +#include "ngspice/dvec.h" +#include "ngspice/plot.h" /* FIXME: Split this file and adjust all callers. */ #if 0 #warning "Please use a more specific header than fteparse.h" #endif -#include +#include "ngspice/pnode.h" /* Operations. These should really be considered functions. */ diff --git a/src/include/ngspice/gendefs.h b/src/include/ngspice/gendefs.h index c600452c8..d28ba2467 100644 --- a/src/include/ngspice/gendefs.h +++ b/src/include/ngspice/gendefs.h @@ -6,8 +6,8 @@ Author: 1985 Thomas L. Quarles #ifndef GEN #define GEN -#include -#include +#include "ngspice/typedefs.h" +#include "ngspice/ifsim.h" diff --git a/src/include/ngspice/gendev.h b/src/include/ngspice/gendev.h index 0f5273ffd..8b43f431a 100644 --- a/src/include/ngspice/gendev.h +++ b/src/include/ngspice/gendev.h @@ -10,7 +10,7 @@ Authors: 1992 David Gates #ifndef GENDEV_H #define GENDEV_H -#include +#include "ngspice/numenum.h" typedef struct sStatInfo { diff --git a/src/include/ngspice/graph.h b/src/include/ngspice/graph.h index 829c3a47f..7200ac58f 100644 --- a/src/include/ngspice/graph.h +++ b/src/include/ngspice/graph.h @@ -10,10 +10,10 @@ Author: 1988 Jeffrey M. Hsu #ifndef _GRAPH_H #define _GRAPH_H -#include -#include -#include -#include /* for struct dvec */ +#include "ngspice/typedefs.h" +#include "ngspice/grid.h" +#include "ngspice/plot.h" +#include "ngspice/dvec.h" /* for struct dvec */ struct _keyed; diff --git a/src/include/ngspice/hash.h b/src/include/ngspice/hash.h index 42fbfa13e..67fb6c0bd 100644 --- a/src/include/ngspice/hash.h +++ b/src/include/ngspice/hash.h @@ -9,7 +9,7 @@ REVISIONS: Aug 21, 2009 - adapted for ngspice #ifndef NGHASH_H #define NGHASH_H -#include +#include "ngspice/bool.h" #include #define _NGMALLOC(size_xz) tmalloc((size_xz)) diff --git a/src/include/ngspice/ifsim.h b/src/include/ngspice/ifsim.h index 3fdd6ef47..dd2d02b19 100644 --- a/src/include/ngspice/ifsim.h +++ b/src/include/ngspice/ifsim.h @@ -6,13 +6,13 @@ Author: 1986 Thomas L. Quarles #ifndef IFSIMULATOR #define IFSIMULATOR -#include +#include "ngspice/typedefs.h" /* gtri - add - wbk - 10/11/90 - for structs referenced in IFdevice */ #ifdef XSPICE -#include -#include +#include "ngspice/mifparse.h" +#include "ngspice/mifcmdat.h" #endif /* gtri - end - wbk - 10/11/90 */ diff --git a/src/include/ngspice/inpdefs.h b/src/include/ngspice/inpdefs.h index 6b8e6cb8a..6e294644e 100644 --- a/src/include/ngspice/inpdefs.h +++ b/src/include/ngspice/inpdefs.h @@ -9,9 +9,9 @@ Modified: 2000 AlansFixes /* structure declarations used by either/both input package */ -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/inpptree.h" typedef struct INPtables INPtables; typedef struct card card; diff --git a/src/include/ngspice/inpptree.h b/src/include/ngspice/inpptree.h index 2d2dba950..812916569 100644 --- a/src/include/ngspice/inpptree.h +++ b/src/include/ngspice/inpptree.h @@ -10,7 +10,7 @@ Author: 1987 Wayne A. Christopher, U. C. Berkeley CAD Group * The first four are the elements of IFparseTree, defined in IFsim.h. */ -#include +#include "ngspice/ifsim.h" #ifndef INP_PARSE #define INP_PARSE diff --git a/src/include/ngspice/ipctiein.h b/src/include/ngspice/ipctiein.h index 9bb921fae..abffee051 100644 --- a/src/include/ngspice/ipctiein.h +++ b/src/include/ngspice/ipctiein.h @@ -41,8 +41,8 @@ NON-STANDARD FEATURES #define IPC_TIEIN_DEFINED -#include -#include +#include "ngspice/ipc.h" +#include "ngspice/ipcproto.h" #define IPC_STDOUT_FILE_NAME "/usr/tmp/atesse_xspice.out" diff --git a/src/include/ngspice/jobdefs.h b/src/include/ngspice/jobdefs.h index f0bf314d5..32d55968d 100644 --- a/src/include/ngspice/jobdefs.h +++ b/src/include/ngspice/jobdefs.h @@ -7,8 +7,8 @@ Author: 1985 Thomas L. Quarles #define JOBdef -#include -#include +#include "ngspice/typedefs.h" +#include "ngspice/ifsim.h" struct JOB { int JOBtype; /* type of job */ diff --git a/src/include/ngspice/material.h b/src/include/ngspice/material.h index a94318a45..d079da37e 100644 --- a/src/include/ngspice/material.h +++ b/src/include/ngspice/material.h @@ -11,7 +11,7 @@ Authors : 1991 David Gates #define MATERIAL_H #ifndef NUM_CARRIERS -#include +#include "ngspice/numenum.h" #endif /* Information needed by the various physical models */ diff --git a/src/include/ngspice/meshext.h b/src/include/ngspice/meshext.h index c8f594074..a5d679e91 100644 --- a/src/include/ngspice/meshext.h +++ b/src/include/ngspice/meshext.h @@ -13,8 +13,8 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group #ifndef MESHEXT_H #define MESHEXT_H -#include -#include +#include "ngspice/meshdefs.h" +#include "ngspice/gendev.h" extern double *MESHmkArray( MESHcoord *, int ); diff --git a/src/include/ngspice/mif.h b/src/include/ngspice/mif.h index 6b8fb14e5..3d30b795b 100644 --- a/src/include/ngspice/mif.h +++ b/src/include/ngspice/mif.h @@ -41,9 +41,9 @@ NON-STANDARD FEATURES =========================================================================== */ -#include -#include -#include +#include "ngspice/miftypes.h" +#include "ngspice/mifdefs.h" +#include "ngspice/cktdefs.h" typedef struct { diff --git a/src/include/ngspice/mifcmdat.h b/src/include/ngspice/mifcmdat.h index f2a130e3c..174bc1773 100644 --- a/src/include/ngspice/mifcmdat.h +++ b/src/include/ngspice/mifcmdat.h @@ -45,8 +45,8 @@ NON-STANDARD FEATURES =========================================================================== */ -#include -#include +#include "ngspice/typedefs.h" +#include "ngspice/miftypes.h" /* ************************************************************************** */ diff --git a/src/include/ngspice/mifdefs.h b/src/include/ngspice/mifdefs.h index 8ca6ddd46..5cf401a60 100644 --- a/src/include/ngspice/mifdefs.h +++ b/src/include/ngspice/mifdefs.h @@ -43,8 +43,8 @@ NON-STANDARD FEATURES =========================================================================== */ -#include -#include +#include "ngspice/mifcmdat.h" +#include "ngspice/ifsim.h" /* The per-instance data structure */ diff --git a/src/include/ngspice/mifparse.h b/src/include/ngspice/mifparse.h index e0a4c9fb3..3bdb40eff 100644 --- a/src/include/ngspice/mifparse.h +++ b/src/include/ngspice/mifparse.h @@ -44,7 +44,7 @@ NON-STANDARD FEATURES =========================================================================== */ -#include +#include "ngspice/miftypes.h" /* diff --git a/src/include/ngspice/mifproto.h b/src/include/ngspice/mifproto.h index f40aab5a5..019709857 100644 --- a/src/include/ngspice/mifproto.h +++ b/src/include/ngspice/mifproto.h @@ -42,11 +42,11 @@ NON-STANDARD FEATURES -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/miftypes.h" diff --git a/src/include/ngspice/ngspice.h b/src/include/ngspice/ngspice.h index ba2e3f13e..e4f2cbe40 100644 --- a/src/include/ngspice/ngspice.h +++ b/src/include/ngspice/ngspice.h @@ -27,12 +27,12 @@ # include #endif -#include -#include -#include -#include -#include -#include +#include "ngspice/memory.h" +#include "ngspice/defines.h" +#include "ngspice/macros.h" +#include "ngspice/bool.h" +#include "ngspice/complex.h" +#include "ngspice/typedefs.h" #include #include @@ -41,7 +41,7 @@ #include #endif -#include +#include "ngspice/missing_math.h" #ifdef STDC_HEADERS # include @@ -138,7 +138,7 @@ #endif #ifdef HAS_WINDOWS -#include +#include "ngspice/wstdio.h" #endif #if defined (__MINGW32__) || defined (__CYGWIN__) || defined (_MSC_VER) diff --git a/src/include/ngspice/noisedef.h b/src/include/ngspice/noisedef.h index 0f768a7a5..814c00ec2 100644 --- a/src/include/ngspice/noisedef.h +++ b/src/include/ngspice/noisedef.h @@ -6,7 +6,7 @@ Author: 1987 Gary W. Ng #ifndef NOISEDEFS #define NOISEDEFS -#include +#include "ngspice/jobdefs.h" /* structure used to describe an noise analysis */ diff --git a/src/include/ngspice/numcards.h b/src/include/ngspice/numcards.h index 42092192f..4ce2103a5 100644 --- a/src/include/ngspice/numcards.h +++ b/src/include/ngspice/numcards.h @@ -13,7 +13,7 @@ Authors: 1991 David Gates #ifndef NUMCARDS_H #define NUMCARDS_H -#include +#include "ngspice/ifsim.h" /* * Generic header for a linked list of cards diff --git a/src/include/ngspice/numgen.h b/src/include/ngspice/numgen.h index 5f66e05bb..5227c7989 100644 --- a/src/include/ngspice/numgen.h +++ b/src/include/ngspice/numgen.h @@ -13,10 +13,10 @@ Authors: 1991 David Gates #ifndef NUMGEN_H #define NUMGEN_H -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/carddefs.h" typedef struct sGENnumModel { /* model structure for a numerical device */ int GENmodType; /* type index of this device type */ diff --git a/src/include/ngspice/onedev.h b/src/include/ngspice/onedev.h index 662c3f9e1..55ff12968 100644 --- a/src/include/ngspice/onedev.h +++ b/src/include/ngspice/onedev.h @@ -14,8 +14,8 @@ Authors: 1987 Karti Mayaram, 1991 David Gates #ifndef ONEDEV_H #define ONEDEV_H -#include -#include +#include "ngspice/gendev.h" +#include "ngspice/smpdefs.h" typedef struct sONEdevice { diff --git a/src/include/ngspice/onemesh.h b/src/include/ngspice/onemesh.h index 933de39e3..442b77131 100644 --- a/src/include/ngspice/onemesh.h +++ b/src/include/ngspice/onemesh.h @@ -14,7 +14,7 @@ Authors: 1987 Karti Mayaram, 1991 David Gates #ifndef ONEMESH_H #define ONEMESH_H -#include +#include "ngspice/material.h" typedef struct sONEelem { struct sONEelem *pElems[2]; /* array to store neighbor elements */ diff --git a/src/include/ngspice/opdefs.h b/src/include/ngspice/opdefs.h index c486bfa12..3f87e8ff4 100644 --- a/src/include/ngspice/opdefs.h +++ b/src/include/ngspice/opdefs.h @@ -7,9 +7,9 @@ Author: 1985 Thomas L. Quarles #define DCOP -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/jobdefs.h" +#include "ngspice/tskdefs.h" /* * structures used to describe D.C. operationg point analyses to * be performed. diff --git a/src/include/ngspice/plot.h b/src/include/ngspice/plot.h index e248cf0a2..3a40aa55f 100644 --- a/src/include/ngspice/plot.h +++ b/src/include/ngspice/plot.h @@ -1,9 +1,9 @@ #ifndef _PLOT_H #define _PLOT_H -#include -#include -#include +#include "ngspice/wordlist.h" +#include "ngspice/bool.h" +#include "ngspice/dvec.h" /* The information for a particular set of vectors that come from one * plot. */ diff --git a/src/include/ngspice/pssdefs.h b/src/include/ngspice/pssdefs.h index 0c4ee293a..6b5371761 100644 --- a/src/include/ngspice/pssdefs.h +++ b/src/include/ngspice/pssdefs.h @@ -5,8 +5,8 @@ Author: 2010-05 Stefano Perticaroli ``spertica'' #ifndef PSS #define PSS -#include -#include +#include "ngspice/jobdefs.h" +#include "ngspice/tskdefs.h" /* * PSSdefs.h - defs for pss analyses */ diff --git a/src/include/ngspice/pzdefs.h b/src/include/ngspice/pzdefs.h index e0236fe9c..2ebcb6080 100644 --- a/src/include/ngspice/pzdefs.h +++ b/src/include/ngspice/pzdefs.h @@ -3,10 +3,10 @@ /* structure used to describe an PZ analysis to be performed */ -#include +#include "ngspice/jobdefs.h" #include -#include -#include +#include "ngspice/complex.h" +#include "ngspice/typedefs.h" struct PZtrial { SPcomplex s, f_raw, f_def; diff --git a/src/include/ngspice/sen2defs.h b/src/include/ngspice/sen2defs.h index f958cfb09..1b02307ca 100644 --- a/src/include/ngspice/sen2defs.h +++ b/src/include/ngspice/sen2defs.h @@ -9,9 +9,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. #define SENSTRUCTS -#include -#include -#include +#include "ngspice/smpdefs.h" +#include "ngspice/jobdefs.h" +#include "ngspice/typedefs.h" struct SENstruct { int JOBtype; diff --git a/src/include/ngspice/sensdefs.h b/src/include/ngspice/sensdefs.h index 5aa680618..8de2045dc 100644 --- a/src/include/ngspice/sensdefs.h +++ b/src/include/ngspice/sensdefs.h @@ -5,7 +5,7 @@ Copyright 1990 Regents of the University of California. All rights reserved. #ifndef SENS_DEFS #define SENS_DEFS -#include +#include "ngspice/jobdefs.h" /* structure used to describe an Adjoint Sensitivity analysis */ diff --git a/src/include/ngspice/smpdefs.h b/src/include/ngspice/smpdefs.h index 356cd2e91..f95c41897 100644 --- a/src/include/ngspice/smpdefs.h +++ b/src/include/ngspice/smpdefs.h @@ -12,7 +12,7 @@ Modified: 2000 AlansFixes #include #include -#include +#include "ngspice/complex.h" int SMPaddElt( SMPmatrix *, int , int , double ); double * SMPmakeElt( SMPmatrix * , int , int ); diff --git a/src/include/ngspice/sperror.h b/src/include/ngspice/sperror.h index 55bb78b79..15dcd1cab 100644 --- a/src/include/ngspice/sperror.h +++ b/src/include/ngspice/sperror.h @@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles #ifndef _SPERROR_H #define _SPERROR_H -#include +#include "ngspice/iferrmsg.h" /* * definitions for error codes returned by SPICE3 routines. diff --git a/src/include/ngspice/spmatrix.h b/src/include/ngspice/spmatrix.h index adc7a7320..626463ae4 100644 --- a/src/include/ngspice/spmatrix.h +++ b/src/include/ngspice/spmatrix.h @@ -83,7 +83,7 @@ * and warnings. */ -#include /* Spice error definitions. */ +#include "ngspice/sperror.h" /* Spice error definitions. */ /* Begin error macros. */ #define spOKAY OK diff --git a/src/include/ngspice/tclspice.h b/src/include/ngspice/tclspice.h index 2621cf334..472d49009 100644 --- a/src/include/ngspice/tclspice.h +++ b/src/include/ngspice/tclspice.h @@ -11,8 +11,8 @@ extern void blt_lockvec(int index); /* For things to do per loop */ int Tcl_ExecutePerLoop(void); -#include -#include +#include "ngspice/graph.h" +#include "ngspice/ftedev.h" /* For tk ploting */ disp_fn_Init_t sp_Tk_Init; @@ -29,7 +29,7 @@ disp_fn_SetColor_t sp_Tk_SetColor; disp_fn_Update_t sp_Tk_Update; /* The blt callback method */ -#include +#include "ngspice/dvec.h" extern int blt_plot(struct dvec *y,struct dvec *x,int new); #endif diff --git a/src/include/ngspice/tfdefs.h b/src/include/ngspice/tfdefs.h index f2c9227f9..fcac1e403 100644 --- a/src/include/ngspice/tfdefs.h +++ b/src/include/ngspice/tfdefs.h @@ -6,10 +6,10 @@ Author: 1985 Thomas L. Quarles #ifndef TF #define TF -#include -#include -#include -#include +#include "ngspice/typedefs.h" +#include "ngspice/jobdefs.h" +#include "ngspice/tskdefs.h" +#include "ngspice/cktdefs.h" /* TFdefs.h - defs for transfer function analyses */ diff --git a/src/include/ngspice/trandefs.h b/src/include/ngspice/trandefs.h index 43352006b..46158f31c 100644 --- a/src/include/ngspice/trandefs.h +++ b/src/include/ngspice/trandefs.h @@ -8,9 +8,9 @@ Author: 1985 Thomas L. Quarles #define TRAN -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/jobdefs.h" +#include "ngspice/tskdefs.h" /* * TRANdefs.h - defs for transient analyses */ diff --git a/src/include/ngspice/trcvdefs.h b/src/include/ngspice/trcvdefs.h index a1c2e16ea..fe203018d 100644 --- a/src/include/ngspice/trcvdefs.h +++ b/src/include/ngspice/trcvdefs.h @@ -9,9 +9,9 @@ Modified: 1999 Paolo Nenzi #define DCTR -#include -#include -#include +#include "ngspice/jobdefs.h" +#include "ngspice/tskdefs.h" +#include "ngspice/gendefs.h" /* * structures used to describe D.C. transfer curve analyses to * be performed. diff --git a/src/include/ngspice/tskdefs.h b/src/include/ngspice/tskdefs.h index 937ff7538..db2fc5147 100644 --- a/src/include/ngspice/tskdefs.h +++ b/src/include/ngspice/tskdefs.h @@ -9,8 +9,8 @@ Modified: 2000 AlansFixes #define TSK -#include -#include +#include "ngspice/typedefs.h" +#include "ngspice/jobdefs.h" struct TSKtask { JOB taskOptions; /* job structure at the front to hold options */ diff --git a/src/include/ngspice/twodev.h b/src/include/ngspice/twodev.h index 2efe32fb5..37dc1740f 100644 --- a/src/include/ngspice/twodev.h +++ b/src/include/ngspice/twodev.h @@ -14,8 +14,8 @@ Authors: 1987 Karti Mayaram, 1991 David Gates #ifndef TWODEV_H #define TWODEV_H -#include -#include +#include "ngspice/gendev.h" +#include "ngspice/smpdefs.h" typedef struct sTWOdevice { diff --git a/src/include/ngspice/twomesh.h b/src/include/ngspice/twomesh.h index 1d341a258..c7f5e4938 100644 --- a/src/include/ngspice/twomesh.h +++ b/src/include/ngspice/twomesh.h @@ -14,7 +14,7 @@ Authors: 1987 Karti Mayaram, 1991 David Gates #ifndef TWOMESH_H #define TWOMESH_H -#include +#include "ngspice/material.h" typedef struct sTWOelem { diff --git a/src/main.c b/src/main.c index 2ef7bd5ce..7796ad8b4 100644 --- a/src/main.c +++ b/src/main.c @@ -8,7 +8,7 @@ $Id$ */ -#include +#include "ngspice/ngspice.h" #ifdef HAVE_ASPRINTF # ifdef HAVE_LIBIBERTY_H /* asprintf */ @@ -43,9 +43,9 @@ extern int rl_catch_signals; /* missing from editline/readline.h */ #endif -#include -#include -#include +#include "ngspice/iferrmsg.h" +#include "ngspice/ftedefs.h" +#include "ngspice/devdefs.h" #include "spicelib/devices/dev.h" #include "spicelib/analysis/analysis.h" #include "misc/ivars.h" @@ -67,19 +67,19 @@ #include "frontend/display.h" /* added by SDB to pick up Input() fcn */ #include "frontend/signal_handler.h" #include "frontend/misccoms.h" -#include +#include "ngspice/compatmode.h" /* saj xspice headers */ #ifdef XSPICE -# include -# include -# include -# include -# include +# include "ngspice/ipctiein.h" +# include "ngspice/mif.h" +# include "ngspice/enh.h" +# include "ngspice/mifproto.h" +# include "ngspice/evtproto.h" #endif #ifdef CIDER -# include +# include "ngspice/numenum.h" # include "maths/misc/accuracy.h" #endif diff --git a/src/makeidx.c b/src/makeidx.c index 019b8b9a4..d57f79ec0 100644 --- a/src/makeidx.c +++ b/src/makeidx.c @@ -7,9 +7,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. #include #include #include -#include -#include -#include +#include "ngspice/cpdefs.h" +#include "ngspice/hlpdefs.h" +#include "ngspice/suffix.h" #define BSIZE_SP 512 diff --git a/src/maths/cmaths/cmath1.c b/src/maths/cmaths/cmath1.c index c1d37a060..c720c45d0 100644 --- a/src/maths/cmaths/cmath1.c +++ b/src/maths/cmaths/cmath1.c @@ -16,10 +16,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/memory.h" +#include "ngspice/cpdefs.h" +#include "ngspice/dvec.h" #include "cmath.h" #include "cmath1.h" diff --git a/src/maths/cmaths/cmath2.c b/src/maths/cmaths/cmath2.c index 8076ae8c2..6e13a8c09 100644 --- a/src/maths/cmaths/cmath2.c +++ b/src/maths/cmaths/cmath2.c @@ -15,9 +15,9 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * and return a char * that is cast to complex or double. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/dvec.h" #include "cmath.h" #include "cmath2.h" diff --git a/src/maths/cmaths/cmath3.c b/src/maths/cmaths/cmath3.c index 32e0ddc59..d032bcfe2 100644 --- a/src/maths/cmaths/cmath3.c +++ b/src/maths/cmaths/cmath3.c @@ -15,9 +15,9 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * and return a char * that is cast to complex or double. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/dvec.h" #include "cmath.h" #include "cmath3.h" diff --git a/src/maths/cmaths/cmath4.c b/src/maths/cmaths/cmath4.c index ea2d84b8d..f57939e02 100644 --- a/src/maths/cmaths/cmath4.c +++ b/src/maths/cmaths/cmath4.c @@ -15,10 +15,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * and return a char * that is cast to complex or double. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/plot.h" +#include "ngspice/complex.h" +#include "ngspice/cpdefs.h" #include #include @@ -28,7 +28,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #include "cmath.h" #include "cmath4.h" -#include /* To get SV_TIME */ +#include "ngspice/sim.h" /* To get SV_TIME */ extern bool cx_degrees; diff --git a/src/maths/cmaths/test_cx_cph.c b/src/maths/cmaths/test_cx_cph.c index b2b39fb51..44d227c5c 100644 --- a/src/maths/cmaths/test_cx_cph.c +++ b/src/maths/cmaths/test_cx_cph.c @@ -3,11 +3,11 @@ #include #include -#include -#include -#include +#include "ngspice/memory.h" +#include "ngspice/dvec.h" +#include "ngspice/complex.h" -#include +#include "ngspice/defines.h" #include "cmath.h" #include "cmath1.h" diff --git a/src/maths/cmaths/test_cx_j.c b/src/maths/cmaths/test_cx_j.c index 81d0f9aa9..46de668e3 100644 --- a/src/maths/cmaths/test_cx_j.c +++ b/src/maths/cmaths/test_cx_j.c @@ -1,9 +1,9 @@ #include #include -#include -#include -#include +#include "ngspice/memory.h" +#include "ngspice/dvec.h" +#include "ngspice/complex.h" #include "cmath.h" #include "cmath1.h" diff --git a/src/maths/cmaths/test_cx_mag.c b/src/maths/cmaths/test_cx_mag.c index 8f02b750a..0cdadb2a2 100644 --- a/src/maths/cmaths/test_cx_mag.c +++ b/src/maths/cmaths/test_cx_mag.c @@ -1,9 +1,9 @@ #include #include -#include -#include -#include +#include "ngspice/memory.h" +#include "ngspice/dvec.h" +#include "ngspice/complex.h" #include "cmath.h" #include "cmath1.h" diff --git a/src/maths/cmaths/test_cx_ph.c b/src/maths/cmaths/test_cx_ph.c index 7bb6a59d0..2e2bc03d7 100644 --- a/src/maths/cmaths/test_cx_ph.c +++ b/src/maths/cmaths/test_cx_ph.c @@ -3,11 +3,11 @@ #include #include -#include -#include -#include +#include "ngspice/memory.h" +#include "ngspice/dvec.h" +#include "ngspice/complex.h" -#include +#include "ngspice/defines.h" #include "cmath.h" #include "cmath1.h" diff --git a/src/maths/deriv/atander.c b/src/maths/deriv/atander.c index 078e84daa..ca5e423d5 100644 --- a/src/maths/deriv/atander.c +++ b/src/maths/deriv/atander.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * AtanDeriv computes the partial derivatives of the arctangent diff --git a/src/maths/deriv/cosderiv.c b/src/maths/deriv/cosderiv.c index 934eccf76..efb9ae3e2 100644 --- a/src/maths/deriv/cosderiv.c +++ b/src/maths/deriv/cosderiv.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * CosDeriv computes the partial derivatives of the cosine diff --git a/src/maths/deriv/cubeder.c b/src/maths/deriv/cubeder.c index 1c42dad84..dc778e034 100644 --- a/src/maths/deriv/cubeder.c +++ b/src/maths/deriv/cubeder.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * CubeDeriv computes the partial derivatives of the cube diff --git a/src/maths/deriv/divderiv.c b/src/maths/deriv/divderiv.c index 76e60bfeb..8137b99fe 100644 --- a/src/maths/deriv/divderiv.c +++ b/src/maths/deriv/divderiv.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * DivDeriv computes the partial derivatives of the division diff --git a/src/maths/deriv/equalder.c b/src/maths/deriv/equalder.c index f16e4aeb3..0d3d4f083 100644 --- a/src/maths/deriv/equalder.c +++ b/src/maths/deriv/equalder.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * EqualDeriv equates partial derivatives. diff --git a/src/maths/deriv/expderiv.c b/src/maths/deriv/expderiv.c index 19f41d19c..429cf0da3 100644 --- a/src/maths/deriv/expderiv.c +++ b/src/maths/deriv/expderiv.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * ExpDeriv computes the partial derivatives of the exponential diff --git a/src/maths/deriv/invderiv.c b/src/maths/deriv/invderiv.c index ceb949986..319532962 100644 --- a/src/maths/deriv/invderiv.c +++ b/src/maths/deriv/invderiv.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * InvDeriv computes the partial derivatives of the 1/x diff --git a/src/maths/deriv/multder.c b/src/maths/deriv/multder.c index de92e4a8c..bb3537c2a 100644 --- a/src/maths/deriv/multder.c +++ b/src/maths/deriv/multder.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * MultDeriv computes the partial derivatives of the multiplication diff --git a/src/maths/deriv/plusder.c b/src/maths/deriv/plusder.c index f54194675..f5b43471a 100644 --- a/src/maths/deriv/plusder.c +++ b/src/maths/deriv/plusder.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * PlusDeriv computes the partial derivatives of the addition diff --git a/src/maths/deriv/powderiv.c b/src/maths/deriv/powderiv.c index 6ec3f9851..174bbf559 100644 --- a/src/maths/deriv/powderiv.c +++ b/src/maths/deriv/powderiv.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * PowDeriv computes the partial derivatives of the x^^m diff --git a/src/maths/deriv/sqrtder.c b/src/maths/deriv/sqrtder.c index 000fb9985..d84f956d2 100644 --- a/src/maths/deriv/sqrtder.c +++ b/src/maths/deriv/sqrtder.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * SqrtDeriv computes the partial derivatives of the sqrt diff --git a/src/maths/deriv/tanderiv.c b/src/maths/deriv/tanderiv.c index 1ebe6febf..49d458056 100644 --- a/src/maths/deriv/tanderiv.c +++ b/src/maths/deriv/tanderiv.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * TanDeriv computes the partial derivatives of the tangent diff --git a/src/maths/deriv/timesder.c b/src/maths/deriv/timesder.c index 14fcfd16b..c48f84495 100644 --- a/src/maths/deriv/timesder.c +++ b/src/maths/deriv/timesder.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" /* * TimesDeriv computes the partial derivatives of the x*k diff --git a/src/maths/fft/fftext.c b/src/maths/fft/fftext.c index 6df797ca7..eaa6143c5 100644 --- a/src/maths/fft/fftext.c +++ b/src/maths/fft/fftext.c @@ -11,8 +11,8 @@ #include #include "fftlib.h" #include "matlib.h" -#include -#include +#include "ngspice/fftext.h" +#include "ngspice/memory.h" // pointers to storage of Utbl's and BRLow's static double *UtblArray[8*sizeof(int)] = diff --git a/src/maths/misc/accuracy.c b/src/maths/misc/accuracy.c index 8038856bd..0bcfe5e1a 100644 --- a/src/maths/misc/accuracy.c +++ b/src/maths/misc/accuracy.c @@ -4,7 +4,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Modified: 2001 Paolo Nenzi **********/ -#include +#include "ngspice/ngspice.h" #include "accuracy.h" diff --git a/src/maths/misc/bernoull.c b/src/maths/misc/bernoull.c index 6050e9a10..24653acc3 100644 --- a/src/maths/misc/bernoull.c +++ b/src/maths/misc/bernoull.c @@ -3,7 +3,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include +#include "ngspice/ngspice.h" #include "accuracy.h" #include "bernoull.h" diff --git a/src/maths/misc/equality.c b/src/maths/misc/equality.c index 1385cb349..83c4ad3c5 100644 --- a/src/maths/misc/equality.c +++ b/src/maths/misc/equality.c @@ -2,7 +2,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. **********/ -#include +#include "ngspice/ngspice.h" #include #include diff --git a/src/maths/misc/erfc.c b/src/maths/misc/erfc.c index 23108d952..d335b26ef 100644 --- a/src/maths/misc/erfc.c +++ b/src/maths/misc/erfc.c @@ -3,8 +3,8 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/numconst.h" #ifndef HAVE_ERFC diff --git a/src/maths/misc/isinf.c b/src/maths/misc/isinf.c index cd659e070..941ca19d9 100644 --- a/src/maths/misc/isinf.c +++ b/src/maths/misc/isinf.c @@ -1,4 +1,4 @@ -#include +#include "ngspice/ngspice.h" #if !HAVE_DECL_ISINF #ifndef HAVE_ISINF diff --git a/src/maths/misc/isnan.c b/src/maths/misc/isnan.c index 112adbc2d..bd709fd2f 100644 --- a/src/maths/misc/isnan.c +++ b/src/maths/misc/isnan.c @@ -1,4 +1,4 @@ -#include +#include "ngspice/ngspice.h" #if !HAVE_DECL_ISNAN #ifndef HAVE_ISNAN diff --git a/src/maths/misc/logb.c b/src/maths/misc/logb.c index 864892d06..ef8fa1fc8 100644 --- a/src/maths/misc/logb.c +++ b/src/maths/misc/logb.c @@ -2,7 +2,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. **********/ -#include +#include "ngspice/ngspice.h" #ifndef HAVE_LOGB diff --git a/src/maths/misc/norm.c b/src/maths/misc/norm.c index 1662017a2..cae748dd7 100644 --- a/src/maths/misc/norm.c +++ b/src/maths/misc/norm.c @@ -3,7 +3,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include +#include "ngspice/ngspice.h" #include "norm.h" /* functions to compute max and one norms of a given vector of doubles */ diff --git a/src/maths/misc/randnumb.c b/src/maths/misc/randnumb.c index 5818ee97b..835e6883f 100644 --- a/src/maths/misc/randnumb.c +++ b/src/maths/misc/randnumb.c @@ -36,9 +36,9 @@ Copyright 2008 Holger Vogt */ //#define HVDEBUG -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" #include #include #include diff --git a/src/maths/misc/scalb.c b/src/maths/misc/scalb.c index 7799fa6ab..61803fec3 100644 --- a/src/maths/misc/scalb.c +++ b/src/maths/misc/scalb.c @@ -2,7 +2,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. **********/ -#include +#include "ngspice/ngspice.h" #ifndef HAVE_SCALBN diff --git a/src/maths/ni/niaciter.c b/src/maths/ni/niaciter.c index 111e52a84..a5d6cd391 100644 --- a/src/maths/ni/niaciter.c +++ b/src/maths/ni/niaciter.c @@ -14,10 +14,10 @@ Modified 1999 Emmanuel Rouat * - return value is non-zero for convergence failure */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/trandefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" #include "niaciter.h" diff --git a/src/maths/ni/nicomcof.c b/src/maths/ni/nicomcof.c index 92bb78536..7686c0d3a 100644 --- a/src/maths/ni/nicomcof.c +++ b/src/maths/ni/nicomcof.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" #include "nicomcof.h" diff --git a/src/maths/ni/niconv.c b/src/maths/ni/niconv.c index 53f91fc57..2ae50a1bb 100644 --- a/src/maths/ni/niconv.c +++ b/src/maths/ni/niconv.c @@ -10,9 +10,9 @@ Author: 1985 Thomas L. Quarles * than absTol + relTol*(max(old,new)), otherwise returns 0 */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "niconv.h" diff --git a/src/maths/ni/nidest.c b/src/maths/ni/nidest.c index 431e81307..bbe3e7186 100644 --- a/src/maths/ni/nidest.c +++ b/src/maths/ni/nidest.c @@ -9,8 +9,8 @@ Author: 1985 Thomas L. Quarles * delete the data structures allocated for numeric integration. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "nidest.h" diff --git a/src/maths/ni/niditer.c b/src/maths/ni/niditer.c index bff76acff..bf8915875 100644 --- a/src/maths/ni/niditer.c +++ b/src/maths/ni/niditer.c @@ -12,10 +12,10 @@ Author: 1988 Jaijeet S. Roychowdhury * */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/trandefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" #include "niditer.h" diff --git a/src/maths/ni/niinit.c b/src/maths/ni/niinit.c index e6c19242a..d9bca9764 100644 --- a/src/maths/ni/niinit.c +++ b/src/maths/ni/niinit.c @@ -11,10 +11,10 @@ Author: 1985 Thomas L. Quarles * iterations on a sparse matrix filled by the specified load package, */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/smpdefs.h" #include "niinit.h" diff --git a/src/maths/ni/niinteg.c b/src/maths/ni/niinteg.c index 2b3b5043d..2a4bf194b 100644 --- a/src/maths/ni/niinteg.c +++ b/src/maths/ni/niinteg.c @@ -8,9 +8,9 @@ Author: 1985 Thomas L. Quarles * ckt structure, ccap follows qcap. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" #include "niinteg.h" #define ccap qcap+1 diff --git a/src/maths/ni/niiter.c b/src/maths/ni/niiter.c index b022a05b6..011f09ff4 100644 --- a/src/maths/ni/niiter.c +++ b/src/maths/ni/niiter.c @@ -13,11 +13,11 @@ Modified: 2001 AlansFixes * convergence test function, and the convergence parameters */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/trandefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/sperror.h" #include "niiter.h" diff --git a/src/maths/ni/niniter.c b/src/maths/ni/niniter.c index 1bcb63aef..f3eee6c07 100644 --- a/src/maths/ni/niniter.c +++ b/src/maths/ni/niniter.c @@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Gary W. Ng **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "niniter.h" /* diff --git a/src/maths/ni/nipred.c b/src/maths/ni/nipred.c index aeac3f092..e5c96b79d 100644 --- a/src/maths/ni/nipred.c +++ b/src/maths/ni/nipred.c @@ -12,11 +12,11 @@ Author: 1985 Thomas L. Quarles * integration method */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/trandefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/smpdefs.h" #include "nipred.h" diff --git a/src/maths/ni/nipzmeth.c b/src/maths/ni/nipzmeth.c index 96bcb3248..0bbf8bd28 100644 --- a/src/maths/ni/nipzmeth.c +++ b/src/maths/ni/nipzmeth.c @@ -2,12 +2,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/pzdefs.h" +#include "ngspice/complex.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #include "nipzmeth.h" diff --git a/src/maths/ni/nireinit.c b/src/maths/ni/nireinit.c index 0ee42c5e1..cda0e45f5 100644 --- a/src/maths/ni/nireinit.c +++ b/src/maths/ni/nireinit.c @@ -9,10 +9,10 @@ Author: 1985 Thomas L. Quarles * how big it is, so allocate RHS vector */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/sperror.h" #include "nireinit.h" diff --git a/src/maths/ni/nisenre.c b/src/maths/ni/nisenre.c index 9a38e0df0..343139cfe 100644 --- a/src/maths/ni/nisenre.c +++ b/src/maths/ni/nisenre.c @@ -11,10 +11,10 @@ Author: 1985 Thomas L. Quarles * how big it is, so allocate RHS vector */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/sperror.h" #include "nisenre.h" diff --git a/src/maths/poly/interpolate.c b/src/maths/poly/interpolate.c index 6543bf947..c63ca63da 100644 --- a/src/maths/poly/interpolate.c +++ b/src/maths/poly/interpolate.c @@ -1,6 +1,6 @@ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" #include "interpolate.h" #include "polyeval.h" diff --git a/src/maths/poly/interpolate.h b/src/maths/poly/interpolate.h index ea520288d..34e223cae 100644 --- a/src/maths/poly/interpolate.h +++ b/src/maths/poly/interpolate.h @@ -1,7 +1,7 @@ #ifndef _INTERPOLATE_H #define _INTERPOLATE_H -#include +#include "ngspice/bool.h" bool ft_interpolate(double *data, double *ndata, double *oscale, int olen, double *nscale, int nlen, int degree); diff --git a/src/maths/poly/polyfit.c b/src/maths/poly/polyfit.c index d06a276d8..2c9d457bf 100644 --- a/src/maths/poly/polyfit.c +++ b/src/maths/poly/polyfit.c @@ -1,4 +1,4 @@ -#include +#include "ngspice/ngspice.h" #include "polyfit.h" #include "polyeval.h" diff --git a/src/maths/poly/polyfit.h b/src/maths/poly/polyfit.h index 2a97995ff..b3e4b5012 100644 --- a/src/maths/poly/polyfit.h +++ b/src/maths/poly/polyfit.h @@ -1,7 +1,7 @@ #ifndef _POLYFIT_H #define _POLYFIT_H -#include +#include "ngspice/bool.h" bool ft_polyfit(double *xdata, double *ydata, double *result, int degree, double *scratch); diff --git a/src/maths/sparse/spalloc.c b/src/maths/sparse/spalloc.c index 0228e9961..b2e9a5511 100644 --- a/src/maths/sparse/spalloc.c +++ b/src/maths/sparse/spalloc.c @@ -64,7 +64,7 @@ #define spINSIDE_SPARSE #include "spconfig.h" -#include +#include "ngspice/spmatrix.h" #include "spdefs.h" #ifdef PARALLEL_ARCH #define COMBINE 1 diff --git a/src/maths/sparse/spbuild.c b/src/maths/sparse/spbuild.c index bb37cf4d8..c3601fc08 100644 --- a/src/maths/sparse/spbuild.c +++ b/src/maths/sparse/spbuild.c @@ -61,7 +61,7 @@ #define spINSIDE_SPARSE #include "spconfig.h" -#include +#include "ngspice/spmatrix.h" #include "spdefs.h" diff --git a/src/maths/sparse/spcombin.c b/src/maths/sparse/spcombin.c index 9b8352dd8..a828c2b1d 100644 --- a/src/maths/sparse/spcombin.c +++ b/src/maths/sparse/spcombin.c @@ -44,7 +44,7 @@ #define spINSIDE_SPARSE #include "spconfig.h" -#include +#include "ngspice/spmatrix.h" #include "spdefs.h" diff --git a/src/maths/sparse/spdefs.h b/src/maths/sparse/spdefs.h index 2ae67cb3e..68852dd67 100644 --- a/src/maths/sparse/spdefs.h +++ b/src/maths/sparse/spdefs.h @@ -387,7 +387,7 @@ extern void * trealloc(void *, size_t); } #endif -#include +#include "ngspice/defines.h" /* diff --git a/src/maths/sparse/spextra.c b/src/maths/sparse/spextra.c index ff278dd43..89483f391 100644 --- a/src/maths/sparse/spextra.c +++ b/src/maths/sparse/spextra.c @@ -24,7 +24,7 @@ #define spINSIDE_SPARSE #include "spconfig.h" -#include +#include "ngspice/spmatrix.h" #include "spdefs.h" diff --git a/src/maths/sparse/spfactor.c b/src/maths/sparse/spfactor.c index cca95d6da..05e0dc5d4 100644 --- a/src/maths/sparse/spfactor.c +++ b/src/maths/sparse/spfactor.c @@ -59,7 +59,7 @@ #define spINSIDE_SPARSE #include "spconfig.h" -#include +#include "ngspice/spmatrix.h" #include "spdefs.h" diff --git a/src/maths/sparse/spoutput.c b/src/maths/sparse/spoutput.c index 0e44cddb8..df2fbb7a3 100644 --- a/src/maths/sparse/spoutput.c +++ b/src/maths/sparse/spoutput.c @@ -50,7 +50,7 @@ #define spINSIDE_SPARSE #include "spconfig.h" -#include +#include "ngspice/spmatrix.h" #include "spdefs.h" int Printer_Width = PRINTER_WIDTH; diff --git a/src/maths/sparse/spsmp.c b/src/maths/sparse/spsmp.c index e42b8e528..8f91cdddf 100644 --- a/src/maths/sparse/spsmp.c +++ b/src/maths/sparse/spsmp.c @@ -98,9 +98,9 @@ #include #include #include -#include +#include "ngspice/spmatrix.h" #include "spdefs.h" -#include +#include "ngspice/smpdefs.h" #if defined (_MSC_VER) extern double scalbn(double, int); diff --git a/src/maths/sparse/spsolve.c b/src/maths/sparse/spsolve.c index 120d817a8..ca78f7133 100644 --- a/src/maths/sparse/spsolve.c +++ b/src/maths/sparse/spsolve.c @@ -49,7 +49,7 @@ #define spINSIDE_SPARSE #include "spconfig.h" -#include +#include "ngspice/spmatrix.h" #include "spdefs.h" diff --git a/src/maths/sparse/sputils.c b/src/maths/sparse/sputils.c index f03aaa5f1..5b767460d 100644 --- a/src/maths/sparse/sputils.c +++ b/src/maths/sparse/sputils.c @@ -63,7 +63,7 @@ #define spINSIDE_SPARSE #include "spconfig.h" -#include +#include "ngspice/spmatrix.h" #include "spdefs.h" diff --git a/src/misc/alloc.c b/src/misc/alloc.c index aa0033efa..c1719f1e7 100644 --- a/src/misc/alloc.c +++ b/src/misc/alloc.c @@ -6,7 +6,7 @@ $Id$ /* * Memory alloction functions */ -#include +#include "ngspice/ngspice.h" #ifndef HAVE_LIBGC diff --git a/src/misc/dstring.c b/src/misc/dstring.c index ebfec526b..d2e7a8993 100644 --- a/src/misc/dstring.c +++ b/src/misc/dstring.c @@ -4,7 +4,10 @@ DESCRIPTION:This file contains the routines for manipulating dynamic strings. CONTENTS: DATE: Wed Mar 24 18:38:28 CDT 2010 REVISIONS: $Log$ -REVISIONS: Revision 1.9 2011-08-20 17:27:12 rlar +REVISIONS: Revision 1.10 2011-12-11 18:05:01 rlar +REVISIONS: #1/4 #include --> #include "ngspice/..." +REVISIONS: +REVISIONS: Revision 1.9 2011/08/20 17:27:12 rlar REVISIONS: #1/7 use a subdirectory "ngspice" for includes to create a uniq namespace REVISIONS: REVISIONS: Revision 1.8 2011/06/26 20:00:03 rlar @@ -32,9 +35,9 @@ REVISIONS: Revision 1.1 2010/03/25 22:44:38 dwarning REVISIONS: Bill Swartz patch REVISIONS: ----------------------------------------------------------------- */ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/dstring.h" /* definitions local to this file only */ diff --git a/src/misc/dup2.c b/src/misc/dup2.c index ddcdfd525..81e0175c3 100644 --- a/src/misc/dup2.c +++ b/src/misc/dup2.c @@ -1,6 +1,6 @@ /* Modified: 2000 AlansFixes */ #include -#include +#include "ngspice/ngspice.h" #include "dup2.h" #ifndef HAVE_DUP2 diff --git a/src/misc/getopt_long_bsd.c b/src/misc/getopt_long_bsd.c index f784da374..c671d017e 100644 --- a/src/misc/getopt_long_bsd.c +++ b/src/misc/getopt_long_bsd.c @@ -67,7 +67,7 @@ /* downloaded from http://www.koders.com/c/fid5FCCD794DA3E7129AC307C40B5D31C268ED04FF5.aspx at 04/10/09 by H. Vogt */ -#include +#include "ngspice/ngspice.h" #include /* If configure finds getopt.h and fcn getopt_long(), then the rest of this file diff --git a/src/misc/hash.c b/src/misc/hash.c index d8d983aaa..019870f33 100644 --- a/src/misc/hash.c +++ b/src/misc/hash.c @@ -24,8 +24,8 @@ DATE: Jul 7, 1988 - original coding. 1988 - 2009 many updates... REVISIONS: ----------------------------------------------------------------- */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/hash.h" /* definitions local to this file only */ diff --git a/src/misc/ivars.c b/src/misc/ivars.c index 5d4418072..ed2d67509 100644 --- a/src/misc/ivars.c +++ b/src/misc/ivars.c @@ -2,7 +2,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. **********/ -#include +#include "ngspice/ngspice.h" #include "ivars.h" #include "../misc/util.h" /* ngdirname() */ diff --git a/src/misc/misc_time.c b/src/misc/misc_time.c index 72486a64f..7557610b0 100644 --- a/src/misc/misc_time.c +++ b/src/misc/misc_time.c @@ -7,7 +7,7 @@ Copyright 1990 Regents of the University of California. All rights reserved. */ #include -#include +#include "ngspice/ngspice.h" #include #include "misc_time.h" diff --git a/src/misc/mktemp.c b/src/misc/mktemp.c index 0a2a6141a..45bc086b8 100644 --- a/src/misc/mktemp.c +++ b/src/misc/mktemp.c @@ -8,7 +8,7 @@ Copyright 1990 Regents of the University of California. All rights reserved. * FIXME: remove smktemp() and adjust all callers to use tmpfile(3). */ -#include +#include "ngspice/ngspice.h" #include "mktemp.h" #ifdef HAVE_UNISTD_H diff --git a/src/misc/printnum.c b/src/misc/printnum.c index bf909eb87..99a8ae922 100644 --- a/src/misc/printnum.c +++ b/src/misc/printnum.c @@ -8,7 +8,7 @@ Modified: 2001 Paolo Nenzi * It is up to the caller to allocate space for strings. */ -#include +#include "ngspice/ngspice.h" #include "printnum.h" #include diff --git a/src/misc/string.c b/src/misc/string.c index ac969e532..3b7970a30 100644 --- a/src/misc/string.c +++ b/src/misc/string.c @@ -6,9 +6,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. * String functions */ -#include +#include "ngspice/ngspice.h" #include "stringutil.h" -#include +#include "ngspice/dstring.h" int prefix(register char *p, register char *s) diff --git a/src/misc/stringutil.h b/src/misc/stringutil.h index 525473f93..3d09afbe1 100644 --- a/src/misc/stringutil.h +++ b/src/misc/stringutil.h @@ -4,7 +4,7 @@ ************/ #include "config.h" -#include +#include "ngspice/bool.h" #ifndef STRING_H_INCLUDED #define STRING_H_INCLUDED diff --git a/src/misc/tilde.c b/src/misc/tilde.c index 833e9dd12..5013c7222 100644 --- a/src/misc/tilde.c +++ b/src/misc/tilde.c @@ -3,7 +3,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. Modified: 2002 R. Oktas, **********/ -#include +#include "ngspice/ngspice.h" #include "tilde.h" #ifdef HAVE_PWD_H diff --git a/src/misc/util.c b/src/misc/util.c index edb26b9dc..ea68a29a3 100644 --- a/src/misc/util.c +++ b/src/misc/util.c @@ -3,7 +3,7 @@ * 2002 R. Oktas, ************/ -#include +#include "ngspice/ngspice.h" #include "util.h" /* **************************************************************** */ diff --git a/src/misc/wlist.c b/src/misc/wlist.c index 56eb3212b..ca203ec44 100644 --- a/src/misc/wlist.c +++ b/src/misc/wlist.c @@ -6,9 +6,9 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group /* Wordlist manipulation stuff. */ #include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/bool.h" +#include "ngspice/wordlist.h" /* Determine the length of a word list. */ diff --git a/src/nghelp.c b/src/nghelp.c index 9448a99a9..21e2d353f 100644 --- a/src/nghelp.c +++ b/src/nghelp.c @@ -8,9 +8,9 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group */ #include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cpdefs.h" +#include "ngspice/hlpdefs.h" #include "frontend/variable.h" diff --git a/src/ngmultidec.c b/src/ngmultidec.c index c9a5c0e3d..6f0867bbb 100644 --- a/src/ngmultidec.c +++ b/src/ngmultidec.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet Roychowdury **********/ -#include +#include "ngspice/ngspice.h" #include #include -#include +#include "ngspice/spmatrix.h" #define THRSH 0.01 #define ABS_THRSH 0 diff --git a/src/ngnutmeg.c b/src/ngnutmeg.c index 21ac2236f..5a9071070 100644 --- a/src/ngnutmeg.c +++ b/src/ngnutmeg.c @@ -12,12 +12,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. **********/ -#include +#include "ngspice/ngspice.h" #define CONFIG #include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" IFsimulator SIMinfo = { "ngnutmeg", /* my name */ @@ -64,7 +64,7 @@ IFsimulator SIMinfo = { #ifdef CIDER /* An ugly hack */ -#include +#include "ngspice/cktdefs.h" void NDEVacct(CKTcircuit *ckt, FILE *file) { diff --git a/src/ngproc2mod.c b/src/ngproc2mod.c index 9862cd645..42fe90f25 100644 --- a/src/ngproc2mod.c +++ b/src/ngproc2mod.c @@ -4,11 +4,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. /* convert .process file to set of .model cards */ #include -#include +#include "ngspice/ngspice.h" #include #include -#include -#include +#include "ngspice/inpdefs.h" +#include "ngspice/suffix.h" void getdata(double*,int,int); diff --git a/src/ngsconvert.c b/src/ngsconvert.c index 731ebb837..6edfd090f 100644 --- a/src/ngsconvert.c +++ b/src/ngsconvert.c @@ -7,14 +7,14 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * Main routine for sconvert. */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include -#include +#include "ngspice/fteinput.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/sim.h" +#include "ngspice/suffix.h" #include "frontend/display.h" #include "../misc/mktemp.h" diff --git a/src/ngspice.c b/src/ngspice.c index da7c5071f..58d76d355 100644 --- a/src/ngspice.c +++ b/src/ngspice.c @@ -5,15 +5,15 @@ Copyright 1990 Regents of the University of California. All rights reserved. **********/ -#include +#include "ngspice/ngspice.h" #define CONFIG -#include -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* XXX Should be -1 ? There is always an extra null element at the end ? */ diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c index c2723f93e..86cdbf538 100644 --- a/src/spicelib/analysis/acan.c +++ b/src/spicelib/analysis/acan.c @@ -4,17 +4,17 @@ Author: 1985 Thomas L. Quarles Modified 2001: AlansFixes **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/acdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #ifdef XSPICE /* gtri - add - wbk - 12/19/90 - Add headers */ -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evtproto.h" +#include "ngspice/ipctiein.h" /* gtri - end - wbk */ #endif diff --git a/src/spicelib/analysis/acaskq.c b/src/spicelib/analysis/acaskq.c index 94338dfcc..b23be045d 100644 --- a/src/spicelib/analysis/acaskq.c +++ b/src/spicelib/analysis/acaskq.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/acdefs.h" +#include "ngspice/cktdefs.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/acsetp.c b/src/spicelib/analysis/acsetp.c index 06628f3bb..8ca60b2c1 100644 --- a/src/spicelib/analysis/acsetp.c +++ b/src/spicelib/analysis/acsetp.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/acdefs.h" +#include "ngspice/cktdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/analysis.c b/src/spicelib/analysis/analysis.c index 3426b64fb..d4ae90302 100644 --- a/src/spicelib/analysis/analysis.c +++ b/src/spicelib/analysis/analysis.c @@ -1,8 +1,8 @@ #include -#include +#include "ngspice/ngspice.h" -#include -#include +#include "ngspice/jobdefs.h" +#include "ngspice/cktdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/cktacct.c b/src/spicelib/analysis/cktacct.c index a9d0074de..e4fe39afe 100644 --- a/src/spicelib/analysis/cktacct.c +++ b/src/spicelib/analysis/cktacct.c @@ -11,12 +11,12 @@ Author: 1985 Thomas L. Quarles * given circuit 'ckt'. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/optdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/spmatrix.h" diff --git a/src/spicelib/analysis/cktacdum.c b/src/spicelib/analysis/cktacdum.c index a501b1daa..9a930e080 100644 --- a/src/spicelib/analysis/cktacdum.c +++ b/src/spicelib/analysis/cktacdum.c @@ -8,11 +8,11 @@ Author: 1985 Thomas L. Quarles * into the rawfile. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/ifsim.h" diff --git a/src/spicelib/analysis/cktaskaq.c b/src/spicelib/analysis/cktaskaq.c index c0476d9e8..9b7c3f182 100644 --- a/src/spicelib/analysis/cktaskaq.c +++ b/src/spicelib/analysis/cktaskaq.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/tskdefs.h" +#include "ngspice/jobdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" #include "analysis.h" diff --git a/src/spicelib/analysis/cktasknq.c b/src/spicelib/analysis/cktasknq.c index 384ba232c..fcdc61c23 100644 --- a/src/spicelib/analysis/cktasknq.c +++ b/src/spicelib/analysis/cktasknq.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * ask about a parameter on a node. */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" diff --git a/src/spicelib/analysis/cktbkdum.c b/src/spicelib/analysis/cktbkdum.c index 32a680733..48727dd2b 100644 --- a/src/spicelib/analysis/cktbkdum.c +++ b/src/spicelib/analysis/cktbkdum.c @@ -9,8 +9,8 @@ Author: 1985 Thomas L. Quarles * the given circuit */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" diff --git a/src/spicelib/analysis/cktclrbk.c b/src/spicelib/analysis/cktclrbk.c index da174c438..3a3995205 100644 --- a/src/spicelib/analysis/cktclrbk.c +++ b/src/spicelib/analysis/cktclrbk.c @@ -9,9 +9,9 @@ Author: 1985 Thomas L. Quarles * delete the first time from the breakpoint table for the given circuit */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" diff --git a/src/spicelib/analysis/cktdelt.c b/src/spicelib/analysis/cktdelt.c index 5bbcd1598..f7ff62aca 100644 --- a/src/spicelib/analysis/cktdelt.c +++ b/src/spicelib/analysis/cktdelt.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/tskdefs.h" +#include "ngspice/jobdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/cktdest.c b/src/spicelib/analysis/cktdest.c index b9946132d..eb7e46dff 100644 --- a/src/spicelib/analysis/cktdest.c +++ b/src/spicelib/analysis/cktdest.c @@ -11,11 +11,11 @@ Author: 1985 Thomas L. Quarles * given circuit */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" int diff --git a/src/spicelib/analysis/cktdisto.c b/src/spicelib/analysis/cktdisto.c index 38f37308a..e25b26fc6 100644 --- a/src/spicelib/analysis/cktdisto.c +++ b/src/spicelib/analysis/cktdisto.c @@ -8,14 +8,14 @@ Author: 1988 Jaijeet S Roychowdhury */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "vsrc/vsrcdefs.h" #include "isrc/isrcdefs.h" -#include -#include -#include +#include "ngspice/iferrmsg.h" +#include "ngspice/distodef.h" +#include "ngspice/sperror.h" int diff --git a/src/spicelib/analysis/cktdlti.c b/src/spicelib/analysis/cktdlti.c index a4e614a0a..69688eca6 100644 --- a/src/spicelib/analysis/cktdlti.c +++ b/src/spicelib/analysis/cktdlti.c @@ -9,10 +9,10 @@ Author: 1985 Thomas L. Quarles * delete the specified instance - not yet supported in spice */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" diff --git a/src/spicelib/analysis/cktdltm.c b/src/spicelib/analysis/cktdltm.c index 7e4737ed2..bbdc36b07 100644 --- a/src/spicelib/analysis/cktdltm.c +++ b/src/spicelib/analysis/cktdltm.c @@ -7,10 +7,10 @@ Author: 1985 Thomas L. Quarles * delete the specified model - not yet supported in spice */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" diff --git a/src/spicelib/analysis/cktdltn.c b/src/spicelib/analysis/cktdltn.c index 5e1e2ea12..69f0c988b 100644 --- a/src/spicelib/analysis/cktdltn.c +++ b/src/spicelib/analysis/cktdltn.c @@ -5,10 +5,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. /* CKTdltNod */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" /* ARGSUSED */ int diff --git a/src/spicelib/analysis/cktdojob.c b/src/spicelib/analysis/cktdojob.c index 8b583351e..1e3f13733 100644 --- a/src/spicelib/analysis/cktdojob.c +++ b/src/spicelib/analysis/cktdojob.c @@ -4,20 +4,20 @@ Author: 1985 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/trandefs.h" #include "analysis.h" #ifdef XSPICE /* gtri - add - wbk - 11/26/90 - add include for MIF and EVT global data */ -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evtproto.h" /* gtri - end - wbk - 11/26/90 */ /* gtri - add - 12/12/90 - wbk - include ipc stuff */ -#include +#include "ngspice/ipctiein.h" /* gtri - end - 12/12/90 */ #endif diff --git a/src/spicelib/analysis/cktdump.c b/src/spicelib/analysis/cktdump.c index 880983516..2c689331f 100644 --- a/src/spicelib/analysis/cktdump.c +++ b/src/spicelib/analysis/cktdump.c @@ -17,14 +17,14 @@ TODO: * this is a simple program to dump the rhs vector to stdout */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #ifdef CIDER /* Begin cider integration */ -#include -#include +#include "ngspice/gendefs.h" +#include "ngspice/devdefs.h" /* End cider integration */ #endif diff --git a/src/spicelib/analysis/cktfbran.c b/src/spicelib/analysis/cktfbran.c index 07299d007..3797c46a9 100644 --- a/src/spicelib/analysis/cktfbran.c +++ b/src/spicelib/analysis/cktfbran.c @@ -11,9 +11,9 @@ Author: 1985 Thomas L. Quarles * given circuit */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" diff --git a/src/spicelib/analysis/cktfnda.c b/src/spicelib/analysis/cktfnda.c index 6e7a7b833..48746d736 100644 --- a/src/spicelib/analysis/cktfnda.c +++ b/src/spicelib/analysis/cktfnda.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * find the given Analysis given its name and return the Analysis pointer */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/jobdefs.h" +#include "ngspice/tskdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/cktdefs.h" diff --git a/src/spicelib/analysis/cktfndm.c b/src/spicelib/analysis/cktfndm.c index 965e5fbc7..a877830e0 100644 --- a/src/spicelib/analysis/cktfndm.c +++ b/src/spicelib/analysis/cktfndm.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" diff --git a/src/spicelib/analysis/cktfnode.c b/src/spicelib/analysis/cktfnode.c index b64c130ab..efc633daf 100644 --- a/src/spicelib/analysis/cktfnode.c +++ b/src/spicelib/analysis/cktfnode.c @@ -9,10 +9,10 @@ Author: 1985 Thomas L. Quarles * find the given node given its name and return the node pointer */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/cktdefs.h" diff --git a/src/spicelib/analysis/cktftask.c b/src/spicelib/analysis/cktftask.c index 0a1517011..b0614bed4 100644 --- a/src/spicelib/analysis/cktftask.c +++ b/src/spicelib/analysis/cktftask.c @@ -9,10 +9,10 @@ Author: 1985 Thomas L. Quarles * find the specified task - not yet supported in spice */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" diff --git a/src/spicelib/analysis/cktgrnd.c b/src/spicelib/analysis/cktgrnd.c index b1ffb4771..2072f3f22 100644 --- a/src/spicelib/analysis/cktgrnd.c +++ b/src/spicelib/analysis/cktgrnd.c @@ -9,10 +9,10 @@ Author: 1985 Thomas L. Quarles * specify the node to be the ground node of the given circuit */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" diff --git a/src/spicelib/analysis/ckti2nod.c b/src/spicelib/analysis/ckti2nod.c index 7974c8269..0625feffc 100644 --- a/src/spicelib/analysis/ckti2nod.c +++ b/src/spicelib/analysis/ckti2nod.c @@ -10,12 +10,12 @@ Author: 1985 Thomas L. Quarles * bound to and the terminal of the device. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/devdefs.h" diff --git a/src/spicelib/analysis/cktic.c b/src/spicelib/analysis/cktic.c index 17a007499..7903a042f 100644 --- a/src/spicelib/analysis/cktic.c +++ b/src/spicelib/analysis/cktic.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" int diff --git a/src/spicelib/analysis/cktlnkeq.c b/src/spicelib/analysis/cktlnkeq.c index 2e2e8f143..eadc9e99a 100644 --- a/src/spicelib/analysis/cktlnkeq.c +++ b/src/spicelib/analysis/cktlnkeq.c @@ -8,11 +8,11 @@ Author: 1985 Thomas L. Quarles * Link an already allocated node into the necessary structure */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" int diff --git a/src/spicelib/analysis/cktload.c b/src/spicelib/analysis/cktload.c index 6a279810f..e74508245 100644 --- a/src/spicelib/analysis/cktload.c +++ b/src/spicelib/analysis/cktload.c @@ -12,15 +12,15 @@ Modified: 2000 AlansFixes * given circuit */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #ifdef XSPICE /* gtri - add - wbk - 11/26/90 - add include for MIF global data */ -#include +#include "ngspice/mif.h" /* gtri - end - wbk - 11/26/90 */ #endif diff --git a/src/spicelib/analysis/cktmapn.c b/src/spicelib/analysis/cktmapn.c index 28c6d40e6..96e0abe66 100644 --- a/src/spicelib/analysis/cktmapn.c +++ b/src/spicelib/analysis/cktmapn.c @@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles * specified circuit */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/cktdefs.h" diff --git a/src/spicelib/analysis/cktmask.c b/src/spicelib/analysis/cktmask.c index d28c89ba4..f7fddad99 100644 --- a/src/spicelib/analysis/cktmask.c +++ b/src/spicelib/analysis/cktmask.c @@ -7,11 +7,11 @@ Author: 1985 Thomas L. Quarles * Ask questions about a specified device. */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/cktmcrt.c b/src/spicelib/analysis/cktmcrt.c index 0f04e9548..5384d21a7 100644 --- a/src/spicelib/analysis/cktmcrt.c +++ b/src/spicelib/analysis/cktmcrt.c @@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles * in the named circuit. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" diff --git a/src/spicelib/analysis/cktmkcur.c b/src/spicelib/analysis/cktmkcur.c index d390ead4e..029dd694b 100644 --- a/src/spicelib/analysis/cktmkcur.c +++ b/src/spicelib/analysis/cktmkcur.c @@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles * specified circuit */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/cktdefs.h" diff --git a/src/spicelib/analysis/cktmknod.c b/src/spicelib/analysis/cktmknod.c index 1e7a7c232..114f5b9e6 100644 --- a/src/spicelib/analysis/cktmknod.c +++ b/src/spicelib/analysis/cktmknod.c @@ -8,11 +8,11 @@ Author: 1985 Thomas L. Quarles * Tentatively allocate a new circuit equation structure */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/cktmkvol.c b/src/spicelib/analysis/cktmkvol.c index c653e8a1a..e3e821d49 100644 --- a/src/spicelib/analysis/cktmkvol.c +++ b/src/spicelib/analysis/cktmkvol.c @@ -8,10 +8,10 @@ Author: 1985 Thomas L. Quarles * specified circuit */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/cktdefs.h" diff --git a/src/spicelib/analysis/cktmpar.c b/src/spicelib/analysis/cktmpar.c index 612e90e8f..925aaf238 100644 --- a/src/spicelib/analysis/cktmpar.c +++ b/src/spicelib/analysis/cktmpar.c @@ -7,11 +7,11 @@ Author: 1985 Thomas L. Quarles * attach the given parameter to the specified model in the given circuit */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/cktnames.c b/src/spicelib/analysis/cktnames.c index 70347a615..dd77db25b 100644 --- a/src/spicelib/analysis/cktnames.c +++ b/src/spicelib/analysis/cktnames.c @@ -9,10 +9,10 @@ Author: 1988 Thomas L. Quarles * */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" int diff --git a/src/spicelib/analysis/cktncdump.c b/src/spicelib/analysis/cktncdump.c index 46c1e0b8e..6b2ce8c15 100644 --- a/src/spicelib/analysis/cktncdump.c +++ b/src/spicelib/analysis/cktncdump.c @@ -3,9 +3,9 @@ Copyright 1999 AG inc. All rights reserved. Author: 1999 Alan Gillespie **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/suffix.h" void CKTncDump( diff --git a/src/spicelib/analysis/cktnewan.c b/src/spicelib/analysis/cktnewan.c index 2523f2fa6..f705caded 100644 --- a/src/spicelib/analysis/cktnewan.c +++ b/src/spicelib/analysis/cktnewan.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/tskdefs.h" +#include "ngspice/jobdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/cktneweq.c b/src/spicelib/analysis/cktneweq.c index 08f2d0bb6..f895779c9 100644 --- a/src/spicelib/analysis/cktneweq.c +++ b/src/spicelib/analysis/cktneweq.c @@ -11,11 +11,11 @@ Author: 1985 Thomas L. Quarles * */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" int diff --git a/src/spicelib/analysis/cktnewn.c b/src/spicelib/analysis/cktnewn.c index becfc9fea..46fb1a63b 100644 --- a/src/spicelib/analysis/cktnewn.c +++ b/src/spicelib/analysis/cktnewn.c @@ -11,11 +11,11 @@ Author: 1985 Thomas L. Quarles * */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" /* should just call CKTnewEQ and set node type afterwards */ diff --git a/src/spicelib/analysis/cktnodn.c b/src/spicelib/analysis/cktnodn.c index 13fcfb9e1..b580a3857 100644 --- a/src/spicelib/analysis/cktnodn.c +++ b/src/spicelib/analysis/cktnodn.c @@ -11,8 +11,8 @@ Author: 1985 Thomas L. Quarles * */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" IFuid diff --git a/src/spicelib/analysis/cktnoise.c b/src/spicelib/analysis/cktnoise.c index 493de8913..a1f1f995f 100644 --- a/src/spicelib/analysis/cktnoise.c +++ b/src/spicelib/analysis/cktnoise.c @@ -12,12 +12,12 @@ Author: 1987 Gary W. Ng * it evaluates the noise for the entire circuit. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/sperror.h" int diff --git a/src/spicelib/analysis/cktntask.c b/src/spicelib/analysis/cktntask.c index 316648923..01b8c9350 100644 --- a/src/spicelib/analysis/cktntask.c +++ b/src/spicelib/analysis/cktntask.c @@ -6,11 +6,11 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/tskdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/cktnum2n.c b/src/spicelib/analysis/cktnum2n.c index f9f9f6817..3b1ef8b62 100644 --- a/src/spicelib/analysis/cktnum2n.c +++ b/src/spicelib/analysis/cktnum2n.c @@ -9,10 +9,10 @@ Author: 1985 Thomas L. Quarles * find the given node given its name and return the node pointer */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/cktdefs.h" diff --git a/src/spicelib/analysis/cktop.c b/src/spicelib/analysis/cktop.c index 401b28f4c..a484a15f2 100644 --- a/src/spicelib/analysis/cktop.c +++ b/src/spicelib/analysis/cktop.c @@ -5,10 +5,10 @@ Modified: 2000 AlansFixes Modified: 2005 Paolo Nenzi - Restructured **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" static int dynamic_gmin (CKTcircuit *, long int, long int, int); diff --git a/src/spicelib/analysis/cktparam.c b/src/spicelib/analysis/cktparam.c index 474924b79..e0f907180 100644 --- a/src/spicelib/analysis/cktparam.c +++ b/src/spicelib/analysis/cktparam.c @@ -7,11 +7,11 @@ Author: 1985 Thomas L. Quarles * attach the given parameter to the specified device in the given circuit */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/cktpartn.c b/src/spicelib/analysis/cktpartn.c index 9146f9ce1..7bfcf78d2 100644 --- a/src/spicelib/analysis/cktpartn.c +++ b/src/spicelib/analysis/cktpartn.c @@ -8,12 +8,12 @@ Author: 1992 David A. Gates, UC Berkeley CADgroup * particular processor in a multiprocessor computer. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #ifdef XSPICE diff --git a/src/spicelib/analysis/cktpmnam.c b/src/spicelib/analysis/cktpmnam.c index 9e2cdafd8..1a7dd310a 100644 --- a/src/spicelib/analysis/cktpmnam.c +++ b/src/spicelib/analysis/cktpmnam.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * Take a parameter by Name and set it on the specified model */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/sperror.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/cktpname.c b/src/spicelib/analysis/cktpname.c index aec53a1c6..97e67fc06 100644 --- a/src/spicelib/analysis/cktpname.c +++ b/src/spicelib/analysis/cktpname.c @@ -11,12 +11,12 @@ Author: 1985 Thomas L. Quarles * Take a parameter by Name and set it on the specified device */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/sperror.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/cktpzld.c b/src/spicelib/analysis/cktpzld.c index 1419a6d91..bdef28b65 100644 --- a/src/spicelib/analysis/cktpzld.c +++ b/src/spicelib/analysis/cktpzld.c @@ -2,13 +2,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. **********/ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/pzdefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" int diff --git a/src/spicelib/analysis/cktpzset.c b/src/spicelib/analysis/cktpzset.c index 050858fbf..b92abcc58 100644 --- a/src/spicelib/analysis/cktpzset.c +++ b/src/spicelib/analysis/cktpzset.c @@ -8,11 +8,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. * given circuit, setup ... */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" int diff --git a/src/spicelib/analysis/cktpzstr.c b/src/spicelib/analysis/cktpzstr.c index 788803533..fe9b18469 100644 --- a/src/spicelib/analysis/cktpzstr.c +++ b/src/spicelib/analysis/cktpzstr.c @@ -6,12 +6,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. * A variant on the "zeroin" method. This is a bit convoluted. */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/pzdefs.h" +#include "ngspice/complex.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #ifdef PZDEBUG diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c index 487133f18..75ce40690 100644 --- a/src/spicelib/analysis/cktsens.c +++ b/src/spicelib/analysis/cktsens.c @@ -3,16 +3,16 @@ Copyright 1991 Regents of the University of California. All rights reserved. Modified: 2000 AlanFixes **********/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/spmatrix.h" +#include "ngspice/gendefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/sensdefs.h" +#include "ngspice/sensgen.h" /* #define ASDEBUG */ #ifdef ASDEBUG diff --git a/src/spicelib/analysis/cktsetap.c b/src/spicelib/analysis/cktsetap.c index 524562f71..0ee5d5f2f 100644 --- a/src/spicelib/analysis/cktsetap.c +++ b/src/spicelib/analysis/cktsetap.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/tskdefs.h" +#include "ngspice/jobdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/cktsetbk.c b/src/spicelib/analysis/cktsetbk.c index c3aba0bc2..e881bea95 100644 --- a/src/spicelib/analysis/cktsetbk.c +++ b/src/spicelib/analysis/cktsetbk.c @@ -9,10 +9,10 @@ Author: 1985 Thomas L. Quarles * add the given time to the breakpoint table for the given circuit */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" /* define to enable breakpoint trace code */ /* #define TRACE_BREAKPOINT */ diff --git a/src/spicelib/analysis/cktsetnp.c b/src/spicelib/analysis/cktsetnp.c index 8197c577f..44c42c569 100644 --- a/src/spicelib/analysis/cktsetnp.c +++ b/src/spicelib/analysis/cktsetnp.c @@ -9,10 +9,10 @@ Author: 1985 Thomas L. Quarles * set a parameter on a node. */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" diff --git a/src/spicelib/analysis/cktsetup.c b/src/spicelib/analysis/cktsetup.c index d2fac4413..f24c216cb 100644 --- a/src/spicelib/analysis/cktsetup.c +++ b/src/spicelib/analysis/cktsetup.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * given circuit */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" diff --git a/src/spicelib/analysis/cktsgen.c b/src/spicelib/analysis/cktsgen.c index d893b3d8a..b50e1e0b1 100644 --- a/src/spicelib/analysis/cktsgen.c +++ b/src/spicelib/analysis/cktsgen.c @@ -2,12 +2,12 @@ Copyright 1991 Regents of the University of California. All rights reserved. **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/gendefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/sensgen.h" /* XXX */ extern char *Sfilter; diff --git a/src/spicelib/analysis/cktsopt.c b/src/spicelib/analysis/cktsopt.c index b9fc37b9b..e9d80e998 100644 --- a/src/spicelib/analysis/cktsopt.c +++ b/src/spicelib/analysis/cktsopt.c @@ -10,19 +10,19 @@ Modified: 2000 AlansFixes * given circuit 'ckt'. */ -#include -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/optdefs.h" +#include "ngspice/tskdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" #include "analysis.h" #ifdef XSPICE /* gtri - begin - wbk - add includes */ -#include +#include "ngspice/mif.h" /* gtri - end - wbk - add includes */ #endif diff --git a/src/spicelib/analysis/ckttemp.c b/src/spicelib/analysis/ckttemp.c index 0d42ab442..71b27f6c1 100644 --- a/src/spicelib/analysis/ckttemp.c +++ b/src/spicelib/analysis/ckttemp.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * elements in the given circuit */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" int diff --git a/src/spicelib/analysis/cktterr.c b/src/spicelib/analysis/cktterr.c index bd33b900e..0a7bd4098 100644 --- a/src/spicelib/analysis/cktterr.c +++ b/src/spicelib/analysis/cktterr.c @@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #define ccap (qcap+1) diff --git a/src/spicelib/analysis/ckttroub.c b/src/spicelib/analysis/ckttroub.c index d8ab34f03..fe52e77e9 100644 --- a/src/spicelib/analysis/ckttroub.c +++ b/src/spicelib/analysis/ckttroub.c @@ -2,13 +2,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/trandefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "vsrc/vsrcdefs.h" #include "isrc/isrcdefs.h" -#include +#include "ngspice/jobdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/ckttrunc.c b/src/spicelib/analysis/ckttrunc.c index 39f221478..fd988d8b9 100644 --- a/src/spicelib/analysis/ckttrunc.c +++ b/src/spicelib/analysis/ckttrunc.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * given circuit */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" int diff --git a/src/spicelib/analysis/ckttyplk.c b/src/spicelib/analysis/ckttyplk.c index f6725d2c8..94f6f7ea7 100644 --- a/src/spicelib/analysis/ckttyplk.c +++ b/src/spicelib/analysis/ckttyplk.c @@ -7,9 +7,9 @@ Author: 1985 Thomas L. Quarles * appropriate strchr for the device found, or -1 for not found */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" int diff --git a/src/spicelib/analysis/cluster.c b/src/spicelib/analysis/cluster.c index 6185da880..c34f75181 100755 --- a/src/spicelib/analysis/cluster.c +++ b/src/spicelib/analysis/cluster.c @@ -1,10 +1,10 @@ /* Spice hooks */ -#include +#include "ngspice/ngspice.h" #ifdef CLUSTER -#include -#include -#include -#include +#include "ngspice/inpdefs.h" +#include "ngspice/cluster.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" /* Misc stuff */ #include diff --git a/src/spicelib/analysis/daskq.c b/src/spicelib/analysis/daskq.c index cc1de3b4c..2c40f5341 100644 --- a/src/spicelib/analysis/daskq.c +++ b/src/spicelib/analysis/daskq.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" +#include "ngspice/distodef.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/dcoaskq.c b/src/spicelib/analysis/dcoaskq.c index 61f505622..57b8ba6ce 100644 --- a/src/spicelib/analysis/dcoaskq.c +++ b/src/spicelib/analysis/dcoaskq.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/opdefs.h" +#include "ngspice/cktdefs.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/dcop.c b/src/spicelib/analysis/dcop.c index 9f316ac4d..df9d715a3 100644 --- a/src/spicelib/analysis/dcop.c +++ b/src/spicelib/analysis/dcop.c @@ -4,17 +4,17 @@ Author: 1985 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" #ifdef XSPICE /* gtri - add - wbk - 12/19/90 - Add headers */ -#include -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtproto.h" +#include "ngspice/ipctiein.h" /* gtri - end - wbk */ #endif diff --git a/src/spicelib/analysis/dcosetp.c b/src/spicelib/analysis/dcosetp.c index 6fac6abe3..2d1455c5a 100644 --- a/src/spicelib/analysis/dcosetp.c +++ b/src/spicelib/analysis/dcosetp.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" +#include "ngspice/opdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c index 78f4c396c..a837cc229 100755 --- a/src/spicelib/analysis/dcpss.c +++ b/src/spicelib/analysis/dcpss.c @@ -5,39 +5,39 @@ /* subroutine to do DC PSS analysis */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/pssdefs.h" +#include "ngspice/sperror.h" /* for FFT */ -#include -#include -#include -#include -#include +#include "ngspice/ftedefs.h" +#include "ngspice/dvec.h" +#include "ngspice/sim.h" +#include "ngspice/fteparse.h" +#include "ngspice/const.h" #include "../../frontend/fourier.h" #include "../../frontend/variable.h" #include "config.h" #include "cktaccept.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/fteext.h" +#include "ngspice/missing_math.h" #ifdef XSPICE /* gtri - add - wbk - Add headers */ -#include +#include "ngspice/miftypes.h" -#include -#include -#include -#include +#include "ngspice/evt.h" +#include "ngspice/mif.h" +#include "ngspice/evtproto.h" +#include "ngspice/ipctiein.h" /* gtri - end - wbk - Add headers */ #endif #ifdef CLUSTER -#include +#include "ngspice/cluster.h" #endif #ifdef HAS_WINDOWS /* hvogt 10.03.99, nach W. Mues */ diff --git a/src/spicelib/analysis/dctaskq.c b/src/spicelib/analysis/dctaskq.c index 967b77a9c..fe8547c11 100644 --- a/src/spicelib/analysis/dctaskq.c +++ b/src/spicelib/analysis/dctaskq.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/trcvdefs.h" +#include "ngspice/cktdefs.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c index 842f34a54..7b758eee3 100644 --- a/src/spicelib/analysis/dctran.c +++ b/src/spicelib/analysis/dctran.c @@ -7,32 +7,32 @@ Modified: 2000 AlansFixes /* subroutine to do DC TRANSIENT analysis --- ONLY, unlike spice2 routine with the same name! */ -#include +#include "ngspice/ngspice.h" #include "config.h" -#include +#include "ngspice/cktdefs.h" #include "cktaccept.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/fteext.h" +#include "ngspice/missing_math.h" /* for setting breakpoints required by dbs data base */ extern struct dbcomm *dbs; -#include +#include "ngspice/ftedebug.h" #ifdef XSPICE /* gtri - add - wbk - Add headers */ -#include +#include "ngspice/miftypes.h" -#include -#include -#include -#include +#include "ngspice/evt.h" +#include "ngspice/mif.h" +#include "ngspice/evtproto.h" +#include "ngspice/ipctiein.h" /* gtri - end - wbk - Add headers */ #endif #ifdef CLUSTER -#include +#include "ngspice/cluster.h" #endif #ifdef PREDICTOR diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c index f38e12ab3..fb3bb3ef7 100644 --- a/src/spicelib/analysis/dctrcurv.c +++ b/src/spicelib/analysis/dctrcurv.c @@ -4,25 +4,25 @@ Author: 1985 Thomas L. Quarles Modified: 1999 Paolo Nenzi **********/ -#include +#include "ngspice/ngspice.h" #include "vsrc/vsrcdefs.h" #include "isrc/isrcdefs.h" #include "res/resdefs.h" -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" #ifdef XSPICE /* gtri - add - wbk - 12/19/90 - Add headers */ -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evtproto.h" +#include "ngspice/ipctiein.h" /* gtri - end - wbk */ #endif -#include +#include "ngspice/devdefs.h" #ifdef HAS_WINDOWS void SetAnalyse( char * Analyse, int Percent); diff --git a/src/spicelib/analysis/dctsetp.c b/src/spicelib/analysis/dctsetp.c index ff0e7236c..0e7eef138 100644 --- a/src/spicelib/analysis/dctsetp.c +++ b/src/spicelib/analysis/dctsetp.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/trcvdefs.h" +#include "ngspice/cktdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/distoan.c b/src/spicelib/analysis/distoan.c index 2ee4abcb8..d89d2880e 100644 --- a/src/spicelib/analysis/distoan.c +++ b/src/spicelib/analysis/distoan.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/distodef.h" +#include "ngspice/sperror.h" static void diff --git a/src/spicelib/analysis/dkerproc.c b/src/spicelib/analysis/dkerproc.c index 588e73e4a..d9989a270 100644 --- a/src/spicelib/analysis/dkerproc.c +++ b/src/spicelib/analysis/dkerproc.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/distodef.h" int diff --git a/src/spicelib/analysis/dloadfns.c b/src/spicelib/analysis/dloadfns.c index d6e6838ad..833c5e610 100644 --- a/src/spicelib/analysis/dloadfns.c +++ b/src/spicelib/analysis/dloadfns.c @@ -3,8 +3,8 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" /* diff --git a/src/spicelib/analysis/dsetparm.c b/src/spicelib/analysis/dsetparm.c index 5ef498aa6..88a95bb70 100644 --- a/src/spicelib/analysis/dsetparm.c +++ b/src/spicelib/analysis/dsetparm.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" +#include "ngspice/distodef.h" #include "analysis.h" diff --git a/src/spicelib/analysis/naskq.c b/src/spicelib/analysis/naskq.c index 88b362129..c961341e0 100644 --- a/src/spicelib/analysis/naskq.c +++ b/src/spicelib/analysis/naskq.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Gary W. Ng **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" int diff --git a/src/spicelib/analysis/nevalsrc.c b/src/spicelib/analysis/nevalsrc.c index 0b2034f5c..ff4c76cd8 100644 --- a/src/spicelib/analysis/nevalsrc.c +++ b/src/spicelib/analysis/nevalsrc.c @@ -15,10 +15,10 @@ Author: 1987 Gary W. Ng */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/const.h" +#include "ngspice/noisedef.h" void diff --git a/src/spicelib/analysis/ninteg.c b/src/spicelib/analysis/ninteg.c index 0184038f2..ec482ac20 100644 --- a/src/spicelib/analysis/ninteg.c +++ b/src/spicelib/analysis/ninteg.c @@ -18,8 +18,8 @@ Author: 1987 Gary W. Ng * Hence, the reason for the constant 'N_INTUSELOG'. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/noisedef.h" #define limexp(x) (x > 700 ? exp(700.0)*(1.0+x-700.0) : exp(x)) diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c index 62cea0a24..6bb430ebb 100644 --- a/src/spicelib/analysis/noisean.c +++ b/src/spicelib/analysis/noisean.c @@ -9,12 +9,12 @@ Author: 1987 Gary W. Ng Modified: 2001 AlansFixes **********/ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/acdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/sperror.h" #include "vsrc/vsrcdefs.h" #include "isrc/isrcdefs.h" #include "../maths/ni/niniter.h" /* va, NInzIter */ diff --git a/src/spicelib/analysis/nsetparm.c b/src/spicelib/analysis/nsetparm.c index 27fc2fef0..821ccffc5 100644 --- a/src/spicelib/analysis/nsetparm.c +++ b/src/spicelib/analysis/nsetparm.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Gary W. Ng **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" #include "analysis.h" diff --git a/src/spicelib/analysis/pssaskq.c b/src/spicelib/analysis/pssaskq.c index 8dc203dee..919e18290 100755 --- a/src/spicelib/analysis/pssaskq.c +++ b/src/spicelib/analysis/pssaskq.c @@ -2,11 +2,11 @@ Author: 2010-05 Stefano Perticaroli ``spertica'' **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" +#include "ngspice/pssdefs.h" /* ARGSUSED */ int diff --git a/src/spicelib/analysis/pssinit.c b/src/spicelib/analysis/pssinit.c index 5cde0ec6a..c0a66b073 100755 --- a/src/spicelib/analysis/pssinit.c +++ b/src/spicelib/analysis/pssinit.c @@ -2,11 +2,11 @@ Author: 2010-05 Stefano Perticaroli ``spertica'' **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/trandefs.h" +#include "ngspice/pssdefs.h" +#include "ngspice/iferrmsg.h" int PSSinit(CKTcircuit *ckt, JOB *job) { diff --git a/src/spicelib/analysis/psssetp.c b/src/spicelib/analysis/psssetp.c index 0c6e3ee6a..d41d89bcd 100755 --- a/src/spicelib/analysis/psssetp.c +++ b/src/spicelib/analysis/psssetp.c @@ -2,11 +2,11 @@ Author: 2010-05 Stefano Perticaroli ``spertica'' **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" +#include "ngspice/pssdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/pzan.c b/src/spicelib/analysis/pzan.c index 8a3a76266..6331fb0fe 100644 --- a/src/spicelib/analysis/pzan.c +++ b/src/spicelib/analysis/pzan.c @@ -2,13 +2,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. **********/ -#include -#include -#include -#include -#include -#include /* only to get the 'mode' definitions */ -#include +#include "ngspice/ngspice.h" +#include "ngspice/complex.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/pzdefs.h" +#include "ngspice/trandefs.h" /* only to get the 'mode' definitions */ +#include "ngspice/sperror.h" #define DEBUG if (0) diff --git a/src/spicelib/analysis/pzaskq.c b/src/spicelib/analysis/pzaskq.c index 13cfda1fa..3131a2c84 100644 --- a/src/spicelib/analysis/pzaskq.c +++ b/src/spicelib/analysis/pzaskq.c @@ -4,11 +4,11 @@ Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/pzdefs.h" +#include "ngspice/cktdefs.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/pzsetp.c b/src/spicelib/analysis/pzsetp.c index 3f46a00b5..db7c4018c 100644 --- a/src/spicelib/analysis/pzsetp.c +++ b/src/spicelib/analysis/pzsetp.c @@ -4,11 +4,11 @@ Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/pzdefs.h" +#include "ngspice/cktdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/sensaskq.c b/src/spicelib/analysis/sensaskq.c index 9ce385fd3..805de0d9f 100644 --- a/src/spicelib/analysis/sensaskq.c +++ b/src/spicelib/analysis/sensaskq.c @@ -2,11 +2,11 @@ Copyright 1991 Regents of the University of California. All rights reserved. **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sensdefs.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/senssetp.c b/src/spicelib/analysis/senssetp.c index f4889d73f..44d96a652 100644 --- a/src/spicelib/analysis/senssetp.c +++ b/src/spicelib/analysis/senssetp.c @@ -2,11 +2,11 @@ Copyright 1991 Regents of the University of California. All rights reserved. **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sensdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c index 0efefe436..619676cf4 100644 --- a/src/spicelib/analysis/tfanal.c +++ b/src/spicelib/analysis/tfanal.c @@ -5,12 +5,12 @@ Author: 1988 Thomas L. Quarles /* subroutine to do DC Transfer Function analysis */ -#include -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/smpdefs.h" +#include "ngspice/tfdefs.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/tfaskq.c b/src/spicelib/analysis/tfaskq.c index 2d23f9c29..df2434eba 100644 --- a/src/spicelib/analysis/tfaskq.c +++ b/src/spicelib/analysis/tfaskq.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/trcvdefs.h" +#include "ngspice/cktdefs.h" /* ARGSUSED */ diff --git a/src/spicelib/analysis/tfsetp.c b/src/spicelib/analysis/tfsetp.c index 650e57ed5..3ad7ddda8 100644 --- a/src/spicelib/analysis/tfsetp.c +++ b/src/spicelib/analysis/tfsetp.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/tfdefs.h" +#include "ngspice/cktdefs.h" #include "analysis.h" diff --git a/src/spicelib/analysis/tranaskq.c b/src/spicelib/analysis/tranaskq.c index 11b0a1c88..853eed7d4 100644 --- a/src/spicelib/analysis/tranaskq.c +++ b/src/spicelib/analysis/tranaskq.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/trandefs.h" +#include "ngspice/cktdefs.h" /* ARGSUSED */ int diff --git a/src/spicelib/analysis/traninit.c b/src/spicelib/analysis/traninit.c index 3996c630b..2f1f02c9a 100644 --- a/src/spicelib/analysis/traninit.c +++ b/src/spicelib/analysis/traninit.c @@ -3,10 +3,10 @@ Copyright 1991 Regents of the University of California. All rights reserved. Modified: 2000 AlansFixes **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/trandefs.h" +#include "ngspice/iferrmsg.h" /* * this used to be in setup, but we need it here now diff --git a/src/spicelib/analysis/transetp.c b/src/spicelib/analysis/transetp.c index 7d32a6736..2385d3a8f 100644 --- a/src/spicelib/analysis/transetp.c +++ b/src/spicelib/analysis/transetp.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/trandefs.h" +#include "ngspice/cktdefs.h" #include "analysis.h" diff --git a/src/spicelib/devices/asrc/asrc.c b/src/spicelib/devices/asrc/asrc.c index 630260f75..8bce8a833 100644 --- a/src/spicelib/devices/asrc/asrc.c +++ b/src/spicelib/devices/asrc/asrc.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Kanwar Jit Singh **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "asrcdefs.h" -#include +#include "ngspice/suffix.h" /* Arbitrary source */ IFparm ASRCpTable[] = { /* parameters */ diff --git a/src/spicelib/devices/asrc/asrcacld.c b/src/spicelib/devices/asrc/asrcacld.c index 3516502b0..c84a06cd0 100644 --- a/src/spicelib/devices/asrc/asrcacld.c +++ b/src/spicelib/devices/asrc/asrcacld.c @@ -6,11 +6,11 @@ Author: 1988 Kanwar Jit Singh * singh@ic.Berkeley.edu */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "asrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/asrc/asrcask.c b/src/spicelib/devices/asrc/asrcask.c index 1255b7afa..339a0e46d 100644 --- a/src/spicelib/devices/asrc/asrcask.c +++ b/src/spicelib/devices/asrc/asrcask.c @@ -11,13 +11,13 @@ Author: 1987 Kanwar Jit Singh * of Current Controlled Voltage Source */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "asrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/asrc/asrcconv.c b/src/spicelib/devices/asrc/asrcconv.c index 6d7a2b348..704c33d37 100644 --- a/src/spicelib/devices/asrc/asrcconv.c +++ b/src/spicelib/devices/asrc/asrcconv.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Kanwar Jit Singh **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "asrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int ASRCconvTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/asrc/asrcdefs.h b/src/spicelib/devices/asrc/asrcdefs.h index fa163a3e5..8f347626c 100644 --- a/src/spicelib/devices/asrc/asrcdefs.h +++ b/src/spicelib/devices/asrc/asrcdefs.h @@ -7,9 +7,9 @@ Author: 1985 Thomas L. Quarles #define ASRC -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/complex.h" /* * structures to describe Arbitrary sources diff --git a/src/spicelib/devices/asrc/asrcdel.c b/src/spicelib/devices/asrc/asrcdel.c index 4d068c132..08be3e573 100644 --- a/src/spicelib/devices/asrc/asrcdel.c +++ b/src/spicelib/devices/asrc/asrcdel.c @@ -6,10 +6,10 @@ Author: 1987 Kanwar Jit Singh * singh@ic.Berkeley.edu */ -#include +#include "ngspice/ngspice.h" #include "asrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/asrc/asrcdest.c b/src/spicelib/devices/asrc/asrcdest.c index b6cc2e5e5..d96036d12 100644 --- a/src/spicelib/devices/asrc/asrcdest.c +++ b/src/spicelib/devices/asrc/asrcdest.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Kanwar Jit Singh **********/ -#include +#include "ngspice/ngspice.h" #include "asrcdefs.h" -#include +#include "ngspice/suffix.h" void ASRCdestroy(GENmodel **model) diff --git a/src/spicelib/devices/asrc/asrcfbr.c b/src/spicelib/devices/asrc/asrcfbr.c index d838361e0..f451f45d4 100644 --- a/src/spicelib/devices/asrc/asrcfbr.c +++ b/src/spicelib/devices/asrc/asrcfbr.c @@ -6,12 +6,12 @@ Author: 1987 Kanwar Jit Singh * singh@ic.Berkeley.edu */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" #include "asrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/asrc/asrcinit.c b/src/spicelib/devices/asrc/asrcinit.c index d89b59fb8..bd5f62bc0 100644 --- a/src/spicelib/devices/asrc/asrcinit.c +++ b/src/spicelib/devices/asrc/asrcinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "asrcitf.h" #include "asrcext.h" diff --git a/src/spicelib/devices/asrc/asrcload.c b/src/spicelib/devices/asrc/asrcload.c index fea16baa7..e9d83adfe 100644 --- a/src/spicelib/devices/asrc/asrcload.c +++ b/src/spicelib/devices/asrc/asrcload.c @@ -6,11 +6,11 @@ Author: 1987 Kanwar Jit Singh * singh@ic.Berkeley.edu */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "asrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" double *asrc_vals, *asrc_derivs; int asrc_nvals; diff --git a/src/spicelib/devices/asrc/asrcmdel.c b/src/spicelib/devices/asrc/asrcmdel.c index f2711d208..2ee344894 100644 --- a/src/spicelib/devices/asrc/asrcmdel.c +++ b/src/spicelib/devices/asrc/asrcmdel.c @@ -6,10 +6,10 @@ Author: 1987 Kanwar Jit Singh * singh@ic.Berkeley.edu */ -#include +#include "ngspice/ngspice.h" #include "asrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/asrc/asrcpar.c b/src/spicelib/devices/asrc/asrcpar.c index de99a86fc..f25d8d80b 100644 --- a/src/spicelib/devices/asrc/asrcpar.c +++ b/src/spicelib/devices/asrc/asrcpar.c @@ -6,11 +6,11 @@ Author: 1987 Kanwar Jit Singh * singh@ic.Berkeley.edu */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "asrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/asrc/asrcpzld.c b/src/spicelib/devices/asrc/asrcpzld.c index 46cc7273b..277fb5682 100644 --- a/src/spicelib/devices/asrc/asrcpzld.c +++ b/src/spicelib/devices/asrc/asrcpzld.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Kanwar Jit Singh **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "asrcdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/complex.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/asrc/asrcset.c b/src/spicelib/devices/asrc/asrcset.c index 1da32c6ac..5203dba9f 100644 --- a/src/spicelib/devices/asrc/asrcset.c +++ b/src/spicelib/devices/asrc/asrcset.c @@ -6,11 +6,11 @@ Author: 1987 Kanwar Jit Singh * singh@ic.Berkeley.edu */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "asrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/bjt/bjt.c b/src/spicelib/devices/bjt/bjt.c index 15505bcf5..3c282f34f 100644 --- a/src/spicelib/devices/bjt/bjt.c +++ b/src/spicelib/devices/bjt/bjt.c @@ -14,10 +14,10 @@ Author: 1985 Thomas L. Quarles * archaic spice2 bjt model */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bjtdefs.h" -#include +#include "ngspice/suffix.h" IFparm BJTpTable[] = { /* parameters */ IOPU("off", BJT_OFF, IF_FLAG, "Device initially off"), diff --git a/src/spicelib/devices/bjt/bjtacld.c b/src/spicelib/devices/bjt/bjtacld.c index 989acd129..b908c8387 100644 --- a/src/spicelib/devices/bjt/bjtacld.c +++ b/src/spicelib/devices/bjt/bjtacld.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * point analysis. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BJTacLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bjt/bjtask.c b/src/spicelib/devices/bjt/bjtask.c index 20c8ef4ec..9ccc79bc4 100644 --- a/src/spicelib/devices/bjt/bjtask.c +++ b/src/spicelib/devices/bjt/bjtask.c @@ -8,13 +8,13 @@ Author: 1985 Mathew Lew and Thomas L. Quarles * parameters for BJTs */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/cktdefs.h" #include "bjtdefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/bjt/bjtconv.c b/src/spicelib/devices/bjt/bjtconv.c index 0fedf520b..d55f6806f 100644 --- a/src/spicelib/devices/bjt/bjtconv.c +++ b/src/spicelib/devices/bjt/bjtconv.c @@ -8,11 +8,11 @@ Author: 1985 Thomas L. Quarles * BJTs in the circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BJTconvTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bjt/bjtdefs.h b/src/spicelib/devices/bjt/bjtdefs.h index 63ab9591a..20132e2cd 100644 --- a/src/spicelib/devices/bjt/bjtdefs.h +++ b/src/spicelib/devices/bjt/bjtdefs.h @@ -6,11 +6,11 @@ Author: 1985 Thomas L. Quarles #ifndef BJT #define BJT -#include -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* structures to describe Bipolar Junction Transistors */ diff --git a/src/spicelib/devices/bjt/bjtdel.c b/src/spicelib/devices/bjt/bjtdel.c index e7d3a0335..20a18407f 100644 --- a/src/spicelib/devices/bjt/bjtdel.c +++ b/src/spicelib/devices/bjt/bjtdel.c @@ -8,10 +8,10 @@ Author: 1985 Thomas L. Quarles * the storage it was using. */ -#include +#include "ngspice/ngspice.h" #include "bjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bjt/bjtdest.c b/src/spicelib/devices/bjt/bjtdest.c index 14d139e37..c7d44413c 100644 --- a/src/spicelib/devices/bjt/bjtdest.c +++ b/src/spicelib/devices/bjt/bjtdest.c @@ -10,9 +10,9 @@ Author: 1985 Thomas L. Quarles * all storage they were using. */ -#include +#include "ngspice/ngspice.h" #include "bjtdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/bjt/bjtdisto.c b/src/spicelib/devices/bjt/bjtdisto.c index 71e06516e..312bdc69b 100644 --- a/src/spicelib/devices/bjt/bjtdisto.c +++ b/src/spicelib/devices/bjt/bjtdisto.c @@ -4,12 +4,12 @@ Author: 1988 Jaijeet S Roychowdhury Modified: 2000 AlansFixes **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bjtdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" #include "bjtdset.h" diff --git a/src/spicelib/devices/bjt/bjtdset.c b/src/spicelib/devices/bjt/bjtdset.c index 8e01f8ff4..26f65b968 100644 --- a/src/spicelib/devices/bjt/bjtdset.c +++ b/src/spicelib/devices/bjt/bjtdset.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bjtdefs.h" -#include -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/distodef.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" /* * This function initialises the Taylor coeffs for the diff --git a/src/spicelib/devices/bjt/bjtgetic.c b/src/spicelib/devices/bjt/bjtgetic.c index 088bc22c5..dd52f995a 100644 --- a/src/spicelib/devices/bjt/bjtgetic.c +++ b/src/spicelib/devices/bjt/bjtgetic.c @@ -10,11 +10,11 @@ Author: 1985 Thomas L. Quarles * from the RHS vector */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bjt/bjtinit.c b/src/spicelib/devices/bjt/bjtinit.c index f21c99109..cbefdb349 100644 --- a/src/spicelib/devices/bjt/bjtinit.c +++ b/src/spicelib/devices/bjt/bjtinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bjtitf.h" #include "bjtext.h" diff --git a/src/spicelib/devices/bjt/bjtload.c b/src/spicelib/devices/bjt/bjtload.c index 3b71c0a6a..407b9d963 100644 --- a/src/spicelib/devices/bjt/bjtload.c +++ b/src/spicelib/devices/bjt/bjtload.c @@ -9,14 +9,14 @@ Modified: 2000 AlansFixes * BJTs in the circuit and load them into the matrix as appropriate */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bjtdefs.h" -#include -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int BJTload(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bjt/bjtmask.c b/src/spicelib/devices/bjt/bjtmask.c index 679a36805..a2baed0fb 100644 --- a/src/spicelib/devices/bjt/bjtmask.c +++ b/src/spicelib/devices/bjt/bjtmask.c @@ -5,14 +5,14 @@ Author: 1987 Mathew Lew and Thomas L. Quarles /* */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/bjt/bjtmdel.c b/src/spicelib/devices/bjt/bjtmdel.c index f0404eba6..a6c399ee8 100644 --- a/src/spicelib/devices/bjt/bjtmdel.c +++ b/src/spicelib/devices/bjt/bjtmdel.c @@ -11,10 +11,10 @@ Author: 1985 Thomas L. Quarles * returns an error if the model has instances */ -#include +#include "ngspice/ngspice.h" #include "bjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bjt/bjtmpar.c b/src/spicelib/devices/bjt/bjtmpar.c index b7ec58096..fcc6ab16c 100644 --- a/src/spicelib/devices/bjt/bjtmpar.c +++ b/src/spicelib/devices/bjt/bjtmpar.c @@ -10,12 +10,12 @@ Author: 1985 Thomas L. Quarles * BJTs in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "bjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bjt/bjtnoise.c b/src/spicelib/devices/bjt/bjtnoise.c index 6a42cf1c0..28f943afc 100644 --- a/src/spicelib/devices/bjt/bjtnoise.c +++ b/src/spicelib/devices/bjt/bjtnoise.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Gary W. Ng **********/ -#include +#include "ngspice/ngspice.h" #include "bjtdefs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * BJTnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bjt/bjtparam.c b/src/spicelib/devices/bjt/bjtparam.c index a97556c7b..1187dab06 100644 --- a/src/spicelib/devices/bjt/bjtparam.c +++ b/src/spicelib/devices/bjt/bjtparam.c @@ -10,12 +10,12 @@ Author: 1985 Thomas L. Quarles * BJTs in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "bjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/bjt/bjtpzld.c b/src/spicelib/devices/bjt/bjtpzld.c index 0bd1c634e..8600cbee4 100644 --- a/src/spicelib/devices/bjt/bjtpzld.c +++ b/src/spicelib/devices/bjt/bjtpzld.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" #include "bjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bjt/bjtsacl.c b/src/spicelib/devices/bjt/bjtsacl.c index f6882671b..46b957497 100644 --- a/src/spicelib/devices/bjt/bjtsacl.c +++ b/src/spicelib/devices/bjt/bjtsacl.c @@ -9,14 +9,14 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "bjtdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bjt/bjtsetup.c b/src/spicelib/devices/bjt/bjtsetup.c index 956f9068b..20f225229 100644 --- a/src/spicelib/devices/bjt/bjtsetup.c +++ b/src/spicelib/devices/bjt/bjtsetup.c @@ -11,14 +11,14 @@ Modified: 2000 AlansFixes * affected by emitter, collector, and base resistances) */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "bjtdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" int BJTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) diff --git a/src/spicelib/devices/bjt/bjtsload.c b/src/spicelib/devices/bjt/bjtsload.c index 0c17f65ef..e354e846f 100644 --- a/src/spicelib/devices/bjt/bjtsload.c +++ b/src/spicelib/devices/bjt/bjtsload.c @@ -9,14 +9,14 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "bjtdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bjt/bjtsprt.c b/src/spicelib/devices/bjt/bjtsprt.c index 098dc5660..441b2c7a7 100644 --- a/src/spicelib/devices/bjt/bjtsprt.c +++ b/src/spicelib/devices/bjt/bjtsprt.c @@ -9,14 +9,14 @@ This function is obsolete (was used by an old sensitivity analysis) * the bjts in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "bjtdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/bjt/bjtsset.c b/src/spicelib/devices/bjt/bjtsset.c index cc56c9c8f..c77968eb3 100644 --- a/src/spicelib/devices/bjt/bjtsset.c +++ b/src/spicelib/devices/bjt/bjtsset.c @@ -9,14 +9,14 @@ This function is obsolete (was used by an old sensitivity analysis) * allocate parameter #s to design parameters */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "bjtdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bjt/bjtsupd.c b/src/spicelib/devices/bjt/bjtsupd.c index 159d7776f..254ab7e0a 100644 --- a/src/spicelib/devices/bjt/bjtsupd.c +++ b/src/spicelib/devices/bjt/bjtsupd.c @@ -7,14 +7,14 @@ This function is obsolete (was used by an old sensitivity analysis) /* update the charge sensitivities and their derivatives */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "bjtdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bjt/bjttemp.c b/src/spicelib/devices/bjt/bjttemp.c index 66de9aff7..f45cef05c 100644 --- a/src/spicelib/devices/bjt/bjttemp.c +++ b/src/spicelib/devices/bjt/bjttemp.c @@ -4,14 +4,14 @@ Author: 1985 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "bjtdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/bjt/bjttrunc.c b/src/spicelib/devices/bjt/bjttrunc.c index 8880e151a..22cf36972 100644 --- a/src/spicelib/devices/bjt/bjttrunc.c +++ b/src/spicelib/devices/bjt/bjttrunc.c @@ -10,11 +10,11 @@ Author: 1985 Thomas L. Quarles * BJTs in the circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim1/b1.c b/src/spicelib/devices/bsim1/b1.c index d41b21573..0e6b50595 100644 --- a/src/spicelib/devices/bsim1/b1.c +++ b/src/spicelib/devices/bsim1/b1.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bsim1def.h" -#include +#include "ngspice/suffix.h" IFparm B1pTable[] = { /* parameters */ IOP( "l", BSIM1_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim1/b1acld.c b/src/spicelib/devices/bsim1/b1acld.c index e72e5427d..eb03f36be 100644 --- a/src/spicelib/devices/bsim1/b1acld.c +++ b/src/spicelib/devices/bsim1/b1acld.c @@ -5,11 +5,11 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim1/b1ask.c b/src/spicelib/devices/bsim1/b1ask.c index 7392be623..7e0ab9b08 100644 --- a/src/spicelib/devices/bsim1/b1ask.c +++ b/src/spicelib/devices/bsim1/b1ask.c @@ -3,13 +3,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Hong J. Park **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/bsim1/b1cvtest.c b/src/spicelib/devices/bsim1/b1cvtest.c index a2f5bd13f..6db3661d4 100644 --- a/src/spicelib/devices/bsim1/b1cvtest.c +++ b/src/spicelib/devices/bsim1/b1cvtest.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B1convTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim1/b1del.c b/src/spicelib/devices/bsim1/b1del.c index 5b9494599..db401deb1 100644 --- a/src/spicelib/devices/bsim1/b1del.c +++ b/src/spicelib/devices/bsim1/b1del.c @@ -5,11 +5,11 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "bsim1def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim1/b1dest.c b/src/spicelib/devices/bsim1/b1dest.c index 9fb7a0502..e5679e7b1 100644 --- a/src/spicelib/devices/bsim1/b1dest.c +++ b/src/spicelib/devices/bsim1/b1dest.c @@ -5,9 +5,9 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "bsim1def.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/bsim1/b1disto.c b/src/spicelib/devices/bsim1/b1disto.c index e7aae6a6e..b805ea573 100644 --- a/src/spicelib/devices/bsim1/b1disto.c +++ b/src/spicelib/devices/bsim1/b1disto.c @@ -4,12 +4,12 @@ Author: 1988 Jaijeet S Roychowdhury Modified: AlansFixes **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" int B1disto(int mode, GENmodel *genmodel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim1/b1dset.c b/src/spicelib/devices/bsim1/b1dset.c index 219abfc33..176000f95 100644 --- a/src/spicelib/devices/bsim1/b1dset.c +++ b/src/spicelib/devices/bsim1/b1dset.c @@ -3,15 +3,15 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/distodef.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/devdefs.h" int B1dSetup(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim1/b1eval.c b/src/spicelib/devices/bsim1/b1eval.c index b63d98393..873d51e3f 100644 --- a/src/spicelib/devices/bsim1/b1eval.c +++ b/src/spicelib/devices/bsim1/b1eval.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/suffix.h" /* This routine evaluates the drain current, its derivatives and the * charges associated with the gate,bulk and drain terminal diff --git a/src/spicelib/devices/bsim1/b1getic.c b/src/spicelib/devices/bsim1/b1getic.c index 301727952..44189f933 100644 --- a/src/spicelib/devices/bsim1/b1getic.c +++ b/src/spicelib/devices/bsim1/b1getic.c @@ -5,11 +5,11 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim1/b1ld.c b/src/spicelib/devices/bsim1/b1ld.c index cbc4be8b1..2cbf2eafc 100644 --- a/src/spicelib/devices/bsim1/b1ld.c +++ b/src/spicelib/devices/bsim1/b1ld.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int B1load(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim1/b1mask.c b/src/spicelib/devices/bsim1/b1mask.c index 16992f1f2..f186468fc 100644 --- a/src/spicelib/devices/bsim1/b1mask.c +++ b/src/spicelib/devices/bsim1/b1mask.c @@ -5,13 +5,13 @@ Author: 1988 Hong J. Park /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/bsim1/b1mdel.c b/src/spicelib/devices/bsim1/b1mdel.c index e4a32120c..9c6e04475 100644 --- a/src/spicelib/devices/bsim1/b1mdel.c +++ b/src/spicelib/devices/bsim1/b1mdel.c @@ -5,10 +5,10 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "bsim1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim1/b1moscap.c b/src/spicelib/devices/bsim1/b1moscap.c index 0f7c61e6d..93cedfbba 100644 --- a/src/spicelib/devices/bsim1/b1moscap.c +++ b/src/spicelib/devices/bsim1/b1moscap.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include +#include "ngspice/suffix.h" /* routine to calculate equivalent conductance and total terminal * charges diff --git a/src/spicelib/devices/bsim1/b1mpar.c b/src/spicelib/devices/bsim1/b1mpar.c index 20cabee11..e8a2ab8d9 100644 --- a/src/spicelib/devices/bsim1/b1mpar.c +++ b/src/spicelib/devices/bsim1/b1mpar.c @@ -5,11 +5,11 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "bsim1def.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim1/b1noi.c b/src/spicelib/devices/bsim1/b1noi.c index 7a4e1d01d..eaff0ec2b 100644 --- a/src/spicelib/devices/bsim1/b1noi.c +++ b/src/spicelib/devices/bsim1/b1noi.c @@ -3,12 +3,12 @@ Copyright 2003 ??. All rights reserved. Author: 2003 Paolo Nenzi **********/ -#include +#include "ngspice/ngspice.h" #include "bsim1def.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * B1noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bsim1/b1par.c b/src/spicelib/devices/bsim1/b1par.c index f08e603c2..e097b73e3 100644 --- a/src/spicelib/devices/bsim1/b1par.c +++ b/src/spicelib/devices/bsim1/b1par.c @@ -5,11 +5,11 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "bsim1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/bsim1/b1pzld.c b/src/spicelib/devices/bsim1/b1pzld.c index c03cbfdec..e202ea085 100644 --- a/src/spicelib/devices/bsim1/b1pzld.c +++ b/src/spicelib/devices/bsim1/b1pzld.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "bsim1def.h" -#include +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim1/b1set.c b/src/spicelib/devices/bsim1/b1set.c index 14f1b93c9..18d781f68 100644 --- a/src/spicelib/devices/bsim1/b1set.c +++ b/src/spicelib/devices/bsim1/b1set.c @@ -3,13 +3,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B1setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, diff --git a/src/spicelib/devices/bsim1/b1temp.c b/src/spicelib/devices/bsim1/b1temp.c index 7e3156ebd..09dcb57bd 100644 --- a/src/spicelib/devices/bsim1/b1temp.c +++ b/src/spicelib/devices/bsim1/b1temp.c @@ -3,13 +3,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/bsim1/b1trunc.c b/src/spicelib/devices/bsim1/b1trunc.c index 5e7da4146..0e78e318e 100644 --- a/src/spicelib/devices/bsim1/b1trunc.c +++ b/src/spicelib/devices/bsim1/b1trunc.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B1trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) diff --git a/src/spicelib/devices/bsim1/bsim1def.h b/src/spicelib/devices/bsim1/bsim1def.h index 8cae5c1b0..b9ff53e7d 100644 --- a/src/spicelib/devices/bsim1/bsim1def.h +++ b/src/spicelib/devices/bsim1/bsim1def.h @@ -6,11 +6,11 @@ Author: 1985 Hong June Park, Thomas L. Quarles #ifndef BSIM1 #define BSIM1 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* declarations for B1 MOSFETs */ diff --git a/src/spicelib/devices/bsim1/bsim1init.c b/src/spicelib/devices/bsim1/bsim1init.c index 8890f9a3e..f2bf54734 100644 --- a/src/spicelib/devices/bsim1/bsim1init.c +++ b/src/spicelib/devices/bsim1/bsim1init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bsim1itf.h" #include "bsim1ext.h" diff --git a/src/spicelib/devices/bsim2/b2.c b/src/spicelib/devices/bsim2/b2.c index be44e93ec..eadba857a 100644 --- a/src/spicelib/devices/bsim2/b2.c +++ b/src/spicelib/devices/bsim2/b2.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Min-Chie Jeng, Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bsim2def.h" -#include +#include "ngspice/suffix.h" IFparm B2pTable[] = { /* parameters */ IOP( "l", BSIM2_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim2/b2acld.c b/src/spicelib/devices/bsim2/b2acld.c index 1acfbae3e..0f91d6d91 100644 --- a/src/spicelib/devices/bsim2/b2acld.c +++ b/src/spicelib/devices/bsim2/b2acld.c @@ -5,11 +5,11 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim2/b2ask.c b/src/spicelib/devices/bsim2/b2ask.c index 580c444b5..debc206d2 100644 --- a/src/spicelib/devices/bsim2/b2ask.c +++ b/src/spicelib/devices/bsim2/b2ask.c @@ -3,13 +3,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Hong J. Park **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/bsim2/b2cvtest.c b/src/spicelib/devices/bsim2/b2cvtest.c index f4b0b5553..6af814ac8 100644 --- a/src/spicelib/devices/bsim2/b2cvtest.c +++ b/src/spicelib/devices/bsim2/b2cvtest.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim2def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B2convTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim2/b2del.c b/src/spicelib/devices/bsim2/b2del.c index 2890c3034..d4183d819 100644 --- a/src/spicelib/devices/bsim2/b2del.c +++ b/src/spicelib/devices/bsim2/b2del.c @@ -5,11 +5,11 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "bsim2def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim2/b2dest.c b/src/spicelib/devices/bsim2/b2dest.c index 00f6eea55..7a34d77c9 100644 --- a/src/spicelib/devices/bsim2/b2dest.c +++ b/src/spicelib/devices/bsim2/b2dest.c @@ -5,9 +5,9 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "bsim2def.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/bsim2/b2eval.c b/src/spicelib/devices/bsim2/b2eval.c index 9aec40aa4..9284665df 100644 --- a/src/spicelib/devices/bsim2/b2eval.c +++ b/src/spicelib/devices/bsim2/b2eval.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Min-Chie Jeng, Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim2def.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/suffix.h" /* This routine evaluates the drain current, its derivatives and the * charges associated with the gate,bulk and drain terminal diff --git a/src/spicelib/devices/bsim2/b2getic.c b/src/spicelib/devices/bsim2/b2getic.c index 53bb5319a..fb3722931 100644 --- a/src/spicelib/devices/bsim2/b2getic.c +++ b/src/spicelib/devices/bsim2/b2getic.c @@ -5,11 +5,11 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim2/b2ld.c b/src/spicelib/devices/bsim2/b2ld.c index ea530545c..b081af12f 100644 --- a/src/spicelib/devices/bsim2/b2ld.c +++ b/src/spicelib/devices/bsim2/b2ld.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim2def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int B2load(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim2/b2mask.c b/src/spicelib/devices/bsim2/b2mask.c index a347ae22a..4a4ed4db8 100644 --- a/src/spicelib/devices/bsim2/b2mask.c +++ b/src/spicelib/devices/bsim2/b2mask.c @@ -5,13 +5,13 @@ Author: 1988 Hong J. Park /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/bsim2/b2mdel.c b/src/spicelib/devices/bsim2/b2mdel.c index 2e388139b..a57cfcc38 100644 --- a/src/spicelib/devices/bsim2/b2mdel.c +++ b/src/spicelib/devices/bsim2/b2mdel.c @@ -5,10 +5,10 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "bsim2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim2/b2moscap.c b/src/spicelib/devices/bsim2/b2moscap.c index 7e4c3cac2..ec38e39ac 100644 --- a/src/spicelib/devices/bsim2/b2moscap.c +++ b/src/spicelib/devices/bsim2/b2moscap.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim2def.h" -#include +#include "ngspice/suffix.h" /* routine to calculate equivalent conductance and total terminal * charges diff --git a/src/spicelib/devices/bsim2/b2mpar.c b/src/spicelib/devices/bsim2/b2mpar.c index 902775134..54389b85b 100644 --- a/src/spicelib/devices/bsim2/b2mpar.c +++ b/src/spicelib/devices/bsim2/b2mpar.c @@ -5,11 +5,11 @@ Author: 1988 Min-Chie Jeng, Hong J. Park, Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "bsim2def.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim2/b2noi.c b/src/spicelib/devices/bsim2/b2noi.c index 4ddffd973..e607c50a1 100644 --- a/src/spicelib/devices/bsim2/b2noi.c +++ b/src/spicelib/devices/bsim2/b2noi.c @@ -3,12 +3,12 @@ Copyright 2003 ??. All rights reserved. Author: 2003 Paolo Nenzi **********/ -#include +#include "ngspice/ngspice.h" #include "bsim2def.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * B2noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bsim2/b2par.c b/src/spicelib/devices/bsim2/b2par.c index 1451ba692..29e7ed06d 100644 --- a/src/spicelib/devices/bsim2/b2par.c +++ b/src/spicelib/devices/bsim2/b2par.c @@ -5,11 +5,11 @@ Author: 1985 Hong J. Park, Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "bsim2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/bsim2/b2pzld.c b/src/spicelib/devices/bsim2/b2pzld.c index 91131641e..e2f804f04 100644 --- a/src/spicelib/devices/bsim2/b2pzld.c +++ b/src/spicelib/devices/bsim2/b2pzld.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "bsim2def.h" -#include +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim2/b2set.c b/src/spicelib/devices/bsim2/b2set.c index 65e6cc7dd..cec8a3759 100644 --- a/src/spicelib/devices/bsim2/b2set.c +++ b/src/spicelib/devices/bsim2/b2set.c @@ -3,13 +3,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Min-Chie Jeng, Hong J. Park, Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim2def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) diff --git a/src/spicelib/devices/bsim2/b2temp.c b/src/spicelib/devices/bsim2/b2temp.c index 68ca88553..f0843d2c7 100644 --- a/src/spicelib/devices/bsim2/b2temp.c +++ b/src/spicelib/devices/bsim2/b2temp.c @@ -3,13 +3,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim2def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/bsim2/b2trunc.c b/src/spicelib/devices/bsim2/b2trunc.c index 41443b1c1..3833a162c 100644 --- a/src/spicelib/devices/bsim2/b2trunc.c +++ b/src/spicelib/devices/bsim2/b2trunc.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Hong J. Park, Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) diff --git a/src/spicelib/devices/bsim2/bsim2def.h b/src/spicelib/devices/bsim2/bsim2def.h index bb6e62d19..3126e36e2 100644 --- a/src/spicelib/devices/bsim2/bsim2def.h +++ b/src/spicelib/devices/bsim2/bsim2def.h @@ -6,10 +6,10 @@ Author: 1988 Min-Chie Jeng, Hong June Park, Thomas L. Quarles #ifndef BSIM2 #define BSIM2 -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" /* declarations for B2 MOSFETs */ diff --git a/src/spicelib/devices/bsim2/bsim2init.c b/src/spicelib/devices/bsim2/bsim2init.c index ea3f57f7f..e697983ba 100644 --- a/src/spicelib/devices/bsim2/bsim2init.c +++ b/src/spicelib/devices/bsim2/bsim2init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bsim2itf.h" #include "bsim2ext.h" diff --git a/src/spicelib/devices/bsim3/b3.c b/src/spicelib/devices/bsim3/b3.c index 6c35462a8..3240b9294 100644 --- a/src/spicelib/devices/bsim3/b3.c +++ b/src/spicelib/devices/bsim3/b3.c @@ -8,10 +8,10 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bsim3def.h" -#include +#include "ngspice/suffix.h" IFparm BSIM3pTable[] = { /* parameters */ IOP( "l", BSIM3_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim3/b3acld.c b/src/spicelib/devices/bsim3/b3acld.c index e99fe4799..8591a0c51 100644 --- a/src/spicelib/devices/bsim3/b3acld.c +++ b/src/spicelib/devices/bsim3/b3acld.c @@ -8,11 +8,11 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3/b3ask.c b/src/spicelib/devices/bsim3/b3ask.c index 99dc5ce3a..5ff21ecf2 100644 --- a/src/spicelib/devices/bsim3/b3ask.c +++ b/src/spicelib/devices/bsim3/b3ask.c @@ -8,13 +8,13 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim3def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3ask( diff --git a/src/spicelib/devices/bsim3/b3check.c b/src/spicelib/devices/bsim3/b3check.c index c5c922b16..1951cdf95 100644 --- a/src/spicelib/devices/bsim3/b3check.c +++ b/src/spicelib/devices/bsim3/b3check.c @@ -10,14 +10,14 @@ * Modified by Xuemei Xi, 07/29/2005. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int BSIM3checkModel( diff --git a/src/spicelib/devices/bsim3/b3cvtest.c b/src/spicelib/devices/bsim3/b3cvtest.c index 0002209dc..1d720db3e 100644 --- a/src/spicelib/devices/bsim3/b3cvtest.c +++ b/src/spicelib/devices/bsim3/b3cvtest.c @@ -8,14 +8,14 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3/b3del.c b/src/spicelib/devices/bsim3/b3del.c index 110c8572e..282854030 100644 --- a/src/spicelib/devices/bsim3/b3del.c +++ b/src/spicelib/devices/bsim3/b3del.c @@ -9,11 +9,11 @@ * Modified by Xuemei Xi, 10/05, 12/14, 2001. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3/b3dest.c b/src/spicelib/devices/bsim3/b3dest.c index 12bbd6d5d..1868a41dc 100644 --- a/src/spicelib/devices/bsim3/b3dest.c +++ b/src/spicelib/devices/bsim3/b3dest.c @@ -8,9 +8,9 @@ * Author: 2001 Xuemei Xi **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3def.h" -#include +#include "ngspice/suffix.h" void BSIM3destroy( diff --git a/src/spicelib/devices/bsim3/b3getic.c b/src/spicelib/devices/bsim3/b3getic.c index 4924b2540..49b55b1f6 100644 --- a/src/spicelib/devices/bsim3/b3getic.c +++ b/src/spicelib/devices/bsim3/b3getic.c @@ -8,11 +8,11 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3/b3ld.c b/src/spicelib/devices/bsim3/b3ld.c index 6c9de7d27..347eee126 100644 --- a/src/spicelib/devices/bsim3/b3ld.c +++ b/src/spicelib/devices/bsim3/b3ld.c @@ -12,14 +12,14 @@ * Modified by Xuemei Xi, 07/29/2005. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim3/b3mask.c b/src/spicelib/devices/bsim3/b3mask.c index 9d3f24313..c90e15aec 100644 --- a/src/spicelib/devices/bsim3/b3mask.c +++ b/src/spicelib/devices/bsim3/b3mask.c @@ -8,13 +8,13 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim3def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3mAsk( diff --git a/src/spicelib/devices/bsim3/b3mdel.c b/src/spicelib/devices/bsim3/b3mdel.c index ef49ecd7f..917522f38 100644 --- a/src/spicelib/devices/bsim3/b3mdel.c +++ b/src/spicelib/devices/bsim3/b3mdel.c @@ -8,10 +8,10 @@ * Author: 2001 Xuemei Xi **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3mDelete( diff --git a/src/spicelib/devices/bsim3/b3mpar.c b/src/spicelib/devices/bsim3/b3mpar.c index 461501ffb..1d81c7de3 100644 --- a/src/spicelib/devices/bsim3/b3mpar.c +++ b/src/spicelib/devices/bsim3/b3mpar.c @@ -8,11 +8,11 @@ * Author: 2001 Xuemei Xi **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3def.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3/b3noi.c b/src/spicelib/devices/bsim3/b3noi.c index eda4b509e..4f6b44402 100644 --- a/src/spicelib/devices/bsim3/b3noi.c +++ b/src/spicelib/devices/bsim3/b3noi.c @@ -9,13 +9,13 @@ * Modified by Xuemei Xi, 10/05/2001. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3def.h" -#include -#include -#include -#include -#include /* jwan */ +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* jwan */ /* * BSIM3noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bsim3/b3par.c b/src/spicelib/devices/bsim3/b3par.c index 33c52f93a..555376443 100644 --- a/src/spicelib/devices/bsim3/b3par.c +++ b/src/spicelib/devices/bsim3/b3par.c @@ -8,12 +8,12 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "bsim3def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/fteext.h" int BSIM3param ( diff --git a/src/spicelib/devices/bsim3/b3pzld.c b/src/spicelib/devices/bsim3/b3pzld.c index d0467a8f7..02351d2f8 100644 --- a/src/spicelib/devices/bsim3/b3pzld.c +++ b/src/spicelib/devices/bsim3/b3pzld.c @@ -8,12 +8,12 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "bsim3def.h" -#include +#include "ngspice/suffix.h" int BSIM3pzLoad( diff --git a/src/spicelib/devices/bsim3/b3set.c b/src/spicelib/devices/bsim3/b3set.c index 80fc1c7fc..65d2e76ab 100644 --- a/src/spicelib/devices/bsim3/b3set.c +++ b/src/spicelib/devices/bsim3/b3set.c @@ -9,16 +9,16 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim3def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef USE_OMP3 -#include +#include "ngspice/cpextern.h" int nthreads; #endif diff --git a/src/spicelib/devices/bsim3/b3temp.c b/src/spicelib/devices/bsim3/b3temp.c index 1b3de928e..9f6bd24a7 100644 --- a/src/spicelib/devices/bsim3/b3temp.c +++ b/src/spicelib/devices/bsim3/b3temp.c @@ -10,13 +10,13 @@ /* Lmin, Lmax, Wmin, Wmax */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim3def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 /* Kb / q where q = 1.60219e-19 */ diff --git a/src/spicelib/devices/bsim3/b3trunc.c b/src/spicelib/devices/bsim3/b3trunc.c index c59421bb7..a8f3d6b3a 100644 --- a/src/spicelib/devices/bsim3/b3trunc.c +++ b/src/spicelib/devices/bsim3/b3trunc.c @@ -8,11 +8,11 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3/bsim3def.h b/src/spicelib/devices/bsim3/bsim3def.h index 18e82a7ff..776823a39 100644 --- a/src/spicelib/devices/bsim3/bsim3def.h +++ b/src/spicelib/devices/bsim3/bsim3def.h @@ -10,11 +10,11 @@ File: bsim3def.h #ifndef BSIM3 #define BSIM3 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" #ifdef USE_OMP #define USE_OMP3 diff --git a/src/spicelib/devices/bsim3/bsim3init.c b/src/spicelib/devices/bsim3/bsim3init.c index cacab1074..683fd760b 100644 --- a/src/spicelib/devices/bsim3/bsim3init.c +++ b/src/spicelib/devices/bsim3/bsim3init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bsim3itf.h" #include "bsim3ext.h" diff --git a/src/spicelib/devices/bsim3soi/b4soi.c b/src/spicelib/devices/bsim3soi/b4soi.c index e27bbd38e..ec82ff3e4 100644 --- a/src/spicelib/devices/bsim3soi/b4soi.c +++ b/src/spicelib/devices/bsim3soi/b4soi.c @@ -14,11 +14,11 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include +#include "ngspice/ngspice.h" -#include +#include "ngspice/devdefs.h" #include "b4soidef.h" -#include +#include "ngspice/suffix.h" IFparm B4SOIpTable[] = { /* parameters */ IOP( "l", B4SOI_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim3soi/b4soiacld.c b/src/spicelib/devices/bsim3soi/b4soiacld.c index 748b1a7fe..68d4d3268 100644 --- a/src/spicelib/devices/bsim3soi/b4soiacld.c +++ b/src/spicelib/devices/bsim3soi/b4soiacld.c @@ -12,12 +12,12 @@ * Modified by Tanvir Morshed 09/22/2009 **********/ -#include +#include "ngspice/ngspice.h" -#include +#include "ngspice/cktdefs.h" #include "b4soidef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi/b4soiask.c b/src/spicelib/devices/bsim3soi/b4soiask.c index 10f7c1585..9778b1608 100644 --- a/src/spicelib/devices/bsim3soi/b4soiask.c +++ b/src/spicelib/devices/bsim3soi/b4soiask.c @@ -13,15 +13,15 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include +#include "ngspice/ngspice.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "b4soidef.h" -#include +#include "ngspice/sperror.h" -#include +#include "ngspice/suffix.h" int B4SOIask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select) diff --git a/src/spicelib/devices/bsim3soi/b4soicheck.c b/src/spicelib/devices/bsim3soi/b4soicheck.c index 561b00a86..9b4fbafba 100644 --- a/src/spicelib/devices/bsim3soi/b4soicheck.c +++ b/src/spicelib/devices/bsim3soi/b4soicheck.c @@ -13,14 +13,14 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b4soidef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int B4SOIcheckModel(B4SOImodel *model, B4SOIinstance *here, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim3soi/b4soicvtest.c b/src/spicelib/devices/bsim3soi/b4soicvtest.c index e3a5f3134..efb54c916 100644 --- a/src/spicelib/devices/bsim3soi/b4soicvtest.c +++ b/src/spicelib/devices/bsim3soi/b4soicvtest.c @@ -13,15 +13,15 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include +#include "ngspice/ngspice.h" -#include +#include "ngspice/cktdefs.h" #include "b4soidef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi/b4soidef.h b/src/spicelib/devices/bsim3soi/b4soidef.h index 0240661b8..b04e4b7ec 100644 --- a/src/spicelib/devices/bsim3soi/b4soidef.h +++ b/src/spicelib/devices/bsim3soi/b4soidef.h @@ -17,11 +17,11 @@ File: b4soidef.h /* debug1, debug2, debug3, ... */ /* #define B4SOI_DEBUG_OUT */ -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" #ifdef USE_OMP diff --git a/src/spicelib/devices/bsim3soi/b4soidel.c b/src/spicelib/devices/bsim3soi/b4soidel.c index e33a97538..9285ee5f8 100644 --- a/src/spicelib/devices/bsim3soi/b4soidel.c +++ b/src/spicelib/devices/bsim3soi/b4soidel.c @@ -13,12 +13,12 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include +#include "ngspice/ngspice.h" #include "b4soidef.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi/b4soidest.c b/src/spicelib/devices/bsim3soi/b4soidest.c index 323f57bb5..9063b028d 100644 --- a/src/spicelib/devices/bsim3soi/b4soidest.c +++ b/src/spicelib/devices/bsim3soi/b4soidest.c @@ -13,10 +13,10 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include +#include "ngspice/ngspice.h" #include "b4soidef.h" -#include +#include "ngspice/suffix.h" void B4SOIdestroy(GENmodel **inModel) diff --git a/src/spicelib/devices/bsim3soi/b4soigetic.c b/src/spicelib/devices/bsim3soi/b4soigetic.c index 9602365b8..9bb11a88e 100644 --- a/src/spicelib/devices/bsim3soi/b4soigetic.c +++ b/src/spicelib/devices/bsim3soi/b4soigetic.c @@ -13,12 +13,12 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include +#include "ngspice/ngspice.h" -#include +#include "ngspice/cktdefs.h" #include "b4soidef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi/b4soiinit.c b/src/spicelib/devices/bsim3soi/b4soiinit.c index a1bd3797c..2cb69e4fa 100644 --- a/src/spicelib/devices/bsim3soi/b4soiinit.c +++ b/src/spicelib/devices/bsim3soi/b4soiinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "b4soiitf.h" #include "b4soiinit.h" diff --git a/src/spicelib/devices/bsim3soi/b4soild.c b/src/spicelib/devices/bsim3soi/b4soild.c index 6496a6df3..244ee6cdc 100644 --- a/src/spicelib/devices/bsim3soi/b4soild.c +++ b/src/spicelib/devices/bsim3soi/b4soild.c @@ -14,14 +14,14 @@ * Modified by Larry Wagner, Calvin Bittner, Geoffrey Coram, Tanvir Morshed 05/14/2010 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b4soidef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #define EPS0 8.85418e-12 /*4.1*/ #define EPSOX 3.453133e-11 diff --git a/src/spicelib/devices/bsim3soi/b4soimask.c b/src/spicelib/devices/bsim3soi/b4soimask.c index d41e24e8e..ac2de84b6 100644 --- a/src/spicelib/devices/bsim3soi/b4soimask.c +++ b/src/spicelib/devices/bsim3soi/b4soimask.c @@ -13,13 +13,13 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "b4soidef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B4SOImAsk( diff --git a/src/spicelib/devices/bsim3soi/b4soimdel.c b/src/spicelib/devices/bsim3soi/b4soimdel.c index fc7b80d09..7074e6bb1 100644 --- a/src/spicelib/devices/bsim3soi/b4soimdel.c +++ b/src/spicelib/devices/bsim3soi/b4soimdel.c @@ -13,11 +13,11 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include +#include "ngspice/ngspice.h" #include "b4soidef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B4SOImDelete( diff --git a/src/spicelib/devices/bsim3soi/b4soimpar.c b/src/spicelib/devices/bsim3soi/b4soimpar.c index e2d573c17..536128ffa 100644 --- a/src/spicelib/devices/bsim3soi/b4soimpar.c +++ b/src/spicelib/devices/bsim3soi/b4soimpar.c @@ -13,12 +13,12 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include +#include "ngspice/ngspice.h" #include "b4soidef.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi/b4soinoi.c b/src/spicelib/devices/bsim3soi/b4soinoi.c index 778981929..8df7c962e 100644 --- a/src/spicelib/devices/bsim3soi/b4soinoi.c +++ b/src/spicelib/devices/bsim3soi/b4soinoi.c @@ -13,13 +13,13 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include +#include "ngspice/ngspice.h" #include "b4soidef.h" -#include -#include -#include -#include -#include /* jwan */ +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* jwan */ /* * B4SOInoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bsim3soi/b4soipar.c b/src/spicelib/devices/bsim3soi/b4soipar.c index fee2eb43e..0237586e1 100644 --- a/src/spicelib/devices/bsim3soi/b4soipar.c +++ b/src/spicelib/devices/bsim3soi/b4soipar.c @@ -13,11 +13,11 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "b4soidef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B4SOIparam( diff --git a/src/spicelib/devices/bsim3soi/b4soipzld.c b/src/spicelib/devices/bsim3soi/b4soipzld.c index 49610bc1d..fccc6d08d 100644 --- a/src/spicelib/devices/bsim3soi/b4soipzld.c +++ b/src/spicelib/devices/bsim3soi/b4soipzld.c @@ -13,12 +13,12 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "b4soidef.h" -#include +#include "ngspice/suffix.h" int B4SOIpzLoad( diff --git a/src/spicelib/devices/bsim3soi/b4soiset.c b/src/spicelib/devices/bsim3soi/b4soiset.c index 443e660cf..7f450f5c1 100644 --- a/src/spicelib/devices/bsim3soi/b4soiset.c +++ b/src/spicelib/devices/bsim3soi/b4soiset.c @@ -14,16 +14,16 @@ * Modified by Tanvir Morshed 04/27/2010 **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "b4soidef.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef USE_OMP4SOI -#include +#include "ngspice/cpextern.h" int nthreads; #endif diff --git a/src/spicelib/devices/bsim3soi/b4soitemp.c b/src/spicelib/devices/bsim3soi/b4soitemp.c index 4a11f1600..a4de69294 100644 --- a/src/spicelib/devices/bsim3soi/b4soitemp.c +++ b/src/spicelib/devices/bsim3soi/b4soitemp.c @@ -16,13 +16,13 @@ /* Lmin, Lmax, Wmin, Wmax */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "b4soidef.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 /* Kb / q where q = 1.60219e-19 */ diff --git a/src/spicelib/devices/bsim3soi/b4soitrunc.c b/src/spicelib/devices/bsim3soi/b4soitrunc.c index c24b92c89..e02ae3517 100644 --- a/src/spicelib/devices/bsim3soi/b4soitrunc.c +++ b/src/spicelib/devices/bsim3soi/b4soitrunc.c @@ -13,11 +13,11 @@ * Modified by Tanvir Morshed 12/31/2009 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b4soidef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_dd/b3soidd.c b/src/spicelib/devices/bsim3soi_dd/b3soidd.c index 2c7629994..5bffac566 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soidd.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soidd.c @@ -12,10 +12,10 @@ Modified by Paolo Nenzi 2001 * BSIMDD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "b3soidddef.h" -#include +#include "ngspice/suffix.h" IFparm B3SOIDDpTable[] = { /* parameters */ IOP( "l", B3SOIDD_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddacld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddacld.c index b144d3607..7f1a95722 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddacld.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddacld.c @@ -11,11 +11,11 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soidddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddask.c b/src/spicelib/devices/bsim3soi_dd/b3soiddask.c index 356f5aeec..5bf2353df 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddask.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddask.c @@ -11,13 +11,13 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "b3soidddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIDDask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddcheck.c b/src/spicelib/devices/bsim3soi_dd/b3soiddcheck.c index d8f34f849..74e51d240 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddcheck.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddcheck.c @@ -10,14 +10,14 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soidddef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int B3SOIDDcheckModel(B3SOIDDmodel *model, B3SOIDDinstance *here, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c b/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c index 81446c04f..dd12e4663 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddcvtest.c @@ -10,14 +10,14 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soidddef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_dd/b3soidddef.h b/src/spicelib/devices/bsim3soi_dd/b3soidddef.h index 9dafd7db5..290cfd92c 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soidddef.h +++ b/src/spicelib/devices/bsim3soi_dd/b3soidddef.h @@ -13,11 +13,11 @@ Modified by Paolo Nenzi 2002 #define SOICODE /* #define BULKCODE */ -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" typedef struct sB3SOIDDinstance { diff --git a/src/spicelib/devices/bsim3soi_dd/b3soidddel.c b/src/spicelib/devices/bsim3soi_dd/b3soidddel.c index fceb8e5c4..0eeb4616e 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soidddel.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soidddel.c @@ -10,11 +10,11 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include +#include "ngspice/ngspice.h" #include "b3soidddef.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_dd/b3soidddest.c b/src/spicelib/devices/bsim3soi_dd/b3soidddest.c index 008ecfb7e..5f405b411 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soidddest.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soidddest.c @@ -10,9 +10,9 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include +#include "ngspice/ngspice.h" #include "b3soidddef.h" -#include +#include "ngspice/suffix.h" void B3SOIDDdestroy(GENmodel **inModel) diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c b/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c index 0d0116fa3..fb0400dd1 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddgetic.c @@ -10,11 +10,11 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soidddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c index 64862c0f9..c62072b46 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "b3soidditf.h" #include "b3soiddinit.h" diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c index c15b43435..20dc08f45 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c @@ -12,14 +12,14 @@ File: b3soiddld.c 98/5/01 * BSIMDD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soidddef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #include "../../../frontend/error.h" /* controlled_exit() */ diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddmask.c b/src/spicelib/devices/bsim3soi_dd/b3soiddmask.c index 2a385d998..ac5b2c7d6 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddmask.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddmask.c @@ -8,13 +8,13 @@ Modified by Paolo Nenzi 2002 **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "b3soidddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIDDmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value) diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c b/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c index 02d59d168..f895c62f5 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c @@ -11,10 +11,10 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include +#include "ngspice/ngspice.h" #include "b3soidddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIDDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddmpar.c b/src/spicelib/devices/bsim3soi_dd/b3soiddmpar.c index a992c9ad2..d0d03aee7 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddmpar.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddmpar.c @@ -12,11 +12,11 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include +#include "ngspice/ngspice.h" #include "b3soidddef.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c index bb6f7a7e4..be87f56cc 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c @@ -11,13 +11,13 @@ Modofied by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include +#include "ngspice/ngspice.h" #include "b3soidddef.h" -#include -#include -#include -#include -#include /* jwan */ +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* jwan */ /* * B3SOIDDnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddpar.c b/src/spicelib/devices/bsim3soi_dd/b3soiddpar.c index a54d87d84..5749df170 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddpar.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddpar.c @@ -10,11 +10,11 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "b3soidddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIDDparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select) diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c index 2639c039c..55fd1ce66 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddpzld.c @@ -11,12 +11,12 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "b3soidddef.h" -#include +#include "ngspice/suffix.h" int B3SOIDDpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddset.c b/src/spicelib/devices/bsim3soi_dd/b3soiddset.c index fc75befbb..a5a64e2f9 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddset.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddset.c @@ -12,13 +12,13 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "b3soidddef.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c b/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c index ce722f6d7..d69947908 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c @@ -14,13 +14,13 @@ Modified by Paolo Nenzi 2002 /* Lmin, Lmax, Wmin, Wmax */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "b3soidddef.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 /* Kb / q where q = 1.60219e-19 */ diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddtrunc.c b/src/spicelib/devices/bsim3soi_dd/b3soiddtrunc.c index 06b953709..da1062fda 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddtrunc.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddtrunc.c @@ -10,11 +10,11 @@ Modified by Paolo Nenzi 2002 * BSIMDD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soidddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifd.c b/src/spicelib/devices/bsim3soi_fd/b3soifd.c index 179cd59d9..d4e70ff09 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifd.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifd.c @@ -12,10 +12,10 @@ File: b3soifd.c 98/5/01 * BSIMFD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "b3soifddef.h" -#include +#include "ngspice/suffix.h" IFparm B3SOIFDpTable[] = { /* parameters */ IOP( "l", B3SOIFD_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c index cc50eea29..2f15594a3 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdacld.c @@ -12,11 +12,11 @@ File: b3soifdacld.c 98/5/01 * BSIMFD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soifddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdask.c b/src/spicelib/devices/bsim3soi_fd/b3soifdask.c index cfe61c507..87e1e3db2 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdask.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdask.c @@ -10,13 +10,13 @@ File: b3soifdask.c 98/5/01 * BSIMFD2.1 release */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "b3soifddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIFDask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdcheck.c b/src/spicelib/devices/bsim3soi_fd/b3soifdcheck.c index 54c608bd3..797557274 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdcheck.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdcheck.c @@ -10,14 +10,14 @@ File: b3soifdcheck.c 98/5/01 * BSIMFD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soifddef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int B3SOIFDcheckModel(B3SOIFDmodel *model, B3SOIFDinstance *here, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c b/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c index 2df707a48..b9f23c109 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdcvtest.c @@ -10,14 +10,14 @@ File: b3soifdcvtest.c 98/5/01 * BSIMFD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soifddef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifddef.h b/src/spicelib/devices/bsim3soi_fd/b3soifddef.h index 8490979ef..13739b68e 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifddef.h +++ b/src/spicelib/devices/bsim3soi_fd/b3soifddef.h @@ -13,11 +13,11 @@ File: b3soifddef.h #define SOICODE /* #define BULKCODE */ -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" typedef struct sB3SOIFDinstance { diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifddel.c b/src/spicelib/devices/bsim3soi_fd/b3soifddel.c index 0e70c4a8c..6f1640880 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifddel.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifddel.c @@ -10,11 +10,11 @@ File: b3soifddel.c 98/5/01 * BSIMFD2.1 release */ -#include +#include "ngspice/ngspice.h" #include "b3soifddef.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifddest.c b/src/spicelib/devices/bsim3soi_fd/b3soifddest.c index 58a7bec58..252f45503 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifddest.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifddest.c @@ -10,9 +10,9 @@ File: b3soifddest.c 98/5/01 * BSIMFD2.1 release */ -#include +#include "ngspice/ngspice.h" #include "b3soifddef.h" -#include +#include "ngspice/suffix.h" void B3SOIFDdestroy(GENmodel **inModel) diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c b/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c index 4c99efd8f..f35728b6a 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdgetic.c @@ -10,11 +10,11 @@ File: b3soifdgetic.c 98/5/01 * BSIMFD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soifddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c b/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c index 408fa3be7..b3a19a3d9 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "b3soifditf.h" #include "b3soifdinit.h" diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c index 93e9ae00f..b04e5ca35 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c @@ -12,14 +12,14 @@ File: b3soifdld.c 98/5/01 * BSIMFD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soifddef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #include "../../../frontend/error.h" /* controlled_exit() */ diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdmask.c b/src/spicelib/devices/bsim3soi_fd/b3soifdmask.c index f9a381565..5cbb2444d 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdmask.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdmask.c @@ -12,13 +12,13 @@ Modified by Paolo Nenzi 2002 * BSIMFD2.1 release */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "b3soifddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIFDmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value) diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c b/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c index e21842705..072019223 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c @@ -10,10 +10,10 @@ File: b3soifdmdel.c 98/5/01 * BSIMFD2.1 release */ -#include +#include "ngspice/ngspice.h" #include "b3soifddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIFDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdmpar.c b/src/spicelib/devices/bsim3soi_fd/b3soifdmpar.c index 74e51b822..69a33ea8b 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdmpar.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdmpar.c @@ -12,11 +12,11 @@ Modified by Paolo Nenzi 2002 * BSIMFD2.1 release */ -#include +#include "ngspice/ngspice.h" #include "b3soifddef.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c index bf072cecc..1de2bed96 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c @@ -11,13 +11,13 @@ Modified by Paolo Nenzi 2002 * BSIMFD2.1 release */ -#include +#include "ngspice/ngspice.h" #include "b3soifddef.h" -#include -#include -#include -#include -#include /* jwan */ +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* jwan */ /* * B3SOIFDnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdpar.c b/src/spicelib/devices/bsim3soi_fd/b3soifdpar.c index 6f7e32ebc..a1351b946 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdpar.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdpar.c @@ -10,11 +10,11 @@ File: b3soifdpar.c 98/5/01 * BSIMFD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "b3soifddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIFDparam(int param, IFvalue *value, GENinstance *inst, diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c index d5f18b456..268b7ed99 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdpzld.c @@ -10,12 +10,12 @@ File: b3soifdpzld.c 98/5/01 * BSIMFD2.1 release */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "b3soifddef.h" -#include +#include "ngspice/suffix.h" int B3SOIFDpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdset.c b/src/spicelib/devices/bsim3soi_fd/b3soifdset.c index 20114dc46..4f6f03aba 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdset.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdset.c @@ -12,13 +12,13 @@ Modified by Paolo Nenzi 2002 * BSIMFD2.1 release */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "b3soifddef.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c b/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c index e108fe550..0803ec0bc 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c @@ -13,13 +13,13 @@ Modified by Paolo Nenzi 2002 /* Lmin, Lmax, Wmin, Wmax */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "b3soifddef.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 /* Kb / q where q = 1.60219e-19 */ diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c b/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c index f8f830018..fd6e97e6c 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdtrunc.c @@ -10,11 +10,11 @@ File: b3soifdtrunc.c 98/5/01 * BSIMFD2.1 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soifddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipd.c b/src/spicelib/devices/bsim3soi_pd/b3soipd.c index 6c62f4399..2ec8c5e7e 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipd.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipd.c @@ -16,10 +16,10 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "b3soipddef.h" -#include +#include "ngspice/suffix.h" IFparm B3SOIPDpTable[] = { /* parameters */ IOP( "l", B3SOIPD_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c index 7a6aa3481..cc3459ffa 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdacld.c @@ -12,11 +12,11 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soipddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdask.c b/src/spicelib/devices/bsim3soi_pd/b3soipdask.c index 4fb3e886c..d0082c543 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdask.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdask.c @@ -12,13 +12,13 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "b3soipddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIPDask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdcheck.c b/src/spicelib/devices/bsim3soi_pd/b3soipdcheck.c index 465b9f91f..66721e7d0 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdcheck.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdcheck.c @@ -14,14 +14,14 @@ Modifies by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soipddef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int B3SOIPDcheckModel(B3SOIPDmodel *model, B3SOIPDinstance *here, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c b/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c index 5123d945e..68aee2a90 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdcvtest.c @@ -10,14 +10,14 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soipddef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipddef.h b/src/spicelib/devices/bsim3soi_pd/b3soipddef.h index 68774e36a..ed943c065 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipddef.h +++ b/src/spicelib/devices/bsim3soi_pd/b3soipddef.h @@ -17,11 +17,11 @@ Modified by Paolo Nenzi 2002 #define SOICODE /* #define BULKCODE */ -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" typedef struct sB3SOIPDinstance { diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipddel.c b/src/spicelib/devices/bsim3soi_pd/b3soipddel.c index b82132acc..f36d9c713 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipddel.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipddel.c @@ -10,11 +10,11 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include +#include "ngspice/ngspice.h" #include "b3soipddef.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipddest.c b/src/spicelib/devices/bsim3soi_pd/b3soipddest.c index 5982d07f2..598de3fd5 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipddest.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipddest.c @@ -10,9 +10,9 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include +#include "ngspice/ngspice.h" #include "b3soipddef.h" -#include +#include "ngspice/suffix.h" void B3SOIPDdestroy(GENmodel **inModel) diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c b/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c index c712efb72..c36fea6b6 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdgetic.c @@ -10,11 +10,11 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soipddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c b/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c index fd2c384e9..9a2bd993a 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "b3soipditf.h" #include "b3soipdinit.h" diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdld.c index fc567b206..86bedb477 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdld.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdld.c @@ -17,14 +17,14 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soipddef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #define EPSOX 3.453133e-11 #define EPSSI 1.03594e-10 diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdmask.c b/src/spicelib/devices/bsim3soi_pd/b3soipdmask.c index 58ab856f0..37a21eee9 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdmask.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdmask.c @@ -16,13 +16,13 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "b3soipddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIPDmAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value) diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c b/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c index 3ad9de18b..a946c018d 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c @@ -10,10 +10,10 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include +#include "ngspice/ngspice.h" #include "b3soipddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIPDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdmpar.c b/src/spicelib/devices/bsim3soi_pd/b3soipdmpar.c index f37610df6..6d52f5535 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdmpar.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdmpar.c @@ -16,11 +16,11 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include +#include "ngspice/ngspice.h" #include "b3soipddef.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c index dfc0bf0f0..6d13e4cc6 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c @@ -11,13 +11,13 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include +#include "ngspice/ngspice.h" #include "b3soipddef.h" -#include -#include -#include -#include -#include /* jwan */ +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* jwan */ /* * B3SOIPDnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdpar.c b/src/spicelib/devices/bsim3soi_pd/b3soipdpar.c index 79fe97e93..84cdc6df5 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdpar.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdpar.c @@ -12,11 +12,11 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "b3soipddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int B3SOIPDparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select) diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c b/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c index cfacc8b69..d3a883083 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdpzld.c @@ -10,12 +10,12 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "b3soipddef.h" -#include +#include "ngspice/suffix.h" int B3SOIPDpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdset.c b/src/spicelib/devices/bsim3soi_pd/b3soipdset.c index 7549be821..14561c6ce 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdset.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdset.c @@ -16,13 +16,13 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "b3soipddef.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define SMOOTHFACTOR 0.1 #define EPSOX 3.453133e-11 diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c b/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c index 66c68a814..113421fcf 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c @@ -18,13 +18,13 @@ Modified by Paolo Nenzi 2002 /* Lmin, Lmax, Wmin, Wmax */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "b3soipddef.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 /* Kb / q where q = 1.60219e-19 */ diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c b/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c index 647a46d72..57e804c5e 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdtrunc.c @@ -10,11 +10,11 @@ Modified by Paolo Nenzi 2002 * BSIMPD2.2.3 release */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "b3soipddef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v0/b3v0.c b/src/spicelib/devices/bsim3v0/b3v0.c index 2fa12b7c9..8ab188fcf 100644 --- a/src/spicelib/devices/bsim3v0/b3v0.c +++ b/src/spicelib/devices/bsim3v0/b3v0.c @@ -4,10 +4,10 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3.c **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bsim3v0def.h" -#include +#include "ngspice/suffix.h" IFparm BSIM3v0pTable[] = { /* parameters */ IOP( "l", BSIM3v0_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim3v0/b3v0acld.c b/src/spicelib/devices/bsim3v0/b3v0acld.c index d5a396f59..8e3eed7a5 100644 --- a/src/spicelib/devices/bsim3v0/b3v0acld.c +++ b/src/spicelib/devices/bsim3v0/b3v0acld.c @@ -4,11 +4,11 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0acld.c **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v0def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v0/b3v0ask.c b/src/spicelib/devices/bsim3v0/b3v0ask.c index 8ff0afd36..61caf2db5 100644 --- a/src/spicelib/devices/bsim3v0/b3v0ask.c +++ b/src/spicelib/devices/bsim3v0/b3v0ask.c @@ -4,13 +4,13 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0ask.c **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim3v0def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3v0ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, diff --git a/src/spicelib/devices/bsim3v0/b3v0cvtest.c b/src/spicelib/devices/bsim3v0/b3v0cvtest.c index ef53b6120..e1ddbb538 100644 --- a/src/spicelib/devices/bsim3v0/b3v0cvtest.c +++ b/src/spicelib/devices/bsim3v0/b3v0cvtest.c @@ -4,14 +4,14 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0cvtest.c **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v0def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v0/b3v0del.c b/src/spicelib/devices/bsim3v0/b3v0del.c index eb261112f..023da2378 100644 --- a/src/spicelib/devices/bsim3v0/b3v0del.c +++ b/src/spicelib/devices/bsim3v0/b3v0del.c @@ -6,11 +6,11 @@ File: b3v0del.c /* */ -#include +#include "ngspice/ngspice.h" #include "bsim3v0def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v0/b3v0dest.c b/src/spicelib/devices/bsim3v0/b3v0dest.c index 8a75fcd9d..5f5cadb34 100644 --- a/src/spicelib/devices/bsim3v0/b3v0dest.c +++ b/src/spicelib/devices/bsim3v0/b3v0dest.c @@ -4,9 +4,9 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0dest.c **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3v0def.h" -#include +#include "ngspice/suffix.h" void BSIM3v0destroy(GENmodel **inModel) diff --git a/src/spicelib/devices/bsim3v0/b3v0getic.c b/src/spicelib/devices/bsim3v0/b3v0getic.c index 721665386..36163d61a 100644 --- a/src/spicelib/devices/bsim3v0/b3v0getic.c +++ b/src/spicelib/devices/bsim3v0/b3v0getic.c @@ -4,11 +4,11 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0getic.c **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v0def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v0/b3v0ld.c b/src/spicelib/devices/bsim3v0/b3v0ld.c index 81ddb7a0a..8a87ccb59 100644 --- a/src/spicelib/devices/bsim3v0/b3v0ld.c +++ b/src/spicelib/devices/bsim3v0/b3v0ld.c @@ -5,14 +5,14 @@ File: b3ld.c 1/3/92 Modified by Mansun Chan (1995) **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v0def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim3v0/b3v0mask.c b/src/spicelib/devices/bsim3v0/b3v0mask.c index c2abe6472..49b52d20c 100644 --- a/src/spicelib/devices/bsim3v0/b3v0mask.c +++ b/src/spicelib/devices/bsim3v0/b3v0mask.c @@ -4,13 +4,13 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0mask.c **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim3v0def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3v0mAsk( diff --git a/src/spicelib/devices/bsim3v0/b3v0mdel.c b/src/spicelib/devices/bsim3v0/b3v0mdel.c index 9e4702c09..2f6033cb2 100644 --- a/src/spicelib/devices/bsim3v0/b3v0mdel.c +++ b/src/spicelib/devices/bsim3v0/b3v0mdel.c @@ -4,10 +4,10 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0mdel.c **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3v0def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3v0mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/bsim3v0/b3v0mpar.c b/src/spicelib/devices/bsim3v0/b3v0mpar.c index 8c07dc69c..bc7a3e47c 100644 --- a/src/spicelib/devices/bsim3v0/b3v0mpar.c +++ b/src/spicelib/devices/bsim3v0/b3v0mpar.c @@ -4,11 +4,11 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0mpar.c **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3v0def.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v0/b3v0noi.c b/src/spicelib/devices/bsim3v0/b3v0noi.c index a75ea3c0c..215aefac9 100644 --- a/src/spicelib/devices/bsim3v0/b3v0noi.c +++ b/src/spicelib/devices/bsim3v0/b3v0noi.c @@ -4,13 +4,13 @@ Author: 1995 Gary W. Ng and Min-Chie Jeng. File: b3v0noi.c **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3v0def.h" -#include -#include -#include -#include -#include /* jwan */ +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* jwan */ /* * BSIM3v0noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bsim3v0/b3v0par.c b/src/spicelib/devices/bsim3v0/b3v0par.c index 8fd88e682..431ed2309 100644 --- a/src/spicelib/devices/bsim3v0/b3v0par.c +++ b/src/spicelib/devices/bsim3v0/b3v0par.c @@ -4,12 +4,12 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0par.c **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "bsim3v0def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/fteext.h" int BSIM3v0param(int param, IFvalue *value, GENinstance *inst, IFvalue *select) diff --git a/src/spicelib/devices/bsim3v0/b3v0pzld.c b/src/spicelib/devices/bsim3v0/b3v0pzld.c index 938fbb55e..9770c65b0 100644 --- a/src/spicelib/devices/bsim3v0/b3v0pzld.c +++ b/src/spicelib/devices/bsim3v0/b3v0pzld.c @@ -4,12 +4,12 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3pzld.c **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "bsim3v0def.h" -#include +#include "ngspice/suffix.h" int BSIM3v0pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) diff --git a/src/spicelib/devices/bsim3v0/b3v0set.c b/src/spicelib/devices/bsim3v0/b3v0set.c index 98f700bb2..69b62c0b3 100644 --- a/src/spicelib/devices/bsim3v0/b3v0set.c +++ b/src/spicelib/devices/bsim3v0/b3v0set.c @@ -4,13 +4,13 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0set.c **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim3v0def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim3v0/b3v0temp.c b/src/spicelib/devices/bsim3v0/b3v0temp.c index 2dc0d8408..93374af9b 100644 --- a/src/spicelib/devices/bsim3v0/b3v0temp.c +++ b/src/spicelib/devices/bsim3v0/b3v0temp.c @@ -5,13 +5,13 @@ File: b3temp.c **********/ /* Lmin, Lmax, Wmin, Wmax */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim3v0def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 /* Kb / q where q = 1.60219e-19 */ diff --git a/src/spicelib/devices/bsim3v0/b3v0trunc.c b/src/spicelib/devices/bsim3v0/b3v0trunc.c index b3e31c068..082006fc8 100644 --- a/src/spicelib/devices/bsim3v0/b3v0trunc.c +++ b/src/spicelib/devices/bsim3v0/b3v0trunc.c @@ -4,11 +4,11 @@ Author: 1995 Min-Chie Jeng and Mansun Chan. File: b3v0trunc.c **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v0def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v0/bsim3v0def.h b/src/spicelib/devices/bsim3v0/bsim3v0def.h index 28a56ccd2..2d993511b 100644 --- a/src/spicelib/devices/bsim3v0/bsim3v0def.h +++ b/src/spicelib/devices/bsim3v0/bsim3v0def.h @@ -7,11 +7,11 @@ File: bsim3v0def.h #ifndef BSIM3v0 #define BSIM3v0 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" typedef struct sBSIM3v0instance { diff --git a/src/spicelib/devices/bsim3v0/bsim3v0init.c b/src/spicelib/devices/bsim3v0/bsim3v0init.c index fdaca0e76..d28e8edd6 100644 --- a/src/spicelib/devices/bsim3v0/bsim3v0init.c +++ b/src/spicelib/devices/bsim3v0/bsim3v0init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bsim3v0itf.h" #include "bsim3v0ext.h" diff --git a/src/spicelib/devices/bsim3v1/b3v1.c b/src/spicelib/devices/bsim3v1/b3v1.c index 0d0773dfe..35324deb6 100644 --- a/src/spicelib/devices/bsim3v1/b3v1.c +++ b/src/spicelib/devices/bsim3v1/b3v1.c @@ -11,10 +11,10 @@ */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bsim3v1def.h" -#include +#include "ngspice/suffix.h" IFparm BSIM3v1pTable[] = { /* parameters */ IOP( "l", BSIM3v1_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim3v1/b3v1acld.c b/src/spicelib/devices/bsim3v1/b3v1acld.c index 640ab5401..080ed3eab 100644 --- a/src/spicelib/devices/bsim3v1/b3v1acld.c +++ b/src/spicelib/devices/bsim3v1/b3v1acld.c @@ -10,11 +10,11 @@ * BSIM3v3.1, Released by yuhua 96/12/08 */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v1/b3v1ask.c b/src/spicelib/devices/bsim3v1/b3v1ask.c index bc3fc3640..2b840847c 100644 --- a/src/spicelib/devices/bsim3v1/b3v1ask.c +++ b/src/spicelib/devices/bsim3v1/b3v1ask.c @@ -10,13 +10,13 @@ * BSIM3v1v3.1, Released by yuhua 96/12/08 */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim3v1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3v1ask (CKTcircuit * ckt, GENinstance * inst, int which, IFvalue * value, diff --git a/src/spicelib/devices/bsim3v1/b3v1check.c b/src/spicelib/devices/bsim3v1/b3v1check.c index 377d2038a..8e87c914f 100644 --- a/src/spicelib/devices/bsim3v1/b3v1check.c +++ b/src/spicelib/devices/bsim3v1/b3v1check.c @@ -11,14 +11,14 @@ */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v1def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int BSIM3v1checkModel(BSIM3v1model *model, BSIM3v1instance *here, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim3v1/b3v1cvtest.c b/src/spicelib/devices/bsim3v1/b3v1cvtest.c index 56ea3ced9..78eab3ca9 100644 --- a/src/spicelib/devices/bsim3v1/b3v1cvtest.c +++ b/src/spicelib/devices/bsim3v1/b3v1cvtest.c @@ -10,14 +10,14 @@ * BSIM3v3.1, Released by yuhua 96/12/08 */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v1def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v1/b3v1del.c b/src/spicelib/devices/bsim3v1/b3v1del.c index 231cd193f..d22099f69 100644 --- a/src/spicelib/devices/bsim3v1/b3v1del.c +++ b/src/spicelib/devices/bsim3v1/b3v1del.c @@ -11,11 +11,11 @@ */ -#include +#include "ngspice/ngspice.h" #include "bsim3v1def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v1/b3v1dest.c b/src/spicelib/devices/bsim3v1/b3v1dest.c index 798e31150..f5fb1a5ab 100644 --- a/src/spicelib/devices/bsim3v1/b3v1dest.c +++ b/src/spicelib/devices/bsim3v1/b3v1dest.c @@ -10,9 +10,9 @@ * BSIM3v3.1, Released by yuhua 96/12/08 */ -#include +#include "ngspice/ngspice.h" #include "bsim3v1def.h" -#include +#include "ngspice/suffix.h" void BSIM3v1destroy(GENmodel **inModel) diff --git a/src/spicelib/devices/bsim3v1/b3v1getic.c b/src/spicelib/devices/bsim3v1/b3v1getic.c index 20ffed566..6b743328e 100644 --- a/src/spicelib/devices/bsim3v1/b3v1getic.c +++ b/src/spicelib/devices/bsim3v1/b3v1getic.c @@ -10,11 +10,11 @@ * BSIM3v3.1, Released by yuhua 96/12/08 */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v1/b3v1ld.c b/src/spicelib/devices/bsim3v1/b3v1ld.c index 690f68faf..2ad116ac2 100644 --- a/src/spicelib/devices/bsim3v1/b3v1ld.c +++ b/src/spicelib/devices/bsim3v1/b3v1ld.c @@ -11,14 +11,14 @@ * BSIM3v1v3.1, Released by yuhua 96/12/08 */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v1def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim3v1/b3v1mask.c b/src/spicelib/devices/bsim3v1/b3v1mask.c index 07721650b..3cd356924 100644 --- a/src/spicelib/devices/bsim3v1/b3v1mask.c +++ b/src/spicelib/devices/bsim3v1/b3v1mask.c @@ -10,13 +10,13 @@ * BSIM3v3.1, Released by yuhua 96/12/08 */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim3v1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3v1mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value) diff --git a/src/spicelib/devices/bsim3v1/b3v1mdel.c b/src/spicelib/devices/bsim3v1/b3v1mdel.c index a0a8f67c5..d27313952 100644 --- a/src/spicelib/devices/bsim3v1/b3v1mdel.c +++ b/src/spicelib/devices/bsim3v1/b3v1mdel.c @@ -10,10 +10,10 @@ * BSIM3v3.1, Released by yuhua 96/12/08 */ -#include +#include "ngspice/ngspice.h" #include "bsim3v1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3v1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/bsim3v1/b3v1mpar.c b/src/spicelib/devices/bsim3v1/b3v1mpar.c index 57e9670a1..4ed0180da 100644 --- a/src/spicelib/devices/bsim3v1/b3v1mpar.c +++ b/src/spicelib/devices/bsim3v1/b3v1mpar.c @@ -10,11 +10,11 @@ * BSIM3v1v3.1, Released by yuhua 96/12/08 */ -#include +#include "ngspice/ngspice.h" #include "bsim3v1def.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v1/b3v1noi.c b/src/spicelib/devices/bsim3v1/b3v1noi.c index 021cffb90..ee0f2cdef 100644 --- a/src/spicelib/devices/bsim3v1/b3v1noi.c +++ b/src/spicelib/devices/bsim3v1/b3v1noi.c @@ -10,13 +10,13 @@ * BSIM3v1v3.1, Released by yuhua 96/12/08 */ -#include +#include "ngspice/ngspice.h" #include "bsim3v1def.h" -#include -#include -#include -#include -#include /* jwan */ +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* jwan */ /* * BSIM3v1noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bsim3v1/b3v1par.c b/src/spicelib/devices/bsim3v1/b3v1par.c index 1a9b5b4d7..f29c1fbc6 100644 --- a/src/spicelib/devices/bsim3v1/b3v1par.c +++ b/src/spicelib/devices/bsim3v1/b3v1par.c @@ -10,12 +10,12 @@ * BSIM3v1v3.1, Released by yuhua 96/12/08 */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "bsim3v1def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/fteext.h" int BSIM3v1param(int param, IFvalue *value, GENinstance *inst, IFvalue *select) diff --git a/src/spicelib/devices/bsim3v1/b3v1pzld.c b/src/spicelib/devices/bsim3v1/b3v1pzld.c index 4c5d907df..a809d7249 100644 --- a/src/spicelib/devices/bsim3v1/b3v1pzld.c +++ b/src/spicelib/devices/bsim3v1/b3v1pzld.c @@ -10,12 +10,12 @@ * BSIM3v3.1, Released by yuhua 96/12/08 */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "bsim3v1def.h" -#include +#include "ngspice/suffix.h" int BSIM3v1pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) diff --git a/src/spicelib/devices/bsim3v1/b3v1set.c b/src/spicelib/devices/bsim3v1/b3v1set.c index 9c6e4ccac..58b72138d 100644 --- a/src/spicelib/devices/bsim3v1/b3v1set.c +++ b/src/spicelib/devices/bsim3v1/b3v1set.c @@ -10,13 +10,13 @@ * BSIM3v1v3.1, Released by yuhua 96/12/08 */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim3v1def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim3v1/b3v1temp.c b/src/spicelib/devices/bsim3v1/b3v1temp.c index 2e0e45f9d..5d7860eb2 100644 --- a/src/spicelib/devices/bsim3v1/b3v1temp.c +++ b/src/spicelib/devices/bsim3v1/b3v1temp.c @@ -12,13 +12,13 @@ /* Lmin, Lmax, Wmin, Wmax */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim3v1def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 /* Kb / q where q = 1.60219e-19 */ diff --git a/src/spicelib/devices/bsim3v1/b3v1trunc.c b/src/spicelib/devices/bsim3v1/b3v1trunc.c index 4fe3e0a20..c15750c6d 100644 --- a/src/spicelib/devices/bsim3v1/b3v1trunc.c +++ b/src/spicelib/devices/bsim3v1/b3v1trunc.c @@ -10,11 +10,11 @@ * BSIM3v3.1, Released by yuhua 96/12/08 */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v1def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v1/bsim3v1def.h b/src/spicelib/devices/bsim3v1/bsim3v1def.h index 7f9ffa9dd..ba4e7057e 100644 --- a/src/spicelib/devices/bsim3v1/bsim3v1def.h +++ b/src/spicelib/devices/bsim3v1/bsim3v1def.h @@ -8,11 +8,11 @@ File: bsim3v1def.h #ifndef BSIM3v1 #define BSIM3v1 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" typedef struct sBSIM3v1instance { diff --git a/src/spicelib/devices/bsim3v1/bsim3v1init.c b/src/spicelib/devices/bsim3v1/bsim3v1init.c index f2e7c29fb..7e93e78a5 100644 --- a/src/spicelib/devices/bsim3v1/bsim3v1init.c +++ b/src/spicelib/devices/bsim3v1/bsim3v1init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bsim3v1itf.h" #include "bsim3v1ext.h" diff --git a/src/spicelib/devices/bsim3v32/b3v32.c b/src/spicelib/devices/bsim3v32/b3v32.c index f125f5fb7..801613188 100644 --- a/src/spicelib/devices/bsim3v32/b3v32.c +++ b/src/spicelib/devices/bsim3v32/b3v32.c @@ -9,10 +9,10 @@ * Modified by Paolo Nenzi 2002 and Dietmar Warning 2003 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bsim3v32def.h" -#include +#include "ngspice/suffix.h" IFparm BSIM3v32pTable[] = { /* parameters */ IOP( "l", BSIM3v32_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim3v32/b3v32acld.c b/src/spicelib/devices/bsim3v32/b3v32acld.c index a3dc2a4a5..1a5b28d43 100644 --- a/src/spicelib/devices/bsim3v32/b3v32acld.c +++ b/src/spicelib/devices/bsim3v32/b3v32acld.c @@ -9,11 +9,11 @@ * Modified by Paolo Nenzi 2002 and Dietmar Warning 2003 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v32def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v32/b3v32ask.c b/src/spicelib/devices/bsim3v32/b3v32ask.c index 60e0914d0..27796a9a6 100644 --- a/src/spicelib/devices/bsim3v32/b3v32ask.c +++ b/src/spicelib/devices/bsim3v32/b3v32ask.c @@ -9,13 +9,13 @@ * Modified bt Paolo Nenzi 2002 and Dietmar Warning 2003 **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim3v32def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3v32ask (CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, diff --git a/src/spicelib/devices/bsim3v32/b3v32check.c b/src/spicelib/devices/bsim3v32/b3v32check.c index 81b7a9e1b..25c522b9f 100644 --- a/src/spicelib/devices/bsim3v32/b3v32check.c +++ b/src/spicelib/devices/bsim3v32/b3v32check.c @@ -10,14 +10,14 @@ * Modified by Paolo Nenzi 2002 and Dietmar Warning 2003 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v32def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int BSIM3v32checkModel (BSIM3v32model *model, BSIM3v32instance *here, CKTcircuit *ckt) diff --git a/src/spicelib/devices/bsim3v32/b3v32cvtest.c b/src/spicelib/devices/bsim3v32/b3v32cvtest.c index dfb2f2e40..200c81a6b 100644 --- a/src/spicelib/devices/bsim3v32/b3v32cvtest.c +++ b/src/spicelib/devices/bsim3v32/b3v32cvtest.c @@ -9,14 +9,14 @@ * Modified by Paolo Nenzi 2002 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v32def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v32/b3v32del.c b/src/spicelib/devices/bsim3v32/b3v32del.c index a63b5dec8..f6b9d15b8 100644 --- a/src/spicelib/devices/bsim3v32/b3v32del.c +++ b/src/spicelib/devices/bsim3v32/b3v32del.c @@ -10,11 +10,11 @@ * Modified by Paolo Nenzi 2002 **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3v32def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v32/b3v32dest.c b/src/spicelib/devices/bsim3v32/b3v32dest.c index 13ebb250c..3260c32fb 100644 --- a/src/spicelib/devices/bsim3v32/b3v32dest.c +++ b/src/spicelib/devices/bsim3v32/b3v32dest.c @@ -9,9 +9,9 @@ * Modified by Paolo Nenzi 2002 **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3v32def.h" -#include +#include "ngspice/suffix.h" void BSIM3v32destroy (GENmodel **inModel) diff --git a/src/spicelib/devices/bsim3v32/b3v32getic.c b/src/spicelib/devices/bsim3v32/b3v32getic.c index a759b6e51..b757759ce 100644 --- a/src/spicelib/devices/bsim3v32/b3v32getic.c +++ b/src/spicelib/devices/bsim3v32/b3v32getic.c @@ -8,11 +8,11 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v32def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v32/b3v32ld.c b/src/spicelib/devices/bsim3v32/b3v32ld.c index ea1f1cd84..1635d9777 100644 --- a/src/spicelib/devices/bsim3v32/b3v32ld.c +++ b/src/spicelib/devices/bsim3v32/b3v32ld.c @@ -11,14 +11,14 @@ * Modified by Paolo Nenzi 2002 and Dietmar Warning 2003 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v32def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim3v32/b3v32mask.c b/src/spicelib/devices/bsim3v32/b3v32mask.c index fab7f47c7..70775ab49 100644 --- a/src/spicelib/devices/bsim3v32/b3v32mask.c +++ b/src/spicelib/devices/bsim3v32/b3v32mask.c @@ -9,13 +9,13 @@ * Modified by Paolo Nenzi 2002 and Dietmar Warning 2003 **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim3v32def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3v32mAsk (CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value) diff --git a/src/spicelib/devices/bsim3v32/b3v32mdel.c b/src/spicelib/devices/bsim3v32/b3v32mdel.c index 2c9d2e18e..27f437819 100644 --- a/src/spicelib/devices/bsim3v32/b3v32mdel.c +++ b/src/spicelib/devices/bsim3v32/b3v32mdel.c @@ -9,10 +9,10 @@ * Modified by Paolo Nenzi 2002 **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3v32def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM3v32mDelete (GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/bsim3v32/b3v32mpar.c b/src/spicelib/devices/bsim3v32/b3v32mpar.c index 134e57cc3..d35d51ba4 100644 --- a/src/spicelib/devices/bsim3v32/b3v32mpar.c +++ b/src/spicelib/devices/bsim3v32/b3v32mpar.c @@ -9,11 +9,11 @@ * Modified by Paolo Nenzi 2002 and Dietmar Warning 2003 **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3v32def.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v32/b3v32noi.c b/src/spicelib/devices/bsim3v32/b3v32noi.c index 93b3815e1..0eda31a40 100644 --- a/src/spicelib/devices/bsim3v32/b3v32noi.c +++ b/src/spicelib/devices/bsim3v32/b3v32noi.c @@ -10,13 +10,13 @@ * Modified bt Paolo Nenzi 2002 and Dietmar Warning 2003 **********/ -#include +#include "ngspice/ngspice.h" #include "bsim3v32def.h" -#include -#include -#include -#include -#include /* jwan */ +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* jwan */ /* * BSIM3v32noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/bsim3v32/b3v32par.c b/src/spicelib/devices/bsim3v32/b3v32par.c index 48e558c50..3f3a489b7 100644 --- a/src/spicelib/devices/bsim3v32/b3v32par.c +++ b/src/spicelib/devices/bsim3v32/b3v32par.c @@ -9,12 +9,12 @@ * Modified by Paolo Nenzi 2002 and Dietmar Warning 2003 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "bsim3v32def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/fteext.h" int BSIM3v32param (int param, IFvalue *value, GENinstance *inst, IFvalue *select) diff --git a/src/spicelib/devices/bsim3v32/b3v32pzld.c b/src/spicelib/devices/bsim3v32/b3v32pzld.c index 8c0c88c0e..2ab66d1d6 100644 --- a/src/spicelib/devices/bsim3v32/b3v32pzld.c +++ b/src/spicelib/devices/bsim3v32/b3v32pzld.c @@ -9,12 +9,12 @@ * Modified by Paolo Nenzi 2002 **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "bsim3v32def.h" -#include +#include "ngspice/suffix.h" int BSIM3v32pzLoad (GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) diff --git a/src/spicelib/devices/bsim3v32/b3v32set.c b/src/spicelib/devices/bsim3v32/b3v32set.c index 4a15d7101..7a5fddff4 100644 --- a/src/spicelib/devices/bsim3v32/b3v32set.c +++ b/src/spicelib/devices/bsim3v32/b3v32set.c @@ -8,13 +8,13 @@ * Author: 2001 Xuemei Xi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim3v32def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim3v32/b3v32temp.c b/src/spicelib/devices/bsim3v32/b3v32temp.c index 05a8a83a7..afc32da17 100644 --- a/src/spicelib/devices/bsim3v32/b3v32temp.c +++ b/src/spicelib/devices/bsim3v32/b3v32temp.c @@ -9,13 +9,13 @@ * Modified by Paolo Nenzi 2002 and Dietmar Warning 2003 **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim3v32def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 /* Kb / q where q = 1.60219e-19 */ diff --git a/src/spicelib/devices/bsim3v32/b3v32trunc.c b/src/spicelib/devices/bsim3v32/b3v32trunc.c index 852e66bb3..8754f29a0 100644 --- a/src/spicelib/devices/bsim3v32/b3v32trunc.c +++ b/src/spicelib/devices/bsim3v32/b3v32trunc.c @@ -9,11 +9,11 @@ * Modified by Poalo Nenzi 2002 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim3v32def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim3v32/bsim3v32def.h b/src/spicelib/devices/bsim3v32/bsim3v32def.h index ba895d723..201d8dbdf 100644 --- a/src/spicelib/devices/bsim3v32/bsim3v32def.h +++ b/src/spicelib/devices/bsim3v32/bsim3v32def.h @@ -10,11 +10,11 @@ File: bsim3v32def.h #ifndef BSIM3v32 #define BSIM3v32 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" typedef struct sBSIM3v32instance { diff --git a/src/spicelib/devices/bsim3v32/bsim3v32init.c b/src/spicelib/devices/bsim3v32/bsim3v32init.c index 18d68b7a6..ce0143f67 100644 --- a/src/spicelib/devices/bsim3v32/bsim3v32init.c +++ b/src/spicelib/devices/bsim3v32/bsim3v32init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bsim3v32itf.h" #include "bsim3v32ext.h" diff --git a/src/spicelib/devices/bsim4/b4.c b/src/spicelib/devices/bsim4/b4.c index 84dadbcd8..b48168e14 100644 --- a/src/spicelib/devices/bsim4/b4.c +++ b/src/spicelib/devices/bsim4/b4.c @@ -21,10 +21,10 @@ * Modified by Tanvir Morshed, Darsen Lu 03/27/2011 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bsim4def.h" -#include +#include "ngspice/suffix.h" IFparm BSIM4pTable[] = { /* parameters */ IOP( "l", BSIM4_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim4/b4acld.c b/src/spicelib/devices/bsim4/b4acld.c index 1cdf2736d..32a082f2e 100644 --- a/src/spicelib/devices/bsim4/b4acld.c +++ b/src/spicelib/devices/bsim4/b4acld.c @@ -11,11 +11,11 @@ * Modified by Xuemei Xi, 10/05/2001. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4/b4ask.c b/src/spicelib/devices/bsim4/b4ask.c index 4cb480ff9..e00155a37 100644 --- a/src/spicelib/devices/bsim4/b4ask.c +++ b/src/spicelib/devices/bsim4/b4ask.c @@ -14,13 +14,13 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4ask( diff --git a/src/spicelib/devices/bsim4/b4check.c b/src/spicelib/devices/bsim4/b4check.c index fec8a9f28..dc5c8ec8e 100644 --- a/src/spicelib/devices/bsim4/b4check.c +++ b/src/spicelib/devices/bsim4/b4check.c @@ -20,14 +20,14 @@ * Modified by Tanvir Morshed, Darsen Lu 03/27/2011 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int BSIM4checkModel( diff --git a/src/spicelib/devices/bsim4/b4cvtest.c b/src/spicelib/devices/bsim4/b4cvtest.c index 4b5fc7dbf..b12d2a040 100644 --- a/src/spicelib/devices/bsim4/b4cvtest.c +++ b/src/spicelib/devices/bsim4/b4cvtest.c @@ -13,14 +13,14 @@ * Modified by Xuemei Xi, 05/09/2003. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4/b4del.c b/src/spicelib/devices/bsim4/b4del.c index 0eed58a1a..b20a7e522 100644 --- a/src/spicelib/devices/bsim4/b4del.c +++ b/src/spicelib/devices/bsim4/b4del.c @@ -10,11 +10,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4/b4dest.c b/src/spicelib/devices/bsim4/b4dest.c index 5a6f77e0d..c44713f73 100644 --- a/src/spicelib/devices/bsim4/b4dest.c +++ b/src/spicelib/devices/bsim4/b4dest.c @@ -10,9 +10,9 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4def.h" -#include +#include "ngspice/suffix.h" void BSIM4destroy( diff --git a/src/spicelib/devices/bsim4/b4geo.c b/src/spicelib/devices/bsim4/b4geo.c index ae8170c89..4ef573c18 100644 --- a/src/spicelib/devices/bsim4/b4geo.c +++ b/src/spicelib/devices/bsim4/b4geo.c @@ -10,7 +10,7 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4def.h" diff --git a/src/spicelib/devices/bsim4/b4getic.c b/src/spicelib/devices/bsim4/b4getic.c index edcf256d0..04351b31c 100644 --- a/src/spicelib/devices/bsim4/b4getic.c +++ b/src/spicelib/devices/bsim4/b4getic.c @@ -10,11 +10,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4/b4ld.c b/src/spicelib/devices/bsim4/b4ld.c index 3c9ced630..bb3f87219 100644 --- a/src/spicelib/devices/bsim4/b4ld.c +++ b/src/spicelib/devices/bsim4/b4ld.c @@ -22,14 +22,14 @@ **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #define MAX_EXPL 2.688117142e+43 #define MIN_EXPL 3.720075976e-44 diff --git a/src/spicelib/devices/bsim4/b4mask.c b/src/spicelib/devices/bsim4/b4mask.c index 1695f683a..52fcd9a96 100644 --- a/src/spicelib/devices/bsim4/b4mask.c +++ b/src/spicelib/devices/bsim4/b4mask.c @@ -19,13 +19,13 @@ **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4mAsk( diff --git a/src/spicelib/devices/bsim4/b4mdel.c b/src/spicelib/devices/bsim4/b4mdel.c index 47d031d0c..71f23ed00 100644 --- a/src/spicelib/devices/bsim4/b4mdel.c +++ b/src/spicelib/devices/bsim4/b4mdel.c @@ -10,10 +10,10 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4mDelete( diff --git a/src/spicelib/devices/bsim4/b4mpar.c b/src/spicelib/devices/bsim4/b4mpar.c index 9282d0971..bcf8d6cf8 100644 --- a/src/spicelib/devices/bsim4/b4mpar.c +++ b/src/spicelib/devices/bsim4/b4mpar.c @@ -21,12 +21,12 @@ * Modified by Tanvir Morshed, Darsen Lu 03/27/2011 **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4def.h" -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" int BSIM4mParam( diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c index 6edb86dad..57f8c043d 100644 --- a/src/spicelib/devices/bsim4/b4noi.c +++ b/src/spicelib/devices/bsim4/b4noi.c @@ -19,13 +19,13 @@ * Modified by Tanvir Morshed, Darsen Lu 03/27/2011 **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4def.h" -#include -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* diff --git a/src/spicelib/devices/bsim4/b4par.c b/src/spicelib/devices/bsim4/b4par.c index 837827a6c..a8a91d948 100644 --- a/src/spicelib/devices/bsim4/b4par.c +++ b/src/spicelib/devices/bsim4/b4par.c @@ -14,11 +14,11 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "bsim4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4param( diff --git a/src/spicelib/devices/bsim4/b4pzld.c b/src/spicelib/devices/bsim4/b4pzld.c index 5640d5aee..29ce0cf38 100644 --- a/src/spicelib/devices/bsim4/b4pzld.c +++ b/src/spicelib/devices/bsim4/b4pzld.c @@ -11,12 +11,12 @@ * Modified by Xuemei Xi, 10/05/2001. **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "bsim4def.h" -#include +#include "ngspice/suffix.h" int BSIM4pzLoad( diff --git a/src/spicelib/devices/bsim4/b4set.c b/src/spicelib/devices/bsim4/b4set.c index b2884bc33..fee044613 100644 --- a/src/spicelib/devices/bsim4/b4set.c +++ b/src/spicelib/devices/bsim4/b4set.c @@ -21,18 +21,18 @@ * Modified by Tanvir Morshed, Darsen Lu 03/27/2011 **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/jobdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim4def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef USE_OMP4 -#include +#include "ngspice/cpextern.h" int nthreads; #endif diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c index acaa611b6..f0e96a0a9 100644 --- a/src/spicelib/devices/bsim4/b4temp.c +++ b/src/spicelib/devices/bsim4/b4temp.c @@ -22,13 +22,13 @@ **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim4def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 diff --git a/src/spicelib/devices/bsim4/b4trunc.c b/src/spicelib/devices/bsim4/b4trunc.c index 48e895452..c48756862 100644 --- a/src/spicelib/devices/bsim4/b4trunc.c +++ b/src/spicelib/devices/bsim4/b4trunc.c @@ -10,11 +10,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4/bsim4def.h b/src/spicelib/devices/bsim4/bsim4def.h index 42f5e2c2a..525673abb 100644 --- a/src/spicelib/devices/bsim4/bsim4def.h +++ b/src/spicelib/devices/bsim4/bsim4def.h @@ -22,11 +22,11 @@ Modified by Wenwei Yang, 07/31/2008. #ifndef BSIM4 #define BSIM4 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" #ifdef USE_OMP #define USE_OMP4 diff --git a/src/spicelib/devices/bsim4/bsim4init.c b/src/spicelib/devices/bsim4/bsim4init.c index ad7827e1c..6118c0578 100644 --- a/src/spicelib/devices/bsim4/bsim4init.c +++ b/src/spicelib/devices/bsim4/bsim4init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bsim4itf.h" #include "bsim4ext.h" diff --git a/src/spicelib/devices/bsim4v4/b4v4.c b/src/spicelib/devices/bsim4v4/b4v4.c index 55d31c79e..c6db03fe6 100644 --- a/src/spicelib/devices/bsim4v4/b4v4.c +++ b/src/spicelib/devices/bsim4v4/b4v4.c @@ -13,10 +13,10 @@ * Modified by Xuemei Xi, 03/04/2004. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bsim4v4def.h" -#include +#include "ngspice/suffix.h" IFparm BSIM4v4pTable[] = { /* parameters */ IOP( "l", BSIM4v4_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim4v4/b4v4acld.c b/src/spicelib/devices/bsim4v4/b4v4acld.c index 0d2f8fee6..4089feae8 100644 --- a/src/spicelib/devices/bsim4v4/b4v4acld.c +++ b/src/spicelib/devices/bsim4v4/b4v4acld.c @@ -9,11 +9,11 @@ * Modified by Xuemei Xi, 10/05/2001. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v4/b4v4ask.c b/src/spicelib/devices/bsim4v4/b4v4ask.c index fd6d02166..0376b9b39 100644 --- a/src/spicelib/devices/bsim4v4/b4v4ask.c +++ b/src/spicelib/devices/bsim4v4/b4v4ask.c @@ -11,13 +11,13 @@ * Modified by Xuemei Xi, 05/09/2003. **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim4v4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4v4ask( diff --git a/src/spicelib/devices/bsim4v4/b4v4check.c b/src/spicelib/devices/bsim4v4/b4v4check.c index 214e84f9b..f600721b5 100644 --- a/src/spicelib/devices/bsim4v4/b4v4check.c +++ b/src/spicelib/devices/bsim4v4/b4v4check.c @@ -14,13 +14,13 @@ * Modified by Xuemei Xi, 03/04/2004. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v4def.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" int BSIM4v4checkModel( diff --git a/src/spicelib/devices/bsim4v4/b4v4cvtest.c b/src/spicelib/devices/bsim4v4/b4v4cvtest.c index 0fca50b42..5b7bdf13c 100644 --- a/src/spicelib/devices/bsim4v4/b4v4cvtest.c +++ b/src/spicelib/devices/bsim4v4/b4v4cvtest.c @@ -11,14 +11,14 @@ * Modified by Xuemei Xi, 05/09/2003. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v4def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v4/b4v4del.c b/src/spicelib/devices/bsim4v4/b4v4del.c index b5a11ed8f..615ecdf1c 100644 --- a/src/spicelib/devices/bsim4v4/b4v4del.c +++ b/src/spicelib/devices/bsim4v4/b4v4del.c @@ -8,11 +8,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v4def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v4/b4v4dest.c b/src/spicelib/devices/bsim4v4/b4v4dest.c index e8ffe38d7..becb4870f 100644 --- a/src/spicelib/devices/bsim4v4/b4v4dest.c +++ b/src/spicelib/devices/bsim4v4/b4v4dest.c @@ -8,9 +8,9 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v4def.h" -#include +#include "ngspice/suffix.h" void BSIM4v4destroy( diff --git a/src/spicelib/devices/bsim4v4/b4v4geo.c b/src/spicelib/devices/bsim4v4/b4v4geo.c index 985271f53..ad8d7a3c3 100644 --- a/src/spicelib/devices/bsim4v4/b4v4geo.c +++ b/src/spicelib/devices/bsim4v4/b4v4geo.c @@ -8,7 +8,7 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v4def.h" /* diff --git a/src/spicelib/devices/bsim4v4/b4v4getic.c b/src/spicelib/devices/bsim4v4/b4v4getic.c index 615881c14..69fdf3fc4 100644 --- a/src/spicelib/devices/bsim4v4/b4v4getic.c +++ b/src/spicelib/devices/bsim4v4/b4v4getic.c @@ -8,11 +8,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v4/b4v4ld.c b/src/spicelib/devices/bsim4v4/b4v4ld.c index 1131f5824..11ec40377 100644 --- a/src/spicelib/devices/bsim4v4/b4v4ld.c +++ b/src/spicelib/devices/bsim4v4/b4v4ld.c @@ -17,13 +17,13 @@ * Modified by Xuemei Xi, 03/04/2004. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v4def.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim4v4/b4v4mask.c b/src/spicelib/devices/bsim4v4/b4v4mask.c index 182f8bf6d..352d88e82 100644 --- a/src/spicelib/devices/bsim4v4/b4v4mask.c +++ b/src/spicelib/devices/bsim4v4/b4v4mask.c @@ -13,13 +13,13 @@ **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim4v4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4v4mAsk( diff --git a/src/spicelib/devices/bsim4v4/b4v4mdel.c b/src/spicelib/devices/bsim4v4/b4v4mdel.c index 27d7b7578..58bb7ba79 100644 --- a/src/spicelib/devices/bsim4v4/b4v4mdel.c +++ b/src/spicelib/devices/bsim4v4/b4v4mdel.c @@ -8,10 +8,10 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4v4mDelete( diff --git a/src/spicelib/devices/bsim4v4/b4v4mpar.c b/src/spicelib/devices/bsim4v4/b4v4mpar.c index 06ab0774d..f508d180c 100644 --- a/src/spicelib/devices/bsim4v4/b4v4mpar.c +++ b/src/spicelib/devices/bsim4v4/b4v4mpar.c @@ -13,12 +13,12 @@ * Modified by Xuemei Xi, 03/04/2004. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v4def.h" -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" int BSIM4v4mParam( diff --git a/src/spicelib/devices/bsim4v4/b4v4noi.c b/src/spicelib/devices/bsim4v4/b4v4noi.c index a6ad79cbe..10d844dae 100644 --- a/src/spicelib/devices/bsim4v4/b4v4noi.c +++ b/src/spicelib/devices/bsim4v4/b4v4noi.c @@ -13,12 +13,12 @@ * Modified by Xuemei Xi, 03/04/2004. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v4def.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/const.h" /* diff --git a/src/spicelib/devices/bsim4v4/b4v4par.c b/src/spicelib/devices/bsim4v4/b4v4par.c index 26043114e..84c2a9d60 100644 --- a/src/spicelib/devices/bsim4v4/b4v4par.c +++ b/src/spicelib/devices/bsim4v4/b4v4par.c @@ -11,12 +11,12 @@ * Modified by Xuemei Xi, 05/09/2003. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "bsim4v4def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/fteext.h" int BSIM4v4param( diff --git a/src/spicelib/devices/bsim4v4/b4v4pzld.c b/src/spicelib/devices/bsim4v4/b4v4pzld.c index fc80665bf..f8e297034 100644 --- a/src/spicelib/devices/bsim4v4/b4v4pzld.c +++ b/src/spicelib/devices/bsim4v4/b4v4pzld.c @@ -9,12 +9,12 @@ * Modified by Xuemei Xi, 10/05/2001. **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "bsim4v4def.h" -#include +#include "ngspice/suffix.h" int BSIM4v4pzLoad( diff --git a/src/spicelib/devices/bsim4v4/b4v4set.c b/src/spicelib/devices/bsim4v4/b4v4set.c index 52380b1ab..7ee004d9d 100644 --- a/src/spicelib/devices/bsim4v4/b4v4set.c +++ b/src/spicelib/devices/bsim4v4/b4v4set.c @@ -13,14 +13,14 @@ * Modified by Xuemei Xi, 03/04/2004. **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/jobdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim4v4def.h" -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim4v4/b4v4temp.c b/src/spicelib/devices/bsim4v4/b4v4temp.c index c1b79a5dc..747771781 100644 --- a/src/spicelib/devices/bsim4v4/b4v4temp.c +++ b/src/spicelib/devices/bsim4v4/b4v4temp.c @@ -13,13 +13,13 @@ * Modified by Xuemei Xi, 03/04/2004. **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim4v4def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 diff --git a/src/spicelib/devices/bsim4v4/b4v4trunc.c b/src/spicelib/devices/bsim4v4/b4v4trunc.c index ba838f6c9..8fea5c41e 100644 --- a/src/spicelib/devices/bsim4v4/b4v4trunc.c +++ b/src/spicelib/devices/bsim4v4/b4v4trunc.c @@ -8,11 +8,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v4def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4v4trunc( diff --git a/src/spicelib/devices/bsim4v4/bsim4v4def.h b/src/spicelib/devices/bsim4v4/bsim4v4def.h index 41497b7ef..a0c763c0d 100644 --- a/src/spicelib/devices/bsim4v4/bsim4v4def.h +++ b/src/spicelib/devices/bsim4v4/bsim4v4def.h @@ -11,11 +11,11 @@ File: bsim4v4def.h #ifndef BSIM4V4 #define BSIM4V4 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" typedef struct sBSIM4v4instance { diff --git a/src/spicelib/devices/bsim4v4/bsim4v4init.c b/src/spicelib/devices/bsim4v4/bsim4v4init.c index dd01e39c7..d7a59b8c0 100644 --- a/src/spicelib/devices/bsim4v4/bsim4v4init.c +++ b/src/spicelib/devices/bsim4v4/bsim4v4init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bsim4v4itf.h" #include "bsim4v4ext.h" diff --git a/src/spicelib/devices/bsim4v5/b4v5.c b/src/spicelib/devices/bsim4v5/b4v5.c index 96fabea53..c32892bb4 100644 --- a/src/spicelib/devices/bsim4v5/b4v5.c +++ b/src/spicelib/devices/bsim4v5/b4v5.c @@ -14,10 +14,10 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bsim4v5def.h" -#include +#include "ngspice/suffix.h" IFparm BSIM4v5pTable[] = { /* parameters */ IOP( "l", BSIM4v5_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim4v5/b4v5acld.c b/src/spicelib/devices/bsim4v5/b4v5acld.c index 1b7fd28a3..173d9ff60 100644 --- a/src/spicelib/devices/bsim4v5/b4v5acld.c +++ b/src/spicelib/devices/bsim4v5/b4v5acld.c @@ -9,11 +9,11 @@ * Modified by Xuemei Xi, 10/05/2001. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v5def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v5/b4v5ask.c b/src/spicelib/devices/bsim4v5/b4v5ask.c index 6a331dbf8..79db3e3c6 100644 --- a/src/spicelib/devices/bsim4v5/b4v5ask.c +++ b/src/spicelib/devices/bsim4v5/b4v5ask.c @@ -12,13 +12,13 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim4v5def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4v5ask( diff --git a/src/spicelib/devices/bsim4v5/b4v5check.c b/src/spicelib/devices/bsim4v5/b4v5check.c index 770583be4..1882516e8 100644 --- a/src/spicelib/devices/bsim4v5/b4v5check.c +++ b/src/spicelib/devices/bsim4v5/b4v5check.c @@ -14,14 +14,14 @@ * Modified by Xuemei Xi, 07/29/2005. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v5def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int BSIM4v5checkModel( diff --git a/src/spicelib/devices/bsim4v5/b4v5cvtest.c b/src/spicelib/devices/bsim4v5/b4v5cvtest.c index 7d3f8163c..cbe467a4b 100644 --- a/src/spicelib/devices/bsim4v5/b4v5cvtest.c +++ b/src/spicelib/devices/bsim4v5/b4v5cvtest.c @@ -11,14 +11,14 @@ * Modified by Xuemei Xi, 05/09/2003. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v5def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v5/b4v5del.c b/src/spicelib/devices/bsim4v5/b4v5del.c index 7c1b9e21b..d80dd3cb3 100644 --- a/src/spicelib/devices/bsim4v5/b4v5del.c +++ b/src/spicelib/devices/bsim4v5/b4v5del.c @@ -8,11 +8,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v5def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v5/b4v5dest.c b/src/spicelib/devices/bsim4v5/b4v5dest.c index 599d017fc..fbaabe7c7 100644 --- a/src/spicelib/devices/bsim4v5/b4v5dest.c +++ b/src/spicelib/devices/bsim4v5/b4v5dest.c @@ -8,9 +8,9 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v5def.h" -#include +#include "ngspice/suffix.h" void BSIM4v5destroy( diff --git a/src/spicelib/devices/bsim4v5/b4v5geo.c b/src/spicelib/devices/bsim4v5/b4v5geo.c index bfd8dbeae..801c3521e 100644 --- a/src/spicelib/devices/bsim4v5/b4v5geo.c +++ b/src/spicelib/devices/bsim4v5/b4v5geo.c @@ -8,7 +8,7 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v5def.h" /* diff --git a/src/spicelib/devices/bsim4v5/b4v5getic.c b/src/spicelib/devices/bsim4v5/b4v5getic.c index 657f8ade8..22010c8a8 100644 --- a/src/spicelib/devices/bsim4v5/b4v5getic.c +++ b/src/spicelib/devices/bsim4v5/b4v5getic.c @@ -8,11 +8,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v5def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v5/b4v5ld.c b/src/spicelib/devices/bsim4v5/b4v5ld.c index 369a15779..c737dfc5f 100644 --- a/src/spicelib/devices/bsim4v5/b4v5ld.c +++ b/src/spicelib/devices/bsim4v5/b4v5ld.c @@ -14,14 +14,14 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v5def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" /* #define MAX_EXP 2.688117142e+43 #define MIN_EXP 3.720075976e-44 diff --git a/src/spicelib/devices/bsim4v5/b4v5mask.c b/src/spicelib/devices/bsim4v5/b4v5mask.c index 4f0937c25..c5be19b88 100644 --- a/src/spicelib/devices/bsim4v5/b4v5mask.c +++ b/src/spicelib/devices/bsim4v5/b4v5mask.c @@ -14,13 +14,13 @@ **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim4v5def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4v5mAsk( diff --git a/src/spicelib/devices/bsim4v5/b4v5mdel.c b/src/spicelib/devices/bsim4v5/b4v5mdel.c index 40a567b83..9c6deadbd 100644 --- a/src/spicelib/devices/bsim4v5/b4v5mdel.c +++ b/src/spicelib/devices/bsim4v5/b4v5mdel.c @@ -8,10 +8,10 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v5def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4v5mDelete( diff --git a/src/spicelib/devices/bsim4v5/b4v5mpar.c b/src/spicelib/devices/bsim4v5/b4v5mpar.c index 8dd9bdf48..750e24de3 100644 --- a/src/spicelib/devices/bsim4v5/b4v5mpar.c +++ b/src/spicelib/devices/bsim4v5/b4v5mpar.c @@ -14,12 +14,12 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v5def.h" -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" int BSIM4v5mParam( diff --git a/src/spicelib/devices/bsim4v5/b4v5noi.c b/src/spicelib/devices/bsim4v5/b4v5noi.c index 1786a0e6c..5b606f01f 100644 --- a/src/spicelib/devices/bsim4v5/b4v5noi.c +++ b/src/spicelib/devices/bsim4v5/b4v5noi.c @@ -14,13 +14,13 @@ * Modified by Xuemei Xi, 07/29/2005. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v5def.h" -#include -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* diff --git a/src/spicelib/devices/bsim4v5/b4v5par.c b/src/spicelib/devices/bsim4v5/b4v5par.c index 8bbe1f309..12883bd02 100644 --- a/src/spicelib/devices/bsim4v5/b4v5par.c +++ b/src/spicelib/devices/bsim4v5/b4v5par.c @@ -12,12 +12,12 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "bsim4v5def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/fteext.h" int BSIM4v5param( diff --git a/src/spicelib/devices/bsim4v5/b4v5pzld.c b/src/spicelib/devices/bsim4v5/b4v5pzld.c index de4db258e..ff2c30a3f 100644 --- a/src/spicelib/devices/bsim4v5/b4v5pzld.c +++ b/src/spicelib/devices/bsim4v5/b4v5pzld.c @@ -9,12 +9,12 @@ * Modified by Xuemei Xi, 10/05/2001. **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "bsim4v5def.h" -#include +#include "ngspice/suffix.h" int BSIM4v5pzLoad( diff --git a/src/spicelib/devices/bsim4v5/b4v5set.c b/src/spicelib/devices/bsim4v5/b4v5set.c index 14d402453..fd166ea01 100644 --- a/src/spicelib/devices/bsim4v5/b4v5set.c +++ b/src/spicelib/devices/bsim4v5/b4v5set.c @@ -14,15 +14,15 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/jobdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim4v5def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim4v5/b4v5temp.c b/src/spicelib/devices/bsim4v5/b4v5temp.c index fcc12be70..a3c1fdbc8 100644 --- a/src/spicelib/devices/bsim4v5/b4v5temp.c +++ b/src/spicelib/devices/bsim4v5/b4v5temp.c @@ -14,13 +14,13 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim4v5def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 diff --git a/src/spicelib/devices/bsim4v5/b4v5trunc.c b/src/spicelib/devices/bsim4v5/b4v5trunc.c index e38c0bf5a..65908dc7d 100644 --- a/src/spicelib/devices/bsim4v5/b4v5trunc.c +++ b/src/spicelib/devices/bsim4v5/b4v5trunc.c @@ -8,11 +8,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v5def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v5/bsim4v5def.h b/src/spicelib/devices/bsim4v5/bsim4v5def.h index 96362943f..c8a10b7d4 100644 --- a/src/spicelib/devices/bsim4v5/bsim4v5def.h +++ b/src/spicelib/devices/bsim4v5/bsim4v5def.h @@ -12,11 +12,11 @@ File: bsim4v5def.h #ifndef BSIM4V5 #define BSIM4V5 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" typedef struct sBSIM4v5instance { diff --git a/src/spicelib/devices/bsim4v5/bsim4v5init.c b/src/spicelib/devices/bsim4v5/bsim4v5init.c index 4e3f4a658..3d72bf5cd 100644 --- a/src/spicelib/devices/bsim4v5/bsim4v5init.c +++ b/src/spicelib/devices/bsim4v5/bsim4v5init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bsim4v5itf.h" #include "bsim4v5ext.h" diff --git a/src/spicelib/devices/bsim4v6/b4v6.c b/src/spicelib/devices/bsim4v6/b4v6.c index c4e665b31..5b422cf1f 100644 --- a/src/spicelib/devices/bsim4v6/b4v6.c +++ b/src/spicelib/devices/bsim4v6/b4v6.c @@ -20,10 +20,10 @@ * Modified by Wenwei Yang, 07/31/2008. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "bsim4v6def.h" -#include +#include "ngspice/suffix.h" IFparm BSIM4v6pTable[] = { /* parameters */ IOP( "l", BSIM4v6_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/bsim4v6/b4v6acld.c b/src/spicelib/devices/bsim4v6/b4v6acld.c index 2610b19d5..51feaf8ef 100644 --- a/src/spicelib/devices/bsim4v6/b4v6acld.c +++ b/src/spicelib/devices/bsim4v6/b4v6acld.c @@ -11,11 +11,11 @@ * Modified by Xuemei Xi, 10/05/2001. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v6def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v6/b4v6ask.c b/src/spicelib/devices/bsim4v6/b4v6ask.c index 052e05026..54a99278a 100644 --- a/src/spicelib/devices/bsim4v6/b4v6ask.c +++ b/src/spicelib/devices/bsim4v6/b4v6ask.c @@ -14,13 +14,13 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim4v6def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4v6ask( diff --git a/src/spicelib/devices/bsim4v6/b4v6check.c b/src/spicelib/devices/bsim4v6/b4v6check.c index 914cb454a..6181eed1a 100644 --- a/src/spicelib/devices/bsim4v6/b4v6check.c +++ b/src/spicelib/devices/bsim4v6/b4v6check.c @@ -19,14 +19,14 @@ * Modified by Wenwei Yang, 07/31/2008 . **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v6def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int BSIM4v6checkModel( diff --git a/src/spicelib/devices/bsim4v6/b4v6cvtest.c b/src/spicelib/devices/bsim4v6/b4v6cvtest.c index ea0fc2499..131761d11 100644 --- a/src/spicelib/devices/bsim4v6/b4v6cvtest.c +++ b/src/spicelib/devices/bsim4v6/b4v6cvtest.c @@ -13,14 +13,14 @@ * Modified by Xuemei Xi, 05/09/2003. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v6def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v6/b4v6del.c b/src/spicelib/devices/bsim4v6/b4v6del.c index d77c9f5e7..c57f794c0 100644 --- a/src/spicelib/devices/bsim4v6/b4v6del.c +++ b/src/spicelib/devices/bsim4v6/b4v6del.c @@ -10,11 +10,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v6def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v6/b4v6dest.c b/src/spicelib/devices/bsim4v6/b4v6dest.c index a86391da8..caa91e182 100644 --- a/src/spicelib/devices/bsim4v6/b4v6dest.c +++ b/src/spicelib/devices/bsim4v6/b4v6dest.c @@ -10,9 +10,9 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v6def.h" -#include +#include "ngspice/suffix.h" void BSIM4v6destroy( diff --git a/src/spicelib/devices/bsim4v6/b4v6geo.c b/src/spicelib/devices/bsim4v6/b4v6geo.c index 63c81dc75..3c888af8a 100644 --- a/src/spicelib/devices/bsim4v6/b4v6geo.c +++ b/src/spicelib/devices/bsim4v6/b4v6geo.c @@ -10,7 +10,7 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v6def.h" /* diff --git a/src/spicelib/devices/bsim4v6/b4v6getic.c b/src/spicelib/devices/bsim4v6/b4v6getic.c index d680edc2f..eb034d512 100644 --- a/src/spicelib/devices/bsim4v6/b4v6getic.c +++ b/src/spicelib/devices/bsim4v6/b4v6getic.c @@ -10,11 +10,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v6def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v6/b4v6ld.c b/src/spicelib/devices/bsim4v6/b4v6ld.c index 1dde13c63..c6516bee4 100644 --- a/src/spicelib/devices/bsim4v6/b4v6ld.c +++ b/src/spicelib/devices/bsim4v6/b4v6ld.c @@ -22,14 +22,14 @@ **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v6def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" /* #define MAX_EXP 2.688117142e+43 diff --git a/src/spicelib/devices/bsim4v6/b4v6mask.c b/src/spicelib/devices/bsim4v6/b4v6mask.c index 505e52b9f..626b43388 100644 --- a/src/spicelib/devices/bsim4v6/b4v6mask.c +++ b/src/spicelib/devices/bsim4v6/b4v6mask.c @@ -18,13 +18,13 @@ **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "bsim4v6def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4v6mAsk( diff --git a/src/spicelib/devices/bsim4v6/b4v6mdel.c b/src/spicelib/devices/bsim4v6/b4v6mdel.c index f59a617e3..899477748 100644 --- a/src/spicelib/devices/bsim4v6/b4v6mdel.c +++ b/src/spicelib/devices/bsim4v6/b4v6mdel.c @@ -10,10 +10,10 @@ * Project Director: Prof. Chenming Hu. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v6def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int BSIM4v6mDelete( diff --git a/src/spicelib/devices/bsim4v6/b4v6mpar.c b/src/spicelib/devices/bsim4v6/b4v6mpar.c index 08ff224bb..0d70ae64e 100644 --- a/src/spicelib/devices/bsim4v6/b4v6mpar.c +++ b/src/spicelib/devices/bsim4v6/b4v6mpar.c @@ -20,12 +20,12 @@ * Modified by Wenwei Yang, 07/31/2008. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v6def.h" -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" int BSIM4v6mParam( diff --git a/src/spicelib/devices/bsim4v6/b4v6noi.c b/src/spicelib/devices/bsim4v6/b4v6noi.c index 4aa9d1c8f..e012c67e1 100644 --- a/src/spicelib/devices/bsim4v6/b4v6noi.c +++ b/src/spicelib/devices/bsim4v6/b4v6noi.c @@ -18,13 +18,13 @@ * Modified by Wenwei Yang, 07/31/2008. **********/ -#include +#include "ngspice/ngspice.h" #include "bsim4v6def.h" -#include -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* diff --git a/src/spicelib/devices/bsim4v6/b4v6par.c b/src/spicelib/devices/bsim4v6/b4v6par.c index 9bbca2bf0..8da55ef2a 100644 --- a/src/spicelib/devices/bsim4v6/b4v6par.c +++ b/src/spicelib/devices/bsim4v6/b4v6par.c @@ -14,12 +14,12 @@ * Modified by Xuemei Xi, Mohan Dunga, 07/29/2005. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "bsim4v6def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/fteext.h" int BSIM4v6param( diff --git a/src/spicelib/devices/bsim4v6/b4v6pzld.c b/src/spicelib/devices/bsim4v6/b4v6pzld.c index 167705e24..6e5e5bbac 100644 --- a/src/spicelib/devices/bsim4v6/b4v6pzld.c +++ b/src/spicelib/devices/bsim4v6/b4v6pzld.c @@ -11,12 +11,12 @@ * Modified by Xuemei Xi, 10/05/2001. **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "bsim4v6def.h" -#include +#include "ngspice/suffix.h" int BSIM4v6pzLoad( diff --git a/src/spicelib/devices/bsim4v6/b4v6set.c b/src/spicelib/devices/bsim4v6/b4v6set.c index ef7eeeca9..a15e75367 100644 --- a/src/spicelib/devices/bsim4v6/b4v6set.c +++ b/src/spicelib/devices/bsim4v6/b4v6set.c @@ -21,18 +21,18 @@ * Modified by Wenwei Yang, 07/31/2008. **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/jobdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim4v6def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef USE_OMP4 -#include +#include "ngspice/cpextern.h" int nthreads; #endif diff --git a/src/spicelib/devices/bsim4v6/b4v6temp.c b/src/spicelib/devices/bsim4v6/b4v6temp.c index 8716e5d4a..795e84f46 100644 --- a/src/spicelib/devices/bsim4v6/b4v6temp.c +++ b/src/spicelib/devices/bsim4v6/b4v6temp.c @@ -21,13 +21,13 @@ **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "bsim4v6def.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define Kb 1.3806226e-23 #define KboQ 8.617087e-5 diff --git a/src/spicelib/devices/bsim4v6/b4v6trunc.c b/src/spicelib/devices/bsim4v6/b4v6trunc.c index 7427f6c64..23e5ac67a 100644 --- a/src/spicelib/devices/bsim4v6/b4v6trunc.c +++ b/src/spicelib/devices/bsim4v6/b4v6trunc.c @@ -10,11 +10,11 @@ * Project Director: Prof. Chenming Hu. **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "bsim4v6def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/bsim4v6/bsim4v6def.h b/src/spicelib/devices/bsim4v6/bsim4v6def.h index 62ee2a269..b262ba897 100644 --- a/src/spicelib/devices/bsim4v6/bsim4v6def.h +++ b/src/spicelib/devices/bsim4v6/bsim4v6def.h @@ -21,11 +21,11 @@ Modified by Wenwei Yang, 07/31/2008. #ifndef BSIM4v6 #define BSIM4v6 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" #ifdef USE_OMP #define USE_OMP4 diff --git a/src/spicelib/devices/bsim4v6/bsim4v6init.c b/src/spicelib/devices/bsim4v6/bsim4v6init.c index 17fa4cd2e..b0c2aa1c4 100644 --- a/src/spicelib/devices/bsim4v6/bsim4v6init.c +++ b/src/spicelib/devices/bsim4v6/bsim4v6init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "bsim4v6itf.h" #include "bsim4v6ext.h" diff --git a/src/spicelib/devices/cap/cap.c b/src/spicelib/devices/cap/cap.c index c77854dd5..2da2e549c 100644 --- a/src/spicelib/devices/cap/cap.c +++ b/src/spicelib/devices/cap/cap.c @@ -4,10 +4,10 @@ Author: 1985 Thomas L. Quarles Modified: September 2003 - Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "capdefs.h" -#include +#include "ngspice/suffix.h" IFparm CAPpTable[] = { /* parameters */ IOPAP("capacitance", CAP_CAP, IF_REAL, "Device capacitance"), diff --git a/src/spicelib/devices/cap/capacld.c b/src/spicelib/devices/cap/capacld.c index df03ab12c..1a38f5879 100644 --- a/src/spicelib/devices/cap/capacld.c +++ b/src/spicelib/devices/cap/capacld.c @@ -6,11 +6,11 @@ Modified: September 2003 Paolo Nenzi /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cap/capask.c b/src/spicelib/devices/cap/capask.c index a8bb2b7f2..f16c8cac4 100644 --- a/src/spicelib/devices/cap/capask.c +++ b/src/spicelib/devices/cap/capask.c @@ -4,13 +4,13 @@ Author: 1985 Thomas L. Quarles Modified: September 2003 Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "capdefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/cap/capdefs.h b/src/spicelib/devices/cap/capdefs.h index aa03608e0..f2be8ed93 100644 --- a/src/spicelib/devices/cap/capdefs.h +++ b/src/spicelib/devices/cap/capdefs.h @@ -8,10 +8,10 @@ Modified: September 2003 Paolo Nenzi #define CAP -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/complex.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" /* structures used to describe capacitors */ diff --git a/src/spicelib/devices/cap/capdel.c b/src/spicelib/devices/cap/capdel.c index f8c4c73dc..20d910518 100644 --- a/src/spicelib/devices/cap/capdel.c +++ b/src/spicelib/devices/cap/capdel.c @@ -6,10 +6,10 @@ Modified: September 2003 Paolo Nenzi /* */ -#include +#include "ngspice/ngspice.h" #include "capdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cap/capdest.c b/src/spicelib/devices/cap/capdest.c index fd61273a3..98cdd5f87 100644 --- a/src/spicelib/devices/cap/capdest.c +++ b/src/spicelib/devices/cap/capdest.c @@ -6,9 +6,9 @@ Modified: September 2003 Paolo Nenzi /* */ -#include +#include "ngspice/ngspice.h" #include "capdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/cap/capgetic.c b/src/spicelib/devices/cap/capgetic.c index c0516bb47..6c35fc74b 100644 --- a/src/spicelib/devices/cap/capgetic.c +++ b/src/spicelib/devices/cap/capgetic.c @@ -4,11 +4,11 @@ Author: 1985 Thomas L. Quarles Modified: September 2003 Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int CAPgetic(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/cap/capinit.c b/src/spicelib/devices/cap/capinit.c index 47888a23b..0a0e1b314 100644 --- a/src/spicelib/devices/cap/capinit.c +++ b/src/spicelib/devices/cap/capinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "capitf.h" #include "capext.h" diff --git a/src/spicelib/devices/cap/capload.c b/src/spicelib/devices/cap/capload.c index bb38f1365..a38009b90 100644 --- a/src/spicelib/devices/cap/capload.c +++ b/src/spicelib/devices/cap/capload.c @@ -4,12 +4,12 @@ Author: 1985 Thomas L. Quarles Modified: September 2003 Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int CAPload(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/cap/capmask.c b/src/spicelib/devices/cap/capmask.c index 066a54415..498094e3c 100644 --- a/src/spicelib/devices/cap/capmask.c +++ b/src/spicelib/devices/cap/capmask.c @@ -6,13 +6,13 @@ Modified: September 2003 Paolo Nenzi /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "capdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/cap/capmdel.c b/src/spicelib/devices/cap/capmdel.c index a9aa43d61..b94f64d95 100644 --- a/src/spicelib/devices/cap/capmdel.c +++ b/src/spicelib/devices/cap/capmdel.c @@ -6,10 +6,10 @@ Modified: Spetember 2003 Paolo Nenzi /* */ -#include +#include "ngspice/ngspice.h" #include "capdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cap/capmpar.c b/src/spicelib/devices/cap/capmpar.c index 5f16c0718..64a37fd70 100644 --- a/src/spicelib/devices/cap/capmpar.c +++ b/src/spicelib/devices/cap/capmpar.c @@ -6,11 +6,11 @@ Modified: September 2003 Paolo Nenzi /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "capdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cap/capparam.c b/src/spicelib/devices/cap/capparam.c index 461429d31..1a11fd5c4 100644 --- a/src/spicelib/devices/cap/capparam.c +++ b/src/spicelib/devices/cap/capparam.c @@ -6,11 +6,11 @@ Modified: September 2003 Paolo Nenzi /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "capdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/cap/cappzld.c b/src/spicelib/devices/cap/cappzld.c index f4cc714cc..3ff776f66 100644 --- a/src/spicelib/devices/cap/cappzld.c +++ b/src/spicelib/devices/cap/cappzld.c @@ -6,12 +6,12 @@ Modified: September 2003 Paolo Nenzi /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "capdefs.h" -#include +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/cap/capsacl.c b/src/spicelib/devices/cap/capsacl.c index c8e153e76..2607b6f9c 100644 --- a/src/spicelib/devices/cap/capsacl.c +++ b/src/spicelib/devices/cap/capsacl.c @@ -12,12 +12,12 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cap/capsetup.c b/src/spicelib/devices/cap/capsetup.c index 4da2b8e7b..70b714066 100644 --- a/src/spicelib/devices/cap/capsetup.c +++ b/src/spicelib/devices/cap/capsetup.c @@ -6,11 +6,11 @@ Modified: September 2003 Paolo Nenzi /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/cap/capsload.c b/src/spicelib/devices/cap/capsload.c index 15aee17d9..a8bcb4592 100644 --- a/src/spicelib/devices/cap/capsload.c +++ b/src/spicelib/devices/cap/capsload.c @@ -12,12 +12,12 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cap/capsprt.c b/src/spicelib/devices/cap/capsprt.c index f363e8d36..038bcf8e2 100644 --- a/src/spicelib/devices/cap/capsprt.c +++ b/src/spicelib/devices/cap/capsprt.c @@ -12,12 +12,12 @@ This function is obsolete (was used by an old sensitivity analysis) * the capacitors in the circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/cap/capsset.c b/src/spicelib/devices/cap/capsset.c index d0e1ca7c8..9a8b1d8f7 100644 --- a/src/spicelib/devices/cap/capsset.c +++ b/src/spicelib/devices/cap/capsset.c @@ -12,12 +12,12 @@ This function is obsolete (was used by an old sensitivity analysis) * allocate parameter #s to design parameters */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cap/capsupd.c b/src/spicelib/devices/cap/capsupd.c index 3caff8411..8c074a855 100644 --- a/src/spicelib/devices/cap/capsupd.c +++ b/src/spicelib/devices/cap/capsupd.c @@ -8,12 +8,12 @@ Modified: September 2003 Paolo Nenzi /* update the charge sensitivities and their derivatives */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cap/captemp.c b/src/spicelib/devices/cap/captemp.c index 8be179854..26c4627fe 100644 --- a/src/spicelib/devices/cap/captemp.c +++ b/src/spicelib/devices/cap/captemp.c @@ -10,11 +10,11 @@ Modified: September 2003 Paolo Nenzi * for fast matrix loading */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/cap/captrunc.c b/src/spicelib/devices/cap/captrunc.c index a8f7d79b2..359244151 100644 --- a/src/spicelib/devices/cap/captrunc.c +++ b/src/spicelib/devices/cap/captrunc.c @@ -6,11 +6,11 @@ Modified: September 2003 Paolo Nenzi /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "capdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cccs/cccs.c b/src/spicelib/devices/cccs/cccs.c index f5c24b7af..79560bfb1 100644 --- a/src/spicelib/devices/cccs/cccs.c +++ b/src/spicelib/devices/cccs/cccs.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "cccsdefs.h" -#include +#include "ngspice/suffix.h" IFparm CCCSpTable[] = { /* parameters */ IOPU("gain", CCCS_GAIN, IF_REAL ,"Gain of source"), diff --git a/src/spicelib/devices/cccs/cccsask.c b/src/spicelib/devices/cccs/cccsask.c index 93237f046..70303f095 100644 --- a/src/spicelib/devices/cccs/cccsask.c +++ b/src/spicelib/devices/cccs/cccsask.c @@ -8,13 +8,13 @@ Author: 1987 * of Current Controlled Current Source */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "cccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/cccs/cccsdefs.h b/src/spicelib/devices/cccs/cccsdefs.h index c4cf37395..42c701e47 100644 --- a/src/spicelib/devices/cccs/cccsdefs.h +++ b/src/spicelib/devices/cccs/cccsdefs.h @@ -6,10 +6,10 @@ Author: 1985 Thomas L. Quarles #ifndef CCCS #define CCCS -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/cktdefs.h" /* structures used to describe Current Controlled Current Sources */ diff --git a/src/spicelib/devices/cccs/cccsdel.c b/src/spicelib/devices/cccs/cccsdel.c index d9d7050f9..f75173047 100644 --- a/src/spicelib/devices/cccs/cccsdel.c +++ b/src/spicelib/devices/cccs/cccsdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "cccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cccs/cccsdest.c b/src/spicelib/devices/cccs/cccsdest.c index 9f9c047fd..982e62722 100644 --- a/src/spicelib/devices/cccs/cccsdest.c +++ b/src/spicelib/devices/cccs/cccsdest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "cccsdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/cccs/cccsinit.c b/src/spicelib/devices/cccs/cccsinit.c index a8e805b54..f398d5b77 100644 --- a/src/spicelib/devices/cccs/cccsinit.c +++ b/src/spicelib/devices/cccs/cccsinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "cccsitf.h" #include "cccsext.h" diff --git a/src/spicelib/devices/cccs/cccsload.c b/src/spicelib/devices/cccs/cccsload.c index 6fc68ec1f..1df666e2a 100644 --- a/src/spicelib/devices/cccs/cccsload.c +++ b/src/spicelib/devices/cccs/cccsload.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "cccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/cccs/cccsmdel.c b/src/spicelib/devices/cccs/cccsmdel.c index 66babe3ae..68b8ef6e8 100644 --- a/src/spicelib/devices/cccs/cccsmdel.c +++ b/src/spicelib/devices/cccs/cccsmdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "cccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cccs/cccspar.c b/src/spicelib/devices/cccs/cccspar.c index 3b9203d98..077d85f0e 100644 --- a/src/spicelib/devices/cccs/cccspar.c +++ b/src/spicelib/devices/cccs/cccspar.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "cccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/cccs/cccspzld.c b/src/spicelib/devices/cccs/cccspzld.c index bc95cb080..71bf31c9f 100644 --- a/src/spicelib/devices/cccs/cccspzld.c +++ b/src/spicelib/devices/cccs/cccspzld.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "cccsdefs.h" -#include +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/cccs/cccssacl.c b/src/spicelib/devices/cccs/cccssacl.c index 13ce6dbda..7910ea611 100644 --- a/src/spicelib/devices/cccs/cccssacl.c +++ b/src/spicelib/devices/cccs/cccssacl.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "cccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cccs/cccsset.c b/src/spicelib/devices/cccs/cccsset.c index a701ce16e..baaeea27e 100644 --- a/src/spicelib/devices/cccs/cccsset.c +++ b/src/spicelib/devices/cccs/cccsset.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * for fast matrix loading */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "cccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/cccs/cccssld.c b/src/spicelib/devices/cccs/cccssld.c index 729dd029d..933c03c83 100644 --- a/src/spicelib/devices/cccs/cccssld.c +++ b/src/spicelib/devices/cccs/cccssld.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "cccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cccs/cccssprt.c b/src/spicelib/devices/cccs/cccssprt.c index 989c60a5f..325f73006 100644 --- a/src/spicelib/devices/cccs/cccssprt.c +++ b/src/spicelib/devices/cccs/cccssprt.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * the CCCS in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "cccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/cccs/cccssset.c b/src/spicelib/devices/cccs/cccssset.c index b0a3e638c..8fe1bb2c0 100644 --- a/src/spicelib/devices/cccs/cccssset.c +++ b/src/spicelib/devices/cccs/cccssset.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * allocate parameter #s to design parameters */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "cccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ccvs/ccvs.c b/src/spicelib/devices/ccvs/ccvs.c index e582885de..382a9170a 100644 --- a/src/spicelib/devices/ccvs/ccvs.c +++ b/src/spicelib/devices/ccvs/ccvs.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "ccvsdefs.h" -#include +#include "ngspice/suffix.h" /* current controlled voltage source */ IFparm CCVSpTable[] = { /* parameters */ diff --git a/src/spicelib/devices/ccvs/ccvsask.c b/src/spicelib/devices/ccvs/ccvsask.c index 158594ba3..64eda11ca 100644 --- a/src/spicelib/devices/ccvs/ccvsask.c +++ b/src/spicelib/devices/ccvs/ccvsask.c @@ -8,13 +8,13 @@ Author: 1987 Thomas L. Quarles * of Current Controlled Voltage Source */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/ccvs/ccvsdefs.h b/src/spicelib/devices/ccvs/ccvsdefs.h index afccf3e65..5b7914715 100644 --- a/src/spicelib/devices/ccvs/ccvsdefs.h +++ b/src/spicelib/devices/ccvs/ccvsdefs.h @@ -6,10 +6,10 @@ Author: 1985 Thomas L. Quarles #ifndef CCVS #define CCVS -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" /* structures used to describe current controlled voltage sources */ diff --git a/src/spicelib/devices/ccvs/ccvsdel.c b/src/spicelib/devices/ccvs/ccvsdel.c index 56d92ca5f..f71794690 100644 --- a/src/spicelib/devices/ccvs/ccvsdel.c +++ b/src/spicelib/devices/ccvs/ccvsdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ccvs/ccvsdest.c b/src/spicelib/devices/ccvs/ccvsdest.c index ba6d2d4fa..0caa59a7c 100644 --- a/src/spicelib/devices/ccvs/ccvsdest.c +++ b/src/spicelib/devices/ccvs/ccvsdest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "ccvsdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/ccvs/ccvsfbr.c b/src/spicelib/devices/ccvs/ccvsfbr.c index d20acb4ed..5f7c0ee57 100644 --- a/src/spicelib/devices/ccvs/ccvsfbr.c +++ b/src/spicelib/devices/ccvs/ccvsfbr.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ccvs/ccvsinit.c b/src/spicelib/devices/ccvs/ccvsinit.c index 9e0235364..31b4ba0c4 100644 --- a/src/spicelib/devices/ccvs/ccvsinit.c +++ b/src/spicelib/devices/ccvs/ccvsinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "ccvsitf.h" #include "ccvsext.h" diff --git a/src/spicelib/devices/ccvs/ccvsload.c b/src/spicelib/devices/ccvs/ccvsload.c index 25e3199c0..9988a80a7 100644 --- a/src/spicelib/devices/ccvs/ccvsload.c +++ b/src/spicelib/devices/ccvs/ccvsload.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/ccvs/ccvsmdel.c b/src/spicelib/devices/ccvs/ccvsmdel.c index ea2b32607..82f887dce 100644 --- a/src/spicelib/devices/ccvs/ccvsmdel.c +++ b/src/spicelib/devices/ccvs/ccvsmdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ccvs/ccvspar.c b/src/spicelib/devices/ccvs/ccvspar.c index ddda9f930..1228fe072 100644 --- a/src/spicelib/devices/ccvs/ccvspar.c +++ b/src/spicelib/devices/ccvs/ccvspar.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/ccvs/ccvspzld.c b/src/spicelib/devices/ccvs/ccvspzld.c index dcc2e83c6..911d8ce91 100644 --- a/src/spicelib/devices/ccvs/ccvspzld.c +++ b/src/spicelib/devices/ccvs/ccvspzld.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "ccvsdefs.h" -#include +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/ccvs/ccvssacl.c b/src/spicelib/devices/ccvs/ccvssacl.c index b9493612c..aec68b067 100644 --- a/src/spicelib/devices/ccvs/ccvssacl.c +++ b/src/spicelib/devices/ccvs/ccvssacl.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * into the array previously provided */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ccvs/ccvsset.c b/src/spicelib/devices/ccvs/ccvsset.c index c7b72003c..3cedc4fec 100644 --- a/src/spicelib/devices/ccvs/ccvsset.c +++ b/src/spicelib/devices/ccvs/ccvsset.c @@ -7,11 +7,11 @@ Author: 1985 Thomas L. Quarles * for fast matrix loading */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/ccvs/ccvssld.c b/src/spicelib/devices/ccvs/ccvssld.c index 520d61232..41b2256ee 100644 --- a/src/spicelib/devices/ccvs/ccvssld.c +++ b/src/spicelib/devices/ccvs/ccvssld.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * into the array previously provided */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ccvs/ccvssprt.c b/src/spicelib/devices/ccvs/ccvssprt.c index e4f479b40..a5bd12b4b 100644 --- a/src/spicelib/devices/ccvs/ccvssprt.c +++ b/src/spicelib/devices/ccvs/ccvssprt.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * the CCVS in the circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/ccvs/ccvssset.c b/src/spicelib/devices/ccvs/ccvssset.c index f27576011..036fd104f 100644 --- a/src/spicelib/devices/ccvs/ccvssset.c +++ b/src/spicelib/devices/ccvs/ccvssset.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * allocate parameter #s to design parameters */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ccvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cktaccept.c b/src/spicelib/devices/cktaccept.c index d8cd938b5..bff25f7cf 100644 --- a/src/spicelib/devices/cktaccept.c +++ b/src/spicelib/devices/cktaccept.c @@ -9,10 +9,10 @@ Author: 1985 Thomas L. Quarles * functions provided for the circuit elements in the given circuit */ #include -#include -#include -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "dev.h" diff --git a/src/spicelib/devices/cktask.c b/src/spicelib/devices/cktask.c index 566f6eac8..9e76268e8 100644 --- a/src/spicelib/devices/cktask.c +++ b/src/spicelib/devices/cktask.c @@ -8,8 +8,8 @@ Author: 1985 Thomas L. Quarles * Ask questions about a specified device. */ #include -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #include "dev.h" diff --git a/src/spicelib/devices/cktbindnode.c b/src/spicelib/devices/cktbindnode.c index be5840cd8..0a4b96898 100644 --- a/src/spicelib/devices/cktbindnode.c +++ b/src/spicelib/devices/cktbindnode.c @@ -8,11 +8,11 @@ Author: 1985 Thomas L. Quarles * bind a node of the specified device of the given type to its place * in the specified circuit. */ -#include +#include "ngspice/ngspice.h" #include #include -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #include "dev.h" diff --git a/src/spicelib/devices/cktcrte.c b/src/spicelib/devices/cktcrte.c index ce63730d7..66a5a24ea 100644 --- a/src/spicelib/devices/cktcrte.c +++ b/src/spicelib/devices/cktcrte.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * the specified model in the named circuit. */ #include -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #include "dev.h" -#include +#include "ngspice/memory.h" int CKTcrtElt(CKTcircuit *ckt, GENmodel *modPtr, GENinstance **inInstPtr, IFuid name) diff --git a/src/spicelib/devices/cktfinddev.c b/src/spicelib/devices/cktfinddev.c index fd6b4eeb8..2e4270ff2 100644 --- a/src/spicelib/devices/cktfinddev.c +++ b/src/spicelib/devices/cktfinddev.c @@ -4,9 +4,9 @@ Author: 1985 Thomas L. Quarles **********/ #include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #include "string.h" diff --git a/src/spicelib/devices/cktinit.c b/src/spicelib/devices/cktinit.c index 449d0484b..8f0cddfd3 100644 --- a/src/spicelib/devices/cktinit.c +++ b/src/spicelib/devices/cktinit.c @@ -6,17 +6,17 @@ Modifed: 2000 AlansFixes #include "config.h" -#include -#include -#include -#include -#include -#include +#include "ngspice/memory.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/fteext.h" +#include "ngspice/ifsim.h" #include "dev.h" #ifdef XSPICE /* gtri - add - wbk - 11/26/90 - add include for MIF global data */ -#include +#include "ngspice/mif.h" /* gtri - end - wbk - 11/26/90 */ #endif diff --git a/src/spicelib/devices/cpl/cpl.c b/src/spicelib/devices/cpl/cpl.c index 77c811250..58838ac65 100644 --- a/src/spicelib/devices/cpl/cpl.c +++ b/src/spicelib/devices/cpl/cpl.c @@ -4,11 +4,11 @@ reserved. Author: 1992 Charles Hough **********/ -#include +#include "ngspice/ngspice.h" #include "cpldefs.h" -#include -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" IFparm CPLpTable[] = { IOPU("pos_nodes", CPL_POS_NODE, IF_VECTOR|IF_STRING, "in nodes"), diff --git a/src/spicelib/devices/cpl/cplask.c b/src/spicelib/devices/cpl/cplask.c index cc06b0639..4606e0313 100644 --- a/src/spicelib/devices/cpl/cplask.c +++ b/src/spicelib/devices/cpl/cplask.c @@ -5,14 +5,14 @@ Author: 2004 Paolo Nenzi **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "cpldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cpl/cpldefs.h b/src/spicelib/devices/cpl/cpldefs.h index 0bd7bde9e..0541c6410 100644 --- a/src/spicelib/devices/cpl/cpldefs.h +++ b/src/spicelib/devices/cpl/cpldefs.h @@ -6,12 +6,12 @@ reserved. #ifndef CPL #define CPL -#include -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" +#include "ngspice/swec.h" /* information used to describe a single instance */ diff --git a/src/spicelib/devices/cpl/cpldel.c b/src/spicelib/devices/cpl/cpldel.c index 148262c6f..dd046cf7c 100644 --- a/src/spicelib/devices/cpl/cpldel.c +++ b/src/spicelib/devices/cpl/cpldel.c @@ -5,10 +5,10 @@ Author: 1992 Charles Hough **********/ -#include +#include "ngspice/ngspice.h" #include "cpldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cpl/cpldest.c b/src/spicelib/devices/cpl/cpldest.c index 777429bc7..04fedb889 100644 --- a/src/spicelib/devices/cpl/cpldest.c +++ b/src/spicelib/devices/cpl/cpldest.c @@ -4,9 +4,9 @@ reserved. Author: 1992 Charles Hough **********/ -#include +#include "ngspice/ngspice.h" #include "cpldefs.h" -#include +#include "ngspice/suffix.h" void CPLdestroy(GENmodel **inModel) diff --git a/src/spicelib/devices/cpl/cplinit.c b/src/spicelib/devices/cpl/cplinit.c index 1387b5e8f..f70de7d97 100644 --- a/src/spicelib/devices/cpl/cplinit.c +++ b/src/spicelib/devices/cpl/cplinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "cplitf.h" #include "cplext.h" diff --git a/src/spicelib/devices/cpl/cplload.c b/src/spicelib/devices/cpl/cplload.c index 111f122a1..0ec101ae2 100644 --- a/src/spicelib/devices/cpl/cplload.c +++ b/src/spicelib/devices/cpl/cplload.c @@ -5,10 +5,10 @@ Author: 1992 Charles Hough **********/ -#include +#include "ngspice/ngspice.h" #include "cpldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "../../../frontend/error.h" /* controlled_exit() */ diff --git a/src/spicelib/devices/cpl/cplmask.c b/src/spicelib/devices/cpl/cplmask.c index 8dcf9bbd7..adcb418b5 100644 --- a/src/spicelib/devices/cpl/cplmask.c +++ b/src/spicelib/devices/cpl/cplmask.c @@ -5,14 +5,14 @@ Author: 2004 Paolo Nenzi **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "cpldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/cpl/cplmdel.c b/src/spicelib/devices/cpl/cplmdel.c index 2c9fb96b0..23784828c 100644 --- a/src/spicelib/devices/cpl/cplmdel.c +++ b/src/spicelib/devices/cpl/cplmdel.c @@ -5,10 +5,10 @@ Author: 1992 Charles Hough **********/ -#include +#include "ngspice/ngspice.h" #include "cpldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/cpl/cplmpar.c b/src/spicelib/devices/cpl/cplmpar.c index c2741a1af..1e094f079 100644 --- a/src/spicelib/devices/cpl/cplmpar.c +++ b/src/spicelib/devices/cpl/cplmpar.c @@ -5,12 +5,12 @@ Author: 1992 Charles Hough **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "cpldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" static void copy_coeffs(double **dst, IFvalue *value) diff --git a/src/spicelib/devices/cpl/cplparam.c b/src/spicelib/devices/cpl/cplparam.c index 07fe1f12f..31ebb9104 100644 --- a/src/spicelib/devices/cpl/cplparam.c +++ b/src/spicelib/devices/cpl/cplparam.c @@ -5,12 +5,12 @@ Author: 1992 Charles Hough **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "cpldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c index 1aa764837..03f2568c3 100644 --- a/src/spicelib/devices/cpl/cplsetup.c +++ b/src/spicelib/devices/cpl/cplsetup.c @@ -6,13 +6,13 @@ Modified: 2004 Paolo Nenzi - (ng)spice integration **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" #include "cpldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" -#include +#include "ngspice/multi_line.h" #include "../../../frontend/error.h" /* controlled_exit() */ diff --git a/src/spicelib/devices/csw/csw.c b/src/spicelib/devices/csw/csw.c index 06c4973a0..c257e12e9 100644 --- a/src/spicelib/devices/csw/csw.c +++ b/src/spicelib/devices/csw/csw.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "cswdefs.h" -#include +#include "ngspice/suffix.h" IFparm CSWpTable[] = { /* parameters */ IOP( "control",CSW_CONTROL, IF_INSTANCE, "Name of controlling source"), diff --git a/src/spicelib/devices/csw/cswacld.c b/src/spicelib/devices/csw/cswacld.c index 59ae0b53d..8800204a1 100644 --- a/src/spicelib/devices/csw/cswacld.c +++ b/src/spicelib/devices/csw/cswacld.c @@ -5,11 +5,11 @@ Author: 1985 Gordon Jacobs /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "cswdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/csw/cswask.c b/src/spicelib/devices/csw/cswask.c index e2037023e..56b2de2ae 100644 --- a/src/spicelib/devices/csw/cswask.c +++ b/src/spicelib/devices/csw/cswask.c @@ -10,13 +10,13 @@ Author: 1987 Thomas L. Quarles * of Current controlled SWitch */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "cswdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/csw/cswdefs.h b/src/spicelib/devices/csw/cswdefs.h index 5b7343d4f..cdc8422c7 100644 --- a/src/spicelib/devices/csw/cswdefs.h +++ b/src/spicelib/devices/csw/cswdefs.h @@ -7,11 +7,11 @@ Modified: 2000 AlansFixes #ifndef CSW #define CSW -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/noisedef.h" +#include "ngspice/complex.h" /* structures used to describe current controlled switches */ diff --git a/src/spicelib/devices/csw/cswdel.c b/src/spicelib/devices/csw/cswdel.c index e99d305ba..9041d0650 100644 --- a/src/spicelib/devices/csw/cswdel.c +++ b/src/spicelib/devices/csw/cswdel.c @@ -5,10 +5,10 @@ Author: 1985 Gordon Jacobs /* */ -#include +#include "ngspice/ngspice.h" #include "cswdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/csw/cswdest.c b/src/spicelib/devices/csw/cswdest.c index 23a763e67..b14ccdaf4 100644 --- a/src/spicelib/devices/csw/cswdest.c +++ b/src/spicelib/devices/csw/cswdest.c @@ -5,9 +5,9 @@ Author: 1985 Gordon Jacobs /* */ -#include +#include "ngspice/ngspice.h" #include "cswdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/csw/cswinit.c b/src/spicelib/devices/csw/cswinit.c index 3abc09168..854ffd30f 100644 --- a/src/spicelib/devices/csw/cswinit.c +++ b/src/spicelib/devices/csw/cswinit.c @@ -2,7 +2,7 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "cswitf.h" #include "cswext.h" diff --git a/src/spicelib/devices/csw/cswload.c b/src/spicelib/devices/csw/cswload.c index 658df5c10..954dcab1f 100644 --- a/src/spicelib/devices/csw/cswload.c +++ b/src/spicelib/devices/csw/cswload.c @@ -4,13 +4,13 @@ Author: 1985 Gordon Jacobs Modified: 2001 Jon Engelbert **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "cswdefs.h" -#include -#include -#include -#include +#include "ngspice/fteext.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int CSWload(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/csw/cswmask.c b/src/spicelib/devices/csw/cswmask.c index a266de139..f4dad7b11 100644 --- a/src/spicelib/devices/csw/cswmask.c +++ b/src/spicelib/devices/csw/cswmask.c @@ -10,13 +10,13 @@ Author: 1987 Thomas L. Quarles * of Current controlled SWitch */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "cswdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/csw/cswmdel.c b/src/spicelib/devices/csw/cswmdel.c index 33d9e4a81..accf8029c 100644 --- a/src/spicelib/devices/csw/cswmdel.c +++ b/src/spicelib/devices/csw/cswmdel.c @@ -5,10 +5,10 @@ Author: 1985 Gordon Jacobs /* */ -#include +#include "ngspice/ngspice.h" #include "cswdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/csw/cswmpar.c b/src/spicelib/devices/csw/cswmpar.c index 405818415..fb047b47d 100644 --- a/src/spicelib/devices/csw/cswmpar.c +++ b/src/spicelib/devices/csw/cswmpar.c @@ -6,11 +6,11 @@ Modified: 2001 Jon Englebert /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "cswdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/csw/cswnoise.c b/src/spicelib/devices/csw/cswnoise.c index 1e71880f8..c912aa4db 100644 --- a/src/spicelib/devices/csw/cswnoise.c +++ b/src/spicelib/devices/csw/cswnoise.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Gary W. Ng **********/ -#include +#include "ngspice/ngspice.h" #include "cswdefs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * CSWnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/csw/cswparam.c b/src/spicelib/devices/csw/cswparam.c index 5aa2cd6ab..c154a1175 100644 --- a/src/spicelib/devices/csw/cswparam.c +++ b/src/spicelib/devices/csw/cswparam.c @@ -5,11 +5,11 @@ Author: 1985 Gordon Jacobs /* */ -#include +#include "ngspice/ngspice.h" #include "cswdefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/csw/cswpzld.c b/src/spicelib/devices/csw/cswpzld.c index 46fef5977..1e650ce31 100644 --- a/src/spicelib/devices/csw/cswpzld.c +++ b/src/spicelib/devices/csw/cswpzld.c @@ -5,12 +5,12 @@ Author: 1985 Gordon Jacobs /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "cswdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/complex.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/csw/cswsetup.c b/src/spicelib/devices/csw/cswsetup.c index 2779f7196..25c308b8f 100644 --- a/src/spicelib/devices/csw/cswsetup.c +++ b/src/spicelib/devices/csw/cswsetup.c @@ -5,11 +5,11 @@ Author: 1985 Gordon Jacobs /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "cswdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/csw/cswtrunc.c b/src/spicelib/devices/csw/cswtrunc.c index 5ca81ddca..415f57c16 100644 --- a/src/spicelib/devices/csw/cswtrunc.c +++ b/src/spicelib/devices/csw/cswtrunc.c @@ -6,10 +6,10 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "cswdefs.h" diff --git a/src/spicelib/devices/dev.c b/src/spicelib/devices/dev.c index 01077ed26..5653fcaf5 100644 --- a/src/spicelib/devices/dev.c +++ b/src/spicelib/devices/dev.c @@ -29,15 +29,15 @@ * HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, * ENHANCEMENTS, OR MODIFICATIONS. */ -#include +#include "ngspice/ngspice.h" #include "config.h" #include "assert.h" -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "dev.h" -#include /* to alloc, realloc devices*/ +#include "ngspice/memory.h" /* to alloc, realloc devices*/ #ifdef XSPICE @@ -50,7 +50,7 @@ typedef void * funptr_t; #undef BOOLEAN #include #ifdef HAS_WINDOWS -#include +#include "ngspice/wstdio.h" #endif typedef FARPROC funptr_t; void *dlopen (const char *, int); @@ -62,8 +62,8 @@ char *dlerror (void); #define RTLD_GLOBAL 4 /* symbols in this dlopen'ed obj are visible to other dlopen'ed objs */ static char errstr[128]; #endif /* ifndef HAS_WINDOWS */ -#include /* the coreInfo Structure*/ -#include /*Use defined nodes */ +#include "ngspice/dllitf.h" /* the coreInfo Structure*/ +#include "ngspice/evtudn.h" /*Use defined nodes */ Evt_Udn_Info_t **g_evt_udn_info = NULL; int g_evt_num_udn_types = 0; @@ -345,11 +345,11 @@ void load_alldevs(void){ /*-------------------- XSPICE additions below ----------------------*/ #ifdef XSPICE -#include -#include -#include -#include /* for ft_sim */ -#include /* for DEVmaxnum */ +#include "ngspice/mif.h" +#include "ngspice/cm.h" +#include "ngspice/cpextern.h" +#include "ngspice/fteext.h" /* for ft_sim */ +#include "ngspice/cktdefs.h" /* for DEVmaxnum */ static void relink(void) { diff --git a/src/spicelib/devices/devsup.c b/src/spicelib/devices/devsup.c index a63ef7624..50d995665 100644 --- a/src/spicelib/devices/devsup.c +++ b/src/spicelib/devices/devsup.c @@ -6,10 +6,10 @@ Modified: 2000 AlansFixes /* support routines for device models */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/suffix.h" /* * Limit the per-iteration change of VDS diff --git a/src/spicelib/devices/dio/dio.c b/src/spicelib/devices/dio/dio.c index 0ea20fcf0..132168668 100644 --- a/src/spicelib/devices/dio/dio.c +++ b/src/spicelib/devices/dio/dio.c @@ -4,10 +4,10 @@ Author: 1985 Thomas L. Quarles Modified by Dietmar Warning 2003 and Paolo Nenzi 2003 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "diodefs.h" -#include +#include "ngspice/suffix.h" IFparm DIOpTable[] = { /* parameters */ IOPU("off", DIO_OFF, IF_FLAG, "Initially off"), diff --git a/src/spicelib/devices/dio/dioacld.c b/src/spicelib/devices/dio/dioacld.c index 065379a85..2c0074029 100644 --- a/src/spicelib/devices/dio/dioacld.c +++ b/src/spicelib/devices/dio/dioacld.c @@ -6,11 +6,11 @@ Modified by Dietmar Warning 2003 /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/dio/dioask.c b/src/spicelib/devices/dio/dioask.c index 88a5770fa..23f09a2aa 100644 --- a/src/spicelib/devices/dio/dioask.c +++ b/src/spicelib/devices/dio/dioask.c @@ -4,14 +4,14 @@ Author: 1985 Thomas L. Quarles Modified by Dietmar Warning 2003 and Paolo Nenzi 2003 **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/dio/dioconv.c b/src/spicelib/devices/dio/dioconv.c index 72fb83e48..6de3f6f23 100644 --- a/src/spicelib/devices/dio/dioconv.c +++ b/src/spicelib/devices/dio/dioconv.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int DIOconvTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/dio/diodefs.h b/src/spicelib/devices/dio/diodefs.h index 187c5a4ea..2a059ded3 100644 --- a/src/spicelib/devices/dio/diodefs.h +++ b/src/spicelib/devices/dio/diodefs.h @@ -6,11 +6,11 @@ Modified by Dietmar Warning 2003 and Paolo Nenzi 2003 #ifndef DIO #define DIO -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* data structures used to describe diodes */ diff --git a/src/spicelib/devices/dio/diodel.c b/src/spicelib/devices/dio/diodel.c index ec8e4de2a..1d834dd81 100644 --- a/src/spicelib/devices/dio/diodel.c +++ b/src/spicelib/devices/dio/diodel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/dio/diodest.c b/src/spicelib/devices/dio/diodest.c index 2bc6c4f2a..874468219 100644 --- a/src/spicelib/devices/dio/diodest.c +++ b/src/spicelib/devices/dio/diodest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "diodefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/dio/diodisto.c b/src/spicelib/devices/dio/diodisto.c index 0627cdd49..b05f08c67 100644 --- a/src/spicelib/devices/dio/diodisto.c +++ b/src/spicelib/devices/dio/diodisto.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" int DIOdisto( int mode, GENmodel *genmodel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/dio/diodset.c b/src/spicelib/devices/dio/diodset.c index 7bed01b55..42c0c6c0b 100644 --- a/src/spicelib/devices/dio/diodset.c +++ b/src/spicelib/devices/dio/diodset.c @@ -4,12 +4,12 @@ Author: 1988 Jaijeet S Roychowdhury Modified by Dietmar Warning 2003 and Paolo Nenzi 2003 **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* actually load the current resistance value into the sparse matrix diff --git a/src/spicelib/devices/dio/diogetic.c b/src/spicelib/devices/dio/diogetic.c index bed0f1f05..3f18ba0be 100644 --- a/src/spicelib/devices/dio/diogetic.c +++ b/src/spicelib/devices/dio/diogetic.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/dio/dioinit.c b/src/spicelib/devices/dio/dioinit.c index 38c52010a..ddda807bd 100644 --- a/src/spicelib/devices/dio/dioinit.c +++ b/src/spicelib/devices/dio/dioinit.c @@ -1,7 +1,7 @@ #include "config.h" -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" #include "dioitf.h" diff --git a/src/spicelib/devices/dio/dioload.c b/src/spicelib/devices/dio/dioload.c index 32b2d39d2..cf8e3e6c9 100644 --- a/src/spicelib/devices/dio/dioload.c +++ b/src/spicelib/devices/dio/dioload.c @@ -5,14 +5,14 @@ Modified: 2000 AlansFixes Modified by Dietmar Warning 2003 and Paolo Nenzi 2003 **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int DIOload(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/dio/diomask.c b/src/spicelib/devices/dio/diomask.c index cc1402469..dd5e09eac 100644 --- a/src/spicelib/devices/dio/diomask.c +++ b/src/spicelib/devices/dio/diomask.c @@ -6,13 +6,13 @@ Modified by Dietmar Warning 2003 and Paolo Nenzi 2003 /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/dio/diomdel.c b/src/spicelib/devices/dio/diomdel.c index b2e828498..68fb4dfaf 100644 --- a/src/spicelib/devices/dio/diomdel.c +++ b/src/spicelib/devices/dio/diomdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/dio/diompar.c b/src/spicelib/devices/dio/diompar.c index 204d7b692..c7c68c470 100644 --- a/src/spicelib/devices/dio/diompar.c +++ b/src/spicelib/devices/dio/diompar.c @@ -6,12 +6,12 @@ Modified by Dietmar Warning 2003 and Paolo Nenzi 2003 /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/dio/dionoise.c b/src/spicelib/devices/dio/dionoise.c index 7b80bbcf5..299969370 100644 --- a/src/spicelib/devices/dio/dionoise.c +++ b/src/spicelib/devices/dio/dionoise.c @@ -4,12 +4,12 @@ Author: 1987 Gary W. Ng Modified by Dietmar Warning 2003 **********/ -#include +#include "ngspice/ngspice.h" #include "diodefs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * DIOnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/dio/dioparam.c b/src/spicelib/devices/dio/dioparam.c index f58e24273..c11ed122c 100644 --- a/src/spicelib/devices/dio/dioparam.c +++ b/src/spicelib/devices/dio/dioparam.c @@ -6,12 +6,12 @@ Modified by Dietmar Warning 2003 and Paolo Nenzi 2003 /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/dio/diopzld.c b/src/spicelib/devices/dio/diopzld.c index e6deb45e0..d2bc0bf4c 100644 --- a/src/spicelib/devices/dio/diopzld.c +++ b/src/spicelib/devices/dio/diopzld.c @@ -6,12 +6,12 @@ Modified by Dietmar Warning 2003 /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "diodefs.h" -#include +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/dio/diosacl.c b/src/spicelib/devices/dio/diosacl.c index e22052d61..a9259b4e3 100644 --- a/src/spicelib/devices/dio/diosacl.c +++ b/src/spicelib/devices/dio/diosacl.c @@ -11,13 +11,13 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/const.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/dio/diosetup.c b/src/spicelib/devices/dio/diosetup.c index 71b193b64..cd715c32f 100644 --- a/src/spicelib/devices/dio/diosetup.c +++ b/src/spicelib/devices/dio/diosetup.c @@ -9,12 +9,12 @@ Modified by Dietmar Warning 2003 and Paolo Nenzi 2003 * for fast matrix loading */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int DIOsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) diff --git a/src/spicelib/devices/dio/diosload.c b/src/spicelib/devices/dio/diosload.c index 126ee2fff..e7570af70 100644 --- a/src/spicelib/devices/dio/diosload.c +++ b/src/spicelib/devices/dio/diosload.c @@ -11,12 +11,12 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/dio/diosprt.c b/src/spicelib/devices/dio/diosprt.c index d7c283d20..696ce8814 100644 --- a/src/spicelib/devices/dio/diosprt.c +++ b/src/spicelib/devices/dio/diosprt.c @@ -11,12 +11,12 @@ This function is obsolete (was used by an old sensitivity analysis) * the diodes in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/dio/diosset.c b/src/spicelib/devices/dio/diosset.c index 8d129d879..d6b6766cd 100644 --- a/src/spicelib/devices/dio/diosset.c +++ b/src/spicelib/devices/dio/diosset.c @@ -11,12 +11,12 @@ This function is obsolete (was used by an old sensitivity analysis) * allocate parameter #s to design parameters */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/dio/diosupd.c b/src/spicelib/devices/dio/diosupd.c index 856ce95a0..6edd0daf1 100644 --- a/src/spicelib/devices/dio/diosupd.c +++ b/src/spicelib/devices/dio/diosupd.c @@ -9,12 +9,12 @@ This function is obsolete (was used by an old sensitivity analysis) /* update the charge sensitivities and their derivatives */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/dio/diotemp.c b/src/spicelib/devices/dio/diotemp.c index 07899bba0..8fb71462a 100644 --- a/src/spicelib/devices/dio/diotemp.c +++ b/src/spicelib/devices/dio/diotemp.c @@ -7,12 +7,12 @@ Modified by Dietmar Warning 2003 and Paolo Nenzi 2003 /* perform the temperature update to the diode */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int DIOtemp(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/dio/diotrunc.c b/src/spicelib/devices/dio/diotrunc.c index 152f7de1f..564e4a1fa 100644 --- a/src/spicelib/devices/dio/diotrunc.c +++ b/src/spicelib/devices/dio/diotrunc.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "diodefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/hfet1/hfet.c b/src/spicelib/devices/hfet1/hfet.c index 6cf951ef3..b2f358912 100644 --- a/src/spicelib/devices/hfet1/hfet.c +++ b/src/spicelib/devices/hfet1/hfet.c @@ -3,11 +3,11 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "hfetdefs.h" -#include +#include "ngspice/suffix.h" IFparm HFETApTable[] = { /* parameters */ diff --git a/src/spicelib/devices/hfet1/hfetacl.c b/src/spicelib/devices/hfet1/hfetacl.c index 23f305d6d..24d9ca865 100644 --- a/src/spicelib/devices/hfet1/hfetacl.c +++ b/src/spicelib/devices/hfet1/hfetacl.c @@ -3,11 +3,11 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "hfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/hfet1/hfetask.c b/src/spicelib/devices/hfet1/hfetask.c index 9833d264d..d4fb5adbf 100644 --- a/src/spicelib/devices/hfet1/hfetask.c +++ b/src/spicelib/devices/hfet1/hfetask.c @@ -6,13 +6,13 @@ Author: 1987 Thomas L. Quarles Imported into HFETA source: Paolo Nenzi 2001 */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "hfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/hfet1/hfetdefs.h b/src/spicelib/devices/hfet1/hfetdefs.h index 3de214b98..27d519667 100644 --- a/src/spicelib/devices/hfet1/hfetdefs.h +++ b/src/spicelib/devices/hfet1/hfetdefs.h @@ -6,11 +6,11 @@ Modified: Paolo Nenzi #ifndef HFETA #define HFETA -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" #define HFETAnumStates 24 diff --git a/src/spicelib/devices/hfet1/hfetdel.c b/src/spicelib/devices/hfet1/hfetdel.c index 7ac029934..d7308ed9c 100644 --- a/src/spicelib/devices/hfet1/hfetdel.c +++ b/src/spicelib/devices/hfet1/hfetdel.c @@ -6,10 +6,10 @@ Author: 1985 S. Hwang Imported into hfeta model: Paolo Nenzi 2001 */ -#include +#include "ngspice/ngspice.h" #include "hfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/hfet1/hfetdest.c b/src/spicelib/devices/hfet1/hfetdest.c index c5902c84c..007ff3d7e 100644 --- a/src/spicelib/devices/hfet1/hfetdest.c +++ b/src/spicelib/devices/hfet1/hfetdest.c @@ -3,9 +3,9 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include +#include "ngspice/ngspice.h" #include "hfetdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/hfet1/hfetgetic.c b/src/spicelib/devices/hfet1/hfetgetic.c index d1f804394..a11ae76ef 100644 --- a/src/spicelib/devices/hfet1/hfetgetic.c +++ b/src/spicelib/devices/hfet1/hfetgetic.c @@ -3,11 +3,11 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "hfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/hfet1/hfetinit.c b/src/spicelib/devices/hfet1/hfetinit.c index 9f98c8323..21f90b77c 100644 --- a/src/spicelib/devices/hfet1/hfetinit.c +++ b/src/spicelib/devices/hfet1/hfetinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "hfetitf.h" #include "hfetext.h" diff --git a/src/spicelib/devices/hfet1/hfetload.c b/src/spicelib/devices/hfet1/hfetload.c index 7b911f381..6d1930806 100644 --- a/src/spicelib/devices/hfet1/hfetload.c +++ b/src/spicelib/devices/hfet1/hfetload.c @@ -3,14 +3,14 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "hfetdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* #define true 1 #define false 0 diff --git a/src/spicelib/devices/hfet1/hfetmask.c b/src/spicelib/devices/hfet1/hfetmask.c index e87cd4a43..8842b3fc0 100644 --- a/src/spicelib/devices/hfet1/hfetmask.c +++ b/src/spicelib/devices/hfet1/hfetmask.c @@ -6,13 +6,13 @@ Author: 1987 Thomas L. Quarles Imported into HFETA model: Paolo Nenzi 2001 */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "hfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/hfet1/hfetmdel.c b/src/spicelib/devices/hfet1/hfetmdel.c index d35a91b07..cf64a3696 100644 --- a/src/spicelib/devices/hfet1/hfetmdel.c +++ b/src/spicelib/devices/hfet1/hfetmdel.c @@ -6,10 +6,10 @@ Author: 1985 S. Hwang Imported into hfeta model: Paolo Nenzi 2001 */ -#include +#include "ngspice/ngspice.h" #include "hfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/hfet1/hfetmpar.c b/src/spicelib/devices/hfet1/hfetmpar.c index 89b1773b7..c7a2d74da 100644 --- a/src/spicelib/devices/hfet1/hfetmpar.c +++ b/src/spicelib/devices/hfet1/hfetmpar.c @@ -3,12 +3,12 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "hfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/hfet1/hfetparam.c b/src/spicelib/devices/hfet1/hfetparam.c index 2c18179cd..766fba189 100644 --- a/src/spicelib/devices/hfet1/hfetparam.c +++ b/src/spicelib/devices/hfet1/hfetparam.c @@ -3,11 +3,11 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "hfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/hfet1/hfetpzl.c b/src/spicelib/devices/hfet1/hfetpzl.c index 863817949..5ed6a8900 100644 --- a/src/spicelib/devices/hfet1/hfetpzl.c +++ b/src/spicelib/devices/hfet1/hfetpzl.c @@ -5,12 +5,12 @@ Author: 2003 Paolo Nenzi */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" #include "hfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/hfet1/hfetsetup.c b/src/spicelib/devices/hfet1/hfetsetup.c index 6d3fd1ccd..ec3f25cd4 100644 --- a/src/spicelib/devices/hfet1/hfetsetup.c +++ b/src/spicelib/devices/hfet1/hfetsetup.c @@ -3,13 +3,13 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "hfetdefs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* #define HFETAphibGiven diff --git a/src/spicelib/devices/hfet1/hfettemp.c b/src/spicelib/devices/hfet1/hfettemp.c index aa13c09eb..8822d9154 100644 --- a/src/spicelib/devices/hfet1/hfettemp.c +++ b/src/spicelib/devices/hfet1/hfettemp.c @@ -3,13 +3,13 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "hfetdefs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/hfet1/hfettrunc.c b/src/spicelib/devices/hfet1/hfettrunc.c index 71670108c..3d0eee5ae 100644 --- a/src/spicelib/devices/hfet1/hfettrunc.c +++ b/src/spicelib/devices/hfet1/hfettrunc.c @@ -3,11 +3,11 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "hfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/hfet2/hfet2.c b/src/spicelib/devices/hfet2/hfet2.c index 5ff54f2c7..847a2306a 100644 --- a/src/spicelib/devices/hfet2/hfet2.c +++ b/src/spicelib/devices/hfet2/hfet2.c @@ -3,11 +3,11 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "hfet2defs.h" -#include +#include "ngspice/suffix.h" IFparm HFET2pTable[] = { /* parameters */ diff --git a/src/spicelib/devices/hfet2/hfet2acl.c b/src/spicelib/devices/hfet2/hfet2acl.c index 1f3ae54b3..0089a6ee0 100644 --- a/src/spicelib/devices/hfet2/hfet2acl.c +++ b/src/spicelib/devices/hfet2/hfet2acl.c @@ -3,11 +3,11 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "hfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HFET2acLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/hfet2/hfet2ask.c b/src/spicelib/devices/hfet2/hfet2ask.c index fad185a1c..82f54eea4 100644 --- a/src/spicelib/devices/hfet2/hfet2ask.c +++ b/src/spicelib/devices/hfet2/hfet2ask.c @@ -6,13 +6,13 @@ Author: 1987 Thomas L. Quarles Imported into HFET2 source: Paolo Nenzi 2001 */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "hfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/hfet2/hfet2defs.h b/src/spicelib/devices/hfet2/hfet2defs.h index 60d644f35..4d9ec1333 100644 --- a/src/spicelib/devices/hfet2/hfet2defs.h +++ b/src/spicelib/devices/hfet2/hfet2defs.h @@ -2,11 +2,11 @@ #ifndef HFET2 #define HFET2 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" typedef struct sHFET2instance { diff --git a/src/spicelib/devices/hfet2/hfet2del.c b/src/spicelib/devices/hfet2/hfet2del.c index a37946d6c..f233da75f 100644 --- a/src/spicelib/devices/hfet2/hfet2del.c +++ b/src/spicelib/devices/hfet2/hfet2del.c @@ -6,10 +6,10 @@ Author: 1985 S. Hwang Imported into hfet2 model: Paolo Nenzi 2001 */ -#include +#include "ngspice/ngspice.h" #include "hfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/hfet2/hfet2dest.c b/src/spicelib/devices/hfet2/hfet2dest.c index fc9c1f252..548259bb7 100644 --- a/src/spicelib/devices/hfet2/hfet2dest.c +++ b/src/spicelib/devices/hfet2/hfet2dest.c @@ -3,9 +3,9 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include +#include "ngspice/ngspice.h" #include "hfet2defs.h" -#include +#include "ngspice/suffix.h" void HFET2destroy(GENmodel **inModel) diff --git a/src/spicelib/devices/hfet2/hfet2getic.c b/src/spicelib/devices/hfet2/hfet2getic.c index 53699559c..893dd788f 100644 --- a/src/spicelib/devices/hfet2/hfet2getic.c +++ b/src/spicelib/devices/hfet2/hfet2getic.c @@ -3,11 +3,11 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "hfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HFET2getic(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/hfet2/hfet2init.c b/src/spicelib/devices/hfet2/hfet2init.c index 275aa9f2e..eb336b5e6 100644 --- a/src/spicelib/devices/hfet2/hfet2init.c +++ b/src/spicelib/devices/hfet2/hfet2init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "hfet2itf.h" #include "hfet2ext.h" diff --git a/src/spicelib/devices/hfet2/hfet2load.c b/src/spicelib/devices/hfet2/hfet2load.c index c8344f139..2d917b515 100644 --- a/src/spicelib/devices/hfet2/hfet2load.c +++ b/src/spicelib/devices/hfet2/hfet2load.c @@ -3,14 +3,14 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "hfet2defs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void Pause(void); diff --git a/src/spicelib/devices/hfet2/hfet2mask.c b/src/spicelib/devices/hfet2/hfet2mask.c index 7e41cf67f..19134caef 100644 --- a/src/spicelib/devices/hfet2/hfet2mask.c +++ b/src/spicelib/devices/hfet2/hfet2mask.c @@ -6,13 +6,13 @@ Author: 1987 Thomas L. Quarles Imported into HFET2 model: Paolo Nenzi 2001 */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "hfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/hfet2/hfet2mdel.c b/src/spicelib/devices/hfet2/hfet2mdel.c index a414f0714..a4407570c 100644 --- a/src/spicelib/devices/hfet2/hfet2mdel.c +++ b/src/spicelib/devices/hfet2/hfet2mdel.c @@ -6,10 +6,10 @@ Author: 1985 S. Hwang Imported into hfet2 model: Paolo Nenzi 2001 */ -#include +#include "ngspice/ngspice.h" #include "hfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/hfet2/hfet2mpar.c b/src/spicelib/devices/hfet2/hfet2mpar.c index 451e21157..6f98a12db 100644 --- a/src/spicelib/devices/hfet2/hfet2mpar.c +++ b/src/spicelib/devices/hfet2/hfet2mpar.c @@ -3,11 +3,11 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "hfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HFET2mParam(int param, IFvalue *value, GENmodel *inModel) diff --git a/src/spicelib/devices/hfet2/hfet2param.c b/src/spicelib/devices/hfet2/hfet2param.c index a89ad2416..b43eb0738 100644 --- a/src/spicelib/devices/hfet2/hfet2param.c +++ b/src/spicelib/devices/hfet2/hfet2param.c @@ -3,11 +3,11 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "hfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HFET2param(int param, IFvalue *value, GENinstance *inst, IFvalue *select) diff --git a/src/spicelib/devices/hfet2/hfet2pzl.c b/src/spicelib/devices/hfet2/hfet2pzl.c index 734fb2683..518685048 100644 --- a/src/spicelib/devices/hfet2/hfet2pzl.c +++ b/src/spicelib/devices/hfet2/hfet2pzl.c @@ -5,11 +5,11 @@ Author: 2003 Paolo Nenzi */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "hfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HFET2pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) diff --git a/src/spicelib/devices/hfet2/hfet2setup.c b/src/spicelib/devices/hfet2/hfet2setup.c index e35efd599..26be75e9b 100644 --- a/src/spicelib/devices/hfet2/hfet2setup.c +++ b/src/spicelib/devices/hfet2/hfet2setup.c @@ -3,13 +3,13 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "hfet2defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HFET2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) diff --git a/src/spicelib/devices/hfet2/hfet2temp.c b/src/spicelib/devices/hfet2/hfet2temp.c index b77f7490c..e262001f4 100644 --- a/src/spicelib/devices/hfet2/hfet2temp.c +++ b/src/spicelib/devices/hfet2/hfet2temp.c @@ -3,13 +3,13 @@ Imported from MacSpice3f4 - Antony Wilson Modified: Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "hfet2defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HFET2temp( diff --git a/src/spicelib/devices/hfet2/hfet2trunc.c b/src/spicelib/devices/hfet2/hfet2trunc.c index 7e6f0e073..4256699c3 100644 --- a/src/spicelib/devices/hfet2/hfet2trunc.c +++ b/src/spicelib/devices/hfet2/hfet2trunc.c @@ -1,10 +1,10 @@ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/cktdefs.h" #include "hfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HFET2trunc( diff --git a/src/spicelib/devices/hisim2/hisim2.h b/src/spicelib/devices/hisim2/hisim2.h index 0b0b81306..e0643147e 100644 --- a/src/spicelib/devices/hisim2/hisim2.h +++ b/src/spicelib/devices/hisim2/hisim2.h @@ -14,7 +14,7 @@ ***********************************************************************/ #include "hsm2def.h" -#include +#include "ngspice/cktdefs.h" #ifndef _HiSIM2_H #define _HiSIM2_H diff --git a/src/spicelib/devices/hisim2/hsm2.c b/src/spicelib/devices/hisim2/hsm2.c index 044b59fba..1bb46d512 100644 --- a/src/spicelib/devices/hisim2/hsm2.c +++ b/src/spicelib/devices/hisim2/hsm2.c @@ -13,11 +13,11 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/devdefs.h" #include "hsm2def.h" -#include +#include "ngspice/suffix.h" IFparm HSM2pTable[] = { /* parameters */ IOP( "l", HSM2_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/hisim2/hsm2acld.c b/src/spicelib/devices/hisim2/hsm2acld.c index dbe7644af..b31cb88b7 100644 --- a/src/spicelib/devices/hisim2/hsm2acld.c +++ b/src/spicelib/devices/hisim2/hsm2acld.c @@ -14,10 +14,10 @@ ***********************************************************************/ #include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "hsm2def.h" diff --git a/src/spicelib/devices/hisim2/hsm2ask.c b/src/spicelib/devices/hisim2/hsm2ask.c index 506e1b19f..15358a6d3 100644 --- a/src/spicelib/devices/hisim2/hsm2ask.c +++ b/src/spicelib/devices/hisim2/hsm2ask.c @@ -13,14 +13,14 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "hsm2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSM2ask( CKTcircuit *ckt, diff --git a/src/spicelib/devices/hisim2/hsm2cvtest.c b/src/spicelib/devices/hisim2/hsm2cvtest.c index 37b1839eb..e203f1376 100644 --- a/src/spicelib/devices/hisim2/hsm2cvtest.c +++ b/src/spicelib/devices/hisim2/hsm2cvtest.c @@ -13,15 +13,15 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/cktdefs.h" #include "hsm2def.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSM2convTest( GENmodel *inModel, diff --git a/src/spicelib/devices/hisim2/hsm2def.h b/src/spicelib/devices/hisim2/hsm2def.h index 588c8ba8c..9ed114208 100644 --- a/src/spicelib/devices/hisim2/hsm2def.h +++ b/src/spicelib/devices/hisim2/hsm2def.h @@ -16,11 +16,11 @@ #ifndef HSM2 #define HSM2 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* declarations for HiSIM2 MOSFETs */ diff --git a/src/spicelib/devices/hisim2/hsm2del.c b/src/spicelib/devices/hisim2/hsm2del.c index 5e7a19be0..2c1d7450c 100644 --- a/src/spicelib/devices/hisim2/hsm2del.c +++ b/src/spicelib/devices/hisim2/hsm2del.c @@ -13,12 +13,12 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include #include "hsm2def.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int HSM2delete( GENmodel *inModel, diff --git a/src/spicelib/devices/hisim2/hsm2dest.c b/src/spicelib/devices/hisim2/hsm2dest.c index bb0c6161f..27bb326f5 100644 --- a/src/spicelib/devices/hisim2/hsm2dest.c +++ b/src/spicelib/devices/hisim2/hsm2dest.c @@ -13,10 +13,10 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include #include "hsm2def.h" -#include +#include "ngspice/suffix.h" void HSM2destroy( GENmodel **inModel) diff --git a/src/spicelib/devices/hisim2/hsm2eval.c b/src/spicelib/devices/hisim2/hsm2eval.c index 752f40b01..8cbb77d17 100644 --- a/src/spicelib/devices/hisim2/hsm2eval.c +++ b/src/spicelib/devices/hisim2/hsm2eval.c @@ -137,9 +137,9 @@ using the HiSIM2 standard. #ifdef __STDC__ /* #include */ #endif -#include +#include "ngspice/cktdefs.h" -#include +#include "ngspice/ngspice.h" /*-----------------------------------* * HiSIM macros diff --git a/src/spicelib/devices/hisim2/hsm2getic.c b/src/spicelib/devices/hisim2/hsm2getic.c index 9b4372692..652105be6 100644 --- a/src/spicelib/devices/hisim2/hsm2getic.c +++ b/src/spicelib/devices/hisim2/hsm2getic.c @@ -13,12 +13,12 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/cktdefs.h" #include "hsm2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSM2getic( GENmodel *inModel, diff --git a/src/spicelib/devices/hisim2/hsm2init.c b/src/spicelib/devices/hisim2/hsm2init.c index d72163450..5119f9c22 100644 --- a/src/spicelib/devices/hisim2/hsm2init.c +++ b/src/spicelib/devices/hisim2/hsm2init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "hsm2def.h" #include "hsm2itf.h" diff --git a/src/spicelib/devices/hisim2/hsm2ld.c b/src/spicelib/devices/hisim2/hsm2ld.c index a461f083b..36b752f95 100644 --- a/src/spicelib/devices/hisim2/hsm2ld.c +++ b/src/spicelib/devices/hisim2/hsm2ld.c @@ -14,15 +14,15 @@ ***********************************************************************/ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "hsm2def.h" #include "hisim2.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #define SHOW_EPS_QUANT 1.0e-15 #define BYP_TOL_FACTOR model->HSM2_byptol diff --git a/src/spicelib/devices/hisim2/hsm2mask.c b/src/spicelib/devices/hisim2/hsm2mask.c index 74981d8f5..14f8ef85c 100644 --- a/src/spicelib/devices/hisim2/hsm2mask.c +++ b/src/spicelib/devices/hisim2/hsm2mask.c @@ -13,14 +13,14 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "hsm2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSM2mAsk( CKTcircuit *ckt, diff --git a/src/spicelib/devices/hisim2/hsm2mdel.c b/src/spicelib/devices/hisim2/hsm2mdel.c index 33a3f9e08..75df8c282 100644 --- a/src/spicelib/devices/hisim2/hsm2mdel.c +++ b/src/spicelib/devices/hisim2/hsm2mdel.c @@ -13,11 +13,11 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include #include "hsm2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSM2mDelete( GENmodel **inModel, diff --git a/src/spicelib/devices/hisim2/hsm2mpar.c b/src/spicelib/devices/hisim2/hsm2mpar.c index 029f6ba0f..96b345791 100644 --- a/src/spicelib/devices/hisim2/hsm2mpar.c +++ b/src/spicelib/devices/hisim2/hsm2mpar.c @@ -13,12 +13,12 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include #include "hsm2def.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSM2mParam( int param, diff --git a/src/spicelib/devices/hisim2/hsm2noi.c b/src/spicelib/devices/hisim2/hsm2noi.c index 8b5dd65ea..ffc6ee14c 100644 --- a/src/spicelib/devices/hisim2/hsm2noi.c +++ b/src/spicelib/devices/hisim2/hsm2noi.c @@ -13,15 +13,15 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include #include #include "hsm2def.h" -#include -#include -#include -#include -#include /* jwan */ +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* jwan */ /* * HSM2noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/hisim2/hsm2par.c b/src/spicelib/devices/hisim2/hsm2par.c index c15e0e799..299e6141c 100644 --- a/src/spicelib/devices/hisim2/hsm2par.c +++ b/src/spicelib/devices/hisim2/hsm2par.c @@ -13,12 +13,12 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/ifsim.h" #include "hsm2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSM2param( int param, diff --git a/src/spicelib/devices/hisim2/hsm2pzld.c b/src/spicelib/devices/hisim2/hsm2pzld.c index d7d8a6065..1879abc73 100644 --- a/src/spicelib/devices/hisim2/hsm2pzld.c +++ b/src/spicelib/devices/hisim2/hsm2pzld.c @@ -13,13 +13,13 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "hsm2def.h" -#include +#include "ngspice/suffix.h" int HSM2pzLoad( GENmodel *inModel, diff --git a/src/spicelib/devices/hisim2/hsm2set.c b/src/spicelib/devices/hisim2/hsm2set.c index 8f70bd135..6051a6f9a 100644 --- a/src/spicelib/devices/hisim2/hsm2set.c +++ b/src/spicelib/devices/hisim2/hsm2set.c @@ -13,15 +13,15 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include -#include -#include +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "hsm2def.h" #include "hsm2evalenv.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSM2setup( diff --git a/src/spicelib/devices/hisim2/hsm2temp.c b/src/spicelib/devices/hisim2/hsm2temp.c index 8c9d5d09b..2f2f8fa55 100644 --- a/src/spicelib/devices/hisim2/hsm2temp.c +++ b/src/spicelib/devices/hisim2/hsm2temp.c @@ -13,14 +13,14 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "hsm2def.h" #include "hsm2evalenv.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define BINNING(param) pParam->HSM2_##param = model->HSM2_##param \ + model->HSM2_l##param / Lbin + model->HSM2_w##param / Wbin \ diff --git a/src/spicelib/devices/hisim2/hsm2trunc.c b/src/spicelib/devices/hisim2/hsm2trunc.c index 11786c448..68df0c526 100644 --- a/src/spicelib/devices/hisim2/hsm2trunc.c +++ b/src/spicelib/devices/hisim2/hsm2trunc.c @@ -13,12 +13,12 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/cktdefs.h" #include "hsm2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSM2trunc( GENmodel *inModel, diff --git a/src/spicelib/devices/hisimhv/hisimhv.h b/src/spicelib/devices/hisimhv/hisimhv.h index 94d85a9b4..172e8f8b0 100644 --- a/src/spicelib/devices/hisimhv/hisimhv.h +++ b/src/spicelib/devices/hisimhv/hisimhv.h @@ -16,7 +16,7 @@ ***********************************************************************/ #include "hsmhvdef.h" -#include +#include "ngspice/cktdefs.h" #ifndef _HiSIMHV_H #define _HiSIMHV_H diff --git a/src/spicelib/devices/hisimhv/hsmhv.c b/src/spicelib/devices/hisimhv/hsmhv.c index 8d266fbcc..e3fa8b933 100644 --- a/src/spicelib/devices/hisimhv/hsmhv.c +++ b/src/spicelib/devices/hisimhv/hsmhv.c @@ -16,10 +16,10 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "hsmhvdef.h" -#include +#include "ngspice/suffix.h" IFparm HSMHVpTable[] = { /* parameters */ IOP( "coselfheat", HSMHV_COSELFHEAT, IF_INTEGER, "Calculation of self heating model"), diff --git a/src/spicelib/devices/hisimhv/hsmhvacld.c b/src/spicelib/devices/hisimhv/hsmhvacld.c index 1b6505b8d..863af4b94 100644 --- a/src/spicelib/devices/hisimhv/hsmhvacld.c +++ b/src/spicelib/devices/hisimhv/hsmhvacld.c @@ -15,10 +15,10 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "hsmhvdef.h" int HSMHVacLoad( diff --git a/src/spicelib/devices/hisimhv/hsmhvask.c b/src/spicelib/devices/hisimhv/hsmhvask.c index dbf765162..3fa5fa089 100644 --- a/src/spicelib/devices/hisimhv/hsmhvask.c +++ b/src/spicelib/devices/hisimhv/hsmhvask.c @@ -15,13 +15,13 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "hsmhvdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSMHVask( CKTcircuit *ckt, diff --git a/src/spicelib/devices/hisimhv/hsmhvcvtest.c b/src/spicelib/devices/hisimhv/hsmhvcvtest.c index c2d7f0433..e51a312e7 100644 --- a/src/spicelib/devices/hisimhv/hsmhvcvtest.c +++ b/src/spicelib/devices/hisimhv/hsmhvcvtest.c @@ -15,15 +15,15 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "hsmhvdef.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSMHVconvTest( GENmodel *inModel, diff --git a/src/spicelib/devices/hisimhv/hsmhvdef.h b/src/spicelib/devices/hisimhv/hsmhvdef.h index 29f32270b..db8c63c47 100644 --- a/src/spicelib/devices/hisimhv/hsmhvdef.h +++ b/src/spicelib/devices/hisimhv/hsmhvdef.h @@ -18,11 +18,11 @@ #ifndef HSMHV #define HSMHV -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* declarations for HiSIMHV MOSFETs */ diff --git a/src/spicelib/devices/hisimhv/hsmhvdel.c b/src/spicelib/devices/hisimhv/hsmhvdel.c index 4ee1088ec..54133680d 100644 --- a/src/spicelib/devices/hisimhv/hsmhvdel.c +++ b/src/spicelib/devices/hisimhv/hsmhvdel.c @@ -15,11 +15,11 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include "hsmhvdef.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" +#include "ngspice/suffix.h" int HSMHVdelete( GENmodel *inModel, diff --git a/src/spicelib/devices/hisimhv/hsmhvdest.c b/src/spicelib/devices/hisimhv/hsmhvdest.c index 39283344c..164893a2e 100644 --- a/src/spicelib/devices/hisimhv/hsmhvdest.c +++ b/src/spicelib/devices/hisimhv/hsmhvdest.c @@ -15,9 +15,9 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include "hsmhvdef.h" -#include +#include "ngspice/suffix.h" void HSMHVdestroy( GENmodel **inModel) diff --git a/src/spicelib/devices/hisimhv/hsmhveval.c b/src/spicelib/devices/hisimhv/hsmhveval.c index f9c1c37b4..9b727ff92 100644 --- a/src/spicelib/devices/hisimhv/hsmhveval.c +++ b/src/spicelib/devices/hisimhv/hsmhveval.c @@ -147,7 +147,7 @@ June. 2008 (revised in June 2011) /* #include */ #endif -#include +#include "ngspice/ngspice.h" /*-----------------------------------* * HiSIM macros diff --git a/src/spicelib/devices/hisimhv/hsmhvgetic.c b/src/spicelib/devices/hisimhv/hsmhvgetic.c index b3a580696..dd579907f 100644 --- a/src/spicelib/devices/hisimhv/hsmhvgetic.c +++ b/src/spicelib/devices/hisimhv/hsmhvgetic.c @@ -15,11 +15,11 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "hsmhvdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSMHVgetic( GENmodel *inModel, diff --git a/src/spicelib/devices/hisimhv/hsmhvinit.c b/src/spicelib/devices/hisimhv/hsmhvinit.c index 37ba45ac1..145550a7d 100644 --- a/src/spicelib/devices/hisimhv/hsmhvinit.c +++ b/src/spicelib/devices/hisimhv/hsmhvinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "hsmhvdef.h" #include "hsmhvitf.h" diff --git a/src/spicelib/devices/hisimhv/hsmhvld.c b/src/spicelib/devices/hisimhv/hsmhvld.c index cfdb267e8..271bf983a 100644 --- a/src/spicelib/devices/hisimhv/hsmhvld.c +++ b/src/spicelib/devices/hisimhv/hsmhvld.c @@ -15,13 +15,13 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include "hisimhv.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" #define SHOW_EPS_QUANT 1.0e-15 diff --git a/src/spicelib/devices/hisimhv/hsmhvmask.c b/src/spicelib/devices/hisimhv/hsmhvmask.c index 5a2e08d33..808aa5d5a 100644 --- a/src/spicelib/devices/hisimhv/hsmhvmask.c +++ b/src/spicelib/devices/hisimhv/hsmhvmask.c @@ -15,13 +15,13 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "hsmhvdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSMHVmAsk( CKTcircuit *ckt, diff --git a/src/spicelib/devices/hisimhv/hsmhvmdel.c b/src/spicelib/devices/hisimhv/hsmhvmdel.c index 73e74636a..126f2fce1 100644 --- a/src/spicelib/devices/hisimhv/hsmhvmdel.c +++ b/src/spicelib/devices/hisimhv/hsmhvmdel.c @@ -15,10 +15,10 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include "hsmhvdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSMHVmDelete( GENmodel **inModel, diff --git a/src/spicelib/devices/hisimhv/hsmhvmpar.c b/src/spicelib/devices/hisimhv/hsmhvmpar.c index 156cf0ef8..7359077bd 100644 --- a/src/spicelib/devices/hisimhv/hsmhvmpar.c +++ b/src/spicelib/devices/hisimhv/hsmhvmpar.c @@ -15,12 +15,12 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include "hsmhvdef.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSMHVmParam( int param, diff --git a/src/spicelib/devices/hisimhv/hsmhvnoi.c b/src/spicelib/devices/hisimhv/hsmhvnoi.c index 41e2e9701..7ec662d00 100644 --- a/src/spicelib/devices/hisimhv/hsmhvnoi.c +++ b/src/spicelib/devices/hisimhv/hsmhvnoi.c @@ -15,14 +15,14 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include +#include "ngspice/ngspice.h" #include "hsmhvdef.h" -#include +#include "ngspice/cktdefs.h" /* #include "fteconst.h" */ -#include -#include -#include -#include /* jwan */ +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" +#include "ngspice/const.h" /* jwan */ #include "hsmhvevalenv.h" /* #include "hsmhvmacro.h" */ diff --git a/src/spicelib/devices/hisimhv/hsmhvpar.c b/src/spicelib/devices/hisimhv/hsmhvpar.c index 20b304332..e0fbcd6d7 100644 --- a/src/spicelib/devices/hisimhv/hsmhvpar.c +++ b/src/spicelib/devices/hisimhv/hsmhvpar.c @@ -15,11 +15,11 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "hsmhvdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSMHVparam( int param, diff --git a/src/spicelib/devices/hisimhv/hsmhvpzld.c b/src/spicelib/devices/hisimhv/hsmhvpzld.c index 8a3e7255a..70a57b5dd 100644 --- a/src/spicelib/devices/hisimhv/hsmhvpzld.c +++ b/src/spicelib/devices/hisimhv/hsmhvpzld.c @@ -15,12 +15,12 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "hsmhvdef.h" -#include +#include "ngspice/suffix.h" int HSMHVpzLoad( GENmodel *inModel, diff --git a/src/spicelib/devices/hisimhv/hsmhvset.c b/src/spicelib/devices/hisimhv/hsmhvset.c index 0b5d4e0ab..65a7dab1e 100644 --- a/src/spicelib/devices/hisimhv/hsmhvset.c +++ b/src/spicelib/devices/hisimhv/hsmhvset.c @@ -15,14 +15,14 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "hsmhvdef.h" #include "hsmhvevalenv.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define C_m2cm (1.0e2) #define C_cm2m_p3 (1.0e-6) diff --git a/src/spicelib/devices/hisimhv/hsmhvtemp.c b/src/spicelib/devices/hisimhv/hsmhvtemp.c index b190d906d..fe188f05f 100644 --- a/src/spicelib/devices/hisimhv/hsmhvtemp.c +++ b/src/spicelib/devices/hisimhv/hsmhvtemp.c @@ -15,14 +15,14 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "hsmhvdef.h" #include "hsmhvevalenv.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define RANGECHECK(param, min, max, pname) \ diff --git a/src/spicelib/devices/hisimhv/hsmhvtrunc.c b/src/spicelib/devices/hisimhv/hsmhvtrunc.c index 93bb9bb71..9d29d39de 100644 --- a/src/spicelib/devices/hisimhv/hsmhvtrunc.c +++ b/src/spicelib/devices/hisimhv/hsmhvtrunc.c @@ -15,11 +15,11 @@ Semiconductor Technology Academic Research Center (STARC) ***********************************************************************/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "hsmhvdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int HSMHVtrunc( GENmodel *inModel, diff --git a/src/spicelib/devices/ind/ind.c b/src/spicelib/devices/ind/ind.c index 66df8fb91..9b83bf868 100644 --- a/src/spicelib/devices/ind/ind.c +++ b/src/spicelib/devices/ind/ind.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "inddefs.h" -#include +#include "ngspice/suffix.h" IFparm INDpTable[] = { /* parameters */ IOPAP("inductance",IND_IND, IF_REAL, "Inductance of inductor"), diff --git a/src/spicelib/devices/ind/indacld.c b/src/spicelib/devices/ind/indacld.c index c7dfc8743..a0819a346 100644 --- a/src/spicelib/devices/ind/indacld.c +++ b/src/spicelib/devices/ind/indacld.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ind/indask.c b/src/spicelib/devices/ind/indask.c index 8a672f244..fb466fd67 100644 --- a/src/spicelib/devices/ind/indask.c +++ b/src/spicelib/devices/ind/indask.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include "inddefs.h" -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/ind/inddefs.h b/src/spicelib/devices/ind/inddefs.h index 01506be3a..64211507b 100644 --- a/src/spicelib/devices/ind/inddefs.h +++ b/src/spicelib/devices/ind/inddefs.h @@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles /* turn on mutual inductor code */ #define MUTUAL -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/complex.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" /* structures used to descrive inductors */ diff --git a/src/spicelib/devices/ind/inddel.c b/src/spicelib/devices/ind/inddel.c index e573b09d2..dd8454fc6 100644 --- a/src/spicelib/devices/ind/inddel.c +++ b/src/spicelib/devices/ind/inddel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ind/inddest.c b/src/spicelib/devices/ind/inddest.c index 752d7ddf5..f4f4e922f 100644 --- a/src/spicelib/devices/ind/inddest.c +++ b/src/spicelib/devices/ind/inddest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "inddefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/ind/indinit.c b/src/spicelib/devices/ind/indinit.c index 5b6801b06..d9e849f02 100644 --- a/src/spicelib/devices/ind/indinit.c +++ b/src/spicelib/devices/ind/indinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "inditf.h" #include "indext.h" diff --git a/src/spicelib/devices/ind/indload.c b/src/spicelib/devices/ind/indload.c index d17757d4d..0d6c951e2 100644 --- a/src/spicelib/devices/ind/indload.c +++ b/src/spicelib/devices/ind/indload.c @@ -7,12 +7,12 @@ Author: 1985 Thomas L. Quarles * sparse matrix previously provided */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int INDload(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/ind/indmask.c b/src/spicelib/devices/ind/indmask.c index 0e10fd502..9a9a59006 100644 --- a/src/spicelib/devices/ind/indmask.c +++ b/src/spicelib/devices/ind/indmask.c @@ -5,13 +5,13 @@ Author: 2003 Paolo Nenzi /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "inddefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/ind/indmdel.c b/src/spicelib/devices/ind/indmdel.c index 3d907ba92..123c728ca 100644 --- a/src/spicelib/devices/ind/indmdel.c +++ b/src/spicelib/devices/ind/indmdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ind/indmpar.c b/src/spicelib/devices/ind/indmpar.c index 6e8ec1533..12b5b0444 100644 --- a/src/spicelib/devices/ind/indmpar.c +++ b/src/spicelib/devices/ind/indmpar.c @@ -5,11 +5,11 @@ Author: 2003 Paolo Nenzi /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ind/indparam.c b/src/spicelib/devices/ind/indparam.c index c2b140fe1..6b7a0fbac 100644 --- a/src/spicelib/devices/ind/indparam.c +++ b/src/spicelib/devices/ind/indparam.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/ind/indpzld.c b/src/spicelib/devices/ind/indpzld.c index ee2133cff..db5c5175f 100644 --- a/src/spicelib/devices/ind/indpzld.c +++ b/src/spicelib/devices/ind/indpzld.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "inddefs.h" -#include +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/ind/indsacl.c b/src/spicelib/devices/ind/indsacl.c index 79f981548..e344973f0 100644 --- a/src/spicelib/devices/ind/indsacl.c +++ b/src/spicelib/devices/ind/indsacl.c @@ -9,12 +9,12 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int INDsAcLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/ind/indsetup.c b/src/spicelib/devices/ind/indsetup.c index 1a4ba5448..5e75ac5da 100644 --- a/src/spicelib/devices/ind/indsetup.c +++ b/src/spicelib/devices/ind/indsetup.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int INDsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) diff --git a/src/spicelib/devices/ind/indsload.c b/src/spicelib/devices/ind/indsload.c index a2d00dd9d..a86455247 100644 --- a/src/spicelib/devices/ind/indsload.c +++ b/src/spicelib/devices/ind/indsload.c @@ -9,12 +9,12 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int INDsLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/ind/indsprt.c b/src/spicelib/devices/ind/indsprt.c index c3cd7fc7f..77fff908f 100644 --- a/src/spicelib/devices/ind/indsprt.c +++ b/src/spicelib/devices/ind/indsprt.c @@ -9,12 +9,12 @@ This function is obsolete (was used by an old sensitivity analysis) * the inductors in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void INDsPrint(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/ind/indsset.c b/src/spicelib/devices/ind/indsset.c index 8ee160b51..9319d3615 100644 --- a/src/spicelib/devices/ind/indsset.c +++ b/src/spicelib/devices/ind/indsset.c @@ -9,12 +9,12 @@ This function is obsolete (was used by an old sensitivity analysis) * allocate parameter #s to design parameters */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int INDsSetup(SENstruct *info, GENmodel *inModel) diff --git a/src/spicelib/devices/ind/indsupd.c b/src/spicelib/devices/ind/indsupd.c index bf8b00833..af5e73da4 100644 --- a/src/spicelib/devices/ind/indsupd.c +++ b/src/spicelib/devices/ind/indsupd.c @@ -7,12 +7,12 @@ This function is obsolete (was used by an old sensitivity analysis) /* update the charge sensitivities and their derivatives */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int INDsUpdate(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/ind/indtemp.c b/src/spicelib/devices/ind/indtemp.c index e430b286b..b5dca819e 100644 --- a/src/spicelib/devices/ind/indtemp.c +++ b/src/spicelib/devices/ind/indtemp.c @@ -6,11 +6,11 @@ Author: 2003 Paolo Nenzi */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/ind/indtrunc.c b/src/spicelib/devices/ind/indtrunc.c index 8bd0a7ca8..0958bb5c8 100644 --- a/src/spicelib/devices/ind/indtrunc.c +++ b/src/spicelib/devices/ind/indtrunc.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ind/mutacld.c b/src/spicelib/devices/ind/mutacld.c index 46dd7aaf3..4b4bda3ca 100644 --- a/src/spicelib/devices/ind/mutacld.c +++ b/src/spicelib/devices/ind/mutacld.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef MUTUAL diff --git a/src/spicelib/devices/ind/mutask.c b/src/spicelib/devices/ind/mutask.c index 6ef96103d..dbf8a16b5 100644 --- a/src/spicelib/devices/ind/mutask.c +++ b/src/spicelib/devices/ind/mutask.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include "inddefs.h" -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef MUTUAL diff --git a/src/spicelib/devices/ind/mutdel.c b/src/spicelib/devices/ind/mutdel.c index 4250ac1f4..361287800 100644 --- a/src/spicelib/devices/ind/mutdel.c +++ b/src/spicelib/devices/ind/mutdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef MUTUAL diff --git a/src/spicelib/devices/ind/mutdest.c b/src/spicelib/devices/ind/mutdest.c index df8a5fdbe..25f4109f9 100644 --- a/src/spicelib/devices/ind/mutdest.c +++ b/src/spicelib/devices/ind/mutdest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "inddefs.h" -#include +#include "ngspice/suffix.h" #ifdef MUTUAL diff --git a/src/spicelib/devices/ind/mutmdel.c b/src/spicelib/devices/ind/mutmdel.c index 35fd8fc03..406775106 100644 --- a/src/spicelib/devices/ind/mutmdel.c +++ b/src/spicelib/devices/ind/mutmdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef MUTUAL diff --git a/src/spicelib/devices/ind/mutparam.c b/src/spicelib/devices/ind/mutparam.c index 9b35baa33..038a568b8 100644 --- a/src/spicelib/devices/ind/mutparam.c +++ b/src/spicelib/devices/ind/mutparam.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef MUTUAL diff --git a/src/spicelib/devices/ind/mutpzld.c b/src/spicelib/devices/ind/mutpzld.c index 30f399159..6787ce015 100644 --- a/src/spicelib/devices/ind/mutpzld.c +++ b/src/spicelib/devices/ind/mutpzld.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "inddefs.h" -#include +#include "ngspice/suffix.h" #ifdef MUTUAL diff --git a/src/spicelib/devices/ind/mutsetup.c b/src/spicelib/devices/ind/mutsetup.c index 8d65cb2c1..096f8d5b4 100644 --- a/src/spicelib/devices/ind/mutsetup.c +++ b/src/spicelib/devices/ind/mutsetup.c @@ -7,13 +7,13 @@ Author: 1985 Thomas L. Quarles * for fast matrix loading */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef MUTUAL diff --git a/src/spicelib/devices/ind/mutsprt.c b/src/spicelib/devices/ind/mutsprt.c index 8086a6d54..ad87de892 100644 --- a/src/spicelib/devices/ind/mutsprt.c +++ b/src/spicelib/devices/ind/mutsprt.c @@ -9,12 +9,12 @@ This function is obsolete (was used by an old sensitivity analysis) * the mutual inductors in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef MUTUAL diff --git a/src/spicelib/devices/ind/mutsset.c b/src/spicelib/devices/ind/mutsset.c index fecd6b045..6f41935fc 100644 --- a/src/spicelib/devices/ind/mutsset.c +++ b/src/spicelib/devices/ind/mutsset.c @@ -9,13 +9,13 @@ This function is obsolete (was used by an old sensitivity analysis) * allocate parameter #s to design parameters */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #ifdef MUTUAL /*ARGSUSED*/ diff --git a/src/spicelib/devices/ind/muttemp.c b/src/spicelib/devices/ind/muttemp.c index ddd860e55..a4eceaf47 100644 --- a/src/spicelib/devices/ind/muttemp.c +++ b/src/spicelib/devices/ind/muttemp.c @@ -6,11 +6,11 @@ Author: 2003 Paolo Nenzi */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "inddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/isrc/isrc.c b/src/spicelib/devices/isrc/isrc.c index e34c26549..e872642ae 100644 --- a/src/spicelib/devices/isrc/isrc.c +++ b/src/spicelib/devices/isrc/isrc.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "isrcdefs.h" -#include +#include "ngspice/suffix.h" IFparm ISRCpTable[] = { /* parameters */ IOPP("dc", ISRC_DC, IF_REAL ,"DC value of source"), diff --git a/src/spicelib/devices/isrc/isrcacct.c b/src/spicelib/devices/isrc/isrcacct.c index 1aab8ab98..aa2f77669 100644 --- a/src/spicelib/devices/isrc/isrcacct.c +++ b/src/spicelib/devices/isrc/isrcacct.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "isrcdefs.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/missing_math.h" +#include "ngspice/1-f-code.h" extern int fftInit(long M); extern void fftFree(void); diff --git a/src/spicelib/devices/isrc/isrcacld.c b/src/spicelib/devices/isrc/isrcacld.c index 39de2bce1..743c80761 100644 --- a/src/spicelib/devices/isrc/isrcacld.c +++ b/src/spicelib/devices/isrc/isrcacld.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "isrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/isrc/isrcask.c b/src/spicelib/devices/isrc/isrcask.c index 1b29feb11..3740ab331 100644 --- a/src/spicelib/devices/isrc/isrcask.c +++ b/src/spicelib/devices/isrc/isrcask.c @@ -10,13 +10,13 @@ Author: 1988 Thomas L. Quarles * of independent current SouRCe */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "isrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/isrc/isrcdefs.h b/src/spicelib/devices/isrc/isrcdefs.h index bb15b3a4f..a7f2c6472 100644 --- a/src/spicelib/devices/isrc/isrcdefs.h +++ b/src/spicelib/devices/isrc/isrcdefs.h @@ -6,10 +6,10 @@ Author: 1985 Thomas L. Quarles #ifndef ISRC #define ISRC -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" /* * structures to describe independent current sources diff --git a/src/spicelib/devices/isrc/isrcdel.c b/src/spicelib/devices/isrc/isrcdel.c index 28de911af..ba535cec6 100644 --- a/src/spicelib/devices/isrc/isrcdel.c +++ b/src/spicelib/devices/isrc/isrcdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "isrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/isrc/isrcdest.c b/src/spicelib/devices/isrc/isrcdest.c index e66c0b381..1f4b9c17b 100644 --- a/src/spicelib/devices/isrc/isrcdest.c +++ b/src/spicelib/devices/isrc/isrcdest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "isrcdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/isrc/isrcinit.c b/src/spicelib/devices/isrc/isrcinit.c index 6a0304748..0ce5e6694 100644 --- a/src/spicelib/devices/isrc/isrcinit.c +++ b/src/spicelib/devices/isrc/isrcinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "isrcitf.h" #include "isrcext.h" diff --git a/src/spicelib/devices/isrc/isrcload.c b/src/spicelib/devices/isrc/isrcload.c index 9fb30a3f1..547a77820 100644 --- a/src/spicelib/devices/isrc/isrcload.c +++ b/src/spicelib/devices/isrc/isrcload.c @@ -5,17 +5,17 @@ Modified: 2000 Alansfixes $Id$ **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "isrcdefs.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/1-f-code.h" #ifdef XSPICE_EXP /* gtri - begin - wbk - modify for supply ramping option */ -#include +#include "ngspice/cmproto.h" /* gtri - end - wbk - modify for supply ramping option */ #endif diff --git a/src/spicelib/devices/isrc/isrcmdel.c b/src/spicelib/devices/isrc/isrcmdel.c index 28dc5b093..d0c8cc0b4 100644 --- a/src/spicelib/devices/isrc/isrcmdel.c +++ b/src/spicelib/devices/isrc/isrcmdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "isrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/isrc/isrcpar.c b/src/spicelib/devices/isrc/isrcpar.c index c58b6373f..2ce4c2580 100644 --- a/src/spicelib/devices/isrc/isrcpar.c +++ b/src/spicelib/devices/isrc/isrcpar.c @@ -6,12 +6,12 @@ Modified: 2000 AlansFixes /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "isrcdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/1-f-code.h" static void copy_coeffs(ISRCinstance *here, IFvalue *value) diff --git a/src/spicelib/devices/isrc/isrctemp.c b/src/spicelib/devices/isrc/isrctemp.c index 81c10a3ca..9734223c5 100644 --- a/src/spicelib/devices/isrc/isrctemp.c +++ b/src/spicelib/devices/isrc/isrctemp.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "isrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/jfet/jfet.c b/src/spicelib/devices/jfet/jfet.c index 60e6d76fc..5670d9bf1 100644 --- a/src/spicelib/devices/jfet/jfet.c +++ b/src/spicelib/devices/jfet/jfet.c @@ -6,11 +6,11 @@ Sydney University mods Copyright(c) 1989 Anthony E. Parker, David J. Skellern Sydney University Department of Electrical Engineering, Australia **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "jfetdefs.h" -#include +#include "ngspice/suffix.h" IFparm JFETpTable[] = { /* device parameters */ IOPU("off", JFET_OFF, IF_FLAG, "Device initially off"), diff --git a/src/spicelib/devices/jfet/jfetacld.c b/src/spicelib/devices/jfet/jfetacld.c index 36e262a25..a8d5983bb 100644 --- a/src/spicelib/devices/jfet/jfetacld.c +++ b/src/spicelib/devices/jfet/jfetacld.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "jfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet/jfetask.c b/src/spicelib/devices/jfet/jfetask.c index 8f09b31f0..43396185f 100644 --- a/src/spicelib/devices/jfet/jfetask.c +++ b/src/spicelib/devices/jfet/jfetask.c @@ -5,14 +5,14 @@ Author: 1987 Mathew Lew and Thomas L. Quarles /* */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "jfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/jfet/jfetdefs.h b/src/spicelib/devices/jfet/jfetdefs.h index 6129d86a0..a6ddda11d 100644 --- a/src/spicelib/devices/jfet/jfetdefs.h +++ b/src/spicelib/devices/jfet/jfetdefs.h @@ -9,11 +9,11 @@ Sydney University mods Copyright(c) 1989 Anthony E. Parker, David J. Skellern #ifndef JFET #define JFET -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* structures used to describe Junction Field Effect Transistors */ diff --git a/src/spicelib/devices/jfet/jfetdel.c b/src/spicelib/devices/jfet/jfetdel.c index 16f69c35e..f583dc66e 100644 --- a/src/spicelib/devices/jfet/jfetdel.c +++ b/src/spicelib/devices/jfet/jfetdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "jfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet/jfetdest.c b/src/spicelib/devices/jfet/jfetdest.c index 7be9d506b..e21d7b6ed 100644 --- a/src/spicelib/devices/jfet/jfetdest.c +++ b/src/spicelib/devices/jfet/jfetdest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "jfetdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/jfet/jfetdist.c b/src/spicelib/devices/jfet/jfetdist.c index a425b9b28..02db4a121 100644 --- a/src/spicelib/devices/jfet/jfetdist.c +++ b/src/spicelib/devices/jfet/jfetdist.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "jfetdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" int JFETdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/jfet/jfetdset.c b/src/spicelib/devices/jfet/jfetdset.c index 7fe1d2e54..19e2ddbcb 100644 --- a/src/spicelib/devices/jfet/jfetdset.c +++ b/src/spicelib/devices/jfet/jfetdset.c @@ -3,15 +3,15 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/cktdefs.h" #include "jfetdefs.h" -#include -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int JFETdSetup(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/jfet/jfetic.c b/src/spicelib/devices/jfet/jfetic.c index a65f4c379..64d3347bd 100644 --- a/src/spicelib/devices/jfet/jfetic.c +++ b/src/spicelib/devices/jfet/jfetic.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "jfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet/jfetinit.c b/src/spicelib/devices/jfet/jfetinit.c index e242280dd..d820fda34 100644 --- a/src/spicelib/devices/jfet/jfetinit.c +++ b/src/spicelib/devices/jfet/jfetinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "jfetitf.h" #include "jfetext.h" diff --git a/src/spicelib/devices/jfet/jfetload.c b/src/spicelib/devices/jfet/jfetload.c index 1d590761f..526b6b8cc 100644 --- a/src/spicelib/devices/jfet/jfetload.c +++ b/src/spicelib/devices/jfet/jfetload.c @@ -7,14 +7,14 @@ Sydney University mods Copyright(c) 1989 Anthony E. Parker, David J. Skellern Sydney University Department of Electrical Engineering, Australia **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "jfetdefs.h" -#include -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" int JFETload(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/jfet/jfetmask.c b/src/spicelib/devices/jfet/jfetmask.c index a1919ddab..46fb31a76 100644 --- a/src/spicelib/devices/jfet/jfetmask.c +++ b/src/spicelib/devices/jfet/jfetmask.c @@ -8,14 +8,14 @@ Sydney University mods Copyright(c) 1989 Anthony E. Parker, David J. Skellern /* */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "jfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/jfet/jfetmdel.c b/src/spicelib/devices/jfet/jfetmdel.c index 74401cb47..d5da508dd 100644 --- a/src/spicelib/devices/jfet/jfetmdel.c +++ b/src/spicelib/devices/jfet/jfetmdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "jfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet/jfetmpar.c b/src/spicelib/devices/jfet/jfetmpar.c index 912841ac2..a545f9603 100644 --- a/src/spicelib/devices/jfet/jfetmpar.c +++ b/src/spicelib/devices/jfet/jfetmpar.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "jfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet/jfetnoi.c b/src/spicelib/devices/jfet/jfetnoi.c index a57c141fe..a158b705b 100644 --- a/src/spicelib/devices/jfet/jfetnoi.c +++ b/src/spicelib/devices/jfet/jfetnoi.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Gary W. Ng **********/ -#include +#include "ngspice/ngspice.h" #include "jfetdefs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * JFETnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/jfet/jfetpar.c b/src/spicelib/devices/jfet/jfetpar.c index 1abf99ceb..a45d5cc61 100644 --- a/src/spicelib/devices/jfet/jfetpar.c +++ b/src/spicelib/devices/jfet/jfetpar.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "jfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/jfet/jfetpzld.c b/src/spicelib/devices/jfet/jfetpzld.c index d1880a7e1..d910e22ed 100644 --- a/src/spicelib/devices/jfet/jfetpzld.c +++ b/src/spicelib/devices/jfet/jfetpzld.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "jfetdefs.h" -#include +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet/jfetset.c b/src/spicelib/devices/jfet/jfetset.c index 13350a36f..0ef5c50e1 100644 --- a/src/spicelib/devices/jfet/jfetset.c +++ b/src/spicelib/devices/jfet/jfetset.c @@ -7,13 +7,13 @@ Sydney University mods Copyright(c) 1989 Anthony E. Parker, David J. Skellern Sydney University Department of Electrical Engineering, Australia **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "jfetdefs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int JFETsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) diff --git a/src/spicelib/devices/jfet/jfettemp.c b/src/spicelib/devices/jfet/jfettemp.c index 2dd7f5b12..0f0d3e147 100644 --- a/src/spicelib/devices/jfet/jfettemp.c +++ b/src/spicelib/devices/jfet/jfettemp.c @@ -6,13 +6,13 @@ Sydney University mods Copyright(c) 1989 Anthony E. Parker, David J. Skellern Sydney University Department of Electrical Engineering, Australia **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "jfetdefs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int JFETtemp(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/jfet/jfettrun.c b/src/spicelib/devices/jfet/jfettrun.c index 843521dcd..592083759 100644 --- a/src/spicelib/devices/jfet/jfettrun.c +++ b/src/spicelib/devices/jfet/jfettrun.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "jfetdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet2/jfet2.c b/src/spicelib/devices/jfet2/jfet2.c index 6fbe8283d..52b5cb609 100644 --- a/src/spicelib/devices/jfet2/jfet2.c +++ b/src/spicelib/devices/jfet2/jfet2.c @@ -9,11 +9,11 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker ) Extra state vectors added to JFET2pTable **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "jfet2defs.h" -#include +#include "ngspice/suffix.h" IFparm JFET2pTable[] = { /* device parameters */ IOPU("off", JFET2_OFF, IF_FLAG, "Device initially off"), diff --git a/src/spicelib/devices/jfet2/jfet2acld.c b/src/spicelib/devices/jfet2/jfet2acld.c index 592f5a558..3044e16fe 100644 --- a/src/spicelib/devices/jfet2/jfet2acld.c +++ b/src/spicelib/devices/jfet2/jfet2acld.c @@ -8,12 +8,12 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker ) 10 Feb 1994: New call to PSacload() with matrix loading **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "jfet2defs.h" -#include +#include "ngspice/sperror.h" #include "psmodel.h" -#include +#include "ngspice/suffix.h" int JFET2acLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/jfet2/jfet2ask.c b/src/spicelib/devices/jfet2/jfet2ask.c index 29fabea44..d00d030e6 100644 --- a/src/spicelib/devices/jfet2/jfet2ask.c +++ b/src/spicelib/devices/jfet2/jfet2ask.c @@ -8,14 +8,14 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker ) 10 Feb 1994: JFET2vtrap and JFET2pave added **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "jfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/jfet2/jfet2defs.h b/src/spicelib/devices/jfet2/jfet2defs.h index 25d2fd26b..56bf81c00 100644 --- a/src/spicelib/devices/jfet2/jfet2defs.h +++ b/src/spicelib/devices/jfet2/jfet2defs.h @@ -14,11 +14,11 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker ) #ifndef JFET2 #define JFET2 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* structures used to describe Junction Field Effect Transistors */ diff --git a/src/spicelib/devices/jfet2/jfet2del.c b/src/spicelib/devices/jfet2/jfet2del.c index 625a9ba5f..a4520e5f0 100644 --- a/src/spicelib/devices/jfet2/jfet2del.c +++ b/src/spicelib/devices/jfet2/jfet2del.c @@ -7,10 +7,10 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker ) Copyright 1994 Macquarie University, Sydney Australia. **********/ -#include +#include "ngspice/ngspice.h" #include "jfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet2/jfet2dest.c b/src/spicelib/devices/jfet2/jfet2dest.c index 1189f043c..e861b74d7 100644 --- a/src/spicelib/devices/jfet2/jfet2dest.c +++ b/src/spicelib/devices/jfet2/jfet2dest.c @@ -9,9 +9,9 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker ) /* */ -#include +#include "ngspice/ngspice.h" #include "jfet2defs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/jfet2/jfet2ic.c b/src/spicelib/devices/jfet2/jfet2ic.c index a538d29ed..7a421d69a 100644 --- a/src/spicelib/devices/jfet2/jfet2ic.c +++ b/src/spicelib/devices/jfet2/jfet2ic.c @@ -9,11 +9,11 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker ) /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "jfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet2/jfet2init.c b/src/spicelib/devices/jfet2/jfet2init.c index 3a4722085..74fb6f83e 100644 --- a/src/spicelib/devices/jfet2/jfet2init.c +++ b/src/spicelib/devices/jfet2/jfet2init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "jfet2itf.h" #include "jfet2ext.h" diff --git a/src/spicelib/devices/jfet2/jfet2load.c b/src/spicelib/devices/jfet2/jfet2load.c index 3717e1f29..b8dfb82d6 100644 --- a/src/spicelib/devices/jfet2/jfet2load.c +++ b/src/spicelib/devices/jfet2/jfet2load.c @@ -8,15 +8,15 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker ) 10 Feb 1994: New code added to call psmodel.c routines **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "jfet2defs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" #include "psmodel.h" -#include +#include "ngspice/suffix.h" int JFET2load(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/jfet2/jfet2mask.c b/src/spicelib/devices/jfet2/jfet2mask.c index 83b26ce1c..f66acf2e0 100644 --- a/src/spicelib/devices/jfet2/jfet2mask.c +++ b/src/spicelib/devices/jfet2/jfet2mask.c @@ -10,14 +10,14 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker ) /* */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "jfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/jfet2/jfet2mdel.c b/src/spicelib/devices/jfet2/jfet2mdel.c index 3d4b3010d..56c100f4b 100644 --- a/src/spicelib/devices/jfet2/jfet2mdel.c +++ b/src/spicelib/devices/jfet2/jfet2mdel.c @@ -9,10 +9,10 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker ) /* */ -#include +#include "ngspice/ngspice.h" #include "jfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet2/jfet2mpar.c b/src/spicelib/devices/jfet2/jfet2mpar.c index 11e3646f9..efdaab944 100644 --- a/src/spicelib/devices/jfet2/jfet2mpar.c +++ b/src/spicelib/devices/jfet2/jfet2mpar.c @@ -8,12 +8,12 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker ) 10 Feb 1994: Added call to jfetparm.h **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "jfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet2/jfet2noi.c b/src/spicelib/devices/jfet2/jfet2noi.c index c72ea4938..22c5d6696 100644 --- a/src/spicelib/devices/jfet2/jfet2noi.c +++ b/src/spicelib/devices/jfet2/jfet2noi.c @@ -7,12 +7,12 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker ) Copyright 1994 Macquarie University, Sydney Australia. **********/ -#include +#include "ngspice/ngspice.h" #include "jfet2defs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * JFET2noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/jfet2/jfet2par.c b/src/spicelib/devices/jfet2/jfet2par.c index e2f0ad7dd..84acdfe07 100644 --- a/src/spicelib/devices/jfet2/jfet2par.c +++ b/src/spicelib/devices/jfet2/jfet2par.c @@ -9,12 +9,12 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker ) /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "jfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/jfet2/jfet2set.c b/src/spicelib/devices/jfet2/jfet2set.c index a0b1fbe93..d6d8f5133 100644 --- a/src/spicelib/devices/jfet2/jfet2set.c +++ b/src/spicelib/devices/jfet2/jfet2set.c @@ -8,13 +8,13 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker ) 10 Feb 1994: Added call to jfetparm.h, used JFET_STATE_COUNT **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "jfet2defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int JFET2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) diff --git a/src/spicelib/devices/jfet2/jfet2temp.c b/src/spicelib/devices/jfet2/jfet2temp.c index 4d7654f1f..ad78dcc96 100644 --- a/src/spicelib/devices/jfet2/jfet2temp.c +++ b/src/spicelib/devices/jfet2/jfet2temp.c @@ -10,14 +10,14 @@ Modified to add PS model and new parameter definitions ( Anthony E. Parker ) sourceResist and drainResist, and fc for depletionCapCoef **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "jfet2defs.h" -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" #include "psmodel.h" -#include +#include "ngspice/suffix.h" int JFET2temp(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/jfet2/jfet2trun.c b/src/spicelib/devices/jfet2/jfet2trun.c index 68eb52d1b..8320eb8fe 100644 --- a/src/spicelib/devices/jfet2/jfet2trun.c +++ b/src/spicelib/devices/jfet2/jfet2trun.c @@ -9,11 +9,11 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker ) /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "jfet2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/jfet2/psmodel.h b/src/spicelib/devices/jfet2/psmodel.h index 35aa367e7..bee8d6801 100644 --- a/src/spicelib/devices/jfet2/psmodel.h +++ b/src/spicelib/devices/jfet2/psmodel.h @@ -12,9 +12,9 @@ #ifdef PSMODEL_C /* PSMODEL_C defined when included from "psmodel.c" */ -#include +#include "ngspice/ngspice.h" #include "jfet2defs.h" -#include +#include "ngspice/const.h" #endif /* Glue definitions for cref modl and inst */ diff --git a/src/spicelib/devices/limit.c b/src/spicelib/devices/limit.c index 86e94b757..1fff9b0fb 100644 --- a/src/spicelib/devices/limit.c +++ b/src/spicelib/devices/limit.c @@ -3,7 +3,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include +#include "ngspice/devdefs.h" /* limiting routines for junction voltages */ diff --git a/src/spicelib/devices/ltra/ltra.c b/src/spicelib/devices/ltra/ltra.c index aace23d79..251e05e17 100644 --- a/src/spicelib/devices/ltra/ltra.c +++ b/src/spicelib/devices/ltra/ltra.c @@ -9,11 +9,11 @@ Author: 1990 Jaijeet S. Roychowdhury * level(s) up the calling hierarchy */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "ltradefs.h" -#include +#include "ngspice/suffix.h" IFparm LTRApTable[] = { /* parameters */ IOPAU("v1", LTRA_V1, IF_REAL, "Initial voltage at end 1"), diff --git a/src/spicelib/devices/ltra/ltraacct.c b/src/spicelib/devices/ltra/ltraacct.c index 69ce6aa25..86a92199a 100644 --- a/src/spicelib/devices/ltra/ltraacct.c +++ b/src/spicelib/devices/ltra/ltraacct.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ltradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int LTRAaccept(CKTcircuit *ckt, GENmodel *inModel) diff --git a/src/spicelib/devices/ltra/ltraacld.c b/src/spicelib/devices/ltra/ltraacld.c index f570b1af6..50dcde7df 100644 --- a/src/spicelib/devices/ltra/ltraacld.c +++ b/src/spicelib/devices/ltra/ltraacld.c @@ -4,12 +4,12 @@ reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ltradefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int LTRAacLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/ltra/ltraask.c b/src/spicelib/devices/ltra/ltraask.c index deee3538d..901b69747 100644 --- a/src/spicelib/devices/ltra/ltraask.c +++ b/src/spicelib/devices/ltra/ltraask.c @@ -7,13 +7,13 @@ Author: 1990 Jaijeet S. Roychowdhury * This routine gives access to the internal device parameter of LTRA lines */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "ltradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/ltra/ltradefs.h b/src/spicelib/devices/ltra/ltradefs.h index 095e3d087..a78b87571 100644 --- a/src/spicelib/devices/ltra/ltradefs.h +++ b/src/spicelib/devices/ltra/ltradefs.h @@ -8,10 +8,10 @@ Author: 1990 Jaijeet S. Roychowdhury #undef LTRALTEINFO #undef LTRADEBUG -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" /* structures used to describe lossy transmission liness */ diff --git a/src/spicelib/devices/ltra/ltradel.c b/src/spicelib/devices/ltra/ltradel.c index 0a175add5..80d79648e 100644 --- a/src/spicelib/devices/ltra/ltradel.c +++ b/src/spicelib/devices/ltra/ltradel.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include +#include "ngspice/ngspice.h" #include "ltradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int LTRAdelete(GENmodel *inModel, IFuid name, GENinstance **kill) diff --git a/src/spicelib/devices/ltra/ltradest.c b/src/spicelib/devices/ltra/ltradest.c index b017aef8c..65583755b 100644 --- a/src/spicelib/devices/ltra/ltradest.c +++ b/src/spicelib/devices/ltra/ltradest.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include +#include "ngspice/ngspice.h" #include "ltradefs.h" -#include +#include "ngspice/suffix.h" void LTRAdestroy(GENmodel **inModel) diff --git a/src/spicelib/devices/ltra/ltrainit.c b/src/spicelib/devices/ltra/ltrainit.c index 39cd0837e..a0fd42549 100644 --- a/src/spicelib/devices/ltra/ltrainit.c +++ b/src/spicelib/devices/ltra/ltrainit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "ltraitf.h" #include "ltraext.h" diff --git a/src/spicelib/devices/ltra/ltraload.c b/src/spicelib/devices/ltra/ltraload.c index 8a9f9d511..52f9f2520 100644 --- a/src/spicelib/devices/ltra/ltraload.c +++ b/src/spicelib/devices/ltra/ltraload.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ltradefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int LTRAload(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/ltra/ltramask.c b/src/spicelib/devices/ltra/ltramask.c index 43009256f..bdba008c7 100644 --- a/src/spicelib/devices/ltra/ltramask.c +++ b/src/spicelib/devices/ltra/ltramask.c @@ -7,12 +7,12 @@ Author: 1990 Jaijeet S. Roychowdhury * This routine sets model parameters for LTRA lines in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "ltradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int LTRAmAsk(CKTcircuit *ckt, GENmodel *inModel, int param, IFvalue *value) diff --git a/src/spicelib/devices/ltra/ltramdel.c b/src/spicelib/devices/ltra/ltramdel.c index de3b7a630..f2e37f1d0 100644 --- a/src/spicelib/devices/ltra/ltramdel.c +++ b/src/spicelib/devices/ltra/ltramdel.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include +#include "ngspice/ngspice.h" #include "ltradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int LTRAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/ltra/ltramisc.c b/src/spicelib/devices/ltra/ltramisc.c index bb7867235..808305e42 100644 --- a/src/spicelib/devices/ltra/ltramisc.c +++ b/src/spicelib/devices/ltra/ltramisc.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include +#include "ngspice/ngspice.h" #include "ltradefs.h" -#include +#include "ngspice/suffix.h" /* * Miscellaneous functions to do with lossy lines diff --git a/src/spicelib/devices/ltra/ltrampar.c b/src/spicelib/devices/ltra/ltrampar.c index 1a05dbda8..08c5dd175 100644 --- a/src/spicelib/devices/ltra/ltrampar.c +++ b/src/spicelib/devices/ltra/ltrampar.c @@ -7,12 +7,12 @@ Author: 1990 Jaijeet S. Roychowdhury * This routine sets model parameters for LTRA lines in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "ltradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int LTRAmParam(int param, IFvalue *value, GENmodel *inModel) diff --git a/src/spicelib/devices/ltra/ltrapar.c b/src/spicelib/devices/ltra/ltrapar.c index 6a8d736b0..7b05ccc19 100644 --- a/src/spicelib/devices/ltra/ltrapar.c +++ b/src/spicelib/devices/ltra/ltrapar.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include +#include "ngspice/ngspice.h" #include "ltradefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/ltra/ltraset.c b/src/spicelib/devices/ltra/ltraset.c index 18484536e..408a90dc5 100644 --- a/src/spicelib/devices/ltra/ltraset.c +++ b/src/spicelib/devices/ltra/ltraset.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "ltradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) diff --git a/src/spicelib/devices/ltra/ltratemp.c b/src/spicelib/devices/ltra/ltratemp.c index a72d59bcc..7b4e47abf 100644 --- a/src/spicelib/devices/ltra/ltratemp.c +++ b/src/spicelib/devices/ltra/ltratemp.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "ltradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/ltra/ltratrun.c b/src/spicelib/devices/ltra/ltratrun.c index 5b7f4a416..076105014 100644 --- a/src/spicelib/devices/ltra/ltratrun.c +++ b/src/spicelib/devices/ltra/ltratrun.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ltradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int LTRAtrunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) diff --git a/src/spicelib/devices/mes/mes.c b/src/spicelib/devices/mes/mes.c index 83f526e29..529244ca6 100644 --- a/src/spicelib/devices/mes/mes.c +++ b/src/spicelib/devices/mes/mes.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "mesdefs.h" -#include +#include "ngspice/suffix.h" IFparm MESpTable[] = { /* parameters */ OPU("off", MES_OFF, IF_FLAG ,"Device initially off"), diff --git a/src/spicelib/devices/mes/mesacl.c b/src/spicelib/devices/mes/mesacl.c index 41ca0c127..82eed429c 100644 --- a/src/spicelib/devices/mes/mesacl.c +++ b/src/spicelib/devices/mes/mesacl.c @@ -5,11 +5,11 @@ Author: 1985 S. Hwang /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mesdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mes/mesask.c b/src/spicelib/devices/mes/mesask.c index 5b45a6658..08707db02 100644 --- a/src/spicelib/devices/mes/mesask.c +++ b/src/spicelib/devices/mes/mesask.c @@ -5,13 +5,13 @@ Author: 1987 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "mesdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mes/mesdefs.h b/src/spicelib/devices/mes/mesdefs.h index 22ebd0ce1..168e78f6f 100644 --- a/src/spicelib/devices/mes/mesdefs.h +++ b/src/spicelib/devices/mes/mesdefs.h @@ -6,11 +6,11 @@ Author: 1985 S. Hwang #ifndef MES #define MES -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" #define MESnumStates 13 diff --git a/src/spicelib/devices/mes/mesdel.c b/src/spicelib/devices/mes/mesdel.c index 014ad94dd..cc46a89f0 100644 --- a/src/spicelib/devices/mes/mesdel.c +++ b/src/spicelib/devices/mes/mesdel.c @@ -5,10 +5,10 @@ Author: 1985 S. Hwang /* */ -#include +#include "ngspice/ngspice.h" #include "mesdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mes/mesdest.c b/src/spicelib/devices/mes/mesdest.c index 34fea6efe..68e4407cb 100644 --- a/src/spicelib/devices/mes/mesdest.c +++ b/src/spicelib/devices/mes/mesdest.c @@ -5,9 +5,9 @@ Author: 1985 S. Hwang /* */ -#include +#include "ngspice/ngspice.h" #include "mesdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/mes/mesdisto.c b/src/spicelib/devices/mes/mesdisto.c index 1c51abb09..bbed7cd22 100644 --- a/src/spicelib/devices/mes/mesdisto.c +++ b/src/spicelib/devices/mes/mesdisto.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mesdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" int MESdisto(int mode,GENmodel *genmodel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mes/mesdset.c b/src/spicelib/devices/mes/mesdset.c index b72f0ea9c..8f80a9af8 100644 --- a/src/spicelib/devices/mes/mesdset.c +++ b/src/spicelib/devices/mes/mesdset.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "mesdefs.h" -#include -#include -#include -#include +#include "ngspice/distodef.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MESdSetup(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mes/mesgetic.c b/src/spicelib/devices/mes/mesgetic.c index e110bed76..747717eb5 100644 --- a/src/spicelib/devices/mes/mesgetic.c +++ b/src/spicelib/devices/mes/mesgetic.c @@ -5,11 +5,11 @@ Author: 1985 S. Hwang /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mesdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mes/mesinit.c b/src/spicelib/devices/mes/mesinit.c index 8d13d32d9..21a943b32 100644 --- a/src/spicelib/devices/mes/mesinit.c +++ b/src/spicelib/devices/mes/mesinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "mesitf.h" #include "mesext.h" diff --git a/src/spicelib/devices/mes/mesload.c b/src/spicelib/devices/mes/mesload.c index fe7bf8784..9ff581ac1 100644 --- a/src/spicelib/devices/mes/mesload.c +++ b/src/spicelib/devices/mes/mesload.c @@ -4,14 +4,14 @@ Author: 1985 S. Hwang Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "mesdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* forward declaraction of our helper function */ diff --git a/src/spicelib/devices/mes/mesmask.c b/src/spicelib/devices/mes/mesmask.c index d51b36b0d..2f26612d1 100644 --- a/src/spicelib/devices/mes/mesmask.c +++ b/src/spicelib/devices/mes/mesmask.c @@ -5,13 +5,13 @@ Author: 1987 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "mesdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mes/mesmdel.c b/src/spicelib/devices/mes/mesmdel.c index 0e352fba8..4c4e11523 100644 --- a/src/spicelib/devices/mes/mesmdel.c +++ b/src/spicelib/devices/mes/mesmdel.c @@ -5,10 +5,10 @@ Author: 1985 S. Hwang /* */ -#include +#include "ngspice/ngspice.h" #include "mesdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mes/mesmpar.c b/src/spicelib/devices/mes/mesmpar.c index 5ea94d3c8..3289b503e 100644 --- a/src/spicelib/devices/mes/mesmpar.c +++ b/src/spicelib/devices/mes/mesmpar.c @@ -5,11 +5,11 @@ Author: 1985 S. Hwang /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "mesdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mes/mesnoise.c b/src/spicelib/devices/mes/mesnoise.c index b9c474fe9..12a6aa2f3 100644 --- a/src/spicelib/devices/mes/mesnoise.c +++ b/src/spicelib/devices/mes/mesnoise.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Gary W. Ng **********/ -#include +#include "ngspice/ngspice.h" #include "mesdefs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * MESnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/mes/mesparam.c b/src/spicelib/devices/mes/mesparam.c index 92f6a2a6e..ce635757a 100644 --- a/src/spicelib/devices/mes/mesparam.c +++ b/src/spicelib/devices/mes/mesparam.c @@ -5,11 +5,11 @@ Author: 1985 S. Hwang /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "mesdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mes/mespzld.c b/src/spicelib/devices/mes/mespzld.c index b28b4977e..072e1de41 100644 --- a/src/spicelib/devices/mes/mespzld.c +++ b/src/spicelib/devices/mes/mespzld.c @@ -5,12 +5,12 @@ Author: 1985 S. Hwang /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mesdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/complex.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mes/messetup.c b/src/spicelib/devices/mes/messetup.c index b1364d36e..e1b041cfb 100644 --- a/src/spicelib/devices/mes/messetup.c +++ b/src/spicelib/devices/mes/messetup.c @@ -4,13 +4,13 @@ Author: 1985 S. Hwang Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mesdefs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MESsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) diff --git a/src/spicelib/devices/mes/mestemp.c b/src/spicelib/devices/mes/mestemp.c index bf447ff87..c82bf5f9e 100644 --- a/src/spicelib/devices/mes/mestemp.c +++ b/src/spicelib/devices/mes/mestemp.c @@ -3,13 +3,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 S. Hwang **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mesdefs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/mes/mestrunc.c b/src/spicelib/devices/mes/mestrunc.c index 471cab21f..d8d5e167d 100644 --- a/src/spicelib/devices/mes/mestrunc.c +++ b/src/spicelib/devices/mes/mestrunc.c @@ -5,11 +5,11 @@ Author: 1985 S. Hwang /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mesdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mesa/mesa.c b/src/spicelib/devices/mesa/mesa.c index 21ac93232..6db75433e 100644 --- a/src/spicelib/devices/mesa/mesa.c +++ b/src/spicelib/devices/mesa/mesa.c @@ -3,11 +3,11 @@ Copyright 1993: T. Ytterdal, K. Lee, M. Shur and T. A. Fjeldly. All rights reser Author: Trond Ytterdal **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "mesadefs.h" -#include +#include "ngspice/suffix.h" IFparm MESApTable[] = { /* parameters */ diff --git a/src/spicelib/devices/mesa/mesaacl.c b/src/spicelib/devices/mesa/mesaacl.c index 4bb839338..83d87ad21 100644 --- a/src/spicelib/devices/mesa/mesaacl.c +++ b/src/spicelib/devices/mesa/mesaacl.c @@ -3,11 +3,11 @@ Copyright 1993: T. Ytterdal, K. Lee, M. Shur and T. A. Fjeldly. All rights reser Author: Trond Ytterdal **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mesadefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mesa/mesaask.c b/src/spicelib/devices/mesa/mesaask.c index aa27a4d19..e92d6517d 100644 --- a/src/spicelib/devices/mesa/mesaask.c +++ b/src/spicelib/devices/mesa/mesaask.c @@ -6,13 +6,13 @@ Author: 1987 Thomas L. Quarles Imported into MESA model: 2001 Paolo Nenzi */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "mesadefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mesa/mesadefs.h b/src/spicelib/devices/mesa/mesadefs.h index 906820144..dd6fc81fe 100644 --- a/src/spicelib/devices/mesa/mesadefs.h +++ b/src/spicelib/devices/mesa/mesadefs.h @@ -6,11 +6,11 @@ Author: Trond Ytterdal #ifndef MESA #define MESA -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* structures used to describe MESFET Transistors */ diff --git a/src/spicelib/devices/mesa/mesadel.c b/src/spicelib/devices/mesa/mesadel.c index a719082be..b6f9dae51 100644 --- a/src/spicelib/devices/mesa/mesadel.c +++ b/src/spicelib/devices/mesa/mesadel.c @@ -6,10 +6,10 @@ Author: 1985 S. Hwang Imported into mesa model: 2001 Paolo Nenzi */ -#include +#include "ngspice/ngspice.h" #include "mesadefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mesa/mesadest.c b/src/spicelib/devices/mesa/mesadest.c index 83bd0827b..5a5a27e34 100644 --- a/src/spicelib/devices/mesa/mesadest.c +++ b/src/spicelib/devices/mesa/mesadest.c @@ -3,9 +3,9 @@ Copyright 1993: T. Ytterdal, K. Lee, M. Shur and T. A. Fjeldly. All rights reser Author: Trond Ytterdal **********/ -#include +#include "ngspice/ngspice.h" #include "mesadefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/mesa/mesagetic.c b/src/spicelib/devices/mesa/mesagetic.c index c2c941529..38cf45267 100644 --- a/src/spicelib/devices/mesa/mesagetic.c +++ b/src/spicelib/devices/mesa/mesagetic.c @@ -3,11 +3,11 @@ Copyright 1993: T. Ytterdal, K. Lee, M. Shur and T. A. Fjeldly. All rights reser Author: Trond Ytterdal **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mesadefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mesa/mesainit.c b/src/spicelib/devices/mesa/mesainit.c index aa90f11b3..a914fe986 100644 --- a/src/spicelib/devices/mesa/mesainit.c +++ b/src/spicelib/devices/mesa/mesainit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "mesaitf.h" #include "mesaext.h" diff --git a/src/spicelib/devices/mesa/mesaload.c b/src/spicelib/devices/mesa/mesaload.c index 2728e70ed..193787cbe 100644 --- a/src/spicelib/devices/mesa/mesaload.c +++ b/src/spicelib/devices/mesa/mesaload.c @@ -3,14 +3,14 @@ Copyright 1993: T. Ytterdal, K. Lee, M. Shur and T. A. Fjeldly. All rights reser Author: Trond Ytterdal **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "mesadefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* #define true 1 diff --git a/src/spicelib/devices/mesa/mesamask.c b/src/spicelib/devices/mesa/mesamask.c index f7434b8f4..7f232436e 100644 --- a/src/spicelib/devices/mesa/mesamask.c +++ b/src/spicelib/devices/mesa/mesamask.c @@ -5,13 +5,13 @@ Author: 1987 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "mesadefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mesa/mesamdel.c b/src/spicelib/devices/mesa/mesamdel.c index 15e9fe403..8c1d88030 100644 --- a/src/spicelib/devices/mesa/mesamdel.c +++ b/src/spicelib/devices/mesa/mesamdel.c @@ -6,10 +6,10 @@ Author: 1985 S. Hwang Imported into mesa model: 2001 Paolo Nenzi */ -#include +#include "ngspice/ngspice.h" #include "mesadefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mesa/mesamparam.c b/src/spicelib/devices/mesa/mesamparam.c index 3ee76f26c..62eeeb3c0 100644 --- a/src/spicelib/devices/mesa/mesamparam.c +++ b/src/spicelib/devices/mesa/mesamparam.c @@ -3,12 +3,12 @@ Copyright 1993: T. Ytterdal, K. Lee, M. Shur and T. A. Fjeldly. All rights reser Author: Trond Ytterdal **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mesadefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mesa/mesaparam.c b/src/spicelib/devices/mesa/mesaparam.c index 1d209b176..5399eef71 100644 --- a/src/spicelib/devices/mesa/mesaparam.c +++ b/src/spicelib/devices/mesa/mesaparam.c @@ -3,12 +3,12 @@ Copyright 1993: T. Ytterdal, K. Lee, M. Shur and T. A. Fjeldly. All rights reser Author: Trond Ytterdal **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mesadefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mesa/mesapzl.c b/src/spicelib/devices/mesa/mesapzl.c index 27c5881cb..c75d2294a 100644 --- a/src/spicelib/devices/mesa/mesapzl.c +++ b/src/spicelib/devices/mesa/mesapzl.c @@ -3,11 +3,11 @@ Copyright 1993: T. Ytterdal, K. Lee, M. Shur and T. A. Fjeldly. All rights reser Author: Trond Ytterdal **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mesadefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mesa/mesasetup.c b/src/spicelib/devices/mesa/mesasetup.c index 04d7ccb3f..422f482fd 100644 --- a/src/spicelib/devices/mesa/mesasetup.c +++ b/src/spicelib/devices/mesa/mesasetup.c @@ -4,13 +4,13 @@ Author: Trond Ytterdal Modified: 2001 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mesadefs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mesa/mesatemp.c b/src/spicelib/devices/mesa/mesatemp.c index fe8071eda..d21a80d8f 100644 --- a/src/spicelib/devices/mesa/mesatemp.c +++ b/src/spicelib/devices/mesa/mesatemp.c @@ -3,13 +3,13 @@ Copyright 1993: T. Ytterdal, K. Lee, M. Shur and T. A. Fjeldly. All rights reser Author: Trond Ytterdal **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mesadefs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define EPSILONGAAS (12.244*8.85418e-12) diff --git a/src/spicelib/devices/mesa/mesatrunc.c b/src/spicelib/devices/mesa/mesatrunc.c index 9d65a2a54..d2468494c 100644 --- a/src/spicelib/devices/mesa/mesatrunc.c +++ b/src/spicelib/devices/mesa/mesatrunc.c @@ -3,11 +3,11 @@ Copyright 1993: T. Ytterdal, K. Lee, M. Shur and T. A. Fjeldly. All rights reser Author: Trond Ytterdal **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mesadefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos1/mos1.c b/src/spicelib/devices/mos1/mos1.c index 250fc6db5..54bee5f79 100644 --- a/src/spicelib/devices/mos1/mos1.c +++ b/src/spicelib/devices/mos1/mos1.c @@ -4,11 +4,11 @@ Author: 1987 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "mos1defs.h" -#include +#include "ngspice/suffix.h" IFparm MOS1pTable[] = { /* parameters */ IOPU("m", MOS1_M, IF_REAL , "Multiplier"), diff --git a/src/spicelib/devices/mos1/mos1acld.c b/src/spicelib/devices/mos1/mos1acld.c index 86a90c96c..50eabbfec 100644 --- a/src/spicelib/devices/mos1/mos1acld.c +++ b/src/spicelib/devices/mos1/mos1acld.c @@ -6,11 +6,11 @@ Modified: 2000 AlansFixes /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos1/mos1ask.c b/src/spicelib/devices/mos1/mos1ask.c index 0d67761b5..be63f9304 100644 --- a/src/spicelib/devices/mos1/mos1ask.c +++ b/src/spicelib/devices/mos1/mos1ask.c @@ -4,14 +4,14 @@ Author: 1987 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/mos1/mos1conv.c b/src/spicelib/devices/mos1/mos1conv.c index 86ddb0fa5..32d1948ed 100644 --- a/src/spicelib/devices/mos1/mos1conv.c +++ b/src/spicelib/devices/mos1/mos1conv.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS1convTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos1/mos1defs.h b/src/spicelib/devices/mos1/mos1defs.h index 2d1563ae5..6b0453a0a 100644 --- a/src/spicelib/devices/mos1/mos1defs.h +++ b/src/spicelib/devices/mos1/mos1defs.h @@ -7,11 +7,11 @@ Modified: 2000 AlansFixes #ifndef MOS1 #define MOS1 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* declarations for level 1 MOSFETs */ diff --git a/src/spicelib/devices/mos1/mos1del.c b/src/spicelib/devices/mos1/mos1del.c index 1376ae31d..fb100d92c 100644 --- a/src/spicelib/devices/mos1/mos1del.c +++ b/src/spicelib/devices/mos1/mos1del.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos1/mos1dest.c b/src/spicelib/devices/mos1/mos1dest.c index 5125f71f0..0bc9c460e 100644 --- a/src/spicelib/devices/mos1/mos1dest.c +++ b/src/spicelib/devices/mos1/mos1dest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "mos1defs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/mos1/mos1dist.c b/src/spicelib/devices/mos1/mos1dist.c index 9d1842f16..1bd256f6a 100644 --- a/src/spicelib/devices/mos1/mos1dist.c +++ b/src/spicelib/devices/mos1/mos1dist.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" int MOS1disto(int mode, GENmodel *genmodel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos1/mos1dset.c b/src/spicelib/devices/mos1/mos1dset.c index 3944beee1..d1d05b673 100644 --- a/src/spicelib/devices/mos1/mos1dset.c +++ b/src/spicelib/devices/mos1/mos1dset.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos1defs.h" -#include -#include -#include -#include +#include "ngspice/distodef.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS1dSetup(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos1/mos1ic.c b/src/spicelib/devices/mos1/mos1ic.c index 54de0bae6..4355c9853 100644 --- a/src/spicelib/devices/mos1/mos1ic.c +++ b/src/spicelib/devices/mos1/mos1ic.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos1/mos1init.c b/src/spicelib/devices/mos1/mos1init.c index 22dec41b8..8d42fdc02 100644 --- a/src/spicelib/devices/mos1/mos1init.c +++ b/src/spicelib/devices/mos1/mos1init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "mos1itf.h" #include "mos1ext.h" diff --git a/src/spicelib/devices/mos1/mos1load.c b/src/spicelib/devices/mos1/mos1load.c index c8ecd8f18..40df68b7b 100644 --- a/src/spicelib/devices/mos1/mos1load.c +++ b/src/spicelib/devices/mos1/mos1load.c @@ -4,14 +4,14 @@ Author: 1985 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos1defs.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS1load(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos1/mos1mask.c b/src/spicelib/devices/mos1/mos1mask.c index ce39798a6..494392609 100644 --- a/src/spicelib/devices/mos1/mos1mask.c +++ b/src/spicelib/devices/mos1/mos1mask.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/mos1/mos1mdel.c b/src/spicelib/devices/mos1/mos1mdel.c index ea9714749..8ffc4de62 100644 --- a/src/spicelib/devices/mos1/mos1mdel.c +++ b/src/spicelib/devices/mos1/mos1mdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos1/mos1mpar.c b/src/spicelib/devices/mos1/mos1mpar.c index bb82835dd..1986e1750 100644 --- a/src/spicelib/devices/mos1/mos1mpar.c +++ b/src/spicelib/devices/mos1/mos1mpar.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS1mParam(int param, IFvalue *value, GENmodel *inModel) diff --git a/src/spicelib/devices/mos1/mos1noi.c b/src/spicelib/devices/mos1/mos1noi.c index c8f20faa0..33a90620c 100644 --- a/src/spicelib/devices/mos1/mos1noi.c +++ b/src/spicelib/devices/mos1/mos1noi.c @@ -4,12 +4,12 @@ Author: 1987 Gary W. Ng Modified: 2000 AlansFixes **********/ -#include +#include "ngspice/ngspice.h" #include "mos1defs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * MOS1noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/mos1/mos1par.c b/src/spicelib/devices/mos1/mos1par.c index b5c439a3f..829563764 100644 --- a/src/spicelib/devices/mos1/mos1par.c +++ b/src/spicelib/devices/mos1/mos1par.c @@ -6,12 +6,12 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mos1/mos1pzld.c b/src/spicelib/devices/mos1/mos1pzld.c index 29a94979a..542fb7b08 100644 --- a/src/spicelib/devices/mos1/mos1pzld.c +++ b/src/spicelib/devices/mos1/mos1pzld.c @@ -6,12 +6,12 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos1/mos1sacl.c b/src/spicelib/devices/mos1/mos1sacl.c index ee9f19bae..9c83a1773 100644 --- a/src/spicelib/devices/mos1/mos1sacl.c +++ b/src/spicelib/devices/mos1/mos1sacl.c @@ -5,13 +5,13 @@ Author: 1985 Thomas L. Quarles This function is obsolete (was used by an old sensitivity analysis) **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/const.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* actually load the current ac sensitivity * information into the array previously provided diff --git a/src/spicelib/devices/mos1/mos1set.c b/src/spicelib/devices/mos1/mos1set.c index aa130586d..b7b6021a8 100644 --- a/src/spicelib/devices/mos1/mos1set.c +++ b/src/spicelib/devices/mos1/mos1set.c @@ -8,12 +8,12 @@ Modified: 2000 AlansFixes * for fast matrix loading */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS1setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, diff --git a/src/spicelib/devices/mos1/mos1sld.c b/src/spicelib/devices/mos1/mos1sld.c index 4d20129e0..1055fd6f5 100644 --- a/src/spicelib/devices/mos1/mos1sld.c +++ b/src/spicelib/devices/mos1/mos1sld.c @@ -9,12 +9,12 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS1sLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos1/mos1sprt.c b/src/spicelib/devices/mos1/mos1sprt.c index 1d934abf3..1c85ab434 100644 --- a/src/spicelib/devices/mos1/mos1sprt.c +++ b/src/spicelib/devices/mos1/mos1sprt.c @@ -10,12 +10,12 @@ This function is obsolete (was used by an old sensitivity analysis) * the MOS1 devices in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void MOS1sPrint(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos1/mos1sset.c b/src/spicelib/devices/mos1/mos1sset.c index eaee08ca6..f420343af 100644 --- a/src/spicelib/devices/mos1/mos1sset.c +++ b/src/spicelib/devices/mos1/mos1sset.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles This function is obsolete (was used by an old sensitivity analysis) **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS1sSetup(SENstruct *info, GENmodel *inModel) diff --git a/src/spicelib/devices/mos1/mos1supd.c b/src/spicelib/devices/mos1/mos1supd.c index 844e75918..bbfeed58d 100644 --- a/src/spicelib/devices/mos1/mos1supd.c +++ b/src/spicelib/devices/mos1/mos1supd.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles This function is obsolete (was used by an old sensitivity analysis) **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* update the charge sensitivities and their derivatives */ diff --git a/src/spicelib/devices/mos1/mos1temp.c b/src/spicelib/devices/mos1/mos1temp.c index b2993e36d..67b2ff632 100644 --- a/src/spicelib/devices/mos1/mos1temp.c +++ b/src/spicelib/devices/mos1/mos1temp.c @@ -4,12 +4,12 @@ Author: 1985 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS1temp(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos1/mos1trun.c b/src/spicelib/devices/mos1/mos1trun.c index 1967dd8f1..5d2184ca6 100644 --- a/src/spicelib/devices/mos1/mos1trun.c +++ b/src/spicelib/devices/mos1/mos1trun.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos1defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos2/mos2.c b/src/spicelib/devices/mos2/mos2.c index 9d9db2376..d36a08147 100644 --- a/src/spicelib/devices/mos2/mos2.c +++ b/src/spicelib/devices/mos2/mos2.c @@ -4,11 +4,11 @@ Author: 1985 Thomas L. Quarles Modified: 2000 AlansFIxes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "mos2defs.h" -#include +#include "ngspice/suffix.h" IFparm MOS2pTable[] = { /* parameters */ IOPU("m", MOS2_M, IF_REAL , "Multiplier"), diff --git a/src/spicelib/devices/mos2/mos2acld.c b/src/spicelib/devices/mos2/mos2acld.c index cda0ff951..4b0f1ecd9 100644 --- a/src/spicelib/devices/mos2/mos2acld.c +++ b/src/spicelib/devices/mos2/mos2acld.c @@ -6,11 +6,11 @@ Modified: 2000 AlansFixes /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos2/mos2ask.c b/src/spicelib/devices/mos2/mos2ask.c index 8c1e2b94f..36378479e 100644 --- a/src/spicelib/devices/mos2/mos2ask.c +++ b/src/spicelib/devices/mos2/mos2ask.c @@ -4,14 +4,14 @@ Author: 1987 Mathew Lew and Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/mos2/mos2conv.c b/src/spicelib/devices/mos2/mos2conv.c index 4ed725738..7b747ebf7 100644 --- a/src/spicelib/devices/mos2/mos2conv.c +++ b/src/spicelib/devices/mos2/mos2conv.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS2convTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos2/mos2defs.h b/src/spicelib/devices/mos2/mos2defs.h index a7d630280..184a869e1 100644 --- a/src/spicelib/devices/mos2/mos2defs.h +++ b/src/spicelib/devices/mos2/mos2defs.h @@ -7,11 +7,11 @@ Modified: 2000 AlansFIxes #ifndef MOS2 #define MOS2 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* declarations for level 2 MOSFETs */ diff --git a/src/spicelib/devices/mos2/mos2del.c b/src/spicelib/devices/mos2/mos2del.c index 429bcac0b..627297129 100644 --- a/src/spicelib/devices/mos2/mos2del.c +++ b/src/spicelib/devices/mos2/mos2del.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos2/mos2dest.c b/src/spicelib/devices/mos2/mos2dest.c index 306e8d830..e4787dfd8 100644 --- a/src/spicelib/devices/mos2/mos2dest.c +++ b/src/spicelib/devices/mos2/mos2dest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "mos2defs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/mos2/mos2dist.c b/src/spicelib/devices/mos2/mos2dist.c index 609aff62b..f9656274b 100644 --- a/src/spicelib/devices/mos2/mos2dist.c +++ b/src/spicelib/devices/mos2/mos2dist.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" int MOS2disto(int mode,GENmodel *genmodel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos2/mos2dset.c b/src/spicelib/devices/mos2/mos2dset.c index 5f3bb541a..55f92e858 100644 --- a/src/spicelib/devices/mos2/mos2dset.c +++ b/src/spicelib/devices/mos2/mos2dset.c @@ -5,15 +5,15 @@ Modified: 2000 AlansFixes $Id$ **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/distodef.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* assuming silicon - make definition for epsilon of silicon */ #define EPSSIL (11.7 * 8.854214871e-12) diff --git a/src/spicelib/devices/mos2/mos2ic.c b/src/spicelib/devices/mos2/mos2ic.c index 998fa8ca2..6c99beede 100644 --- a/src/spicelib/devices/mos2/mos2ic.c +++ b/src/spicelib/devices/mos2/mos2ic.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos2/mos2init.c b/src/spicelib/devices/mos2/mos2init.c index 7fa6067d7..d0ffd343a 100644 --- a/src/spicelib/devices/mos2/mos2init.c +++ b/src/spicelib/devices/mos2/mos2init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "mos2itf.h" #include "mos2ext.h" diff --git a/src/spicelib/devices/mos2/mos2load.c b/src/spicelib/devices/mos2/mos2load.c index 33e9a99fa..257bf0b0f 100644 --- a/src/spicelib/devices/mos2/mos2load.c +++ b/src/spicelib/devices/mos2/mos2load.c @@ -5,14 +5,14 @@ Modified: 2000 alansFixes $Id$ **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* assuming silicon - make definition for epsilon of silicon */ #define EPSSIL (11.7 * 8.854214871e-12) diff --git a/src/spicelib/devices/mos2/mos2mask.c b/src/spicelib/devices/mos2/mos2mask.c index 964a2239c..b3cfda751 100644 --- a/src/spicelib/devices/mos2/mos2mask.c +++ b/src/spicelib/devices/mos2/mos2mask.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS2mAsk(CKTcircuit *ckt, GENmodel *inModel, int param, diff --git a/src/spicelib/devices/mos2/mos2mdel.c b/src/spicelib/devices/mos2/mos2mdel.c index 20b065a94..bc0fc0059 100644 --- a/src/spicelib/devices/mos2/mos2mdel.c +++ b/src/spicelib/devices/mos2/mos2mdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos2/mos2mpar.c b/src/spicelib/devices/mos2/mos2mpar.c index c5dc70436..49967db0a 100644 --- a/src/spicelib/devices/mos2/mos2mpar.c +++ b/src/spicelib/devices/mos2/mos2mpar.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos2/mos2noi.c b/src/spicelib/devices/mos2/mos2noi.c index fc0df268e..b17d02d5a 100644 --- a/src/spicelib/devices/mos2/mos2noi.c +++ b/src/spicelib/devices/mos2/mos2noi.c @@ -4,12 +4,12 @@ Author: 1987 Gary W. Ng Modified: 2000 AlansFixes **********/ -#include +#include "ngspice/ngspice.h" #include "mos2defs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * MOS2noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/mos2/mos2par.c b/src/spicelib/devices/mos2/mos2par.c index ef17d15de..ac7ef7b42 100644 --- a/src/spicelib/devices/mos2/mos2par.c +++ b/src/spicelib/devices/mos2/mos2par.c @@ -6,12 +6,12 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mos2/mos2pzld.c b/src/spicelib/devices/mos2/mos2pzld.c index 8d74ebd24..a0a7bf151 100644 --- a/src/spicelib/devices/mos2/mos2pzld.c +++ b/src/spicelib/devices/mos2/mos2pzld.c @@ -6,12 +6,12 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos2/mos2sacl.c b/src/spicelib/devices/mos2/mos2sacl.c index 4196eab6f..3004d131e 100644 --- a/src/spicelib/devices/mos2/mos2sacl.c +++ b/src/spicelib/devices/mos2/mos2sacl.c @@ -9,13 +9,13 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/const.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS2sAcLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos2/mos2set.c b/src/spicelib/devices/mos2/mos2set.c index f44a00a95..f7322ca2d 100644 --- a/src/spicelib/devices/mos2/mos2set.c +++ b/src/spicelib/devices/mos2/mos2set.c @@ -4,13 +4,13 @@ Author: 1985 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/const.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) diff --git a/src/spicelib/devices/mos2/mos2sld.c b/src/spicelib/devices/mos2/mos2sld.c index 63b8aeff6..c2771e02a 100644 --- a/src/spicelib/devices/mos2/mos2sld.c +++ b/src/spicelib/devices/mos2/mos2sld.c @@ -9,12 +9,12 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS2sLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos2/mos2sprt.c b/src/spicelib/devices/mos2/mos2sprt.c index 700da2664..c31d61291 100644 --- a/src/spicelib/devices/mos2/mos2sprt.c +++ b/src/spicelib/devices/mos2/mos2sprt.c @@ -6,12 +6,12 @@ Modified: 2000 AlansFixes This function is obsolete (was used by an old sensitivity analysis) **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void MOS2sPrint(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos2/mos2sset.c b/src/spicelib/devices/mos2/mos2sset.c index 272436865..9eaebeca6 100644 --- a/src/spicelib/devices/mos2/mos2sset.c +++ b/src/spicelib/devices/mos2/mos2sset.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles This function is obsolete (was used by an old sensitivity analysis) **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS2sSetup(SENstruct *info, GENmodel *inModel) diff --git a/src/spicelib/devices/mos2/mos2supd.c b/src/spicelib/devices/mos2/mos2supd.c index f9d234a2a..5eafd0fe4 100644 --- a/src/spicelib/devices/mos2/mos2supd.c +++ b/src/spicelib/devices/mos2/mos2supd.c @@ -7,12 +7,12 @@ This function is obsolete (was used by an old sensitivity analysis) /* update the charge sensitivities and their derivatives */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS2sUpdate(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos2/mos2temp.c b/src/spicelib/devices/mos2/mos2temp.c index 59b3729fe..f83d93653 100644 --- a/src/spicelib/devices/mos2/mos2temp.c +++ b/src/spicelib/devices/mos2/mos2temp.c @@ -4,12 +4,12 @@ Author: 1985 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* assuming silicon - make definition for epsilon of silicon */ #define EPSSIL (11.7 * 8.854214871e-12) diff --git a/src/spicelib/devices/mos2/mos2trun.c b/src/spicelib/devices/mos2/mos2trun.c index 9ee308610..d06626d37 100644 --- a/src/spicelib/devices/mos2/mos2trun.c +++ b/src/spicelib/devices/mos2/mos2trun.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos2defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos3/mos3.c b/src/spicelib/devices/mos3/mos3.c index 7aae125db..b132316d2 100644 --- a/src/spicelib/devices/mos3/mos3.c +++ b/src/spicelib/devices/mos3/mos3.c @@ -4,11 +4,11 @@ Author: 1987 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "mos3defs.h" -#include +#include "ngspice/suffix.h" IFparm MOS3pTable[] = { /* parameters */ IOPU("m", MOS3_M, IF_REAL , "Multiplier"), diff --git a/src/spicelib/devices/mos3/mos3acld.c b/src/spicelib/devices/mos3/mos3acld.c index cb5bd2a25..b48834d8f 100644 --- a/src/spicelib/devices/mos3/mos3acld.c +++ b/src/spicelib/devices/mos3/mos3acld.c @@ -6,11 +6,11 @@ Modified: 2000 AlansFixes /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos3/mos3ask.c b/src/spicelib/devices/mos3/mos3ask.c index 89089e352..5ac10f317 100644 --- a/src/spicelib/devices/mos3/mos3ask.c +++ b/src/spicelib/devices/mos3/mos3ask.c @@ -4,14 +4,14 @@ Author: 1987 Mathew Lew and Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/mos3/mos3conv.c b/src/spicelib/devices/mos3/mos3conv.c index 8ecffeb38..7344a0ade 100644 --- a/src/spicelib/devices/mos3/mos3conv.c +++ b/src/spicelib/devices/mos3/mos3conv.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS3convTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos3/mos3defs.h b/src/spicelib/devices/mos3/mos3defs.h index 079d7e1e5..3cd4e37f6 100644 --- a/src/spicelib/devices/mos3/mos3defs.h +++ b/src/spicelib/devices/mos3/mos3defs.h @@ -7,11 +7,11 @@ Modified: 2000 AlanFixes #ifndef MOS3 #define MOS3 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* declarations for level 3 MOSFETs */ diff --git a/src/spicelib/devices/mos3/mos3del.c b/src/spicelib/devices/mos3/mos3del.c index edee1216e..5a3857175 100644 --- a/src/spicelib/devices/mos3/mos3del.c +++ b/src/spicelib/devices/mos3/mos3del.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos3/mos3dest.c b/src/spicelib/devices/mos3/mos3dest.c index d3b24fb82..7edad1d2e 100644 --- a/src/spicelib/devices/mos3/mos3dest.c +++ b/src/spicelib/devices/mos3/mos3dest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "mos3defs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/mos3/mos3dist.c b/src/spicelib/devices/mos3/mos3dist.c index 50de5a085..93c06b916 100644 --- a/src/spicelib/devices/mos3/mos3dist.c +++ b/src/spicelib/devices/mos3/mos3dist.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Jaijeet S Roychowdhury **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" int MOS3disto(int mode, GENmodel *genmodel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos3/mos3dset.c b/src/spicelib/devices/mos3/mos3dset.c index ed3efc242..d6b023408 100644 --- a/src/spicelib/devices/mos3/mos3dset.c +++ b/src/spicelib/devices/mos3/mos3dset.c @@ -4,15 +4,15 @@ Author: 1988 Jaijeet S Roychowdhury Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos3defs.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/distodef.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS3dSetup(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos3/mos3ic.c b/src/spicelib/devices/mos3/mos3ic.c index a8e989baf..5ad129e13 100644 --- a/src/spicelib/devices/mos3/mos3ic.c +++ b/src/spicelib/devices/mos3/mos3ic.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos3/mos3init.c b/src/spicelib/devices/mos3/mos3init.c index 2ad476b41..93b746e80 100644 --- a/src/spicelib/devices/mos3/mos3init.c +++ b/src/spicelib/devices/mos3/mos3init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "mos3itf.h" #include "mos3ext.h" diff --git a/src/spicelib/devices/mos3/mos3load.c b/src/spicelib/devices/mos3/mos3load.c index a0940ac32..05e22c472 100644 --- a/src/spicelib/devices/mos3/mos3load.c +++ b/src/spicelib/devices/mos3/mos3load.c @@ -4,14 +4,14 @@ Author: 1985 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos3defs.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* actually load the current value into the sparse matrix previously * provided */ diff --git a/src/spicelib/devices/mos3/mos3mask.c b/src/spicelib/devices/mos3/mos3mask.c index f9d250e03..d66c89029 100644 --- a/src/spicelib/devices/mos3/mos3mask.c +++ b/src/spicelib/devices/mos3/mos3mask.c @@ -6,14 +6,14 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/mos3/mos3mdel.c b/src/spicelib/devices/mos3/mos3mdel.c index e97d745ea..5df179f5e 100644 --- a/src/spicelib/devices/mos3/mos3mdel.c +++ b/src/spicelib/devices/mos3/mos3mdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos3/mos3mpar.c b/src/spicelib/devices/mos3/mos3mpar.c index a2f83414a..8b4a57e87 100644 --- a/src/spicelib/devices/mos3/mos3mpar.c +++ b/src/spicelib/devices/mos3/mos3mpar.c @@ -6,12 +6,12 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos3/mos3noi.c b/src/spicelib/devices/mos3/mos3noi.c index 18a518866..a02c3e5c9 100644 --- a/src/spicelib/devices/mos3/mos3noi.c +++ b/src/spicelib/devices/mos3/mos3noi.c @@ -4,12 +4,12 @@ Author: 1987 Gary W. Ng Modified: 2000 AlansFixes **********/ -#include +#include "ngspice/ngspice.h" #include "mos3defs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * MOS3noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/mos3/mos3par.c b/src/spicelib/devices/mos3/mos3par.c index f37be5e48..0e0227f7a 100644 --- a/src/spicelib/devices/mos3/mos3par.c +++ b/src/spicelib/devices/mos3/mos3par.c @@ -6,12 +6,12 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mos3/mos3pzld.c b/src/spicelib/devices/mos3/mos3pzld.c index b2c55040f..7ca88c4a8 100644 --- a/src/spicelib/devices/mos3/mos3pzld.c +++ b/src/spicelib/devices/mos3/mos3pzld.c @@ -6,12 +6,12 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos3/mos3sacl.c b/src/spicelib/devices/mos3/mos3sacl.c index bbdc65af6..954c15b89 100644 --- a/src/spicelib/devices/mos3/mos3sacl.c +++ b/src/spicelib/devices/mos3/mos3sacl.c @@ -9,13 +9,13 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/const.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS3sAcLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos3/mos3set.c b/src/spicelib/devices/mos3/mos3set.c index 9c9196458..fff3e6fa7 100644 --- a/src/spicelib/devices/mos3/mos3set.c +++ b/src/spicelib/devices/mos3/mos3set.c @@ -4,13 +4,13 @@ Author: 1985 Thomas L. Quarlesù Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* assuming silicon - make definition for epsilon of silicon */ #define EPSSIL (11.7 * 8.854214871e-12) diff --git a/src/spicelib/devices/mos3/mos3sld.c b/src/spicelib/devices/mos3/mos3sld.c index aff4ddf43..0ec3dd99a 100644 --- a/src/spicelib/devices/mos3/mos3sld.c +++ b/src/spicelib/devices/mos3/mos3sld.c @@ -10,12 +10,12 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS3sLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos3/mos3sprt.c b/src/spicelib/devices/mos3/mos3sprt.c index c5ed8f26f..15d6e2610 100644 --- a/src/spicelib/devices/mos3/mos3sprt.c +++ b/src/spicelib/devices/mos3/mos3sprt.c @@ -10,12 +10,12 @@ This function is obsolete (was used by an old sensitivity analysis) * devices in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void MOS3sPrint(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos3/mos3sset.c b/src/spicelib/devices/mos3/mos3sset.c index 3b15e6e0f..3855c49fe 100644 --- a/src/spicelib/devices/mos3/mos3sset.c +++ b/src/spicelib/devices/mos3/mos3sset.c @@ -9,12 +9,12 @@ This function is obsolete (was used by an old sensitivity analysis) * allocate parameter #s to design parameters */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS3sSetup(SENstruct *info, GENmodel *inModel) diff --git a/src/spicelib/devices/mos3/mos3supd.c b/src/spicelib/devices/mos3/mos3supd.c index 1ee60ec1a..8004725e5 100644 --- a/src/spicelib/devices/mos3/mos3supd.c +++ b/src/spicelib/devices/mos3/mos3supd.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles This function is obsolete (was used by an old sensitivity analysis) **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS3sUpdate(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos3/mos3temp.c b/src/spicelib/devices/mos3/mos3temp.c index 9435bb233..a27e98032 100644 --- a/src/spicelib/devices/mos3/mos3temp.c +++ b/src/spicelib/devices/mos3/mos3temp.c @@ -4,12 +4,12 @@ Author: 1985 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* assuming silicon - make definition for epsilon of silicon */ #define EPSSIL (11.7 * 8.854214871e-12) diff --git a/src/spicelib/devices/mos3/mos3trun.c b/src/spicelib/devices/mos3/mos3trun.c index fd76686c7..4d9df3d95 100644 --- a/src/spicelib/devices/mos3/mos3trun.c +++ b/src/spicelib/devices/mos3/mos3trun.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS3trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) diff --git a/src/spicelib/devices/mos6/mos6.c b/src/spicelib/devices/mos6/mos6.c index 4b7d6cf77..65435f59e 100644 --- a/src/spicelib/devices/mos6/mos6.c +++ b/src/spicelib/devices/mos6/mos6.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Takayasu Sakurai **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "mos6defs.h" -#include +#include "ngspice/suffix.h" IFparm MOS6pTable[] = { /* parameters */ IOPU("l", MOS6_L, IF_REAL , "Length"), diff --git a/src/spicelib/devices/mos6/mos6ask.c b/src/spicelib/devices/mos6/mos6ask.c index 4cc4e3edd..35483c6c4 100644 --- a/src/spicelib/devices/mos6/mos6ask.c +++ b/src/spicelib/devices/mos6/mos6ask.c @@ -4,14 +4,14 @@ Author: 1989 Takayasu Sakurai Modified: 2000 AlansFixes **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos6defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/mos6/mos6conv.c b/src/spicelib/devices/mos6/mos6conv.c index df869528c..e8a16e450 100644 --- a/src/spicelib/devices/mos6/mos6conv.c +++ b/src/spicelib/devices/mos6/mos6conv.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Takayasu Sakurai **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos6defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS6convTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos6/mos6defs.h b/src/spicelib/devices/mos6/mos6defs.h index 8065a848e..8b230dfa4 100644 --- a/src/spicelib/devices/mos6/mos6defs.h +++ b/src/spicelib/devices/mos6/mos6defs.h @@ -6,10 +6,10 @@ Author: 1985 Thomas L. Quarles #ifndef MOS6 #define MOS6 -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" /* declarations for level 5 MOSFETs */ diff --git a/src/spicelib/devices/mos6/mos6dest.c b/src/spicelib/devices/mos6/mos6dest.c index 8ccb1341f..74c357d24 100644 --- a/src/spicelib/devices/mos6/mos6dest.c +++ b/src/spicelib/devices/mos6/mos6dest.c @@ -5,9 +5,9 @@ Author: 1989 Takayasu Sakurai /* */ -#include +#include "ngspice/ngspice.h" #include "mos6defs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/mos6/mos6ic.c b/src/spicelib/devices/mos6/mos6ic.c index 2c528f95c..c3459ae9d 100644 --- a/src/spicelib/devices/mos6/mos6ic.c +++ b/src/spicelib/devices/mos6/mos6ic.c @@ -5,11 +5,11 @@ Author: 1989 Takayasu Sakurai /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos6defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos6/mos6init.c b/src/spicelib/devices/mos6/mos6init.c index 2adf4561b..5419f59c7 100644 --- a/src/spicelib/devices/mos6/mos6init.c +++ b/src/spicelib/devices/mos6/mos6init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "mos6itf.h" #include "mos6ext.h" diff --git a/src/spicelib/devices/mos6/mos6load.c b/src/spicelib/devices/mos6/mos6load.c index 1d12ee682..b120c7b90 100644 --- a/src/spicelib/devices/mos6/mos6load.c +++ b/src/spicelib/devices/mos6/mos6load.c @@ -4,14 +4,14 @@ Author: 1989 Takayasu Sakurai Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos6defs.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS6load(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos6/mos6mask.c b/src/spicelib/devices/mos6/mos6mask.c index d4822796e..6f6df15a3 100644 --- a/src/spicelib/devices/mos6/mos6mask.c +++ b/src/spicelib/devices/mos6/mos6mask.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Takayasu Sakurai **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos6defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS6mAsk(CKTcircuit *ckt, GENmodel *inModel, int param, diff --git a/src/spicelib/devices/mos6/mos6mpar.c b/src/spicelib/devices/mos6/mos6mpar.c index b41271aad..58f7bea00 100644 --- a/src/spicelib/devices/mos6/mos6mpar.c +++ b/src/spicelib/devices/mos6/mos6mpar.c @@ -5,12 +5,12 @@ Author: 1989 Takayasu Sakurai /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos6defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos6/mos6par.c b/src/spicelib/devices/mos6/mos6par.c index 20e1d18c5..a3f526f99 100644 --- a/src/spicelib/devices/mos6/mos6par.c +++ b/src/spicelib/devices/mos6/mos6par.c @@ -5,12 +5,12 @@ Author: 1989 Takayasu Sakurai /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos6defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mos6/mos6set.c b/src/spicelib/devices/mos6/mos6set.c index fca8087ba..46f0bd054 100644 --- a/src/spicelib/devices/mos6/mos6set.c +++ b/src/spicelib/devices/mos6/mos6set.c @@ -8,12 +8,12 @@ Modified: 2000 AlansFixes * for fast matrix loading */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos6defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS6setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, diff --git a/src/spicelib/devices/mos6/mos6temp.c b/src/spicelib/devices/mos6/mos6temp.c index 436978462..bb8ec2f92 100644 --- a/src/spicelib/devices/mos6/mos6temp.c +++ b/src/spicelib/devices/mos6/mos6temp.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1989 Takayasu Sakurai **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos6defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS6temp(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos6/mos6trun.c b/src/spicelib/devices/mos6/mos6trun.c index cf74d9fe9..d7563dd7c 100644 --- a/src/spicelib/devices/mos6/mos6trun.c +++ b/src/spicelib/devices/mos6/mos6trun.c @@ -5,11 +5,11 @@ Author: 1989 Takayasu Sakurai /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos6defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos9/mos9.c b/src/spicelib/devices/mos9/mos9.c index 4388dce86..85447c08f 100644 --- a/src/spicelib/devices/mos9/mos9.c +++ b/src/spicelib/devices/mos9/mos9.c @@ -4,11 +4,11 @@ Author: 1987 Thomas L. Quarles Modified: Alan Gillespie **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "mos9defs.h" -#include +#include "ngspice/suffix.h" IFparm MOS9pTable[] = { /* parameters */ diff --git a/src/spicelib/devices/mos9/mos9acld.c b/src/spicelib/devices/mos9/mos9acld.c index cb3035901..a3d3bbde8 100644 --- a/src/spicelib/devices/mos9/mos9acld.c +++ b/src/spicelib/devices/mos9/mos9acld.c @@ -6,11 +6,11 @@ Modified: Alan Gillespie /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos9/mos9ask.c b/src/spicelib/devices/mos9/mos9ask.c index 318b5201b..d74b75c11 100644 --- a/src/spicelib/devices/mos9/mos9ask.c +++ b/src/spicelib/devices/mos9/mos9ask.c @@ -4,14 +4,14 @@ Author: 1987 Mathew Lew and Thomas L. Quarles Modified: Alan Gillespie **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/mos9/mos9conv.c b/src/spicelib/devices/mos9/mos9conv.c index 34773957a..f02764bac 100644 --- a/src/spicelib/devices/mos9/mos9conv.c +++ b/src/spicelib/devices/mos9/mos9conv.c @@ -4,12 +4,12 @@ Author: 1985 Thomas L. Quarles Modified: Alan Gillespie **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include +#include "ngspice/sperror.h" -#include +#include "ngspice/suffix.h" int MOS9convTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos9/mos9defs.h b/src/spicelib/devices/mos9/mos9defs.h index 3859b3427..485c9af1e 100644 --- a/src/spicelib/devices/mos9/mos9defs.h +++ b/src/spicelib/devices/mos9/mos9defs.h @@ -7,11 +7,11 @@ Modified: Alan Gillespie #ifndef MOS9 #define MOS9 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* declarations for level 9 MOSFETs */ diff --git a/src/spicelib/devices/mos9/mos9del.c b/src/spicelib/devices/mos9/mos9del.c index 4a31f0dd2..a0b27790e 100644 --- a/src/spicelib/devices/mos9/mos9del.c +++ b/src/spicelib/devices/mos9/mos9del.c @@ -6,10 +6,10 @@ Modified: Alan Gillespie /* */ -#include +#include "ngspice/ngspice.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos9/mos9dest.c b/src/spicelib/devices/mos9/mos9dest.c index 3f7ca1607..05490399f 100644 --- a/src/spicelib/devices/mos9/mos9dest.c +++ b/src/spicelib/devices/mos9/mos9dest.c @@ -6,9 +6,9 @@ Modified: Alan Gillespie /* */ -#include +#include "ngspice/ngspice.h" #include "mos9defs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/mos9/mos9dist.c b/src/spicelib/devices/mos9/mos9dist.c index 3b44c4686..56085d218 100644 --- a/src/spicelib/devices/mos9/mos9dist.c +++ b/src/spicelib/devices/mos9/mos9dist.c @@ -4,12 +4,12 @@ Author: 1988 Jaijeet S Roychowdhury Modified: Alan Gillespie **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/distodef.h" +#include "ngspice/suffix.h" int MOS9disto( diff --git a/src/spicelib/devices/mos9/mos9dset.c b/src/spicelib/devices/mos9/mos9dset.c index 01f07e80d..f6a2ee04d 100644 --- a/src/spicelib/devices/mos9/mos9dset.c +++ b/src/spicelib/devices/mos9/mos9dset.c @@ -4,15 +4,15 @@ Author: 1988 Jaijeet S Roychowdhury Modified: Alan Gillespie **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos9defs.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/distodef.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS9dSetup(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos9/mos9ic.c b/src/spicelib/devices/mos9/mos9ic.c index 9c9abed1a..d2cb9a906 100644 --- a/src/spicelib/devices/mos9/mos9ic.c +++ b/src/spicelib/devices/mos9/mos9ic.c @@ -6,11 +6,11 @@ Modified: Alan Gillespie /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos9/mos9init.c b/src/spicelib/devices/mos9/mos9init.c index f666f44e0..4bea55264 100644 --- a/src/spicelib/devices/mos9/mos9init.c +++ b/src/spicelib/devices/mos9/mos9init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "mos9itf.h" #include "mos9ext.h" diff --git a/src/spicelib/devices/mos9/mos9load.c b/src/spicelib/devices/mos9/mos9load.c index 3575abb3a..37c6decee 100644 --- a/src/spicelib/devices/mos9/mos9load.c +++ b/src/spicelib/devices/mos9/mos9load.c @@ -4,14 +4,14 @@ Author: 1985 Thomas L. Quarles Modified: Alan Gillespie **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos9defs.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS9load(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos9/mos9mask.c b/src/spicelib/devices/mos9/mos9mask.c index fc210b01f..fd5a07726 100644 --- a/src/spicelib/devices/mos9/mos9mask.c +++ b/src/spicelib/devices/mos9/mos9mask.c @@ -6,14 +6,14 @@ Modified: Alan Gillespie /* */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/mos9/mos9mdel.c b/src/spicelib/devices/mos9/mos9mdel.c index 9555fbf22..05b249a38 100644 --- a/src/spicelib/devices/mos9/mos9mdel.c +++ b/src/spicelib/devices/mos9/mos9mdel.c @@ -6,10 +6,10 @@ Modified: Alan Gillespie /* */ -#include +#include "ngspice/ngspice.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos9/mos9mpar.c b/src/spicelib/devices/mos9/mos9mpar.c index 9173204d4..4e3bbb183 100644 --- a/src/spicelib/devices/mos9/mos9mpar.c +++ b/src/spicelib/devices/mos9/mos9mpar.c @@ -6,12 +6,12 @@ Modified: Alan Gillespie /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos9/mos9noi.c b/src/spicelib/devices/mos9/mos9noi.c index 7345cf7a4..5f8b14d9b 100644 --- a/src/spicelib/devices/mos9/mos9noi.c +++ b/src/spicelib/devices/mos9/mos9noi.c @@ -4,12 +4,12 @@ Author: 1987 Gary W. Ng Modified: Alan Gillespie **********/ -#include +#include "ngspice/ngspice.h" #include "mos9defs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * MOS9noise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/mos9/mos9par.c b/src/spicelib/devices/mos9/mos9par.c index d91fbca3a..c8f3c9fdb 100644 --- a/src/spicelib/devices/mos9/mos9par.c +++ b/src/spicelib/devices/mos9/mos9par.c @@ -6,12 +6,12 @@ Modified: Alan Gillespie /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/mos9/mos9pzld.c b/src/spicelib/devices/mos9/mos9pzld.c index 381a49a75..a545e8af9 100644 --- a/src/spicelib/devices/mos9/mos9pzld.c +++ b/src/spicelib/devices/mos9/mos9pzld.c @@ -6,12 +6,12 @@ Modified: Alan Gillespie /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/mos9/mos9sacl.c b/src/spicelib/devices/mos9/mos9sacl.c index d52edc712..91ccf5d96 100644 --- a/src/spicelib/devices/mos9/mos9sacl.c +++ b/src/spicelib/devices/mos9/mos9sacl.c @@ -10,13 +10,13 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/const.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS9sAcLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos9/mos9set.c b/src/spicelib/devices/mos9/mos9set.c index e3b00bf92..286fc4656 100644 --- a/src/spicelib/devices/mos9/mos9set.c +++ b/src/spicelib/devices/mos9/mos9set.c @@ -4,13 +4,13 @@ Author: 1985 Thomas L. Quarles Modified: Alan Gillespie **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* assuming silicon - make definition for epsilon of silicon */ #define EPSSIL (11.7 * 8.854214871e-12) diff --git a/src/spicelib/devices/mos9/mos9sld.c b/src/spicelib/devices/mos9/mos9sld.c index 0809dd081..dba41342e 100644 --- a/src/spicelib/devices/mos9/mos9sld.c +++ b/src/spicelib/devices/mos9/mos9sld.c @@ -10,12 +10,12 @@ This function is obsolete (was used by an old sensitivity analysis) * information into the array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS9sLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos9/mos9sprt.c b/src/spicelib/devices/mos9/mos9sprt.c index f5e3a5eba..4add2b17c 100644 --- a/src/spicelib/devices/mos9/mos9sprt.c +++ b/src/spicelib/devices/mos9/mos9sprt.c @@ -10,12 +10,12 @@ This function is obsolete (was used by an old sensitivity analysis) * devices in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void MOS9sPrint(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos9/mos9sset.c b/src/spicelib/devices/mos9/mos9sset.c index 288ee11b1..b813ec58e 100644 --- a/src/spicelib/devices/mos9/mos9sset.c +++ b/src/spicelib/devices/mos9/mos9sset.c @@ -10,12 +10,12 @@ This function is obsolete (was used by an old sensitivity analysis) * allocate parameter #s to design parameters */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS9sSetup(SENstruct *info, GENmodel *inModel) diff --git a/src/spicelib/devices/mos9/mos9supd.c b/src/spicelib/devices/mos9/mos9supd.c index bbbe0d587..fc9e1dc7b 100644 --- a/src/spicelib/devices/mos9/mos9supd.c +++ b/src/spicelib/devices/mos9/mos9supd.c @@ -6,12 +6,12 @@ Modified: Alan Gillespie This function is obsolete (was used by an old sensitivity analysis) **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS9sUpdate(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/mos9/mos9temp.c b/src/spicelib/devices/mos9/mos9temp.c index 18d7da4c0..f5ad71f47 100644 --- a/src/spicelib/devices/mos9/mos9temp.c +++ b/src/spicelib/devices/mos9/mos9temp.c @@ -4,12 +4,12 @@ Author: 1985 Thomas L. Quarles Modified: Alan Gillespie **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* assuming silicon - make definition for epsilon of silicon */ #define EPSSIL (11.7 * 8.854214871e-12) diff --git a/src/spicelib/devices/mos9/mos9trun.c b/src/spicelib/devices/mos9/mos9trun.c index 02b7b4d9f..ccb3d95da 100644 --- a/src/spicelib/devices/mos9/mos9trun.c +++ b/src/spicelib/devices/mos9/mos9trun.c @@ -4,11 +4,11 @@ Author: 1985 Thomas L. Quarles Modified: Alan Gillespie **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "mos9defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int MOS9trunc( diff --git a/src/spicelib/devices/nbjt/nbjt.c b/src/spicelib/devices/nbjt/nbjt.c index 8c153c597..e91190d9f 100644 --- a/src/spicelib/devices/nbjt/nbjt.c +++ b/src/spicelib/devices/nbjt/nbjt.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "nbjtdefs.h" -#include +#include "ngspice/suffix.h" /* * This file defines the Numerical BJT data structures that are available to diff --git a/src/spicelib/devices/nbjt/nbjtacld.c b/src/spicelib/devices/nbjt/nbjtacld.c index c0466c4f5..b728eeb1c 100644 --- a/src/spicelib/devices/nbjt/nbjtacld.c +++ b/src/spicelib/devices/nbjt/nbjtacld.c @@ -8,15 +8,15 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * parameters saved during a previous DC operating point analysis. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "nbjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/complex.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/numglobs.h" +#include "ngspice/suffix.h" /* External Declarations */ extern int ONEacDebug; diff --git a/src/spicelib/devices/nbjt/nbjtask.c b/src/spicelib/devices/nbjt/nbjtask.c index bbcd95155..5ae1ab5fa 100644 --- a/src/spicelib/devices/nbjt/nbjtask.c +++ b/src/spicelib/devices/nbjt/nbjtask.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "nbjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* Check out this one */ extern int NBJTinitSmSig(NBJTinstance *); diff --git a/src/spicelib/devices/nbjt/nbjtdefs.h b/src/spicelib/devices/nbjt/nbjtdefs.h index 9434ac07b..f18dfadd5 100644 --- a/src/spicelib/devices/nbjt/nbjtdefs.h +++ b/src/spicelib/devices/nbjt/nbjtdefs.h @@ -9,16 +9,16 @@ Authors: 1987 Karti Mayaram, 1991 David Gates /* data structures used to describe 1D Numerical BJTs */ /* circuit level includes */ -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" /* device level includes */ -#include -#include -#include -#include -#include +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/profile.h" +#include "ngspice/numglobs.h" +#include "ngspice/carddefs.h" /* information needed per instance */ typedef struct sNBJTinstance { diff --git a/src/spicelib/devices/nbjt/nbjtdel.c b/src/spicelib/devices/nbjt/nbjtdel.c index 6b1f49b2f..cde3b11e3 100644 --- a/src/spicelib/devices/nbjt/nbjtdel.c +++ b/src/spicelib/devices/nbjt/nbjtdel.c @@ -8,10 +8,10 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * storage it was using. */ -#include +#include "ngspice/ngspice.h" #include "nbjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NBJTdelete(GENmodel *inModel, IFuid name, GENinstance **kill) diff --git a/src/spicelib/devices/nbjt/nbjtdest.c b/src/spicelib/devices/nbjt/nbjtdest.c index 42ba6dafe..bf01357d2 100644 --- a/src/spicelib/devices/nbjt/nbjtdest.c +++ b/src/spicelib/devices/nbjt/nbjtdest.c @@ -8,11 +8,11 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * were using. The current implementation has memory leaks. */ -#include +#include "ngspice/ngspice.h" #include "nbjtdefs.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" void NBJTdestroy(GENmodel **inModel) diff --git a/src/spicelib/devices/nbjt/nbjtdump.c b/src/spicelib/devices/nbjt/nbjtdump.c index 61f4bda1d..c41822f9e 100644 --- a/src/spicelib/devices/nbjt/nbjtdump.c +++ b/src/spicelib/devices/nbjt/nbjtdump.c @@ -9,12 +9,12 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group * states for .OP, .DC, & .TRAN simulations. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "nbjtdefs.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" /* Forward Declarations */ diff --git a/src/spicelib/devices/nbjt/nbjtinit.c b/src/spicelib/devices/nbjt/nbjtinit.c index 75d6950b6..0022ef094 100644 --- a/src/spicelib/devices/nbjt/nbjtinit.c +++ b/src/spicelib/devices/nbjt/nbjtinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "nbjtitf.h" #include "nbjtext.h" diff --git a/src/spicelib/devices/nbjt/nbjtload.c b/src/spicelib/devices/nbjt/nbjtload.c index 3a188394a..644a65372 100644 --- a/src/spicelib/devices/nbjt/nbjtload.c +++ b/src/spicelib/devices/nbjt/nbjtload.c @@ -9,15 +9,15 @@ $Id$ * in the circuit and load them into the matrix as appropriate */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "nbjtdefs.h" -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" /* Forward declarations */ int NBJTinitSmSig(NBJTinstance *); diff --git a/src/spicelib/devices/nbjt/nbjtmdel.c b/src/spicelib/devices/nbjt/nbjtmdel.c index 077cd770d..84b8863bd 100644 --- a/src/spicelib/devices/nbjt/nbjtmdel.c +++ b/src/spicelib/devices/nbjt/nbjtmdel.c @@ -8,10 +8,10 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * it was using. returns an error if the model has instances */ -#include +#include "ngspice/ngspice.h" #include "nbjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NBJTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/nbjt/nbjtmpar.c b/src/spicelib/devices/nbjt/nbjtmpar.c index feadd5b55..4eeb090d1 100644 --- a/src/spicelib/devices/nbjt/nbjtmpar.c +++ b/src/spicelib/devices/nbjt/nbjtmpar.c @@ -7,12 +7,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * This routine sets model parameters for NBJTs in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "nbjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NBJTmParam(int param, IFvalue *value, GENmodel *inModel) diff --git a/src/spicelib/devices/nbjt/nbjtparm.c b/src/spicelib/devices/nbjt/nbjtparm.c index f6941e344..9c6af3df0 100644 --- a/src/spicelib/devices/nbjt/nbjtparm.c +++ b/src/spicelib/devices/nbjt/nbjtparm.c @@ -7,12 +7,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * This routine sets instance parameters for NBJTs in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "nbjtdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NBJTparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select) diff --git a/src/spicelib/devices/nbjt/nbjtpzld.c b/src/spicelib/devices/nbjt/nbjtpzld.c index 89cf489b6..97bd93fbd 100644 --- a/src/spicelib/devices/nbjt/nbjtpzld.c +++ b/src/spicelib/devices/nbjt/nbjtpzld.c @@ -8,14 +8,14 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * parameters saved during a previous DC operating point analysis. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "nbjtdefs.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/sperror.h" +#include "ngspice/complex.h" +#include "ngspice/suffix.h" /* External Declarations */ extern int ONEacDebug; diff --git a/src/spicelib/devices/nbjt/nbjtset.c b/src/spicelib/devices/nbjt/nbjtset.c index 7d7734eac..6c1b8205e 100644 --- a/src/spicelib/devices/nbjt/nbjtset.c +++ b/src/spicelib/devices/nbjt/nbjtset.c @@ -3,18 +3,18 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "nbjtdefs.h" -#include -#include -#include +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/ciderinp.h" +#include "ngspice/suffix.h" +#include "ngspice/meshext.h" #define NIL(type) ((type *)0) #define TSCALLOC(var, size, type)\ diff --git a/src/spicelib/devices/nbjt/nbjttemp.c b/src/spicelib/devices/nbjt/nbjttemp.c index c31beb940..003174260 100644 --- a/src/spicelib/devices/nbjt/nbjttemp.c +++ b/src/spicelib/devices/nbjt/nbjttemp.c @@ -4,15 +4,15 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1992 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "nbjtdefs.h" -#include -#include -#include +#include "ngspice/numenum.h" +#include "ngspice/carddefs.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" #define NIL(type) ((type *)0) extern int ONEdcDebug; diff --git a/src/spicelib/devices/nbjt/nbjttrun.c b/src/spicelib/devices/nbjt/nbjttrun.c index a69084735..8278032f9 100644 --- a/src/spicelib/devices/nbjt/nbjttrun.c +++ b/src/spicelib/devices/nbjt/nbjttrun.c @@ -8,13 +8,13 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "nbjtdefs.h" -#include +#include "ngspice/sperror.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/nbjt2/nbjt2def.h b/src/spicelib/devices/nbjt2/nbjt2def.h index 8ac85b9fc..555fa0967 100644 --- a/src/spicelib/devices/nbjt2/nbjt2def.h +++ b/src/spicelib/devices/nbjt2/nbjt2def.h @@ -9,16 +9,16 @@ Authors: 1987 Karti Mayaram, 1991 David Gates /* structures to describe 2d Numerical Bipolar Junction Transistors */ /* circuit level includes */ -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" /* device level includes */ -#include -#include -#include -#include -#include +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/profile.h" +#include "ngspice/numglobs.h" +#include "ngspice/carddefs.h" /* information needed per instance */ typedef struct sNBJT2instance { diff --git a/src/spicelib/devices/nbjt2/nbt2.c b/src/spicelib/devices/nbjt2/nbt2.c index 99e713bca..70071d04e 100644 --- a/src/spicelib/devices/nbjt2/nbt2.c +++ b/src/spicelib/devices/nbjt2/nbt2.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "nbjt2def.h" -#include +#include "ngspice/suffix.h" /* * This file defines the 2d Numerical BJT data structures that are available diff --git a/src/spicelib/devices/nbjt2/nbt2acld.c b/src/spicelib/devices/nbjt2/nbt2acld.c index 6f79dcff7..3389911e8 100644 --- a/src/spicelib/devices/nbjt2/nbt2acld.c +++ b/src/spicelib/devices/nbjt2/nbt2acld.c @@ -8,15 +8,15 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * parameters saved during a previous DC operating point analysis. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "nbjt2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/complex.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/nbjt2/nbt2ask.c b/src/spicelib/devices/nbjt2/nbt2ask.c index dbf56a499..129ec55d2 100644 --- a/src/spicelib/devices/nbjt2/nbt2ask.c +++ b/src/spicelib/devices/nbjt2/nbt2ask.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "nbjt2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* Check out this one */ diff --git a/src/spicelib/devices/nbjt2/nbt2del.c b/src/spicelib/devices/nbjt2/nbt2del.c index ba1086216..6728dd5b6 100644 --- a/src/spicelib/devices/nbjt2/nbt2del.c +++ b/src/spicelib/devices/nbjt2/nbt2del.c @@ -8,10 +8,10 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * storage it was using. */ -#include +#include "ngspice/ngspice.h" #include "nbjt2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NBJT2delete(GENmodel *inModel, IFuid name, GENinstance **kill) diff --git a/src/spicelib/devices/nbjt2/nbt2dest.c b/src/spicelib/devices/nbjt2/nbt2dest.c index 9f152f6e7..22533ed68 100644 --- a/src/spicelib/devices/nbjt2/nbt2dest.c +++ b/src/spicelib/devices/nbjt2/nbt2dest.c @@ -8,11 +8,11 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * they were using. The current implementation has memory leaks. */ -#include +#include "ngspice/ngspice.h" #include "nbjt2def.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include +#include "ngspice/suffix.h" void NBJT2destroy(GENmodel **inModel) diff --git a/src/spicelib/devices/nbjt2/nbt2dump.c b/src/spicelib/devices/nbjt2/nbt2dump.c index ac9c10ce3..fbf32bdaf 100644 --- a/src/spicelib/devices/nbjt2/nbt2dump.c +++ b/src/spicelib/devices/nbjt2/nbt2dump.c @@ -9,13 +9,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group * states for .OP, .DC, & .TRAN simulations. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "nbjt2def.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" /* Forward Declarations */ diff --git a/src/spicelib/devices/nbjt2/nbt2init.c b/src/spicelib/devices/nbjt2/nbt2init.c index 597a1fdc1..2a221cccc 100644 --- a/src/spicelib/devices/nbjt2/nbt2init.c +++ b/src/spicelib/devices/nbjt2/nbt2init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "nbjt2itf.h" #include "nbjt2ext.h" diff --git a/src/spicelib/devices/nbjt2/nbt2load.c b/src/spicelib/devices/nbjt2/nbt2load.c index 95ca3f409..c2743f60e 100644 --- a/src/spicelib/devices/nbjt2/nbt2load.c +++ b/src/spicelib/devices/nbjt2/nbt2load.c @@ -8,16 +8,16 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * BJTs in the circuit and load them into the matrix as appropriate */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "nbjt2def.h" -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" /* External Declarations */ diff --git a/src/spicelib/devices/nbjt2/nbt2mdel.c b/src/spicelib/devices/nbjt2/nbt2mdel.c index 8839ade73..cd9449633 100644 --- a/src/spicelib/devices/nbjt2/nbt2mdel.c +++ b/src/spicelib/devices/nbjt2/nbt2mdel.c @@ -8,10 +8,10 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * it was using. returns an error if the model has instances */ -#include +#include "ngspice/ngspice.h" #include "nbjt2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NBJT2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/nbjt2/nbt2mpar.c b/src/spicelib/devices/nbjt2/nbt2mpar.c index e9091d75b..f7b0439ed 100644 --- a/src/spicelib/devices/nbjt2/nbt2mpar.c +++ b/src/spicelib/devices/nbjt2/nbt2mpar.c @@ -7,12 +7,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * This routine sets model parameters for NBJT2s in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "nbjt2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NBJT2mParam(int param, IFvalue *value, GENmodel *inModel) diff --git a/src/spicelib/devices/nbjt2/nbt2parm.c b/src/spicelib/devices/nbjt2/nbt2parm.c index ed2419492..489ed57dc 100644 --- a/src/spicelib/devices/nbjt2/nbt2parm.c +++ b/src/spicelib/devices/nbjt2/nbt2parm.c @@ -7,12 +7,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * This routine sets instance parameters for NBJT2s in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "nbjt2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NBJT2param(int param, IFvalue *value, GENinstance *inInst, IFvalue *select) diff --git a/src/spicelib/devices/nbjt2/nbt2pzld.c b/src/spicelib/devices/nbjt2/nbt2pzld.c index b32214415..715054265 100644 --- a/src/spicelib/devices/nbjt2/nbt2pzld.c +++ b/src/spicelib/devices/nbjt2/nbt2pzld.c @@ -3,15 +3,15 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" #include "nbjt2def.h" -#include +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/nbjt2/nbt2set.c b/src/spicelib/devices/nbjt2/nbt2set.c index 7e728b5c1..2d9309c3d 100644 --- a/src/spicelib/devices/nbjt2/nbt2set.c +++ b/src/spicelib/devices/nbjt2/nbt2set.c @@ -4,19 +4,19 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "nbjt2def.h" -#include -#include -#include -#include +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/meshext.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include -#include +#include "ngspice/ciderinp.h" +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" #define NIL(type) ((type *)0) #define TSCALLOC(var, size, type)\ diff --git a/src/spicelib/devices/nbjt2/nbt2temp.c b/src/spicelib/devices/nbjt2/nbt2temp.c index 82d373662..e46629c96 100644 --- a/src/spicelib/devices/nbjt2/nbt2temp.c +++ b/src/spicelib/devices/nbjt2/nbt2temp.c @@ -4,16 +4,16 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1992 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "nbjt2def.h" -#include -#include -#include +#include "ngspice/numenum.h" +#include "ngspice/carddefs.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" #define NIL(type) ((type *)0) diff --git a/src/spicelib/devices/nbjt2/nbt2trun.c b/src/spicelib/devices/nbjt2/nbt2trun.c index dc7879ab2..05bc01c9a 100644 --- a/src/spicelib/devices/nbjt2/nbt2trun.c +++ b/src/spicelib/devices/nbjt2/nbt2trun.c @@ -8,14 +8,14 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "nbjt2def.h" -#include +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ndev/ndev.c b/src/spicelib/devices/ndev/ndev.c index 9d19d0b1b..7537768e7 100644 --- a/src/spicelib/devices/ndev/ndev.c +++ b/src/spicelib/devices/ndev/ndev.c @@ -4,10 +4,10 @@ Author: 2007 Gong Ding, gdiso@ustc.edu University of Science and Technology of China **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "ndevdefs.h" -#include +#include "ngspice/suffix.h" IFparm NDEVpTable[] = { /* parameters */ diff --git a/src/spicelib/devices/ndev/ndevaccept.c b/src/spicelib/devices/ndev/ndevaccept.c index 3dd7a3fb0..b8c4679ca 100644 --- a/src/spicelib/devices/ndev/ndevaccept.c +++ b/src/spicelib/devices/ndev/ndevaccept.c @@ -3,15 +3,15 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "ndevdefs.h" -#include -#include -#include +#include "ngspice/complex.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" diff --git a/src/spicelib/devices/ndev/ndevacld.c b/src/spicelib/devices/ndev/ndevacld.c index eccb6db33..b2becfee5 100644 --- a/src/spicelib/devices/ndev/ndevacld.c +++ b/src/spicelib/devices/ndev/ndevacld.c @@ -8,12 +8,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * parameters saved during a previous DC operating point analysis. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ndevdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/complex.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ndev/ndevask.c b/src/spicelib/devices/ndev/ndevask.c index d6d139514..a8e0b4a51 100644 --- a/src/spicelib/devices/ndev/ndevask.c +++ b/src/spicelib/devices/ndev/ndevask.c @@ -3,15 +3,15 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "ndevdefs.h" -#include -#include -#include +#include "ngspice/complex.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/ndev/ndevdefs.h b/src/spicelib/devices/ndev/ndevdefs.h index 58a302bcb..1cdb28bc7 100644 --- a/src/spicelib/devices/ndev/ndevdefs.h +++ b/src/spicelib/devices/ndev/ndevdefs.h @@ -9,10 +9,10 @@ University of Science and Technology of China /* circuit level includes */ -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpmacs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" #include "ndevexch.h" /* network function */ diff --git a/src/spicelib/devices/ndev/ndevdel.c b/src/spicelib/devices/ndev/ndevdel.c index 22f82666c..c49c1dd26 100644 --- a/src/spicelib/devices/ndev/ndevdel.c +++ b/src/spicelib/devices/ndev/ndevdel.c @@ -4,10 +4,10 @@ Author: 2007 Gong Ding, gdiso@ustc.edu University of Science and Technology of China **********/ -#include +#include "ngspice/ngspice.h" #include "ndevdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NDEVdelete( diff --git a/src/spicelib/devices/ndev/ndevdest.c b/src/spicelib/devices/ndev/ndevdest.c index afd754311..0afa6f3f3 100644 --- a/src/spicelib/devices/ndev/ndevdest.c +++ b/src/spicelib/devices/ndev/ndevdest.c @@ -5,9 +5,9 @@ University of Science and Technology of China **********/ -#include +#include "ngspice/ngspice.h" #include "ndevdefs.h" -#include +#include "ngspice/suffix.h" void NDEVdestroy(GENmodel **inModel) diff --git a/src/spicelib/devices/ndev/ndevdump.c b/src/spicelib/devices/ndev/ndevdump.c index 4f5751d8c..4789bf12f 100644 --- a/src/spicelib/devices/ndev/ndevdump.c +++ b/src/spicelib/devices/ndev/ndevdump.c @@ -9,10 +9,10 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group * states for .OP, .DC, & .TRAN simulations. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ndevdefs.h" -#include +#include "ngspice/suffix.h" /* State Counter diff --git a/src/spicelib/devices/ndev/ndevinit.c b/src/spicelib/devices/ndev/ndevinit.c index c322fe78d..6ff2c41cd 100644 --- a/src/spicelib/devices/ndev/ndevinit.c +++ b/src/spicelib/devices/ndev/ndevinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "ndevitf.h" #include "ndevext.h" diff --git a/src/spicelib/devices/ndev/ndevload.c b/src/spicelib/devices/ndev/ndevload.c index e03ccb32d..4dac8b43c 100644 --- a/src/spicelib/devices/ndev/ndevload.c +++ b/src/spicelib/devices/ndev/ndevload.c @@ -4,15 +4,15 @@ Author: 2007 Gong Ding, gdiso@ustc.edu University of Science and Technology of China **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "ndevdefs.h" -#include -#include -#include -#include -#include +#include "ngspice/numenum.h" +#include "ngspice/trandefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ndev/ndevmdel.c b/src/spicelib/devices/ndev/ndevmdel.c index baa762208..7b9da2b65 100644 --- a/src/spicelib/devices/ndev/ndevmdel.c +++ b/src/spicelib/devices/ndev/ndevmdel.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include +#include "ngspice/ngspice.h" #include "ndevdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NDEVmDelete( diff --git a/src/spicelib/devices/ndev/ndevmpar.c b/src/spicelib/devices/ndev/ndevmpar.c index d6ef6b7c7..77beaf6b7 100644 --- a/src/spicelib/devices/ndev/ndevmpar.c +++ b/src/spicelib/devices/ndev/ndevmpar.c @@ -7,12 +7,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * This routine sets model parameters for NDEVs in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "ndevdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NDEVmParam(int param, IFvalue * value, GENmodel * inModel) diff --git a/src/spicelib/devices/ndev/ndevparm.c b/src/spicelib/devices/ndev/ndevparm.c index bed6977c3..8ba980dd0 100644 --- a/src/spicelib/devices/ndev/ndevparm.c +++ b/src/spicelib/devices/ndev/ndevparm.c @@ -3,12 +3,12 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/const.h" #include "ndevdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NDEVparam( diff --git a/src/spicelib/devices/ndev/ndevpzld.c b/src/spicelib/devices/ndev/ndevpzld.c index 3056ff9f5..ab05140f1 100644 --- a/src/spicelib/devices/ndev/ndevpzld.c +++ b/src/spicelib/devices/ndev/ndevpzld.c @@ -3,12 +3,12 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "ndevdefs.h" -#include +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/ndev/ndevset.c b/src/spicelib/devices/ndev/ndevset.c index 91838e248..9f7e0ecd4 100644 --- a/src/spicelib/devices/ndev/ndevset.c +++ b/src/spicelib/devices/ndev/ndevset.c @@ -4,14 +4,14 @@ Author: 2007 Gong Ding, gdiso@ustc.edu University of Science and Technology of China **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "ndevdefs.h" -#include -#include -#include -#include +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define NIL(type) ((type *)0) #define TSCALLOC(var, size, type)\ diff --git a/src/spicelib/devices/ndev/ndevtemp.c b/src/spicelib/devices/ndev/ndevtemp.c index 51015f3fd..cea9a7f97 100644 --- a/src/spicelib/devices/ndev/ndevtemp.c +++ b/src/spicelib/devices/ndev/ndevtemp.c @@ -4,13 +4,13 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1992 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ndevdefs.h" -#include -#include -#include -#include +#include "ngspice/numenum.h" +#include "ngspice/carddefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #define NIL(type) ((type *)0) diff --git a/src/spicelib/devices/ndev/ndevtrun.c b/src/spicelib/devices/ndev/ndevtrun.c index 00e85ec56..358749ff3 100644 --- a/src/spicelib/devices/ndev/ndevtrun.c +++ b/src/spicelib/devices/ndev/ndevtrun.c @@ -3,11 +3,11 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "ndevdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" diff --git a/src/spicelib/devices/numd/numd.c b/src/spicelib/devices/numd/numd.c index cd5d57de6..464b05a1f 100644 --- a/src/spicelib/devices/numd/numd.c +++ b/src/spicelib/devices/numd/numd.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "numddefs.h" -#include +#include "ngspice/suffix.h" IFparm NUMDpTable[] = { /* parameters */ IP("off", NUMD_OFF, IF_FLAG, "Initially off"), diff --git a/src/spicelib/devices/numd/numdacld.c b/src/spicelib/devices/numd/numdacld.c index b19c9a454..23d28000d 100644 --- a/src/spicelib/devices/numd/numdacld.c +++ b/src/spicelib/devices/numd/numdacld.c @@ -8,15 +8,15 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * parameters saved during a previous DC operating point analysis. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/complex.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/numglobs.h" +#include "ngspice/suffix.h" /* External Declarations */ extern int ONEacDebug; diff --git a/src/spicelib/devices/numd/numdask.c b/src/spicelib/devices/numd/numdask.c index a17567181..e521e8fb1 100644 --- a/src/spicelib/devices/numd/numdask.c +++ b/src/spicelib/devices/numd/numdask.c @@ -4,15 +4,15 @@ Author: 1987 Thomas L. Quarles $Id$ **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "numddefs.h" -#include -#include -#include +#include "ngspice/complex.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* Check out this one */ extern int NUMDinitSmSig(NUMDinstance *); diff --git a/src/spicelib/devices/numd/numddefs.h b/src/spicelib/devices/numd/numddefs.h index 4b018c6c8..43aba4745 100644 --- a/src/spicelib/devices/numd/numddefs.h +++ b/src/spicelib/devices/numd/numddefs.h @@ -9,16 +9,16 @@ Authors: 1987 Karti Mayaram, 1991 David Gates /* data structures used to describe 1D numerical diodes */ /* circuit level includes */ -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" /* device level includes */ -#include -#include -#include -#include -#include +#include "ngspice/onemesh.h" +#include "ngspice/onedev.h" +#include "ngspice/profile.h" +#include "ngspice/numglobs.h" +#include "ngspice/carddefs.h" /* information needed per instance */ typedef struct sNUMDinstance { diff --git a/src/spicelib/devices/numd/numddel.c b/src/spicelib/devices/numd/numddel.c index d6af4ad4e..8a045a67c 100644 --- a/src/spicelib/devices/numd/numddel.c +++ b/src/spicelib/devices/numd/numddel.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include +#include "ngspice/ngspice.h" #include "numddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMDdelete(GENmodel *inModel, IFuid name, GENinstance **kill) diff --git a/src/spicelib/devices/numd/numddest.c b/src/spicelib/devices/numd/numddest.c index fe2980562..a4b4043ed 100644 --- a/src/spicelib/devices/numd/numddest.c +++ b/src/spicelib/devices/numd/numddest.c @@ -8,11 +8,11 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * were using. The current implementation has memory leaks. */ -#include +#include "ngspice/ngspice.h" #include "numddefs.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" void NUMDdestroy(GENmodel **inModel) diff --git a/src/spicelib/devices/numd/numddump.c b/src/spicelib/devices/numd/numddump.c index f05926971..8e08f632c 100644 --- a/src/spicelib/devices/numd/numddump.c +++ b/src/spicelib/devices/numd/numddump.c @@ -9,12 +9,12 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group * states for .OP, .DC, & .TRAN simulations. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numddefs.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" /* Forward Declarations */ diff --git a/src/spicelib/devices/numd/numdinit.c b/src/spicelib/devices/numd/numdinit.c index 247f7e1c6..a44f04956 100644 --- a/src/spicelib/devices/numd/numdinit.c +++ b/src/spicelib/devices/numd/numdinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "numditf.h" #include "numdext.h" diff --git a/src/spicelib/devices/numd/numdload.c b/src/spicelib/devices/numd/numdload.c index a6d3a7cbd..2c6647e8d 100644 --- a/src/spicelib/devices/numd/numdload.c +++ b/src/spicelib/devices/numd/numdload.c @@ -3,17 +3,17 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "numddefs.h" -#include -#include -#include -#include +#include "ngspice/numenum.h" +#include "ngspice/trandefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" diff --git a/src/spicelib/devices/numd/numdmdel.c b/src/spicelib/devices/numd/numdmdel.c index 77c4baa56..a523b063f 100644 --- a/src/spicelib/devices/numd/numdmdel.c +++ b/src/spicelib/devices/numd/numdmdel.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include +#include "ngspice/ngspice.h" #include "numddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/numd/numdmpar.c b/src/spicelib/devices/numd/numdmpar.c index 484883b25..18b0eb04e 100644 --- a/src/spicelib/devices/numd/numdmpar.c +++ b/src/spicelib/devices/numd/numdmpar.c @@ -7,12 +7,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * This routine sets model parameters for NUMDs in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "numddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMDmParam(int param, IFvalue *value, GENmodel *inModel) diff --git a/src/spicelib/devices/numd/numdparm.c b/src/spicelib/devices/numd/numdparm.c index e376660f3..5ab8c3ff3 100644 --- a/src/spicelib/devices/numd/numdparm.c +++ b/src/spicelib/devices/numd/numdparm.c @@ -3,12 +3,12 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/const.h" #include "numddefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMDparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select) diff --git a/src/spicelib/devices/numd/numdpzld.c b/src/spicelib/devices/numd/numdpzld.c index 6c5c73fdb..611aa28d8 100644 --- a/src/spicelib/devices/numd/numdpzld.c +++ b/src/spicelib/devices/numd/numdpzld.c @@ -3,14 +3,14 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "numddefs.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" /* External Declarations */ extern int ONEacDebug; diff --git a/src/spicelib/devices/numd/numdset.c b/src/spicelib/devices/numd/numdset.c index 0c2c069ac..73d04e085 100644 --- a/src/spicelib/devices/numd/numdset.c +++ b/src/spicelib/devices/numd/numdset.c @@ -3,18 +3,18 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "numddefs.h" -#include -#include -#include +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/ciderinp.h" +#include "ngspice/suffix.h" +#include "ngspice/meshext.h" #define NIL(type) ((type *)0) #define TSCALLOC(var, size, type)\ diff --git a/src/spicelib/devices/numd/numdtemp.c b/src/spicelib/devices/numd/numdtemp.c index 1c17e19e9..0ff7408f6 100644 --- a/src/spicelib/devices/numd/numdtemp.c +++ b/src/spicelib/devices/numd/numdtemp.c @@ -4,15 +4,15 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1992 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numddefs.h" -#include -#include -#include +#include "ngspice/numenum.h" +#include "ngspice/carddefs.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" #define NIL(type) ((type *)0) diff --git a/src/spicelib/devices/numd/numdtrun.c b/src/spicelib/devices/numd/numdtrun.c index 52b42df9c..047f1b3c7 100644 --- a/src/spicelib/devices/numd/numdtrun.c +++ b/src/spicelib/devices/numd/numdtrun.c @@ -3,13 +3,13 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numddefs.h" -#include +#include "ngspice/sperror.h" #include "../../../ciderlib/oned/onedext.h" -#include -#include +#include "ngspice/suffix.h" +#include "ngspice/cidersupt.h" diff --git a/src/spicelib/devices/numd2/nud2.c b/src/spicelib/devices/numd2/nud2.c index 87310e6c1..3b4404fb7 100644 --- a/src/spicelib/devices/numd2/nud2.c +++ b/src/spicelib/devices/numd2/nud2.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "numd2def.h" -#include +#include "ngspice/suffix.h" /* * This file defines the 2d Numerical Diode data structures that are diff --git a/src/spicelib/devices/numd2/nud2acld.c b/src/spicelib/devices/numd2/nud2acld.c index 9711554fb..85959b3c7 100644 --- a/src/spicelib/devices/numd2/nud2acld.c +++ b/src/spicelib/devices/numd2/nud2acld.c @@ -8,16 +8,16 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * parameters saved during a previous DC operating point analysis. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numd2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/complex.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/numglobs.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/numd2/nud2ask.c b/src/spicelib/devices/numd2/nud2ask.c index 5d434cb10..d312c878e 100644 --- a/src/spicelib/devices/numd2/nud2ask.c +++ b/src/spicelib/devices/numd2/nud2ask.c @@ -4,14 +4,14 @@ Author: 1987 Thomas L. Quarles $Id$ **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "numd2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* Check out this one */ diff --git a/src/spicelib/devices/numd2/nud2del.c b/src/spicelib/devices/numd2/nud2del.c index cfd4a4e6d..e1fa42fec 100644 --- a/src/spicelib/devices/numd2/nud2del.c +++ b/src/spicelib/devices/numd2/nud2del.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include +#include "ngspice/ngspice.h" #include "numd2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMD2delete(GENmodel *inModel, IFuid name, GENinstance **kill) diff --git a/src/spicelib/devices/numd2/nud2dest.c b/src/spicelib/devices/numd2/nud2dest.c index 9bf9725ce..c7630dff6 100644 --- a/src/spicelib/devices/numd2/nud2dest.c +++ b/src/spicelib/devices/numd2/nud2dest.c @@ -8,12 +8,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * they were using. The current implementation has memory leaks. */ -#include +#include "ngspice/ngspice.h" #include "numd2def.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" void NUMD2destroy(GENmodel **inModel) diff --git a/src/spicelib/devices/numd2/nud2dump.c b/src/spicelib/devices/numd2/nud2dump.c index 348dda376..0ea1bf58b 100644 --- a/src/spicelib/devices/numd2/nud2dump.c +++ b/src/spicelib/devices/numd2/nud2dump.c @@ -9,13 +9,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group * states for .OP, .DC, & .TRAN simulations. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numd2def.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" /* Forward Declarations */ diff --git a/src/spicelib/devices/numd2/nud2load.c b/src/spicelib/devices/numd2/nud2load.c index 07471e52d..63038eba5 100644 --- a/src/spicelib/devices/numd2/nud2load.c +++ b/src/spicelib/devices/numd2/nud2load.c @@ -9,16 +9,16 @@ $Id$ * Diodes in the circuit and load them into the matrix as appropriate */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "numd2def.h" -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" /* Forward declarations */ diff --git a/src/spicelib/devices/numd2/nud2mdel.c b/src/spicelib/devices/numd2/nud2mdel.c index 8caff86a7..af8214a07 100644 --- a/src/spicelib/devices/numd2/nud2mdel.c +++ b/src/spicelib/devices/numd2/nud2mdel.c @@ -3,10 +3,10 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include +#include "ngspice/ngspice.h" #include "numd2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMD2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/numd2/nud2mpar.c b/src/spicelib/devices/numd2/nud2mpar.c index 18348f976..54061c054 100644 --- a/src/spicelib/devices/numd2/nud2mpar.c +++ b/src/spicelib/devices/numd2/nud2mpar.c @@ -7,12 +7,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * This routine sets model parameters for NUMD2s in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "numd2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMD2mParam(int param, IFvalue *value, GENmodel *inModel) diff --git a/src/spicelib/devices/numd2/nud2parm.c b/src/spicelib/devices/numd2/nud2parm.c index 835689dbb..122c3e2b0 100644 --- a/src/spicelib/devices/numd2/nud2parm.c +++ b/src/spicelib/devices/numd2/nud2parm.c @@ -3,12 +3,12 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "numd2def.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMD2param(int param, IFvalue *value, GENinstance *inInst, IFvalue *select) diff --git a/src/spicelib/devices/numd2/nud2pzld.c b/src/spicelib/devices/numd2/nud2pzld.c index 466301bb7..8e5704c2f 100644 --- a/src/spicelib/devices/numd2/nud2pzld.c +++ b/src/spicelib/devices/numd2/nud2pzld.c @@ -3,15 +3,15 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "numd2def.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/numd2/nud2set.c b/src/spicelib/devices/numd2/nud2set.c index 6c8d19b68..5ac04f56d 100644 --- a/src/spicelib/devices/numd2/nud2set.c +++ b/src/spicelib/devices/numd2/nud2set.c @@ -4,19 +4,19 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "numd2def.h" -#include -#include -#include -#include +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/meshext.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/ciderinp.h" +#include "ngspice/suffix.h" #define NIL(type) ((type *)0) #define TSCALLOC(var, size, type)\ diff --git a/src/spicelib/devices/numd2/nud2temp.c b/src/spicelib/devices/numd2/nud2temp.c index c635728eb..cdd3bddfa 100644 --- a/src/spicelib/devices/numd2/nud2temp.c +++ b/src/spicelib/devices/numd2/nud2temp.c @@ -4,16 +4,16 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1992 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numd2def.h" -#include -#include -#include +#include "ngspice/numenum.h" +#include "ngspice/carddefs.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" #define NIL(type) ((type *)0) diff --git a/src/spicelib/devices/numd2/nud2trun.c b/src/spicelib/devices/numd2/nud2trun.c index c2cf45147..961649cea 100644 --- a/src/spicelib/devices/numd2/nud2trun.c +++ b/src/spicelib/devices/numd2/nud2trun.c @@ -3,14 +3,14 @@ Copyright 1992 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numd2def.h" -#include +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/suffix.h" +#include "ngspice/cidersupt.h" int NUMD2trunc(GENmodel *inModel, CKTcircuit *ckt, double *timeStep) diff --git a/src/spicelib/devices/numd2/numd2def.h b/src/spicelib/devices/numd2/numd2def.h index f0c3f39c6..49690bb9f 100644 --- a/src/spicelib/devices/numd2/numd2def.h +++ b/src/spicelib/devices/numd2/numd2def.h @@ -9,16 +9,16 @@ Authors: 1987 Karti Mayaram, 1991 David Gates /* data structures used to describe 2D numerical diodes */ /* circuit level includes */ -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" /* device level includes */ -#include -#include -#include -#include -#include +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/profile.h" +#include "ngspice/numglobs.h" +#include "ngspice/carddefs.h" /* information needed per instance */ typedef struct sNUMD2instance { diff --git a/src/spicelib/devices/numd2/numd2init.c b/src/spicelib/devices/numd2/numd2init.c index 17122f44a..cc3597d3f 100644 --- a/src/spicelib/devices/numd2/numd2init.c +++ b/src/spicelib/devices/numd2/numd2init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "numd2itf.h" #include "numd2ext.h" diff --git a/src/spicelib/devices/numos/numm.c b/src/spicelib/devices/numos/numm.c index 13e847464..1e5d02dcc 100644 --- a/src/spicelib/devices/numos/numm.c +++ b/src/spicelib/devices/numos/numm.c @@ -4,10 +4,10 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "numosdef.h" -#include +#include "ngspice/suffix.h" /* * This file defines the 2d Numerical MOSFET data structures that are diff --git a/src/spicelib/devices/numos/nummacld.c b/src/spicelib/devices/numos/nummacld.c index 3199b055a..d01688030 100644 --- a/src/spicelib/devices/numos/nummacld.c +++ b/src/spicelib/devices/numos/nummacld.c @@ -8,15 +8,15 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * parameters saved during a previous DC operating point analysis. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numosdef.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/complex.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include +#include "ngspice/cidersupt.h" int diff --git a/src/spicelib/devices/numos/nummask.c b/src/spicelib/devices/numos/nummask.c index 84252be1f..7dd2bc3b5 100644 --- a/src/spicelib/devices/numos/nummask.c +++ b/src/spicelib/devices/numos/nummask.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "numosdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* Externals Declarations */ extern int NUMOSinitSmSig(NUMOSinstance *); diff --git a/src/spicelib/devices/numos/nummdel.c b/src/spicelib/devices/numos/nummdel.c index 19bfd4787..738b6d2a2 100644 --- a/src/spicelib/devices/numos/nummdel.c +++ b/src/spicelib/devices/numos/nummdel.c @@ -8,10 +8,10 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * storage it was using. */ -#include +#include "ngspice/ngspice.h" #include "numosdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMOSdelete(GENmodel *inModel, IFuid name, GENinstance **kill) diff --git a/src/spicelib/devices/numos/nummdest.c b/src/spicelib/devices/numos/nummdest.c index 604da62d3..08484a72d 100644 --- a/src/spicelib/devices/numos/nummdest.c +++ b/src/spicelib/devices/numos/nummdest.c @@ -8,11 +8,11 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * they were using. The current implementation has memory leaks. */ -#include +#include "ngspice/ngspice.h" #include "numosdef.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include +#include "ngspice/suffix.h" void NUMOSdestroy(GENmodel **inModel) diff --git a/src/spicelib/devices/numos/nummdump.c b/src/spicelib/devices/numos/nummdump.c index 502f79625..4cc64c722 100644 --- a/src/spicelib/devices/numos/nummdump.c +++ b/src/spicelib/devices/numos/nummdump.c @@ -9,13 +9,13 @@ Author: 1991 David A. Gates, U. C. Berkeley CAD Group * states for .OP, .DC, & .TRAN simulations. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numosdef.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" /* Forward Declarations */ diff --git a/src/spicelib/devices/numos/nummload.c b/src/spicelib/devices/numos/nummload.c index 19af2bf27..54660c234 100644 --- a/src/spicelib/devices/numos/nummload.c +++ b/src/spicelib/devices/numos/nummload.c @@ -8,16 +8,16 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * MOSFETs in the circuit and load them into the matrix as appropriate */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/cktdefs.h" #include "numosdef.h" -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" diff --git a/src/spicelib/devices/numos/nummmdel.c b/src/spicelib/devices/numos/nummmdel.c index e06ac3d8f..9b17b1b22 100644 --- a/src/spicelib/devices/numos/nummmdel.c +++ b/src/spicelib/devices/numos/nummmdel.c @@ -8,10 +8,10 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * it was using. returns an error if the model has instances */ -#include +#include "ngspice/ngspice.h" #include "numosdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMOSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) diff --git a/src/spicelib/devices/numos/nummmpar.c b/src/spicelib/devices/numos/nummmpar.c index 561e978d8..86e6e9620 100644 --- a/src/spicelib/devices/numos/nummmpar.c +++ b/src/spicelib/devices/numos/nummmpar.c @@ -7,12 +7,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * This routine sets model parameters for NUMOSs in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "numosdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMOSmParam(int param, IFvalue *value, GENmodel *inModel) diff --git a/src/spicelib/devices/numos/nummparm.c b/src/spicelib/devices/numos/nummparm.c index 4cd1f4e69..56a793389 100644 --- a/src/spicelib/devices/numos/nummparm.c +++ b/src/spicelib/devices/numos/nummparm.c @@ -7,12 +7,12 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * This routine sets instance parameters for NUMOSs in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "numosdef.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int NUMOSparam(int param, IFvalue *value, GENinstance *inInst, IFvalue *select) diff --git a/src/spicelib/devices/numos/nummpzld.c b/src/spicelib/devices/numos/nummpzld.c index 259bd8c1f..156f84984 100644 --- a/src/spicelib/devices/numos/nummpzld.c +++ b/src/spicelib/devices/numos/nummpzld.c @@ -3,15 +3,15 @@ Copyright 1991 Regents of the University of California. All rights reserved. Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" #include "numosdef.h" -#include +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/numos/nummset.c b/src/spicelib/devices/numos/nummset.c index 0eedc5207..142d4cbb8 100644 --- a/src/spicelib/devices/numos/nummset.c +++ b/src/spicelib/devices/numos/nummset.c @@ -4,19 +4,19 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group $Id$ **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "numosdef.h" -#include -#include -#include -#include +#include "ngspice/numconst.h" +#include "ngspice/numenum.h" +#include "ngspice/meshext.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/ciderinp.h" +#include "ngspice/suffix.h" #define NIL(type) ((type *)0) #define TSCALLOC(var, size, type)\ diff --git a/src/spicelib/devices/numos/nummtemp.c b/src/spicelib/devices/numos/nummtemp.c index b405387ca..18d585a3c 100644 --- a/src/spicelib/devices/numos/nummtemp.c +++ b/src/spicelib/devices/numos/nummtemp.c @@ -4,16 +4,16 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group Author: 1991 David A. Gates, U. C. Berkeley CAD Group **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numosdef.h" -#include -#include -#include +#include "ngspice/numenum.h" +#include "ngspice/carddefs.h" +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" #define NIL(type) ((type *)0) diff --git a/src/spicelib/devices/numos/nummtrun.c b/src/spicelib/devices/numos/nummtrun.c index 567083680..4aeb914f2 100644 --- a/src/spicelib/devices/numos/nummtrun.c +++ b/src/spicelib/devices/numos/nummtrun.c @@ -8,14 +8,14 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group * circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "numosdef.h" -#include +#include "ngspice/sperror.h" #include "../../../ciderlib/twod/twoddefs.h" #include "../../../ciderlib/twod/twodext.h" -#include -#include +#include "ngspice/cidersupt.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/numos/numosdef.h b/src/spicelib/devices/numos/numosdef.h index 18bd57d1a..a578ae02b 100644 --- a/src/spicelib/devices/numos/numosdef.h +++ b/src/spicelib/devices/numos/numosdef.h @@ -9,16 +9,16 @@ Authors: 1987 Karti Mayaram, 1991 David Gates /* data structures used to describe 2D Numerical MOSFETs */ /* circuit level includes */ -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" /* device level includes */ -#include -#include -#include -#include -#include +#include "ngspice/twomesh.h" +#include "ngspice/twodev.h" +#include "ngspice/profile.h" +#include "ngspice/numglobs.h" +#include "ngspice/carddefs.h" /* information needed per instance */ typedef struct sNUMOSinstance { diff --git a/src/spicelib/devices/numos/numosinit.c b/src/spicelib/devices/numos/numosinit.c index 5fd9a6c50..0b59d00e0 100644 --- a/src/spicelib/devices/numos/numosinit.c +++ b/src/spicelib/devices/numos/numosinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "numositf.h" #include "numosext.h" diff --git a/src/spicelib/devices/res/res.c b/src/spicelib/devices/res/res.c index 63667334b..228c8b8f0 100644 --- a/src/spicelib/devices/res/res.c +++ b/src/spicelib/devices/res/res.c @@ -5,10 +5,10 @@ Modified: Apr 2000 - Paolo Nenzi Modified: 2000 AlansFixes **********/ -#include +#include "ngspice/ngspice.h" #include "resdefs.h" -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" IFparm RESpTable[] = { /* parameters */ IOPP( "resistance", RES_RESIST, IF_REAL, "Resistance"), diff --git a/src/spicelib/devices/res/resask.c b/src/spicelib/devices/res/resask.c index b84d85101..2d9956b02 100644 --- a/src/spicelib/devices/res/resask.c +++ b/src/spicelib/devices/res/resask.c @@ -4,12 +4,12 @@ Author: 1985 Thomas L. Quarles Modified: Apr 2000 - Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" #include "resdefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" /* TODO : there are "double" value compared with 0 (eg: vm == 0) diff --git a/src/spicelib/devices/res/resdefs.h b/src/spicelib/devices/res/resdefs.h index 252aef565..43232b455 100644 --- a/src/spicelib/devices/res/resdefs.h +++ b/src/spicelib/devices/res/resdefs.h @@ -7,11 +7,11 @@ Modified: 2000 AlansFixes #ifndef RES #define RES -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* definitions used to describe resistors */ diff --git a/src/spicelib/devices/res/resdel.c b/src/spicelib/devices/res/resdel.c index 893ff59b4..311723396 100644 --- a/src/spicelib/devices/res/resdel.c +++ b/src/spicelib/devices/res/resdel.c @@ -6,9 +6,9 @@ Modified: Apr 2000 - Paolo Nenzi /* */ -#include +#include "ngspice/ngspice.h" #include "resdefs.h" -#include +#include "ngspice/sperror.h" int diff --git a/src/spicelib/devices/res/resdest.c b/src/spicelib/devices/res/resdest.c index 660b4dfb0..ba127e6fc 100644 --- a/src/spicelib/devices/res/resdest.c +++ b/src/spicelib/devices/res/resdest.c @@ -6,7 +6,7 @@ Modified: Apr 2000 - Paolo Nenzi /* */ -#include +#include "ngspice/ngspice.h" #include "resdefs.h" diff --git a/src/spicelib/devices/res/resinit.c b/src/spicelib/devices/res/resinit.c index c8e879013..d5148da25 100644 --- a/src/spicelib/devices/res/resinit.c +++ b/src/spicelib/devices/res/resinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "resitf.h" #include "resext.h" diff --git a/src/spicelib/devices/res/resload.c b/src/spicelib/devices/res/resload.c index b53661cd9..1d05cf61a 100644 --- a/src/spicelib/devices/res/resload.c +++ b/src/spicelib/devices/res/resload.c @@ -4,10 +4,10 @@ Author: 1985 Thomas L. Quarles Modified: Apr 2000 - Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "resdefs.h" -#include +#include "ngspice/sperror.h" /* actually load the current resistance value into the sparse matrix diff --git a/src/spicelib/devices/res/resmask.c b/src/spicelib/devices/res/resmask.c index 1cc030057..4b541f737 100644 --- a/src/spicelib/devices/res/resmask.c +++ b/src/spicelib/devices/res/resmask.c @@ -6,13 +6,13 @@ Modified: 2000 AlansFixes **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" #include "resdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" int diff --git a/src/spicelib/devices/res/resmdel.c b/src/spicelib/devices/res/resmdel.c index ec4b81ddf..5157b111d 100644 --- a/src/spicelib/devices/res/resmdel.c +++ b/src/spicelib/devices/res/resmdel.c @@ -4,9 +4,9 @@ Author: 1985 Thomas L. Quarles Modified: Apr 2000 - Paolo Nenzi **********/ -#include +#include "ngspice/ngspice.h" #include "resdefs.h" -#include +#include "ngspice/sperror.h" int diff --git a/src/spicelib/devices/res/resmpar.c b/src/spicelib/devices/res/resmpar.c index 3ece4946f..a08efceeb 100644 --- a/src/spicelib/devices/res/resmpar.c +++ b/src/spicelib/devices/res/resmpar.c @@ -5,11 +5,11 @@ Modified: Apr 2000 - Paolo Nenzi Modified: 2000 AlansFixes **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "resdefs.h" -#include +#include "ngspice/sperror.h" int diff --git a/src/spicelib/devices/res/resnoise.c b/src/spicelib/devices/res/resnoise.c index 69db2a4ad..1a7d6b723 100644 --- a/src/spicelib/devices/res/resnoise.c +++ b/src/spicelib/devices/res/resnoise.c @@ -4,11 +4,11 @@ Author: 1987 Gary W. Ng Modified: Apr 2000 - Paolo Nenzi **********/ -#include +#include "ngspice/ngspice.h" #include "resdefs.h" -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" /* * RESnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/res/resparam.c b/src/spicelib/devices/res/resparam.c index 82e15ff1d..8156a8160 100644 --- a/src/spicelib/devices/res/resparam.c +++ b/src/spicelib/devices/res/resparam.c @@ -4,12 +4,12 @@ Author: 1985 Thomas L. Quarles Modified: Apr 2000 - Paolo Nenzi **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "resdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/missing_math.h" int RESparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select) diff --git a/src/spicelib/devices/res/respzld.c b/src/spicelib/devices/res/respzld.c index 317ec5c2d..ee0fea6a5 100644 --- a/src/spicelib/devices/res/respzld.c +++ b/src/spicelib/devices/res/respzld.c @@ -5,10 +5,10 @@ Modified: Apr 2000 - Paolo Nenzi **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "resdefs.h" diff --git a/src/spicelib/devices/res/ressacl.c b/src/spicelib/devices/res/ressacl.c index 388b388c9..5077988b9 100644 --- a/src/spicelib/devices/res/ressacl.c +++ b/src/spicelib/devices/res/ressacl.c @@ -6,10 +6,10 @@ Modified: Apr 2000 - Paolo Nenzi This function is obsolete (was used by an old sensitivity analysis) **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "resdefs.h" -#include +#include "ngspice/sperror.h" int diff --git a/src/spicelib/devices/res/ressetup.c b/src/spicelib/devices/res/ressetup.c index 83839573d..cdb65acc1 100644 --- a/src/spicelib/devices/res/ressetup.c +++ b/src/spicelib/devices/res/ressetup.c @@ -4,10 +4,10 @@ Author: 1985 Thomas L. Quarles Modified: Apr 2000 Paolo Nenzi **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" #include "resdefs.h" -#include +#include "ngspice/sperror.h" int diff --git a/src/spicelib/devices/res/ressload.c b/src/spicelib/devices/res/ressload.c index ef692347c..c37760e2c 100644 --- a/src/spicelib/devices/res/ressload.c +++ b/src/spicelib/devices/res/ressload.c @@ -7,10 +7,10 @@ This function is obsolete (was used by an old sensitivity analysis) **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "resdefs.h" -#include +#include "ngspice/sperror.h" int diff --git a/src/spicelib/devices/res/ressprt.c b/src/spicelib/devices/res/ressprt.c index 416307001..dcca56c83 100644 --- a/src/spicelib/devices/res/ressprt.c +++ b/src/spicelib/devices/res/ressprt.c @@ -10,10 +10,10 @@ This function is obsolete (was used by an old sensitivity analysis) * the resistors in the circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "resdefs.h" -#include +#include "ngspice/sperror.h" void diff --git a/src/spicelib/devices/res/ressset.c b/src/spicelib/devices/res/ressset.c index 66e9b888a..7c47c9754 100644 --- a/src/spicelib/devices/res/ressset.c +++ b/src/spicelib/devices/res/ressset.c @@ -6,11 +6,11 @@ Modified: Apr 2000 - Paolo Nenzi This function is obsolete (was used by an old sensitivity analysis) **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" #include "resdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/cktdefs.h" int diff --git a/src/spicelib/devices/res/restemp.c b/src/spicelib/devices/res/restemp.c index 1674b3a18..26078ac8a 100644 --- a/src/spicelib/devices/res/restemp.c +++ b/src/spicelib/devices/res/restemp.c @@ -5,10 +5,10 @@ Modified Apr 2000 - Paolo Nenzi Modified: 2000 AlanSfixes **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "resdefs.h" -#include +#include "ngspice/sperror.h" int REStemp(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/soi3/soi3.c b/src/spicelib/devices/soi3/soi3.c index 45b6a88ca..401fa042b 100644 --- a/src/spicelib/devices/soi3/soi3.c +++ b/src/spicelib/devices/soi3/soi3.c @@ -20,11 +20,11 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "soi3defs.h" -#include +#include "ngspice/suffix.h" char *SOI3names[] = { diff --git a/src/spicelib/devices/soi3/soi3acld.c b/src/spicelib/devices/soi3/soi3acld.c index 512f65598..1bc784ca6 100644 --- a/src/spicelib/devices/soi3/soi3acld.c +++ b/src/spicelib/devices/soi3/soi3acld.c @@ -21,11 +21,11 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/soi3/soi3ask.c b/src/spicelib/devices/soi3/soi3ask.c index fea60770e..70f931977 100644 --- a/src/spicelib/devices/soi3/soi3ask.c +++ b/src/spicelib/devices/soi3/soi3ask.c @@ -20,14 +20,14 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/soi3/soi3cap.c b/src/spicelib/devices/soi3/soi3cap.c index 34af72904..a8ec1312a 100644 --- a/src/spicelib/devices/soi3/soi3cap.c +++ b/src/spicelib/devices/soi3/soi3cap.c @@ -21,12 +21,12 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/suffix.h" #include "soi3defs.h" -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" void diff --git a/src/spicelib/devices/soi3/soi3conv.c b/src/spicelib/devices/soi3/soi3conv.c index 83d871336..f02b63996 100644 --- a/src/spicelib/devices/soi3/soi3conv.c +++ b/src/spicelib/devices/soi3/soi3conv.c @@ -20,11 +20,11 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/soi3/soi3defs.h b/src/spicelib/devices/soi3/soi3defs.h index 6335dcd16..3c246e8bb 100644 --- a/src/spicelib/devices/soi3/soi3defs.h +++ b/src/spicelib/devices/soi3/soi3defs.h @@ -24,11 +24,11 @@ ngspice integration #ifndef SOI3 #define SOI3 -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* declarations for SOI3 MOSFETs */ diff --git a/src/spicelib/devices/soi3/soi3del.c b/src/spicelib/devices/soi3/soi3del.c index 82f7c140c..b36ae48f4 100644 --- a/src/spicelib/devices/soi3/soi3del.c +++ b/src/spicelib/devices/soi3/soi3del.c @@ -20,10 +20,10 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include +#include "ngspice/ngspice.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/soi3/soi3dest.c b/src/spicelib/devices/soi3/soi3dest.c index 79b040212..053206b77 100644 --- a/src/spicelib/devices/soi3/soi3dest.c +++ b/src/spicelib/devices/soi3/soi3dest.c @@ -20,9 +20,9 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include +#include "ngspice/ngspice.h" #include "soi3defs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/soi3/soi3ic.c b/src/spicelib/devices/soi3/soi3ic.c index 2f07dbb1d..2cfc21f1b 100644 --- a/src/spicelib/devices/soi3/soi3ic.c +++ b/src/spicelib/devices/soi3/soi3ic.c @@ -20,11 +20,11 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/soi3/soi3init.c b/src/spicelib/devices/soi3/soi3init.c index ba78f490f..b8f35a9e9 100644 --- a/src/spicelib/devices/soi3/soi3init.c +++ b/src/spicelib/devices/soi3/soi3init.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "soi3itf.h" #include "soi3ext.h" diff --git a/src/spicelib/devices/soi3/soi3load.c b/src/spicelib/devices/soi3/soi3load.c index f1a8a7f38..4d3808a23 100644 --- a/src/spicelib/devices/soi3/soi3load.c +++ b/src/spicelib/devices/soi3/soi3load.c @@ -21,14 +21,14 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "soi3defs.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" extern double DEVsoipnjlim(double, double, double, double, int *); diff --git a/src/spicelib/devices/soi3/soi3mask.c b/src/spicelib/devices/soi3/soi3mask.c index f8cb47659..4855d0706 100644 --- a/src/spicelib/devices/soi3/soi3mask.c +++ b/src/spicelib/devices/soi3/soi3mask.c @@ -20,14 +20,14 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/soi3/soi3mdel.c b/src/spicelib/devices/soi3/soi3mdel.c index e3d462aa6..76ed666eb 100644 --- a/src/spicelib/devices/soi3/soi3mdel.c +++ b/src/spicelib/devices/soi3/soi3mdel.c @@ -20,10 +20,10 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include +#include "ngspice/ngspice.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/soi3/soi3mpar.c b/src/spicelib/devices/soi3/soi3mpar.c index ee6e991f2..14ee12567 100644 --- a/src/spicelib/devices/soi3/soi3mpar.c +++ b/src/spicelib/devices/soi3/soi3mpar.c @@ -20,12 +20,12 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int SOI3mParam(int param, IFvalue *value, GENmodel *inModel) diff --git a/src/spicelib/devices/soi3/soi3nois.c b/src/spicelib/devices/soi3/soi3nois.c index 290058386..46cee8fe8 100644 --- a/src/spicelib/devices/soi3/soi3nois.c +++ b/src/spicelib/devices/soi3/soi3nois.c @@ -20,13 +20,13 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include +#include "ngspice/ngspice.h" #include "soi3defs.h" -#include -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/const.h" +#include "ngspice/suffix.h" /* This routine is VERY closely based on the standard MOS noise function. diff --git a/src/spicelib/devices/soi3/soi3par.c b/src/spicelib/devices/soi3/soi3par.c index f2e103a56..e621c891d 100644 --- a/src/spicelib/devices/soi3/soi3par.c +++ b/src/spicelib/devices/soi3/soi3par.c @@ -20,12 +20,12 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/soi3/soi3set.c b/src/spicelib/devices/soi3/soi3set.c index 20f7da9d2..4622244e0 100644 --- a/src/spicelib/devices/soi3/soi3set.c +++ b/src/spicelib/devices/soi3/soi3set.c @@ -21,12 +21,12 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/soi3/soi3temp.c b/src/spicelib/devices/soi3/soi3temp.c index b35a2705a..854c6eda1 100644 --- a/src/spicelib/devices/soi3/soi3temp.c +++ b/src/spicelib/devices/soi3/soi3temp.c @@ -20,12 +20,12 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "soi3defs.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/soi3/soi3trun.c b/src/spicelib/devices/soi3/soi3trun.c index 99631fb51..74b78889b 100644 --- a/src/spicelib/devices/soi3/soi3trun.c +++ b/src/spicelib/devices/soi3/soi3trun.c @@ -20,11 +20,11 @@ Modified by Paolo Nenzi 2002 ngspice integration **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "soi3defs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/sw/sw.c b/src/spicelib/devices/sw/sw.c index c9e20b0ad..c1bb66a06 100644 --- a/src/spicelib/devices/sw/sw.c +++ b/src/spicelib/devices/sw/sw.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "swdefs.h" -#include +#include "ngspice/suffix.h" IFparm SWpTable[] = { /* parameters */ IP("on", SW_IC_ON, IF_FLAG,"Switch initially closed"), diff --git a/src/spicelib/devices/sw/swacload.c b/src/spicelib/devices/sw/swacload.c index c49c17a9a..43f6d5a01 100644 --- a/src/spicelib/devices/sw/swacload.c +++ b/src/spicelib/devices/sw/swacload.c @@ -5,11 +5,11 @@ Author: 1985 Gordon Jacobs /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "swdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/sw/swask.c b/src/spicelib/devices/sw/swask.c index f815bb5a2..7af8f7511 100644 --- a/src/spicelib/devices/sw/swask.c +++ b/src/spicelib/devices/sw/swask.c @@ -10,13 +10,13 @@ Author: 1987 Thomas L. Quarles * of voltage controlled SWitch */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "swdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/sw/swdefs.h b/src/spicelib/devices/sw/swdefs.h index 3920a37f4..e77ee7b51 100644 --- a/src/spicelib/devices/sw/swdefs.h +++ b/src/spicelib/devices/sw/swdefs.h @@ -7,11 +7,11 @@ Modified: 2000 AlansFixes #ifndef SW #define SW -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* structures used to describe voltage controlled switches */ diff --git a/src/spicelib/devices/sw/swdelete.c b/src/spicelib/devices/sw/swdelete.c index 1798a1509..9a1707a96 100644 --- a/src/spicelib/devices/sw/swdelete.c +++ b/src/spicelib/devices/sw/swdelete.c @@ -5,10 +5,10 @@ Author: 1985 Gordon Jacobs /* */ -#include +#include "ngspice/ngspice.h" #include "swdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/sw/swdest.c b/src/spicelib/devices/sw/swdest.c index 3c8959a77..a2dcee0af 100644 --- a/src/spicelib/devices/sw/swdest.c +++ b/src/spicelib/devices/sw/swdest.c @@ -5,9 +5,9 @@ Author: 1985 Gordon Jacobs /* */ -#include +#include "ngspice/ngspice.h" #include "swdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/sw/swinit.c b/src/spicelib/devices/sw/swinit.c index c1a460607..92bd4da92 100644 --- a/src/spicelib/devices/sw/swinit.c +++ b/src/spicelib/devices/sw/swinit.c @@ -1,7 +1,7 @@ /* Modified: Alansfixes */ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "switf.h" #include "swext.h" diff --git a/src/spicelib/devices/sw/swload.c b/src/spicelib/devices/sw/swload.c index 684854f9f..918721d12 100644 --- a/src/spicelib/devices/sw/swload.c +++ b/src/spicelib/devices/sw/swload.c @@ -4,13 +4,13 @@ Author: 1985 Gordon Jacobs Modified: 2001 Jon Engelbert **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/fteext.h" #include "swdefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int SWload(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/sw/swmask.c b/src/spicelib/devices/sw/swmask.c index 2fa59536d..ff8a0c3aa 100644 --- a/src/spicelib/devices/sw/swmask.c +++ b/src/spicelib/devices/sw/swmask.c @@ -10,13 +10,13 @@ Author: 1987 Thomas L. Quarles * of voltage controlled SWitch */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "swdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/sw/swmdel.c b/src/spicelib/devices/sw/swmdel.c index e0ea9d32e..9b3103152 100644 --- a/src/spicelib/devices/sw/swmdel.c +++ b/src/spicelib/devices/sw/swmdel.c @@ -5,10 +5,10 @@ Author: 1985 Gordon Jacobs /* */ -#include +#include "ngspice/ngspice.h" #include "swdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/sw/swmparam.c b/src/spicelib/devices/sw/swmparam.c index 3ff39117d..1eb1b1478 100644 --- a/src/spicelib/devices/sw/swmparam.c +++ b/src/spicelib/devices/sw/swmparam.c @@ -6,11 +6,11 @@ Modified: 2001 Jon Engelbert /* */ -#include +#include "ngspice/ngspice.h" #include "swdefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/sw/swnoise.c b/src/spicelib/devices/sw/swnoise.c index 817d900bb..723189b96 100644 --- a/src/spicelib/devices/sw/swnoise.c +++ b/src/spicelib/devices/sw/swnoise.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Gary W. Ng **********/ -#include +#include "ngspice/ngspice.h" #include "swdefs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * SWnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/sw/swparam.c b/src/spicelib/devices/sw/swparam.c index 5c58385b5..bda497b0e 100644 --- a/src/spicelib/devices/sw/swparam.c +++ b/src/spicelib/devices/sw/swparam.c @@ -5,11 +5,11 @@ Author: 1985 Gordon Jacobs /* */ -#include +#include "ngspice/ngspice.h" #include "swdefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/sw/swpzload.c b/src/spicelib/devices/sw/swpzload.c index 0a443a865..07db97c46 100644 --- a/src/spicelib/devices/sw/swpzload.c +++ b/src/spicelib/devices/sw/swpzload.c @@ -5,12 +5,12 @@ Author: 1985 Gordon Jacobs /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "swdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/complex.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/sw/swsetup.c b/src/spicelib/devices/sw/swsetup.c index 96c311c24..bf7a0eb80 100644 --- a/src/spicelib/devices/sw/swsetup.c +++ b/src/spicelib/devices/sw/swsetup.c @@ -5,12 +5,12 @@ Author: 1985 Gordon Jacobs /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "swdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/sw/swtrunc.c b/src/spicelib/devices/sw/swtrunc.c index a561b0bd4..cf19501b0 100644 --- a/src/spicelib/devices/sw/swtrunc.c +++ b/src/spicelib/devices/sw/swtrunc.c @@ -6,10 +6,10 @@ Modified: 2000 AlansFixes /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "swdefs.h" int diff --git a/src/spicelib/devices/tra/tra.c b/src/spicelib/devices/tra/tra.c index d1b85cecf..fe0cc5188 100644 --- a/src/spicelib/devices/tra/tra.c +++ b/src/spicelib/devices/tra/tra.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "tradefs.h" -#include +#include "ngspice/suffix.h" IFparm TRApTable[] = { /* parameters */ IOPU( "z0", TRA_Z0, IF_REAL , "Characteristic impedance"), diff --git a/src/spicelib/devices/tra/traacct.c b/src/spicelib/devices/tra/traacct.c index b03ce12b1..ea5d3ffa4 100644 --- a/src/spicelib/devices/tra/traacct.c +++ b/src/spicelib/devices/tra/traacct.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "tradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/tra/traacld.c b/src/spicelib/devices/tra/traacld.c index 3368e11c4..62a8e14fe 100644 --- a/src/spicelib/devices/tra/traacld.c +++ b/src/spicelib/devices/tra/traacld.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "tradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int TRAacLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/tra/traask.c b/src/spicelib/devices/tra/traask.c index 47e6c393d..a8e0042b2 100644 --- a/src/spicelib/devices/tra/traask.c +++ b/src/spicelib/devices/tra/traask.c @@ -10,13 +10,13 @@ Author: 1987 Thomas L. Quarles * of TRAnsmission lines */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "tradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/tra/tradefs.h b/src/spicelib/devices/tra/tradefs.h index 095ae90b5..5f566ade6 100644 --- a/src/spicelib/devices/tra/tradefs.h +++ b/src/spicelib/devices/tra/tradefs.h @@ -7,10 +7,10 @@ Author: 1985 Thomas L. Quarles #define TRA -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" /* definitions used to describe transmission liness */ diff --git a/src/spicelib/devices/tra/tradel.c b/src/spicelib/devices/tra/tradel.c index ed0db728d..33d725995 100644 --- a/src/spicelib/devices/tra/tradel.c +++ b/src/spicelib/devices/tra/tradel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "tradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/tra/tradest.c b/src/spicelib/devices/tra/tradest.c index 0048bde85..61cfda5e7 100644 --- a/src/spicelib/devices/tra/tradest.c +++ b/src/spicelib/devices/tra/tradest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "tradefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/tra/trainit.c b/src/spicelib/devices/tra/trainit.c index a1bb5b590..aac4cca8d 100644 --- a/src/spicelib/devices/tra/trainit.c +++ b/src/spicelib/devices/tra/trainit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "traitf.h" #include "traext.h" diff --git a/src/spicelib/devices/tra/traload.c b/src/spicelib/devices/tra/traload.c index fea8edf1f..a3a9eb51a 100644 --- a/src/spicelib/devices/tra/traload.c +++ b/src/spicelib/devices/tra/traload.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "tradefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/tra/tramdel.c b/src/spicelib/devices/tra/tramdel.c index c97c2aea2..a56040c54 100644 --- a/src/spicelib/devices/tra/tramdel.c +++ b/src/spicelib/devices/tra/tramdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "tradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/tra/traparam.c b/src/spicelib/devices/tra/traparam.c index 57574f077..2a1023331 100644 --- a/src/spicelib/devices/tra/traparam.c +++ b/src/spicelib/devices/tra/traparam.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "tradefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/tra/trasetup.c b/src/spicelib/devices/tra/trasetup.c index 63bef22e3..197dcda75 100644 --- a/src/spicelib/devices/tra/trasetup.c +++ b/src/spicelib/devices/tra/trasetup.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "tradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/tra/tratemp.c b/src/spicelib/devices/tra/tratemp.c index 191471aaf..8e987dd1d 100644 --- a/src/spicelib/devices/tra/tratemp.c +++ b/src/spicelib/devices/tra/tratemp.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "tradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/tra/tratrunc.c b/src/spicelib/devices/tra/tratrunc.c index 36bf23169..3a049c01b 100644 --- a/src/spicelib/devices/tra/tratrunc.c +++ b/src/spicelib/devices/tra/tratrunc.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "tradefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/txl/txl.c b/src/spicelib/devices/txl/txl.c index 696e52cdb..9da8f15e0 100644 --- a/src/spicelib/devices/txl/txl.c +++ b/src/spicelib/devices/txl/txl.c @@ -4,11 +4,11 @@ reserved. Author: 1992 Charles Hough **********/ -#include +#include "ngspice/ngspice.h" #include "txldefs.h" -#include -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" IFparm TXLpTable[] = { IP("pos_node", TXL_IN_NODE, IF_INTEGER,"Positive node of txl"), diff --git a/src/spicelib/devices/txl/txlacct.c b/src/spicelib/devices/txl/txlacct.c index a8c8ff064..197dbc3da 100644 --- a/src/spicelib/devices/txl/txlacct.c +++ b/src/spicelib/devices/txl/txlacct.c @@ -5,11 +5,11 @@ Author: 1992 Charles Hough **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "txldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/txl/txlask.c b/src/spicelib/devices/txl/txlask.c index 6a3c8267d..6cb7c91fa 100644 --- a/src/spicelib/devices/txl/txlask.c +++ b/src/spicelib/devices/txl/txlask.c @@ -5,13 +5,13 @@ Author: 1992 Charles Hough **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" #include "txldefs.h" -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/txl/txldefs.h b/src/spicelib/devices/txl/txldefs.h index cdc68c6c9..12dce940c 100644 --- a/src/spicelib/devices/txl/txldefs.h +++ b/src/spicelib/devices/txl/txldefs.h @@ -1,12 +1,12 @@ #ifndef TXL #define TXL -#include -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" +#include "ngspice/swec.h" /* information used to describe a single instance */ diff --git a/src/spicelib/devices/txl/txldel.c b/src/spicelib/devices/txl/txldel.c index 0f51e334c..3a5b63d24 100644 --- a/src/spicelib/devices/txl/txldel.c +++ b/src/spicelib/devices/txl/txldel.c @@ -5,10 +5,10 @@ Author: 1992 Charles Hough **********/ -#include +#include "ngspice/ngspice.h" #include "txldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/txl/txldest.c b/src/spicelib/devices/txl/txldest.c index e20857601..5dffc7b12 100644 --- a/src/spicelib/devices/txl/txldest.c +++ b/src/spicelib/devices/txl/txldest.c @@ -5,9 +5,9 @@ Author: 1992 Charles Hough **********/ -#include +#include "ngspice/ngspice.h" #include "txldefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/txl/txlfbr.c b/src/spicelib/devices/txl/txlfbr.c index cce15b20a..be6f423a6 100644 --- a/src/spicelib/devices/txl/txlfbr.c +++ b/src/spicelib/devices/txl/txlfbr.c @@ -5,11 +5,11 @@ Author: 1992 Charles Hough **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "txldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/txl/txlinit.c b/src/spicelib/devices/txl/txlinit.c index 7e5fa1f03..55696a63f 100644 --- a/src/spicelib/devices/txl/txlinit.c +++ b/src/spicelib/devices/txl/txlinit.c @@ -5,7 +5,7 @@ Author: 1992 Charles Hough **********/ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "txlitf.h" #include "txlext.h" diff --git a/src/spicelib/devices/txl/txlload.c b/src/spicelib/devices/txl/txlload.c index 5e16f3fa8..e3e67ac66 100644 --- a/src/spicelib/devices/txl/txlload.c +++ b/src/spicelib/devices/txl/txlload.c @@ -5,10 +5,10 @@ Author: 1992 Charles Hough **********/ -#include +#include "ngspice/ngspice.h" #include "txldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "../../../frontend/error.h" /* controlled_exit() */ diff --git a/src/spicelib/devices/txl/txlmask.c b/src/spicelib/devices/txl/txlmask.c index c4950f915..23cd40881 100644 --- a/src/spicelib/devices/txl/txlmask.c +++ b/src/spicelib/devices/txl/txlmask.c @@ -5,15 +5,15 @@ Author: 1992 Charles Hough **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" #include "txldefs.h" -#include -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" +#include "ngspice/suffix.h" +#include "ngspice/swec.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/txl/txlmdel.c b/src/spicelib/devices/txl/txlmdel.c index 512132134..b57d572de 100644 --- a/src/spicelib/devices/txl/txlmdel.c +++ b/src/spicelib/devices/txl/txlmdel.c @@ -5,10 +5,10 @@ Author: 1992 Charles Hough **********/ -#include +#include "ngspice/ngspice.h" #include "txldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/txl/txlmpar.c b/src/spicelib/devices/txl/txlmpar.c index 1420bcc80..7142d6724 100644 --- a/src/spicelib/devices/txl/txlmpar.c +++ b/src/spicelib/devices/txl/txlmpar.c @@ -5,12 +5,12 @@ Author: 1992 Charles Hough **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "txldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/txl/txlparam.c b/src/spicelib/devices/txl/txlparam.c index 7c128c7d6..5d6b66369 100644 --- a/src/spicelib/devices/txl/txlparam.c +++ b/src/spicelib/devices/txl/txlparam.c @@ -4,12 +4,12 @@ reserved. Author: 1992 Charles Hough **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "txldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/txl/txlsetup.c b/src/spicelib/devices/txl/txlsetup.c index 2b4ae766b..e24d55825 100644 --- a/src/spicelib/devices/txl/txlsetup.c +++ b/src/spicelib/devices/txl/txlsetup.c @@ -5,11 +5,11 @@ Author: 1992 Charles Hough **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" #include "txldefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "../../../frontend/error.h" /* controlled_exit() */ diff --git a/src/spicelib/devices/urc/urc.c b/src/spicelib/devices/urc/urc.c index 262afc054..238220fa0 100644 --- a/src/spicelib/devices/urc/urc.c +++ b/src/spicelib/devices/urc/urc.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "urcdefs.h" -#include +#include "ngspice/suffix.h" IFparm URCpTable[] = { /* parameters */ IOPU( "l", URC_LEN, IF_REAL, "Length of transmission line"), diff --git a/src/spicelib/devices/urc/urcask.c b/src/spicelib/devices/urc/urcask.c index bbae1e3af..702b454cf 100644 --- a/src/spicelib/devices/urc/urcask.c +++ b/src/spicelib/devices/urc/urcask.c @@ -11,13 +11,13 @@ Author: 1987 Thomas L. Quarles * of Uniform distributed RC lines */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "urcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/urc/urcdefs.h b/src/spicelib/devices/urc/urcdefs.h index e82b2eb27..cb8ee766b 100644 --- a/src/spicelib/devices/urc/urcdefs.h +++ b/src/spicelib/devices/urc/urcdefs.h @@ -7,10 +7,10 @@ Author: 1985 Thomas L. Quarles #define URC -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" /* * structures used to describe uniform RC lines diff --git a/src/spicelib/devices/urc/urcdel.c b/src/spicelib/devices/urc/urcdel.c index e8e9d060a..1111f4056 100644 --- a/src/spicelib/devices/urc/urcdel.c +++ b/src/spicelib/devices/urc/urcdel.c @@ -5,10 +5,10 @@ Author: 1987 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "urcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/urc/urcdest.c b/src/spicelib/devices/urc/urcdest.c index 611836a16..b81a3a2f6 100644 --- a/src/spicelib/devices/urc/urcdest.c +++ b/src/spicelib/devices/urc/urcdest.c @@ -6,9 +6,9 @@ Author: 1987 Thomas L. Quarles */ -#include +#include "ngspice/ngspice.h" #include "urcdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/urc/urcinit.c b/src/spicelib/devices/urc/urcinit.c index 7a4d5e3c5..82eba7504 100644 --- a/src/spicelib/devices/urc/urcinit.c +++ b/src/spicelib/devices/urc/urcinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "urcitf.h" #include "urcext.h" diff --git a/src/spicelib/devices/urc/urcmask.c b/src/spicelib/devices/urc/urcmask.c index 04b189a5a..98a0f0511 100644 --- a/src/spicelib/devices/urc/urcmask.c +++ b/src/spicelib/devices/urc/urcmask.c @@ -10,13 +10,13 @@ Author: 1987 Thomas L. Quarles * of Uniform distributed RC lines */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "urcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/urc/urcmdel.c b/src/spicelib/devices/urc/urcmdel.c index bd4f752e7..908fb4938 100644 --- a/src/spicelib/devices/urc/urcmdel.c +++ b/src/spicelib/devices/urc/urcmdel.c @@ -5,10 +5,10 @@ Author: 1987 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "urcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/urc/urcmpar.c b/src/spicelib/devices/urc/urcmpar.c index 0884f4355..df429a96f 100644 --- a/src/spicelib/devices/urc/urcmpar.c +++ b/src/spicelib/devices/urc/urcmpar.c @@ -5,11 +5,11 @@ Author: 1987 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "urcdefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/urc/urcparam.c b/src/spicelib/devices/urc/urcparam.c index 1be99231e..dd9799a37 100644 --- a/src/spicelib/devices/urc/urcparam.c +++ b/src/spicelib/devices/urc/urcparam.c @@ -5,11 +5,11 @@ Author: 1987 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "urcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/urc/urcsetup.c b/src/spicelib/devices/urc/urcsetup.c index 1edee0c12..d332a499e 100644 --- a/src/spicelib/devices/urc/urcsetup.c +++ b/src/spicelib/devices/urc/urcsetup.c @@ -3,13 +3,13 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "urcdefs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/vbic/vbic.c b/src/spicelib/devices/vbic/vbic.c index e1354f1be..8ad41bee4 100644 --- a/src/spicelib/devices/vbic/vbic.c +++ b/src/spicelib/devices/vbic/vbic.c @@ -10,10 +10,10 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * available to the next level(s) up the calling hierarchy */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" #include "vbicdefs.h" -#include +#include "ngspice/suffix.h" IFparm VBICpTable[] = { /* parameters */ IOPU("area", VBIC_AREA, IF_REAL, "Area factor"), diff --git a/src/spicelib/devices/vbic/vbicacld.c b/src/spicelib/devices/vbic/vbicacld.c index 6dcc1f284..03a8afdec 100644 --- a/src/spicelib/devices/vbic/vbicacld.c +++ b/src/spicelib/devices/vbic/vbicacld.c @@ -11,11 +11,11 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * point analysis. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vbicdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int VBICacLoad(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/vbic/vbicask.c b/src/spicelib/devices/vbic/vbicask.c index a7634ae8d..1f98f1663 100644 --- a/src/spicelib/devices/vbic/vbicask.c +++ b/src/spicelib/devices/vbic/vbicask.c @@ -10,13 +10,13 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * parameters for VBICs */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/cktdefs.h" #include "vbicdefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/vbic/vbicconv.c b/src/spicelib/devices/vbic/vbicconv.c index d86db8427..aca8cafce 100644 --- a/src/spicelib/devices/vbic/vbicconv.c +++ b/src/spicelib/devices/vbic/vbicconv.c @@ -10,11 +10,11 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * VBICs in the circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vbicdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int VBICconvTest(GENmodel *inModel, CKTcircuit *ckt) diff --git a/src/spicelib/devices/vbic/vbicdefs.h b/src/spicelib/devices/vbic/vbicdefs.h index 0ecd75fa2..53cff2ff1 100644 --- a/src/spicelib/devices/vbic/vbicdefs.h +++ b/src/spicelib/devices/vbic/vbicdefs.h @@ -8,11 +8,11 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH #ifndef VBIC #define VBIC -#include -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" +#include "ngspice/noisedef.h" /* structures to describe Bipolar Junction Transistors */ diff --git a/src/spicelib/devices/vbic/vbicdel.c b/src/spicelib/devices/vbic/vbicdel.c index 4d6aa2b59..9d2108d97 100644 --- a/src/spicelib/devices/vbic/vbicdel.c +++ b/src/spicelib/devices/vbic/vbicdel.c @@ -10,10 +10,10 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * the storage it was using. */ -#include +#include "ngspice/ngspice.h" #include "vbicdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vbic/vbicdest.c b/src/spicelib/devices/vbic/vbicdest.c index 03fbb61ce..7b94e7998 100644 --- a/src/spicelib/devices/vbic/vbicdest.c +++ b/src/spicelib/devices/vbic/vbicdest.c @@ -10,9 +10,9 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * all storage they were using. */ -#include +#include "ngspice/ngspice.h" #include "vbicdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/vbic/vbicgetic.c b/src/spicelib/devices/vbic/vbicgetic.c index 9201b1bd0..405c9a4e2 100644 --- a/src/spicelib/devices/vbic/vbicgetic.c +++ b/src/spicelib/devices/vbic/vbicgetic.c @@ -10,11 +10,11 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * from the RHS vector */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vbicdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vbic/vbicinit.c b/src/spicelib/devices/vbic/vbicinit.c index 76dad6475..e0b3157e9 100644 --- a/src/spicelib/devices/vbic/vbicinit.c +++ b/src/spicelib/devices/vbic/vbicinit.c @@ -7,7 +7,7 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "vbicitf.h" #include "vbicext.h" diff --git a/src/spicelib/devices/vbic/vbicload.c b/src/spicelib/devices/vbic/vbicload.c index 9edc93fe1..935c7d27f 100644 --- a/src/spicelib/devices/vbic/vbicload.c +++ b/src/spicelib/devices/vbic/vbicload.c @@ -10,13 +10,13 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * VBICs in the circuit and load them into the matrix as appropriate */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vbicdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/devdefs.h" int vbic_4T_it_cf_fj(double *, double *,double *,double *,double *,double *,double *, diff --git a/src/spicelib/devices/vbic/vbicmask.c b/src/spicelib/devices/vbic/vbicmask.c index 4923a8346..1ada8469c 100644 --- a/src/spicelib/devices/vbic/vbicmask.c +++ b/src/spicelib/devices/vbic/vbicmask.c @@ -5,14 +5,14 @@ Model Author: 1995 Colin McAndrew Motorola Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "vbicdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/vbic/vbicmdel.c b/src/spicelib/devices/vbic/vbicmdel.c index 72b490542..97fecb5a7 100644 --- a/src/spicelib/devices/vbic/vbicmdel.c +++ b/src/spicelib/devices/vbic/vbicmdel.c @@ -11,10 +11,10 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * returns an error if the model has instances */ -#include +#include "ngspice/ngspice.h" #include "vbicdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vbic/vbicmpar.c b/src/spicelib/devices/vbic/vbicmpar.c index 4b09bafa6..100c71c48 100644 --- a/src/spicelib/devices/vbic/vbicmpar.c +++ b/src/spicelib/devices/vbic/vbicmpar.c @@ -10,12 +10,12 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * VBICs in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "vbicdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vbic/vbicnoise.c b/src/spicelib/devices/vbic/vbicnoise.c index f6b5dafbc..d04d5173a 100644 --- a/src/spicelib/devices/vbic/vbicnoise.c +++ b/src/spicelib/devices/vbic/vbicnoise.c @@ -5,12 +5,12 @@ Model Author: 1995 Colin McAndrew Motorola Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH **********/ -#include +#include "ngspice/ngspice.h" #include "vbicdefs.h" -#include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/noisedef.h" +#include "ngspice/suffix.h" /* * VBICnoise (mode, operation, firstModel, ckt, data, OnDens) diff --git a/src/spicelib/devices/vbic/vbicparam.c b/src/spicelib/devices/vbic/vbicparam.c index c5b6b986f..34e14bbc3 100644 --- a/src/spicelib/devices/vbic/vbicparam.c +++ b/src/spicelib/devices/vbic/vbicparam.c @@ -10,12 +10,12 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * VBICs in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/const.h" +#include "ngspice/ifsim.h" #include "vbicdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/vbic/vbicpzld.c b/src/spicelib/devices/vbic/vbicpzld.c index 73b815f76..875e4cebc 100644 --- a/src/spicelib/devices/vbic/vbicpzld.c +++ b/src/spicelib/devices/vbic/vbicpzld.c @@ -11,11 +11,11 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * point analysis. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vbicdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int VBICpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) diff --git a/src/spicelib/devices/vbic/vbicsetup.c b/src/spicelib/devices/vbic/vbicsetup.c index b307253a0..bf7e6b82d 100644 --- a/src/spicelib/devices/vbic/vbicsetup.c +++ b/src/spicelib/devices/vbic/vbicsetup.c @@ -12,14 +12,14 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * affected by emitter, collector, and base resistances) */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "vbicdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" int VBICsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) diff --git a/src/spicelib/devices/vbic/vbictemp.c b/src/spicelib/devices/vbic/vbictemp.c index 569dc4d7f..6f05e5c6f 100644 --- a/src/spicelib/devices/vbic/vbictemp.c +++ b/src/spicelib/devices/vbic/vbictemp.c @@ -5,14 +5,14 @@ Model Author: 1995 Colin McAndrew Motorola Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/smpdefs.h" #include "vbicdefs.h" -#include -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/ifsim.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/vbic/vbictrunc.c b/src/spicelib/devices/vbic/vbictrunc.c index 9ed944330..3e3636f30 100644 --- a/src/spicelib/devices/vbic/vbictrunc.c +++ b/src/spicelib/devices/vbic/vbictrunc.c @@ -10,11 +10,11 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH * VBICs in the circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vbicdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vccs/vccs.c b/src/spicelib/devices/vccs/vccs.c index 34506c939..313f730b5 100644 --- a/src/spicelib/devices/vccs/vccs.c +++ b/src/spicelib/devices/vccs/vccs.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "vccsdefs.h" -#include +#include "ngspice/suffix.h" IFparm VCCSpTable[] = { /* parameters */ IOPU("gain", VCCS_TRANS, IF_REAL, "Transconductance of source (gain)"), diff --git a/src/spicelib/devices/vccs/vccsask.c b/src/spicelib/devices/vccs/vccsask.c index 8fd4b72d4..4749074d8 100644 --- a/src/spicelib/devices/vccs/vccsask.c +++ b/src/spicelib/devices/vccs/vccsask.c @@ -8,13 +8,13 @@ Author: 1987 Thomas L. Quarles * of Voltage Controlled Current Source */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "vccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "vccsext.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/vccs/vccsdefs.h b/src/spicelib/devices/vccs/vccsdefs.h index 68a097203..60001b0c8 100644 --- a/src/spicelib/devices/vccs/vccsdefs.h +++ b/src/spicelib/devices/vccs/vccsdefs.h @@ -6,10 +6,10 @@ Author: 1985 Thomas L. Quarles #ifndef VCCS #define VCCS -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" /* * structures to describe Voltage Controlled Current Sources diff --git a/src/spicelib/devices/vccs/vccsdel.c b/src/spicelib/devices/vccs/vccsdel.c index 91eeff8bd..aaba2e38e 100644 --- a/src/spicelib/devices/vccs/vccsdel.c +++ b/src/spicelib/devices/vccs/vccsdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "vccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccsdest.c b/src/spicelib/devices/vccs/vccsdest.c index b064835bf..ce63e869a 100644 --- a/src/spicelib/devices/vccs/vccsdest.c +++ b/src/spicelib/devices/vccs/vccsdest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "vccsdefs.h" -#include +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccsinit.c b/src/spicelib/devices/vccs/vccsinit.c index fefb63709..4acfe3475 100644 --- a/src/spicelib/devices/vccs/vccsinit.c +++ b/src/spicelib/devices/vccs/vccsinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "vccsitf.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccsload.c b/src/spicelib/devices/vccs/vccsload.c index a100f6122..7f56a034b 100644 --- a/src/spicelib/devices/vccs/vccsload.c +++ b/src/spicelib/devices/vccs/vccsload.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccsmdel.c b/src/spicelib/devices/vccs/vccsmdel.c index 201286c70..48a5aab71 100644 --- a/src/spicelib/devices/vccs/vccsmdel.c +++ b/src/spicelib/devices/vccs/vccsmdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "vccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccspar.c b/src/spicelib/devices/vccs/vccspar.c index 227754883..81c7a9c9b 100644 --- a/src/spicelib/devices/vccs/vccspar.c +++ b/src/spicelib/devices/vccs/vccspar.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "vccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccspzld.c b/src/spicelib/devices/vccs/vccspzld.c index 8e73a97ef..e4c248f5f 100644 --- a/src/spicelib/devices/vccs/vccspzld.c +++ b/src/spicelib/devices/vccs/vccspzld.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "vccsdefs.h" -#include +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccssacl.c b/src/spicelib/devices/vccs/vccssacl.c index 265dfc490..865b5379f 100644 --- a/src/spicelib/devices/vccs/vccssacl.c +++ b/src/spicelib/devices/vccs/vccssacl.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "vccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccsset.c b/src/spicelib/devices/vccs/vccsset.c index 58e1d642f..7c179397a 100644 --- a/src/spicelib/devices/vccs/vccsset.c +++ b/src/spicelib/devices/vccs/vccsset.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * for fast matrix loading */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "vccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccssld.c b/src/spicelib/devices/vccs/vccssld.c index 9fde08842..e19c9d43e 100644 --- a/src/spicelib/devices/vccs/vccssld.c +++ b/src/spicelib/devices/vccs/vccssld.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * array previously provided */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "vccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccssprt.c b/src/spicelib/devices/vccs/vccssprt.c index 0ea8ead93..b16112ff7 100644 --- a/src/spicelib/devices/vccs/vccssprt.c +++ b/src/spicelib/devices/vccs/vccssprt.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * all the VCCS in the circuit. */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "vccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vccs/vccssset.c b/src/spicelib/devices/vccs/vccssset.c index c2e6a1fd5..4dd389a03 100644 --- a/src/spicelib/devices/vccs/vccssset.c +++ b/src/spicelib/devices/vccs/vccssset.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * allocate parameter #s to design parameters */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "vccsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" #include "vccsext.h" diff --git a/src/spicelib/devices/vcvs/vcvs.c b/src/spicelib/devices/vcvs/vcvs.c index b1cb8fb1b..90854d3b8 100644 --- a/src/spicelib/devices/vcvs/vcvs.c +++ b/src/spicelib/devices/vcvs/vcvs.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" #include "vcvsdefs.h" -#include +#include "ngspice/suffix.h" IFparm VCVSpTable[] = { /* parameters */ IOPU("gain", VCVS_GAIN, IF_REAL,"Voltage gain"), diff --git a/src/spicelib/devices/vcvs/vcvsask.c b/src/spicelib/devices/vcvs/vcvsask.c index 2d58d15d5..f0c9f1737 100644 --- a/src/spicelib/devices/vcvs/vcvsask.c +++ b/src/spicelib/devices/vcvs/vcvsask.c @@ -8,13 +8,13 @@ Author: 1987 Thomas L. Quarles * of Voltage Controlled Voltage Source */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "vcvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/vcvs/vcvsdefs.h b/src/spicelib/devices/vcvs/vcvsdefs.h index f90c1bbbf..d08628f41 100644 --- a/src/spicelib/devices/vcvs/vcvsdefs.h +++ b/src/spicelib/devices/vcvs/vcvsdefs.h @@ -7,10 +7,10 @@ Author: 1985 Thomas L. Quarles #define VCVS -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" /* * structures to describe Voltage Controlled Voltage Sources diff --git a/src/spicelib/devices/vcvs/vcvsdel.c b/src/spicelib/devices/vcvs/vcvsdel.c index b962dda19..1cb5d28b4 100644 --- a/src/spicelib/devices/vcvs/vcvsdel.c +++ b/src/spicelib/devices/vcvs/vcvsdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "vcvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vcvs/vcvsdest.c b/src/spicelib/devices/vcvs/vcvsdest.c index b04e6997e..a4db01492 100644 --- a/src/spicelib/devices/vcvs/vcvsdest.c +++ b/src/spicelib/devices/vcvs/vcvsdest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "vcvsdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/vcvs/vcvsfbr.c b/src/spicelib/devices/vcvs/vcvsfbr.c index 5d7f388f1..d26275129 100644 --- a/src/spicelib/devices/vcvs/vcvsfbr.c +++ b/src/spicelib/devices/vcvs/vcvsfbr.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vcvsdefs.h" -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vcvs/vcvsinit.c b/src/spicelib/devices/vcvs/vcvsinit.c index 5bc256c57..2a4d46b65 100644 --- a/src/spicelib/devices/vcvs/vcvsinit.c +++ b/src/spicelib/devices/vcvs/vcvsinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "vcvsitf.h" #include "vcvsext.h" diff --git a/src/spicelib/devices/vcvs/vcvsload.c b/src/spicelib/devices/vcvs/vcvsload.c index 5d53e4f37..e4fb09312 100644 --- a/src/spicelib/devices/vcvs/vcvsload.c +++ b/src/spicelib/devices/vcvs/vcvsload.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vcvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/vcvs/vcvsmdel.c b/src/spicelib/devices/vcvs/vcvsmdel.c index 9eabf4d08..f85021a05 100644 --- a/src/spicelib/devices/vcvs/vcvsmdel.c +++ b/src/spicelib/devices/vcvs/vcvsmdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "vcvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vcvs/vcvspar.c b/src/spicelib/devices/vcvs/vcvspar.c index ecf522f46..27121e1f7 100644 --- a/src/spicelib/devices/vcvs/vcvspar.c +++ b/src/spicelib/devices/vcvs/vcvspar.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "vcvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/vcvs/vcvspzld.c b/src/spicelib/devices/vcvs/vcvspzld.c index f24245e71..4d0bf52e2 100644 --- a/src/spicelib/devices/vcvs/vcvspzld.c +++ b/src/spicelib/devices/vcvs/vcvspzld.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "vcvsdefs.h" -#include +#include "ngspice/suffix.h" /*ARGSUSED*/ diff --git a/src/spicelib/devices/vcvs/vcvssacl.c b/src/spicelib/devices/vcvs/vcvssacl.c index 1366317d5..162a65abc 100644 --- a/src/spicelib/devices/vcvs/vcvssacl.c +++ b/src/spicelib/devices/vcvs/vcvssacl.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * array previously provided */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vcvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vcvs/vcvsset.c b/src/spicelib/devices/vcvs/vcvsset.c index 449b66e95..3faef1625 100644 --- a/src/spicelib/devices/vcvs/vcvsset.c +++ b/src/spicelib/devices/vcvs/vcvsset.c @@ -7,12 +7,12 @@ Author: 1985 Thomas L. Quarles * for fast matrix loading */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "vcvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/devices/vcvs/vcvssld.c b/src/spicelib/devices/vcvs/vcvssld.c index 8bc223e00..df58f466e 100644 --- a/src/spicelib/devices/vcvs/vcvssld.c +++ b/src/spicelib/devices/vcvs/vcvssld.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * array previously provided */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vcvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vcvs/vcvssprt.c b/src/spicelib/devices/vcvs/vcvssprt.c index 0e3b40859..35daa17fa 100644 --- a/src/spicelib/devices/vcvs/vcvssprt.c +++ b/src/spicelib/devices/vcvs/vcvssprt.c @@ -9,11 +9,11 @@ Author: 1985 Thomas L. Quarles * all the VCVS in the circuit. */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vcvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/vcvs/vcvssset.c b/src/spicelib/devices/vcvs/vcvssset.c index a49dcc586..45139723a 100644 --- a/src/spicelib/devices/vcvs/vcvssset.c +++ b/src/spicelib/devices/vcvs/vcvssset.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * allocate parameter #s to design parameters */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "vcvsdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vsrc/vsrc.c b/src/spicelib/devices/vsrc/vsrc.c index 11263b61e..88ae8eb3a 100644 --- a/src/spicelib/devices/vsrc/vsrc.c +++ b/src/spicelib/devices/vsrc/vsrc.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1987 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "vsrcdefs.h" -#include +#include "ngspice/suffix.h" IFparm VSRCpTable[] = { /* parameters */ IOPP("dc", VSRC_DC, IF_REAL ,"DC value of source"), diff --git a/src/spicelib/devices/vsrc/vsrcacct.c b/src/spicelib/devices/vsrc/vsrcacct.c index 96899a6b5..13903f6ec 100644 --- a/src/spicelib/devices/vsrc/vsrcacct.c +++ b/src/spicelib/devices/vsrc/vsrcacct.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vsrcdefs.h" -#include -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/missing_math.h" +#include "ngspice/1-f-code.h" extern int fftInit(long M); extern void fftFree(void); diff --git a/src/spicelib/devices/vsrc/vsrcacld.c b/src/spicelib/devices/vsrc/vsrcacld.c index 2469984a3..5b6a81bb1 100644 --- a/src/spicelib/devices/vsrc/vsrcacld.c +++ b/src/spicelib/devices/vsrc/vsrcacld.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vsrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vsrc/vsrcask.c b/src/spicelib/devices/vsrc/vsrcask.c index a552976b1..5e9847551 100644 --- a/src/spicelib/devices/vsrc/vsrcask.c +++ b/src/spicelib/devices/vsrc/vsrcask.c @@ -10,13 +10,13 @@ Author: 1987 Thomas L. Quarles * of independent Voltage SouRCe */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" #include "vsrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ diff --git a/src/spicelib/devices/vsrc/vsrcdefs.h b/src/spicelib/devices/vsrc/vsrcdefs.h index 75791bb53..90b81edca 100644 --- a/src/spicelib/devices/vsrc/vsrcdefs.h +++ b/src/spicelib/devices/vsrc/vsrcdefs.h @@ -6,10 +6,10 @@ Author: 1985 Thomas L. Quarles #ifndef VSRC #define VSRC -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/complex.h" struct trnoise_state; diff --git a/src/spicelib/devices/vsrc/vsrcdel.c b/src/spicelib/devices/vsrc/vsrcdel.c index 645b76ba5..5c5691f47 100644 --- a/src/spicelib/devices/vsrc/vsrcdel.c +++ b/src/spicelib/devices/vsrc/vsrcdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "vsrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vsrc/vsrcdest.c b/src/spicelib/devices/vsrc/vsrcdest.c index 87c0e4c13..0d2054b47 100644 --- a/src/spicelib/devices/vsrc/vsrcdest.c +++ b/src/spicelib/devices/vsrc/vsrcdest.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "vsrcdefs.h" -#include +#include "ngspice/suffix.h" void diff --git a/src/spicelib/devices/vsrc/vsrcfbr.c b/src/spicelib/devices/vsrc/vsrcfbr.c index c71413584..05f9d356a 100644 --- a/src/spicelib/devices/vsrc/vsrcfbr.c +++ b/src/spicelib/devices/vsrc/vsrcfbr.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vsrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vsrc/vsrcinit.c b/src/spicelib/devices/vsrc/vsrcinit.c index 204a71e49..950fc6ea1 100644 --- a/src/spicelib/devices/vsrc/vsrcinit.c +++ b/src/spicelib/devices/vsrc/vsrcinit.c @@ -1,6 +1,6 @@ #include "config.h" -#include +#include "ngspice/devdefs.h" #include "vsrcitf.h" #include "vsrcext.h" diff --git a/src/spicelib/devices/vsrc/vsrcload.c b/src/spicelib/devices/vsrc/vsrcload.c index 646d31218..ce25281c1 100644 --- a/src/spicelib/devices/vsrc/vsrcload.c +++ b/src/spicelib/devices/vsrc/vsrcload.c @@ -5,17 +5,17 @@ Modified: 2000 AlansFixes $Id$ **********/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" #include "vsrcdefs.h" -#include -#include -#include -#include +#include "ngspice/trandefs.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/1-f-code.h" #ifdef XSPICE_EXP /* gtri - begin - wbk - modify for supply ramping option */ -#include +#include "ngspice/cmproto.h" /* gtri - end - wbk - modify for supply ramping option */ #endif diff --git a/src/spicelib/devices/vsrc/vsrcmdel.c b/src/spicelib/devices/vsrc/vsrcmdel.c index 7cdafae09..172d63157 100644 --- a/src/spicelib/devices/vsrc/vsrcmdel.c +++ b/src/spicelib/devices/vsrc/vsrcmdel.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include "vsrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" int diff --git a/src/spicelib/devices/vsrc/vsrcpar.c b/src/spicelib/devices/vsrc/vsrcpar.c index 8e79c111c..e0db81974 100644 --- a/src/spicelib/devices/vsrc/vsrcpar.c +++ b/src/spicelib/devices/vsrc/vsrcpar.c @@ -6,12 +6,12 @@ Modified: 2000 AlansFixes /* */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" #include "vsrcdefs.h" -#include -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" +#include "ngspice/1-f-code.h" static void copy_coeffs(VSRCinstance *here, IFvalue *value) diff --git a/src/spicelib/devices/vsrc/vsrcpzld.c b/src/spicelib/devices/vsrc/vsrcpzld.c index dadf931a6..d95266de3 100644 --- a/src/spicelib/devices/vsrc/vsrcpzld.c +++ b/src/spicelib/devices/vsrc/vsrcpzld.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" +#include "ngspice/complex.h" +#include "ngspice/sperror.h" #include "vsrcdefs.h" -#include +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/vsrc/vsrcpzs.c b/src/spicelib/devices/vsrc/vsrcpzs.c index c5495ea66..616802832 100644 --- a/src/spicelib/devices/vsrc/vsrcpzs.c +++ b/src/spicelib/devices/vsrc/vsrcpzs.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "vsrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* load the voltage source structure with those pointers needed later * for fast matrix loading */ diff --git a/src/spicelib/devices/vsrc/vsrcset.c b/src/spicelib/devices/vsrc/vsrcset.c index 4ad9d5fdf..0428bbc86 100644 --- a/src/spicelib/devices/vsrc/vsrcset.c +++ b/src/spicelib/devices/vsrc/vsrcset.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "vsrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/spicelib/devices/vsrc/vsrctemp.c b/src/spicelib/devices/vsrc/vsrctemp.c index 8c03fbd01..f6022d17a 100644 --- a/src/spicelib/devices/vsrc/vsrctemp.c +++ b/src/spicelib/devices/vsrc/vsrctemp.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" #include "vsrcdefs.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /*ARGSUSED*/ int diff --git a/src/spicelib/parser/ifeval.c b/src/spicelib/parser/ifeval.c index aaf765fbc..4db4781d7 100644 --- a/src/spicelib/parser/ifeval.c +++ b/src/spicelib/parser/ifeval.c @@ -4,15 +4,15 @@ Author: 1985 Thomas L. Quarles $Id$ **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/inpptree.h" #include "inp.h" -#include +#include "ngspice/cktdefs.h" /* Uncomment to allow tracing */ /*#define TRACE*/ diff --git a/src/spicelib/parser/ifnewuid.c b/src/spicelib/parser/ifnewuid.c index 523992433..02818add2 100644 --- a/src/spicelib/parser/ifnewuid.c +++ b/src/spicelib/parser/ifnewuid.c @@ -3,7 +3,7 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #ifdef HAVE_ASPRINTF #ifdef HAVE_LIBIBERTY_H /* asprintf */ @@ -15,15 +15,15 @@ extern int vasprintf(char **out, const char *fmt, va_list ap); #endif #endif -#include -#include -#include +#include "ngspice/wordlist.h" +#include "ngspice/bool.h" +#include "ngspice/inpdefs.h" #include -#include +#include "ngspice/cpdefs.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/fteext.h" #include "inp.h" diff --git a/src/spicelib/parser/inp2b.c b/src/spicelib/parser/inp2b.c index d21d10832..21b72e28b 100644 --- a/src/spicelib/parser/inp2b.c +++ b/src/spicelib/parser/inp2b.c @@ -3,14 +3,14 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" -#include +#include "ngspice/cktdefs.h" void INP2B(CKTcircuit *ckt, INPtables * tab, card * current) { diff --git a/src/spicelib/parser/inp2c.c b/src/spicelib/parser/inp2c.c index 51eec67d1..a749bfb18 100644 --- a/src/spicelib/parser/inp2c.c +++ b/src/spicelib/parser/inp2c.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2C(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2d.c b/src/spicelib/parser/inp2d.c index b2158ab83..a92339f9b 100644 --- a/src/spicelib/parser/inp2d.c +++ b/src/spicelib/parser/inp2d.c @@ -4,12 +4,12 @@ Author: 1988 Thomas L. Quarles Modified: 2001 Paolo Nenzi (Cider Integration) **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2D(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2dot.c b/src/spicelib/parser/inp2dot.c index 70fdaeddd..5aa420a82 100644 --- a/src/spicelib/parser/inp2dot.c +++ b/src/spicelib/parser/inp2dot.c @@ -4,15 +4,15 @@ Author: 1988 Thomas L. Quarles Modified: 2000 AlansFixes **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" -#include -#include +#include "ngspice/cpdefs.h" +#include "ngspice/tskdefs.h" static int dot_noise(char *line, CKTcircuit *ckt, INPtables *tab, card *current, diff --git a/src/spicelib/parser/inp2e.c b/src/spicelib/parser/inp2e.c index 944d6398d..aef59507f 100644 --- a/src/spicelib/parser/inp2e.c +++ b/src/spicelib/parser/inp2e.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2E(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2f.c b/src/spicelib/parser/inp2f.c index 71072bb13..fb1717333 100644 --- a/src/spicelib/parser/inp2f.c +++ b/src/spicelib/parser/inp2f.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2F(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2g.c b/src/spicelib/parser/inp2g.c index c2af453a5..6d7356d0c 100644 --- a/src/spicelib/parser/inp2g.c +++ b/src/spicelib/parser/inp2g.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2G(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2h.c b/src/spicelib/parser/inp2h.c index 55f8a00bb..4666c62c5 100644 --- a/src/spicelib/parser/inp2h.c +++ b/src/spicelib/parser/inp2h.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2H(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2i.c b/src/spicelib/parser/inp2i.c index 987c26943..f168f45fb 100644 --- a/src/spicelib/parser/inp2i.c +++ b/src/spicelib/parser/inp2i.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2I(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2j.c b/src/spicelib/parser/inp2j.c index d10165618..b2cffcfca 100644 --- a/src/spicelib/parser/inp2j.c +++ b/src/spicelib/parser/inp2j.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2J(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2k.c b/src/spicelib/parser/inp2k.c index be6f4f06f..01c9111e0 100644 --- a/src/spicelib/parser/inp2k.c +++ b/src/spicelib/parser/inp2k.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2K(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2l.c b/src/spicelib/parser/inp2l.c index ca4da13cb..8685e6fae 100644 --- a/src/spicelib/parser/inp2l.c +++ b/src/spicelib/parser/inp2l.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2L(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c index 63df0ae34..467433ba1 100644 --- a/src/spicelib/parser/inp2m.c +++ b/src/spicelib/parser/inp2m.c @@ -4,12 +4,12 @@ Author: 1988 Thomas L. Quarles Modified: 2001 Paolo Nenzi (Cider Integration) **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void diff --git a/src/spicelib/parser/inp2n.c b/src/spicelib/parser/inp2n.c index db6a4d7a7..d970cad72 100644 --- a/src/spicelib/parser/inp2n.c +++ b/src/spicelib/parser/inp2n.c @@ -8,13 +8,13 @@ University of Science and Technology of China #ifdef NDEV -#include +#include "ngspice/ngspice.h" #include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" #include "../devices/ndev/ndevdefs.h" -#include -#include +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2N(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2o.c b/src/spicelib/parser/inp2o.c index 2b2be00d7..736e68684 100644 --- a/src/spicelib/parser/inp2o.c +++ b/src/spicelib/parser/inp2o.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1990 Jaijeet S. Roychowdhury **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" diff --git a/src/spicelib/parser/inp2p.c b/src/spicelib/parser/inp2p.c index 86714b2da..fc2a4dd8a 100644 --- a/src/spicelib/parser/inp2p.c +++ b/src/spicelib/parser/inp2p.c @@ -4,11 +4,11 @@ reserved. Author: 1992 Charles Hough **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c index e764e26c0..ffea3e61f 100644 --- a/src/spicelib/parser/inp2q.c +++ b/src/spicelib/parser/inp2q.c @@ -4,11 +4,11 @@ Author: 1988 Thomas L. Quarles Modified: 2001 Paolo Nenzi (Cider Integration) **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" #ifdef ADMS diff --git a/src/spicelib/parser/inp2r.c b/src/spicelib/parser/inp2r.c index 139d4f4cf..702bb8a0d 100644 --- a/src/spicelib/parser/inp2r.c +++ b/src/spicelib/parser/inp2r.c @@ -7,11 +7,11 @@ Remarks: This code is based on a version written by Serban Popescu which to conform to INP standard. (PN) **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" /* undefine to add tracing to this file */ diff --git a/src/spicelib/parser/inp2s.c b/src/spicelib/parser/inp2s.c index 822729318..d65b122fd 100644 --- a/src/spicelib/parser/inp2s.c +++ b/src/spicelib/parser/inp2s.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2S(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2t.c b/src/spicelib/parser/inp2t.c index 3ce279b86..9bedf6038 100644 --- a/src/spicelib/parser/inp2t.c +++ b/src/spicelib/parser/inp2t.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2T(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2u.c b/src/spicelib/parser/inp2u.c index 6c455549c..e292791ec 100644 --- a/src/spicelib/parser/inp2u.c +++ b/src/spicelib/parser/inp2u.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2U(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2v.c b/src/spicelib/parser/inp2v.c index c22f04928..e1dcd92fd 100644 --- a/src/spicelib/parser/inp2v.c +++ b/src/spicelib/parser/inp2v.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2V(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2w.c b/src/spicelib/parser/inp2w.c index 0aa774255..a6d7d9c0d 100644 --- a/src/spicelib/parser/inp2w.c +++ b/src/spicelib/parser/inp2w.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1988 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2W(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inp2y.c b/src/spicelib/parser/inp2y.c index 34c264e5f..16313f83b 100644 --- a/src/spicelib/parser/inp2y.c +++ b/src/spicelib/parser/inp2y.c @@ -4,11 +4,11 @@ reserved. Author: 1992 Charles Hough **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void diff --git a/src/spicelib/parser/inp2z.c b/src/spicelib/parser/inp2z.c index 459550019..94bad54eb 100644 --- a/src/spicelib/parser/inp2z.c +++ b/src/spicelib/parser/inp2z.c @@ -10,12 +10,12 @@ Author: 1988 Thomas L. Quarles */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" #include "inp.h" void INP2Z(CKTcircuit *ckt, INPtables * tab, card * current) diff --git a/src/spicelib/parser/inpaname.c b/src/spicelib/parser/inpaname.c index e93442f24..8c4a72981 100644 --- a/src/spicelib/parser/inpaname.c +++ b/src/spicelib/parser/inpaname.c @@ -11,12 +11,12 @@ Author: 1985 Thomas L. Quarles * **fast is a device, and will be set if possible. */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/cpdefs.h" +#include "ngspice/fteext.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" #include "inp.h" int diff --git a/src/spicelib/parser/inpapnam.c b/src/spicelib/parser/inpapnam.c index c9d54ddf5..060656749 100644 --- a/src/spicelib/parser/inpapnam.c +++ b/src/spicelib/parser/inpapnam.c @@ -3,12 +3,12 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cpdefs.h" +#include "ngspice/fteext.h" #include "inp.h" int diff --git a/src/spicelib/parser/inpcfix.c b/src/spicelib/parser/inpcfix.c index 12112b340..205c7af88 100644 --- a/src/spicelib/parser/inpcfix.c +++ b/src/spicelib/parser/inpcfix.c @@ -5,10 +5,10 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include -#include -#include +#include "ngspice/fteext.h" +#include "ngspice/inpdefs.h" #include "inp.h" diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c index 0da150320..5789f3143 100644 --- a/src/spicelib/parser/inpdomod.c +++ b/src/spicelib/parser/inpdomod.c @@ -3,9 +3,9 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/inpdefs.h" #include "inp.h" /*-------------------------------------------------------------- diff --git a/src/spicelib/parser/inpdoopt.c b/src/spicelib/parser/inpdoopt.c index 9e8c39a74..dd8ad825c 100644 --- a/src/spicelib/parser/inpdoopt.c +++ b/src/spicelib/parser/inpdoopt.c @@ -9,12 +9,12 @@ Modified: 2000 AlansFixes * the given circuit */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/inpdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/cpdefs.h" +#include "ngspice/fteext.h" void diff --git a/src/spicelib/parser/inpdpar.c b/src/spicelib/parser/inpdpar.c index 29069add6..13b6e5817 100644 --- a/src/spicelib/parser/inpdpar.c +++ b/src/spicelib/parser/inpdpar.c @@ -11,13 +11,13 @@ Author: 1985 Thomas L. Quarles * an optional leading numeric parameter is handled. */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cpdefs.h" +#include "ngspice/fteext.h" #include "inp.h" char *INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast, diff --git a/src/spicelib/parser/inperrc.c b/src/spicelib/parser/inperrc.c index b5fcc4849..a069d6e8d 100644 --- a/src/spicelib/parser/inperrc.c +++ b/src/spicelib/parser/inperrc.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/inpdefs.h" #include "inp.h" diff --git a/src/spicelib/parser/inperror.c b/src/spicelib/parser/inperror.c index 398e573e3..82c8cf0e2 100644 --- a/src/spicelib/parser/inperror.c +++ b/src/spicelib/parser/inperror.c @@ -7,7 +7,7 @@ Author: 1985 Thomas L. Quarles * provide the error message appropriate for the given error code */ -#include +#include "ngspice/ngspice.h" #ifdef HAVE_ASPRINTF #ifdef HAVE_LIBIBERTY_H /* asprintf */ @@ -19,10 +19,10 @@ extern int vasprintf(char **out, const char *fmt, va_list ap); #endif #endif -#include -#include -#include -#include +#include "ngspice/fteext.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/sperror.h" #include "inp.h" char *INPerror(int type) diff --git a/src/spicelib/parser/inpeval.c b/src/spicelib/parser/inpeval.c index 92d4a930f..bdcf2b505 100644 --- a/src/spicelib/parser/inpeval.c +++ b/src/spicelib/parser/inpeval.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include #include -#include +#include "ngspice/inpdefs.h" #include "inp.h" double INPevaluate(char **line, int *error, int gobble) diff --git a/src/spicelib/parser/inpfindl.c b/src/spicelib/parser/inpfindl.c index d075d1f3b..74779c795 100644 --- a/src/spicelib/parser/inpfindl.c +++ b/src/spicelib/parser/inpfindl.c @@ -10,8 +10,8 @@ Modified: 1999 Paolo Nenzi - Now we can use a two digits level code - * */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/inpdefs.h" #include "inp.h" char *INPfindLev(char *line, int *level) diff --git a/src/spicelib/parser/inpfindv.c b/src/spicelib/parser/inpfindv.c index 2022dad0f..49596fe53 100644 --- a/src/spicelib/parser/inpfindv.c +++ b/src/spicelib/parser/inpfindv.c @@ -4,10 +4,10 @@ * */ -#include +#include "ngspice/ngspice.h" #include #include -#include +#include "ngspice/inpdefs.h" #include "inp.h" char *INPfindVer(char *line, char *version) diff --git a/src/spicelib/parser/inpgmod.c b/src/spicelib/parser/inpgmod.c index 19ca9bff2..fe5b8dfab 100644 --- a/src/spicelib/parser/inpgmod.c +++ b/src/spicelib/parser/inpgmod.c @@ -5,20 +5,20 @@ Modified: 2001 Paolo Nenzi (Cider Integration) $Id$ **********/ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/inpdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/cpstd.h" +#include "ngspice/fteext.h" #include "inp.h" #include #ifdef CIDER /* begin Cider Integration */ -#include -#include -#include -#include +#include "ngspice/numcards.h" +#include "ngspice/carddefs.h" +#include "ngspice/numgen.h" +#include "ngspice/suffix.h" extern IFcardInfo *INPcardTab[]; extern int INPnumCards; diff --git a/src/spicelib/parser/inpgstr.c b/src/spicelib/parser/inpgstr.c index 7becf9a4d..39a19a651 100644 --- a/src/spicelib/parser/inpgstr.c +++ b/src/spicelib/parser/inpgstr.c @@ -7,10 +7,10 @@ Author: 1985 Thomas L. Quarles * Get string input token from 'line', and return a pointer to it in 'token' */ -#include +#include "ngspice/ngspice.h" #include -#include -#include +#include "ngspice/iferrmsg.h" +#include "ngspice/inpdefs.h" #include "inp.h" int INPgetStr(char **line, char **token, int gobble) diff --git a/src/spicelib/parser/inpgtitl.c b/src/spicelib/parser/inpgtitl.c index 9c4cd2402..4e200ea31 100644 --- a/src/spicelib/parser/inpgtitl.c +++ b/src/spicelib/parser/inpgtitl.c @@ -8,12 +8,12 @@ Author: 1985 Thomas L. Quarles * it through to SPICE-3. */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/inpdefs.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/cpstd.h" +#include "ngspice/fteext.h" #include "inp.h" int INPgetTitle(CKTcircuit **ckt, card ** data) diff --git a/src/spicelib/parser/inpgtok.c b/src/spicelib/parser/inpgtok.c index 0fc9a3865..2b328aedd 100644 --- a/src/spicelib/parser/inpgtok.c +++ b/src/spicelib/parser/inpgtok.c @@ -13,9 +13,9 @@ Modified: 2000 AlansFixes (called from INPevaluate) */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/inpdefs.h" #include "inp.h" /*------------------------------------------------------------------- diff --git a/src/spicelib/parser/inpgval.c b/src/spicelib/parser/inpgval.c index 8a7e20ef0..3bbd2e80d 100644 --- a/src/spicelib/parser/inpgval.c +++ b/src/spicelib/parser/inpgval.c @@ -3,11 +3,11 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpptree.h" #include "inp.h" IFvalue *INPgetValue(CKTcircuit *ckt, char **line, int type, INPtables * tab) diff --git a/src/spicelib/parser/inpkmods.c b/src/spicelib/parser/inpkmods.c index f4134c533..02a3c4841 100644 --- a/src/spicelib/parser/inpkmods.c +++ b/src/spicelib/parser/inpkmods.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/inpdefs.h" #include "inp.h" diff --git a/src/spicelib/parser/inplist.c b/src/spicelib/parser/inplist.c index 9d7e89b2b..ff528b4c9 100644 --- a/src/spicelib/parser/inplist.c +++ b/src/spicelib/parser/inplist.c @@ -11,9 +11,9 @@ Author: 1985 Thomas L. Quarles * lines as specified by the type parameter. */ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/inpdefs.h" #include "inp.h" extern void INPlist(FILE *file, card *deck, int type); /* nowhere used function */ diff --git a/src/spicelib/parser/inplkmod.c b/src/spicelib/parser/inplkmod.c index 6dfa75971..9cdb04ad5 100644 --- a/src/spicelib/parser/inplkmod.c +++ b/src/spicelib/parser/inplkmod.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/inpdefs.h" #include "inp.h" diff --git a/src/spicelib/parser/inpmkmod.c b/src/spicelib/parser/inpmkmod.c index 8b7dfec4b..c1eead245 100644 --- a/src/spicelib/parser/inpmkmod.c +++ b/src/spicelib/parser/inpmkmod.c @@ -3,10 +3,10 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include +#include "ngspice/ngspice.h" #include -#include -#include +#include "ngspice/inpdefs.h" +#include "ngspice/iferrmsg.h" #include "inp.h" /* global input model table. */ diff --git a/src/spicelib/parser/inpmktmp.c b/src/spicelib/parser/inpmktmp.c index e5bb31ec2..21d2945b4 100644 --- a/src/spicelib/parser/inpmktmp.c +++ b/src/spicelib/parser/inpmktmp.c @@ -5,9 +5,9 @@ Author: 1985 Thomas L. Quarles /* */ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/inpdefs.h" #include "inp.h" diff --git a/src/spicelib/parser/inppas1.c b/src/spicelib/parser/inppas1.c index 00165d5d4..3e8fc75a8 100644 --- a/src/spicelib/parser/inppas1.c +++ b/src/spicelib/parser/inppas1.c @@ -6,7 +6,7 @@ Author: 1985 Thomas L. Quarles #include #include -#include +#include "ngspice/ngspice.h" #include "inppas1.h" diff --git a/src/spicelib/parser/inppas1.h b/src/spicelib/parser/inppas1.h index c1ad0ba41..a5941038f 100644 --- a/src/spicelib/parser/inppas1.h +++ b/src/spicelib/parser/inppas1.h @@ -1,7 +1,7 @@ #ifndef _INPPAS1_H #define _INPPAS1_H -#include +#include "ngspice/inpdefs.h" #endif diff --git a/src/spicelib/parser/inppas2.c b/src/spicelib/parser/inppas2.c index 0a406e86b..c16b879fa 100644 --- a/src/spicelib/parser/inppas2.c +++ b/src/spicelib/parser/inppas2.c @@ -3,16 +3,16 @@ Copyright 1990 Regents of the University of California. All rights reserved. Author: 1985 Thomas L. Quarles **********/ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/inpmacs.h" #include "inppas2.h" #include "inp.h" #ifdef XSPICE /* gtri - add - wbk - 11/9/90 - include function prototypes */ -#include +#include "ngspice/mifproto.h" /* gtri - end - wbk - 11/9/90 */ #endif diff --git a/src/spicelib/parser/inppas2.h b/src/spicelib/parser/inppas2.h index dfb733077..7f0478fd7 100644 --- a/src/spicelib/parser/inppas2.h +++ b/src/spicelib/parser/inppas2.h @@ -1,7 +1,7 @@ #ifndef _INPPAS2_H #define _INPPAS2_H -#include +#include "ngspice/inpdefs.h" diff --git a/src/spicelib/parser/inppas3.c b/src/spicelib/parser/inppas3.c index dbc4ab586..c84a0f971 100644 --- a/src/spicelib/parser/inppas3.c +++ b/src/spicelib/parser/inppas3.c @@ -5,10 +5,10 @@ Modified: AlansFixes **********/ #include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/ifsim.h" +#include "ngspice/inpmacs.h" #include "inppas3.h" diff --git a/src/spicelib/parser/inppas3.h b/src/spicelib/parser/inppas3.h index ec00b2afb..9007855ac 100644 --- a/src/spicelib/parser/inppas3.h +++ b/src/spicelib/parser/inppas3.h @@ -2,7 +2,7 @@ #ifndef _INPPAS3_H #define _INPPAS3_H -#include +#include "ngspice/inpdefs.h" diff --git a/src/spicelib/parser/inppname.c b/src/spicelib/parser/inppname.c index b53ef1451..df9d9d479 100644 --- a/src/spicelib/parser/inppname.c +++ b/src/spicelib/parser/inppname.c @@ -9,12 +9,12 @@ Author: 1985 Thomas L. Quarles * Take a parameter by Name and set it on the specified device */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/cpdefs.h" +#include "ngspice/fteext.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" #include "inp.h" int INPpName(char *parm, IFvalue * val, CKTcircuit *ckt, int dev, GENinstance *fast) diff --git a/src/spicelib/parser/inpptree.c b/src/spicelib/parser/inpptree.c index 19f0e07a7..0f8f33793 100644 --- a/src/spicelib/parser/inpptree.c +++ b/src/spicelib/parser/inpptree.c @@ -4,11 +4,11 @@ Author: 1987 Wayne A. Christopher, U. C. Berkeley CAD Group **********/ //#define TRACE -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/inpdefs.h" +#include "ngspice/inpptree.h" #include "inp.h" static INPparseNode *mkcon(double value); diff --git a/src/spicelib/parser/inpsymt.c b/src/spicelib/parser/inpsymt.c index bc18cfac7..c21c3346e 100644 --- a/src/spicelib/parser/inpsymt.c +++ b/src/spicelib/parser/inpsymt.c @@ -9,13 +9,13 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group */ /* MW. Special INPinsertNofree for routines from spiceif.c and outif.c */ -#include +#include "ngspice/ngspice.h" #include /* Take this out soon. */ -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/inpdefs.h" +#include "ngspice/cpstd.h" +#include "ngspice/fteext.h" #include "inp.h" diff --git a/src/spicelib/parser/inptyplk.c b/src/spicelib/parser/inptyplk.c index 74220cdba..b30dc0b92 100644 --- a/src/spicelib/parser/inptyplk.c +++ b/src/spicelib/parser/inptyplk.c @@ -7,11 +7,11 @@ Author: 1985 Thomas L. Quarles * appropriate strchr for the device found, or -1 for not found */ -#include -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/inpdefs.h" +#include "ngspice/cpdefs.h" +#include "ngspice/fteext.h" +#include "ngspice/ifsim.h" #include "inp.h" int INPtypelook(char *type) diff --git a/src/spicelib/parser/ptfuncs.c b/src/spicelib/parser/ptfuncs.c index e0f9555e6..e92d24931 100644 --- a/src/spicelib/parser/ptfuncs.c +++ b/src/spicelib/parser/ptfuncs.c @@ -9,11 +9,11 @@ Author: 1987 Wayne A. Christopher, U. C. Berkeley CAD Group */ #include -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include +#include "ngspice/fteext.h" +#include "ngspice/ifsim.h" +#include "ngspice/inpptree.h" #include "inp.h" /* XXX These should be in math.h */ diff --git a/src/spicelib/parser/sperror.c b/src/spicelib/parser/sperror.c index 6d4250bb9..1db8924f5 100644 --- a/src/spicelib/parser/sperror.c +++ b/src/spicelib/parser/sperror.c @@ -7,12 +7,12 @@ Author: 1985 Thomas L. Quarles * provide the error message appropriate for the given error code */ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include +#include "ngspice/fteext.h" +#include "ngspice/sperror.h" +#include "ngspice/cktdefs.h" +#include "ngspice/ifsim.h" #include "inp.h" const char *SPerror(int type) diff --git a/src/tclspice.c b/src/tclspice.c index f26e9ae2d..34486d609 100755 --- a/src/tclspice.c +++ b/src/tclspice.c @@ -27,7 +27,7 @@ /* Header files for C functions */ /**********************************************************************/ -#include +#include "ngspice/ngspice.h" #include "misc/misc_time.h" #include @@ -81,9 +81,9 @@ typedef pthread_t threadId_t; #include /* usleep */ #endif /* __MINGW32__ */ -#include -#include -#include +#include "ngspice/iferrmsg.h" +#include "ngspice/ftedefs.h" +#include "ngspice/devdefs.h" #include #include #include @@ -94,7 +94,7 @@ typedef pthread_t threadId_t; #define snprintf _snprintf #endif #include -#include +#include "ngspice/memory.h" #include #ifndef HAVE_GETRUSAGE @@ -111,14 +111,14 @@ typedef void (*sighandler)(int); #include "frontend/signal_handler.h" /*Included for the module to access data*/ -#include -#include +#include "ngspice/dvec.h" +#include "ngspice/plot.h" #ifdef __CYGWIN__ #undef WIN32 #endif #include -#include +#include "ngspice/sim.h" /* defines for Tcl support * Tcl 8.3 and Tcl 8.4 support, @@ -1359,7 +1359,7 @@ static int delta TCL_CMDPROCARGS(clientData,interp,argc,argv) { return TCL_OK; } -#include +#include "ngspice/trandefs.h" /* Direct control over the maximum stepsize * Spice will still adjust it to keep accuracy wuithin reltol and abstol */ @@ -1391,7 +1391,7 @@ static int maxstep TCL_CMDPROCARGS(clientData,interp,argc,argv) { /****************************************/ /* Use Tcl_GetStringResult to get canvas size etc. from Tcl */ -#include +#include "ngspice/ftedev.h" int sp_Tk_Init(void) { /* This is hard coded in C at the mo, use X11 values */ dispdev->numlinestyles = 8; @@ -1402,7 +1402,7 @@ int sp_Tk_Init(void) { return 0; } -#include +#include "ngspice/graph.h" int sp_Tk_NewViewport(GRAPH *graph) { const char *result; int width, height, fontwidth, fontheight; diff --git a/src/unsupported/cktsenac.c b/src/unsupported/cktsenac.c index 523a23b4e..07b18e71a 100644 --- a/src/unsupported/cktsenac.c +++ b/src/unsupported/cktsenac.c @@ -7,12 +7,12 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include -#include -#include -#include -#include +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/trandefs.h" +#include "ngspice/suffix.h" /* CKTsenAC(ckt) diff --git a/src/unsupported/cktsenup.c b/src/unsupported/cktsenup.c index 0d11954bf..830370f4c 100644 --- a/src/unsupported/cktsenup.c +++ b/src/unsupported/cktsenup.c @@ -13,12 +13,12 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include -#include -#include -#include -#include +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/trandefs.h" +#include "ngspice/suffix.h" int diff --git a/src/unsupported/cktsncom.c b/src/unsupported/cktsncom.c index 57a391a85..0e68d79f5 100644 --- a/src/unsupported/cktsncom.c +++ b/src/unsupported/cktsncom.c @@ -12,12 +12,12 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include -#include -#include -#include -#include +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/trandefs.h" +#include "ngspice/suffix.h" int diff --git a/src/unsupported/cktsndct.c b/src/unsupported/cktsndct.c index 1643d47ad..195c0e7be 100644 --- a/src/unsupported/cktsndct.c +++ b/src/unsupported/cktsndct.c @@ -12,12 +12,12 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include -#include -#include -#include -#include +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/trandefs.h" +#include "ngspice/suffix.h" int diff --git a/src/unsupported/cktsnld.c b/src/unsupported/cktsnld.c index 243dc11bb..556e4b8a4 100644 --- a/src/unsupported/cktsnld.c +++ b/src/unsupported/cktsnld.c @@ -14,12 +14,12 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include -#include -#include -#include -#include +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/trandefs.h" +#include "ngspice/suffix.h" int diff --git a/src/unsupported/cktsnprt.c b/src/unsupported/cktsnprt.c index 469c4f270..fb6b1b3c6 100644 --- a/src/unsupported/cktsnprt.c +++ b/src/unsupported/cktsnprt.c @@ -7,12 +7,12 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include -#include -#include -#include -#include +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/trandefs.h" +#include "ngspice/suffix.h" /* CKTsenPrint(ckt) diff --git a/src/unsupported/cktsnset.c b/src/unsupported/cktsnset.c index e55941f70..2cb344b60 100644 --- a/src/unsupported/cktsnset.c +++ b/src/unsupported/cktsnset.c @@ -15,12 +15,12 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include -#include -#include -#include -#include +#include "ngspice/smpdefs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" +#include "ngspice/trandefs.h" +#include "ngspice/suffix.h" int diff --git a/src/unsupported/sen2dest.c b/src/unsupported/sen2dest.c index 606dc1a99..583871016 100644 --- a/src/unsupported/sen2dest.c +++ b/src/unsupported/sen2dest.c @@ -11,12 +11,12 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" #include "util.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" void SENdestroy(info) diff --git a/src/unsupported/sen2setp.c b/src/unsupported/sen2setp.c index f512498aa..2744d1a19 100644 --- a/src/unsupported/sen2setp.c +++ b/src/unsupported/sen2setp.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/sen2defs.h" +#include "ngspice/cktdefs.h" #include "util.h" -#include +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/unsupported/snaskq.c b/src/unsupported/snaskq.c index 9e20f145b..ddaf0d75c 100644 --- a/src/unsupported/snaskq.c +++ b/src/unsupported/snaskq.c @@ -5,11 +5,11 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/iferrmsg.h" +#include "ngspice/sen2defs.h" +#include "ngspice/cktdefs.h" +#include "ngspice/suffix.h" /* ARGSUSED */ int diff --git a/src/unsupported/snstart.c b/src/unsupported/snstart.c index 2f5885616..54e3993da 100644 --- a/src/unsupported/snstart.c +++ b/src/unsupported/snstart.c @@ -5,12 +5,12 @@ Author: 1985 Thomas L. Quarles #include "spice.h" #include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/cktdefs.h" #include "util.h" -#include -#include -#include +#include "ngspice/const.h" +#include "ngspice/sperror.h" +#include "ngspice/suffix.h" /* This is a routine to initialize the sensitivity * data structure diff --git a/src/unsupported/spiced.c b/src/unsupported/spiced.c index 5f1431810..e8e99c1b3 100644 --- a/src/unsupported/spiced.c +++ b/src/unsupported/spiced.c @@ -44,7 +44,7 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group /* Better have #ifdef HAS_WAIT XXX */ #include -#include +#include "ngspice/suffix.h" #define MAXJOBS 2 diff --git a/src/winmain.c b/src/winmain.c index d304fc004..4d0dc58ca 100644 --- a/src/winmain.c +++ b/src/winmain.c @@ -25,7 +25,7 @@ #include #include #include -#include /* bool defined as unsigned char */ +#include "ngspice/bool.h" /* bool defined as unsigned char */ #include "misc/misc_time.h" /* timediff */ /* Constants */ diff --git a/src/xspice/cm/cm.c b/src/xspice/cm/cm.c index 6d95fb155..3e05c7b73 100755 --- a/src/xspice/cm/cm.c +++ b/src/xspice/cm/cm.c @@ -46,10 +46,10 @@ NON-STANDARD FEATURES None. =========================================================================== */ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cm.h" +#include "ngspice/mif.h" +#include "ngspice/cktdefs.h" //#include "util.h" diff --git a/src/xspice/cm/cmevt.c b/src/xspice/cm/cmevt.c index ea47b0b8c..db7f4ca08 100755 --- a/src/xspice/cm/cmevt.c +++ b/src/xspice/cm/cmevt.c @@ -39,14 +39,14 @@ NON-STANDARD FEATURES =========================================================================== */ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" -#include -#include -#include +#include "ngspice/cm.h" +#include "ngspice/mif.h" +#include "ngspice/evt.h" -#include +#include "ngspice/evtproto.h" /* diff --git a/src/xspice/cm/cmexport.c b/src/xspice/cm/cmexport.c index ef5831b29..aeadd292c 100755 --- a/src/xspice/cm/cmexport.c +++ b/src/xspice/cm/cmexport.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/mif.h" +#include "ngspice/cm.h" +#include "ngspice/dllitf.h" /*how annoying!, needed for structure below*/ static void *tcalloc(size_t a, size_t b) { diff --git a/src/xspice/cm/cmmeters.c b/src/xspice/cm/cmmeters.c index 104c7f7b6..8f398b341 100755 --- a/src/xspice/cm/cmmeters.c +++ b/src/xspice/cm/cmmeters.c @@ -39,17 +39,17 @@ NON-STANDARD FEATURES None. =========================================================================== */ -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cm.h" +#include "ngspice/mif.h" -#include +#include "ngspice/cktdefs.h" -#include +#include "ngspice/mifdefs.h" #include "cap/capdefs.h" #include "ind/inddefs.h" #include "vsrc/vsrcdefs.h" -#include +#include "ngspice/inpdefs.h" diff --git a/src/xspice/cm/cmutil.c b/src/xspice/cm/cmutil.c index ef058a2b4..b0a919046 100755 --- a/src/xspice/cm/cmutil.c +++ b/src/xspice/cm/cmutil.c @@ -48,10 +48,10 @@ NON-STANDARD FEATURES None. =========================================================================== */ -#include /* for NaN */ +#include "ngspice/ngspice.h" /* for NaN */ #include #include -#include +#include "ngspice/cm.h" /* Corner Smoothing Function ************************************ * * diff --git a/src/xspice/enh/enh.c b/src/xspice/enh/enh.c index 4679efb34..86d79531b 100755 --- a/src/xspice/enh/enh.c +++ b/src/xspice/enh/enh.c @@ -41,7 +41,7 @@ NON-STANDARD FEATURES #include -#include +#include "ngspice/enh.h" /* ENHreport_conv_prob() diff --git a/src/xspice/enh/enhtrans.c b/src/xspice/enh/enhtrans.c index 6b26027dd..728bd02e9 100755 --- a/src/xspice/enh/enhtrans.c +++ b/src/xspice/enh/enhtrans.c @@ -49,14 +49,14 @@ NON-STANDARD FEATURES /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" //#include "misc.h" -#include -#include -#include -#include -#include +#include "ngspice/fteinp.h" +#include "ngspice/enh.h" +#include "ngspice/cpdefs.h" +#include "ngspice/ftedefs.h" +#include "ngspice/mifproto.h" /* #include "suffix.h" */ diff --git a/src/xspice/evt/evtaccept.c b/src/xspice/evt/evtaccept.c index d18bbee7e..1cd67ca11 100755 --- a/src/xspice/evt/evtaccept.c +++ b/src/xspice/evt/evtaccept.c @@ -42,11 +42,11 @@ NON-STANDARD FEATURES #include #include -#include +#include "ngspice/cktdefs.h" -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtproto.h" diff --git a/src/xspice/evt/evtbackup.c b/src/xspice/evt/evtbackup.c index 32754c0a1..e2c2ecab2 100755 --- a/src/xspice/evt/evtbackup.c +++ b/src/xspice/evt/evtbackup.c @@ -41,15 +41,15 @@ NON-STANDARD FEATURES /*=== INCLUDE FILES ===*/ #include -#include +#include "ngspice/ngspice.h" -#include +#include "ngspice/cktdefs.h" //#include "util.h" -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" -#include +#include "ngspice/evtproto.h" diff --git a/src/xspice/evt/evtcall_hybrids.c b/src/xspice/evt/evtcall_hybrids.c index 82a3ca64c..8cdb2c9db 100755 --- a/src/xspice/evt/evtcall_hybrids.c +++ b/src/xspice/evt/evtcall_hybrids.c @@ -41,12 +41,12 @@ NON-STANDARD FEATURES ============================================================================*/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" -#include +#include "ngspice/evt.h" -#include +#include "ngspice/evtproto.h" /* diff --git a/src/xspice/evt/evtdeque.c b/src/xspice/evt/evtdeque.c index 131c313da..fa8b5a261 100755 --- a/src/xspice/evt/evtdeque.c +++ b/src/xspice/evt/evtdeque.c @@ -40,16 +40,16 @@ NON-STANDARD FEATURES #include -#include +#include "ngspice/ngspice.h" -#include +#include "ngspice/cktdefs.h" //#include "util.h" -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtudn.h" -#include +#include "ngspice/evtproto.h" static void EVTdequeue_output(CKTcircuit *ckt, double time); diff --git a/src/xspice/evt/evtdump.c b/src/xspice/evt/evtdump.c index 7a471f485..af8173372 100755 --- a/src/xspice/evt/evtdump.c +++ b/src/xspice/evt/evtdump.c @@ -42,21 +42,21 @@ NON-STANDARD FEATURES #include #include -#include +#include "ngspice/ngspice.h" //#include "misc.h" -#include +#include "ngspice/cktdefs.h" //#include "util.h" -#include +#include "ngspice/sperror.h" -#include -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtproto.h" +#include "ngspice/evtudn.h" -#include -#include -#include +#include "ngspice/ipc.h" +#include "ngspice/ipctiein.h" +#include "ngspice/ipcproto.h" diff --git a/src/xspice/evt/evtinit.c b/src/xspice/evt/evtinit.c index c39218ce0..539f49211 100755 --- a/src/xspice/evt/evtinit.c +++ b/src/xspice/evt/evtinit.c @@ -42,12 +42,12 @@ NON-STANDARD FEATURES #include #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" //#include "util.h" -#include +#include "ngspice/sperror.h" -#include +#include "ngspice/evtproto.h" diff --git a/src/xspice/evt/evtiter.c b/src/xspice/evt/evtiter.c index 443a0bff8..7f1ac21e5 100755 --- a/src/xspice/evt/evtiter.c +++ b/src/xspice/evt/evtiter.c @@ -41,17 +41,17 @@ NON-STANDARD FEATURES #include #include -#include +#include "ngspice/ngspice.h" //#include "misc.h" -#include +#include "ngspice/cktdefs.h" //#include "util.h" -#include +#include "ngspice/sperror.h" -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtudn.h" -#include +#include "ngspice/evtproto.h" /* diff --git a/src/xspice/evt/evtload.c b/src/xspice/evt/evtload.c index b472f3f0b..ad27cbf3f 100755 --- a/src/xspice/evt/evtload.c +++ b/src/xspice/evt/evtload.c @@ -41,18 +41,18 @@ NON-STANDARD FEATURES #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" //#include "util.h" -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtudn.h" -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/evtproto.h" static void EVTcreate_state( diff --git a/src/xspice/evt/evtnext_time.c b/src/xspice/evt/evtnext_time.c index 564f98c7a..771a66a6e 100755 --- a/src/xspice/evt/evtnext_time.c +++ b/src/xspice/evt/evtnext_time.c @@ -40,14 +40,14 @@ NON-STANDARD FEATURES #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" //#include "util.h" -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" -#include +#include "ngspice/evtproto.h" diff --git a/src/xspice/evt/evtnode_copy.c b/src/xspice/evt/evtnode_copy.c index 698c31f3a..ec5b13ea0 100755 --- a/src/xspice/evt/evtnode_copy.c +++ b/src/xspice/evt/evtnode_copy.c @@ -38,17 +38,17 @@ NON-STANDARD FEATURES ============================================================================*/ -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" //#include "util.h" -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtudn.h" -#include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/evtproto.h" +#include "ngspice/cm.h" /* EVTnode_copy diff --git a/src/xspice/evt/evtop.c b/src/xspice/evt/evtop.c index 1849b1fd0..dd1117ff3 100755 --- a/src/xspice/evt/evtop.c +++ b/src/xspice/evt/evtop.c @@ -41,15 +41,15 @@ NON-STANDARD FEATURES ============================================================================*/ #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" //#include "util.h" -#include +#include "ngspice/sperror.h" -#include -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtproto.h" +#include "ngspice/evtudn.h" static void EVTnode_compare( diff --git a/src/xspice/evt/evtplot.c b/src/xspice/evt/evtplot.c index c92aaa9b1..665bc4e7b 100755 --- a/src/xspice/evt/evtplot.c +++ b/src/xspice/evt/evtplot.c @@ -40,21 +40,21 @@ NON-STANDARD FEATURES #include #include -#include +#include "ngspice/ngspice.h" //nclude "misc.h" -#include -#include -#include -#include -#include +#include "ngspice/evt.h" +#include "ngspice/evtudn.h" +#include "ngspice/evtproto.h" +#include "ngspice/mif.h" +#include "ngspice/mifproto.h" /*saj for output */ -#include -#include +#include "ngspice/sim.h" +#include "ngspice/dvec.h" //#include "ftedata.h" //#include "fteconstant.h" //#include "util.h" -#include +#include "ngspice/cpstd.h" /* diff --git a/src/xspice/evt/evtprint.c b/src/xspice/evt/evtprint.c index 5e30659b0..d9719c646 100755 --- a/src/xspice/evt/evtprint.c +++ b/src/xspice/evt/evtprint.c @@ -42,16 +42,16 @@ NON-STANDARD FEATURES #include #include -#include +#include "ngspice/ngspice.h" //#include "misc.h" -#include +#include "ngspice/cpstd.h" -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtudn.h" -#include +#include "ngspice/evtproto.h" diff --git a/src/xspice/evt/evtqueue.c b/src/xspice/evt/evtqueue.c index f9c4af167..69db1e861 100755 --- a/src/xspice/evt/evtqueue.c +++ b/src/xspice/evt/evtqueue.c @@ -52,15 +52,15 @@ NON-STANDARD FEATURES #include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/cktdefs.h" //#include "util.h" -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtudn.h" -#include +#include "ngspice/evtproto.h" diff --git a/src/xspice/evt/evtsetup.c b/src/xspice/evt/evtsetup.c index 633723468..8c7685b79 100755 --- a/src/xspice/evt/evtsetup.c +++ b/src/xspice/evt/evtsetup.c @@ -43,18 +43,18 @@ NON-STANDARD FEATURES #include #include -#include +#include "ngspice/ngspice.h" //#include "misc.h" -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" //#include "util.h" -#include -#include -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtudn.h" +#include "ngspice/mifproto.h" +#include "ngspice/evtproto.h" diff --git a/src/xspice/evt/evttermi.c b/src/xspice/evt/evttermi.c index bfdddf7b0..06165d765 100755 --- a/src/xspice/evt/evttermi.c +++ b/src/xspice/evt/evttermi.c @@ -51,18 +51,18 @@ NON-STANDARD FEATURES #include -#include +#include "ngspice/ngspice.h" //#include "misc.h" -#include +#include "ngspice/cktdefs.h" //#include "util.h" -#include -#include -#include +#include "ngspice/mif.h" +#include "ngspice/evt.h" +#include "ngspice/evtudn.h" -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/evtproto.h" static void EVTinst_insert( diff --git a/src/xspice/icm/dlmain.c b/src/xspice/icm/dlmain.c index 6f39a8fde..496f86020 100644 --- a/src/xspice/icm/dlmain.c +++ b/src/xspice/icm/dlmain.c @@ -7,10 +7,10 @@ // Author: Arpad Buermen ////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include "ngspice/inpdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/evtudn.h" +#include "ngspice/dllitf.h" #include "cmextrn.h" #include "udnextrn.h" diff --git a/src/xspice/icm/xtraevt/int/udnfunc.c b/src/xspice/icm/xtraevt/int/udnfunc.c index bb1a43e22..f4cf67878 100644 --- a/src/xspice/icm/xtraevt/int/udnfunc.c +++ b/src/xspice/icm/xtraevt/int/udnfunc.c @@ -40,9 +40,9 @@ NON-STANDARD FEATURES ============================================================================*/ #include -#include +#include "ngspice/cm.h" -#include +#include "ngspice/evtudn.h" void *tmalloc(size_t); diff --git a/src/xspice/icm/xtraevt/real/udnfunc.c b/src/xspice/icm/xtraevt/real/udnfunc.c index 171cf58b6..df8d040a1 100644 --- a/src/xspice/icm/xtraevt/real/udnfunc.c +++ b/src/xspice/icm/xtraevt/real/udnfunc.c @@ -40,9 +40,9 @@ NON-STANDARD FEATURES ============================================================================*/ #include -#include +#include "ngspice/cm.h" -#include +#include "ngspice/evtudn.h" void *tmalloc(size_t); diff --git a/src/xspice/idn/idndig.c b/src/xspice/idn/idndig.c index 77b389670..d9eaf8ba9 100755 --- a/src/xspice/idn/idndig.c +++ b/src/xspice/idn/idndig.c @@ -39,11 +39,11 @@ NON-STANDARD FEATURES ============================================================================*/ -#include +#include "ngspice/ngspice.h" -#include +#include "ngspice/cm.h" -#include +#include "ngspice/evtudn.h" /* ************************************************************************ */ diff --git a/src/xspice/ipc/ipc.c b/src/xspice/ipc/ipc.c index 13b4fbe80..ccf319778 100755 --- a/src/xspice/ipc/ipc.c +++ b/src/xspice/ipc/ipc.c @@ -70,17 +70,17 @@ SUMMARY ============================================================================*/ -#include +#include "ngspice/ngspice.h" #include -#include /* NOTE: I think this is a Sys5ism (there is not man +#include "ngspice/memory.h" /* NOTE: I think this is a Sys5ism (there is not man * page for it under Bsd, but it's in /usr/include * and it has a BSD copyright header. Go figure. */ -#include -#include -#include +#include "ngspice/ipc.h" +#include "ngspice/ipctiein.h" +#include "ngspice/ipcproto.h" /* diff --git a/src/xspice/ipc/ipcaegis.c b/src/xspice/ipc/ipcaegis.c index 0e9c78775..4a32c01c2 100755 --- a/src/xspice/ipc/ipcaegis.c +++ b/src/xspice/ipc/ipcaegis.c @@ -42,9 +42,9 @@ NON-STANDARD FEATURES #include #include #include -#include +#include "ngspice/memory.h" -#include +#include "ngspice/ipc.h" typedef unsigned char Buffer_char_t; @@ -64,7 +64,7 @@ static mbx_$server_msg_t *mbx_ret_ptr; static int mbx_ret_len; static short mbx_chan; -#include +#include "ngspice/ipcproto.h" /*---------------------------------------------------------------------------*/ diff --git a/src/xspice/ipc/ipcsockets.c b/src/xspice/ipc/ipcsockets.c index 1ba095487..1843ce4b7 100755 --- a/src/xspice/ipc/ipcsockets.c +++ b/src/xspice/ipc/ipcsockets.c @@ -90,7 +90,7 @@ =============================================================================*/ -#include +#include "ngspice/ngspice.h" #ifdef IPC_UNIX_SOCKETS @@ -99,8 +99,8 @@ #include #include -#include -#include +#include "ngspice/ipc.h" +#include "ngspice/ipctiein.h" /*=== TYPE DEFINITIONS ===*/ @@ -121,7 +121,7 @@ static Ipc_Sock_State_t sock_state = IPC_SOCK_UNINITIALIZED; /*=== INCLUDE FILES ===*/ -#include +#include "ngspice/ipcproto.h" /*============================================================================= diff --git a/src/xspice/ipc/ipcstdio.c b/src/xspice/ipc/ipcstdio.c index c15923c27..c5c38e021 100755 --- a/src/xspice/ipc/ipcstdio.c +++ b/src/xspice/ipc/ipcstdio.c @@ -7,16 +7,16 @@ * */ -#include +#include "ngspice/ngspice.h" #ifdef IPC_DEBUG_VIA_STDIO #include -#include +#include "ngspice/ipc.h" -#include +#include "ngspice/ipcproto.h" #include /* 12/1/97 jg */ diff --git a/src/xspice/ipc/ipctiein.c b/src/xspice/ipc/ipctiein.c index 7b58754e2..cbf6553be 100755 --- a/src/xspice/ipc/ipctiein.c +++ b/src/xspice/ipc/ipctiein.c @@ -52,18 +52,18 @@ NON-STANDARD FEATURES #define CONFIG -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/inpdefs.h" +#include "ngspice/gendefs.h" +#include "ngspice/cktdefs.h" #include "bjt/bjtdefs.h" #include "jfet/jfetdefs.h" #include "mos1/mos1defs.h" #include "mos2/mos2defs.h" #include "mos3/mos3defs.h" -#include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/ipc.h" +#include "ngspice/ipctiein.h" diff --git a/src/xspice/mif/mif.c b/src/xspice/mif/mif.c index bafeba5fc..38c474a72 100755 --- a/src/xspice/mif/mif.c +++ b/src/xspice/mif/mif.c @@ -37,7 +37,7 @@ NON-STANDARD FEATURES ============================================================================*/ -#include +#include "ngspice/mif.h" int MIFiSize = sizeof(MIFinstance); int MIFmSize = sizeof(MIFmodel); diff --git a/src/xspice/mif/mif_inp2.c b/src/xspice/mif/mif_inp2.c index f2b434f22..485cf472f 100755 --- a/src/xspice/mif/mif_inp2.c +++ b/src/xspice/mif/mif_inp2.c @@ -38,22 +38,22 @@ NON-STANDARD FEATURES ============================================================================*/ /* #include "prefix.h" */ /* jgroves */ -#include +#include "ngspice/ngspice.h" #include //#include "util.h" -#include -#include -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/inpdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/inpmacs.h" +#include "ngspice/fteext.h" -#include -#include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifparse.h" +#include "ngspice/mifdefs.h" +#include "ngspice/mifcmdat.h" -#include -#include +#include "ngspice/evt.h" +#include "ngspice/evtproto.h" /* #include "suffix.h" */ /* jgroves */ diff --git a/src/xspice/mif/mifask.c b/src/xspice/mif/mifask.c index 0a0221d53..21dfb400b 100755 --- a/src/xspice/mif/mifask.c +++ b/src/xspice/mif/mifask.c @@ -38,18 +38,18 @@ NON-STANDARD FEATURES ============================================================================*/ /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" #include //#include "CONST.h" //#include "util.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifdefs.h" /* #include "suffix.h" */ diff --git a/src/xspice/mif/mifconvt.c b/src/xspice/mif/mifconvt.c index f44c3ce90..da0c50f3d 100755 --- a/src/xspice/mif/mifconvt.c +++ b/src/xspice/mif/mifconvt.c @@ -39,21 +39,21 @@ NON-STANDARD FEATURES ============================================================================*/ /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" #include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" //#include "util.h" -#include +#include "ngspice/devdefs.h" //#include "CONST.h" -#include +#include "ngspice/trandefs.h" #include -#include -#include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifparse.h" +#include "ngspice/mifdefs.h" +#include "ngspice/mifcmdat.h" /* #include "suffix.h" */ diff --git a/src/xspice/mif/mifdelete.c b/src/xspice/mif/mifdelete.c index 88bffa01b..0154c6131 100755 --- a/src/xspice/mif/mifdelete.c +++ b/src/xspice/mif/mifdelete.c @@ -39,14 +39,14 @@ NON-STANDARD FEATURES ============================================================================*/ #include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifdefs.h" -#include +#include "ngspice/suffix.h" diff --git a/src/xspice/mif/mifdestr.c b/src/xspice/mif/mifdestr.c index 045f85792..73a888493 100755 --- a/src/xspice/mif/mifdestr.c +++ b/src/xspice/mif/mifdestr.c @@ -38,10 +38,10 @@ NON-STANDARD FEATURES ============================================================================*/ /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/mifproto.h" /* #include "suffix.h" */ diff --git a/src/xspice/mif/mifgetmod.c b/src/xspice/mif/mifgetmod.c index 1fd6310e3..4ebca0396 100755 --- a/src/xspice/mif/mifgetmod.c +++ b/src/xspice/mif/mifgetmod.c @@ -45,20 +45,20 @@ NON-STANDARD FEATURES ============================================================================*/ -#include +#include "ngspice/ngspice.h" #include -#include -#include -#include -#include -#include +#include "ngspice/inpdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/ifsim.h" +#include "ngspice/cpstd.h" +#include "ngspice/fteext.h" -#include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifdefs.h" +#include "ngspice/mifcmdat.h" -#include +#include "ngspice/suffix.h" /* This is the table of all models known to the program. It is now defined in inpmkmod.c. */ diff --git a/src/xspice/mif/mifgetvalue.c b/src/xspice/mif/mifgetvalue.c index 7c2b7d848..9dd4f91c4 100755 --- a/src/xspice/mif/mifgetvalue.c +++ b/src/xspice/mif/mifgetvalue.c @@ -38,20 +38,20 @@ NON-STANDARD FEATURES ============================================================================*/ /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" #include -#include +#include "ngspice/ifsim.h" //#include "util.h" -#include -#include +#include "ngspice/inpdefs.h" +#include "ngspice/inpptree.h" /* #include */ #include -#include -#include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifparse.h" +#include "ngspice/mifdefs.h" +#include "ngspice/mifcmdat.h" /* #include "suffix.h" */ diff --git a/src/xspice/mif/mifload.c b/src/xspice/mif/mifload.c index 3cf6142c5..7975f4051 100755 --- a/src/xspice/mif/mifload.c +++ b/src/xspice/mif/mifload.c @@ -43,23 +43,23 @@ NON-STANDARD FEATURES /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" #include #include -#include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" -#include -#include -#include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifparse.h" +#include "ngspice/mifdefs.h" +#include "ngspice/mifcmdat.h" +#include "ngspice/mif.h" -#include -#include +#include "ngspice/enh.h" +#include "ngspice/cm.h" /* #include "suffix.h" */ diff --git a/src/xspice/mif/mifmask.c b/src/xspice/mif/mifmask.c index fd1225e84..7a9a6c16b 100755 --- a/src/xspice/mif/mifmask.c +++ b/src/xspice/mif/mifmask.c @@ -38,18 +38,18 @@ NON-STANDARD FEATURES ============================================================================*/ /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" #include //#include "CONST.h" //#include "util.h" -#include -#include -#include +#include "ngspice/ifsim.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifdefs.h" /* #include "suffix.h" */ diff --git a/src/xspice/mif/mifmdelete.c b/src/xspice/mif/mifmdelete.c index 7483dcead..930b8bb94 100755 --- a/src/xspice/mif/mifmdelete.c +++ b/src/xspice/mif/mifmdelete.c @@ -38,14 +38,14 @@ NON-STANDARD FEATURES ============================================================================*/ /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" #include //#include "util.h" -#include -#include +#include "ngspice/sperror.h" +#include "ngspice/gendefs.h" -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifdefs.h" /* #include "suffix.h" */ diff --git a/src/xspice/mif/mifmpara.c b/src/xspice/mif/mifmpara.c index 276e4916b..8f0753147 100755 --- a/src/xspice/mif/mifmpara.c +++ b/src/xspice/mif/mifmpara.c @@ -38,21 +38,21 @@ NON-STANDARD FEATURES ============================================================================*/ /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" #include //#include "CONST.h" //#include "util.h" -#include +#include "ngspice/ifsim.h" //#include "resdefs.h" -#include -#include +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" #include -#include -#include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifparse.h" +#include "ngspice/mifdefs.h" +#include "ngspice/mifcmdat.h" /* #include "suffix.h" */ diff --git a/src/xspice/mif/mifsetup.c b/src/xspice/mif/mifsetup.c index 3e3aaf50d..fc320df84 100755 --- a/src/xspice/mif/mifsetup.c +++ b/src/xspice/mif/mifsetup.c @@ -42,15 +42,15 @@ NON-STANDARD FEATURES ============================================================================*/ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/smpdefs.h" +#include "ngspice/devdefs.h" +#include "ngspice/sperror.h" -#include -#include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifparse.h" +#include "ngspice/mifdefs.h" +#include "ngspice/mifcmdat.h" diff --git a/src/xspice/mif/miftrunc.c b/src/xspice/mif/miftrunc.c index 8c69cf9f8..ba69706fd 100755 --- a/src/xspice/mif/miftrunc.c +++ b/src/xspice/mif/miftrunc.c @@ -38,18 +38,18 @@ NON-STANDARD FEATURES ============================================================================*/ /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" #include -#include -#include +#include "ngspice/cktdefs.h" +#include "ngspice/sperror.h" //#include "util.h" #include -#include -#include -#include -#include +#include "ngspice/mifproto.h" +#include "ngspice/mifparse.h" +#include "ngspice/mifdefs.h" +#include "ngspice/mifcmdat.h" /* #include "suffix.h" */ diff --git a/src/xspice/mif/mifutil.c b/src/xspice/mif/mifutil.c index 23ea511f6..338074eb1 100755 --- a/src/xspice/mif/mifutil.c +++ b/src/xspice/mif/mifutil.c @@ -40,13 +40,13 @@ NON-STANDARD FEATURES ============================================================================*/ /* #include "prefix.h" */ -#include +#include "ngspice/ngspice.h" //#include "util.h" -#include +#include "ngspice/cpstd.h" #include -#include -#include +#include "ngspice/miftypes.h" +#include "ngspice/mifproto.h" /* #include "suffix.h" */ diff --git a/src/xspice/xspice.c b/src/xspice/xspice.c index 31430d72b..21e0cc880 100755 --- a/src/xspice/xspice.c +++ b/src/xspice/xspice.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "ngspice/ngspice.h" +#include "ngspice/mif.h" +#include "ngspice/cm.h" +#include "ngspice/dllitf.h" /*how annoying!, needed for structure below*/ static void *tcalloc(size_t a, size_t b) {