diff --git a/autogen.sh b/autogen.sh index a816809d6..f42b1d0d1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,8 +2,8 @@ # Run this to generate all the initial makefiles, etc. PROJECT=ng-spice -TEST_TYPE=-d -FILE=src/circuit +TEST_TYPE=-f +FILE=DEVICES DIE=0 diff --git a/configure.in b/configure.in index c403a9574..dec79e1a6 100644 --- a/configure.in +++ b/configure.in @@ -197,8 +197,8 @@ doc/Makefile \ man/Makefile \ man/man1/Makefile \ src/Makefile \ -src/analysis/Makefile \ src/devices/Makefile \ +src/devices/analysis/Makefile \ src/devices/asrc/Makefile \ src/devices/bjt/Makefile \ src/devices/bsim1/Makefile \ diff --git a/src/ChangeLog b/src/ChangeLog index d3b6fff09..716db6f0e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,18 @@ +2000-07-21 Arno W. Peters + + * src/analysis/*: Moved these files into src/devices/analysis. + The files in this directory implement the analysis and simulation + for electrical circuits. + + This is the final step to separating the Spice sources into a + library part and a frontend part. Now, the devices subdirectory + has to be renamed to spicelib and the devices that are now + scattered in that directory should be moved into a new devices + directory. + + * configure.in, src/Makefile.am, src/devices/Makefile.am: Files + affected by the move. + 2000-07-20 Arno W. Peters * src/hlp/*: moved these files into src/frontend/help. The files diff --git a/src/Makefile.am b/src/Makefile.am index 250c3f075..8cc3dbaab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = misc maths analysis frontend devices include +SUBDIRS = misc maths frontend devices include bin_PROGRAMS = ngspice nutmeg help sconvert proc2mod multidec makeidx @@ -57,7 +57,7 @@ ngspice_LDADD = \ frontend/libfte.a \ frontend/plotting/libplotting.a \ $(DYNAMIC_DEVICELIBS) \ - analysis/libckt.a \ + devices/analysis/libckt.a \ devices/libdev.a \ frontend/parser/libparser.a \ frontend/help/libhlp.a \ diff --git a/src/spicelib/devices/ChangeLog b/src/spicelib/devices/ChangeLog index 921a4fc2a..b704ae25d 100644 --- a/src/spicelib/devices/ChangeLog +++ b/src/spicelib/devices/ChangeLog @@ -1,3 +1,7 @@ +2000-07-21 Arno W. Peters + + * README: Updated. + 2000-07-10 Arno W. Peters * asrc/asrcinit.c, asrc/asrcitf.h, bjt/bjtinit.c, bjt/bjtitf.h, diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am index b4d7684fd..01044eedf 100644 --- a/src/spicelib/devices/Makefile.am +++ b/src/spicelib/devices/Makefile.am @@ -31,6 +31,7 @@ SUBDIRS = \ vccs \ vcvs \ vsrc \ + analysis \ parser lib_LIBRARIES = libdev.a diff --git a/src/spicelib/devices/README b/src/spicelib/devices/README index 57e9cc627..cc95a763d 100644 --- a/src/spicelib/devices/README +++ b/src/spicelib/devices/README @@ -1,3 +1,3 @@ -The circuit builder. +The Spice Library. It takes a circuit description and builds a simulator from it. diff --git a/src/analysis/.cvsignore b/src/spicelib/devices/analysis/.cvsignore similarity index 100% rename from src/analysis/.cvsignore rename to src/spicelib/devices/analysis/.cvsignore diff --git a/src/analysis/ChangeLog b/src/spicelib/devices/analysis/ChangeLog similarity index 100% rename from src/analysis/ChangeLog rename to src/spicelib/devices/analysis/ChangeLog diff --git a/src/analysis/Makefile.am b/src/spicelib/devices/analysis/Makefile.am similarity index 100% rename from src/analysis/Makefile.am rename to src/spicelib/devices/analysis/Makefile.am diff --git a/src/analysis/acan.c b/src/spicelib/devices/analysis/acan.c similarity index 100% rename from src/analysis/acan.c rename to src/spicelib/devices/analysis/acan.c diff --git a/src/analysis/acaskq.c b/src/spicelib/devices/analysis/acaskq.c similarity index 100% rename from src/analysis/acaskq.c rename to src/spicelib/devices/analysis/acaskq.c diff --git a/src/analysis/acsetp.c b/src/spicelib/devices/analysis/acsetp.c similarity index 100% rename from src/analysis/acsetp.c rename to src/spicelib/devices/analysis/acsetp.c diff --git a/src/analysis/ckt.h b/src/spicelib/devices/analysis/ckt.h similarity index 100% rename from src/analysis/ckt.h rename to src/spicelib/devices/analysis/ckt.h diff --git a/src/analysis/cktacct.c b/src/spicelib/devices/analysis/cktacct.c similarity index 100% rename from src/analysis/cktacct.c rename to src/spicelib/devices/analysis/cktacct.c diff --git a/src/analysis/cktacdum.c b/src/spicelib/devices/analysis/cktacdum.c similarity index 100% rename from src/analysis/cktacdum.c rename to src/spicelib/devices/analysis/cktacdum.c diff --git a/src/analysis/cktaskaq.c b/src/spicelib/devices/analysis/cktaskaq.c similarity index 100% rename from src/analysis/cktaskaq.c rename to src/spicelib/devices/analysis/cktaskaq.c diff --git a/src/analysis/cktasknq.c b/src/spicelib/devices/analysis/cktasknq.c similarity index 100% rename from src/analysis/cktasknq.c rename to src/spicelib/devices/analysis/cktasknq.c diff --git a/src/analysis/cktbkdum.c b/src/spicelib/devices/analysis/cktbkdum.c similarity index 100% rename from src/analysis/cktbkdum.c rename to src/spicelib/devices/analysis/cktbkdum.c diff --git a/src/analysis/cktclrbk.c b/src/spicelib/devices/analysis/cktclrbk.c similarity index 100% rename from src/analysis/cktclrbk.c rename to src/spicelib/devices/analysis/cktclrbk.c diff --git a/src/analysis/cktdelt.c b/src/spicelib/devices/analysis/cktdelt.c similarity index 100% rename from src/analysis/cktdelt.c rename to src/spicelib/devices/analysis/cktdelt.c diff --git a/src/analysis/cktdest.c b/src/spicelib/devices/analysis/cktdest.c similarity index 100% rename from src/analysis/cktdest.c rename to src/spicelib/devices/analysis/cktdest.c diff --git a/src/analysis/cktdisto.c b/src/spicelib/devices/analysis/cktdisto.c similarity index 100% rename from src/analysis/cktdisto.c rename to src/spicelib/devices/analysis/cktdisto.c diff --git a/src/analysis/cktdlti.c b/src/spicelib/devices/analysis/cktdlti.c similarity index 100% rename from src/analysis/cktdlti.c rename to src/spicelib/devices/analysis/cktdlti.c diff --git a/src/analysis/cktdltm.c b/src/spicelib/devices/analysis/cktdltm.c similarity index 100% rename from src/analysis/cktdltm.c rename to src/spicelib/devices/analysis/cktdltm.c diff --git a/src/analysis/cktdltn.c b/src/spicelib/devices/analysis/cktdltn.c similarity index 100% rename from src/analysis/cktdltn.c rename to src/spicelib/devices/analysis/cktdltn.c diff --git a/src/analysis/cktdojob.c b/src/spicelib/devices/analysis/cktdojob.c similarity index 100% rename from src/analysis/cktdojob.c rename to src/spicelib/devices/analysis/cktdojob.c diff --git a/src/analysis/cktdump.c b/src/spicelib/devices/analysis/cktdump.c similarity index 100% rename from src/analysis/cktdump.c rename to src/spicelib/devices/analysis/cktdump.c diff --git a/src/analysis/cktfbran.c b/src/spicelib/devices/analysis/cktfbran.c similarity index 100% rename from src/analysis/cktfbran.c rename to src/spicelib/devices/analysis/cktfbran.c diff --git a/src/analysis/cktfnda.c b/src/spicelib/devices/analysis/cktfnda.c similarity index 100% rename from src/analysis/cktfnda.c rename to src/spicelib/devices/analysis/cktfnda.c diff --git a/src/analysis/cktfndm.c b/src/spicelib/devices/analysis/cktfndm.c similarity index 100% rename from src/analysis/cktfndm.c rename to src/spicelib/devices/analysis/cktfndm.c diff --git a/src/analysis/cktfnode.c b/src/spicelib/devices/analysis/cktfnode.c similarity index 100% rename from src/analysis/cktfnode.c rename to src/spicelib/devices/analysis/cktfnode.c diff --git a/src/analysis/cktftask.c b/src/spicelib/devices/analysis/cktftask.c similarity index 100% rename from src/analysis/cktftask.c rename to src/spicelib/devices/analysis/cktftask.c diff --git a/src/analysis/cktgrnd.c b/src/spicelib/devices/analysis/cktgrnd.c similarity index 100% rename from src/analysis/cktgrnd.c rename to src/spicelib/devices/analysis/cktgrnd.c diff --git a/src/analysis/ckti2nod.c b/src/spicelib/devices/analysis/ckti2nod.c similarity index 100% rename from src/analysis/ckti2nod.c rename to src/spicelib/devices/analysis/ckti2nod.c diff --git a/src/analysis/cktic.c b/src/spicelib/devices/analysis/cktic.c similarity index 100% rename from src/analysis/cktic.c rename to src/spicelib/devices/analysis/cktic.c diff --git a/src/analysis/cktlnkeq.c b/src/spicelib/devices/analysis/cktlnkeq.c similarity index 100% rename from src/analysis/cktlnkeq.c rename to src/spicelib/devices/analysis/cktlnkeq.c diff --git a/src/analysis/cktload.c b/src/spicelib/devices/analysis/cktload.c similarity index 100% rename from src/analysis/cktload.c rename to src/spicelib/devices/analysis/cktload.c diff --git a/src/analysis/cktmapn.c b/src/spicelib/devices/analysis/cktmapn.c similarity index 100% rename from src/analysis/cktmapn.c rename to src/spicelib/devices/analysis/cktmapn.c diff --git a/src/analysis/cktmask.c b/src/spicelib/devices/analysis/cktmask.c similarity index 100% rename from src/analysis/cktmask.c rename to src/spicelib/devices/analysis/cktmask.c diff --git a/src/analysis/cktmcrt.c b/src/spicelib/devices/analysis/cktmcrt.c similarity index 100% rename from src/analysis/cktmcrt.c rename to src/spicelib/devices/analysis/cktmcrt.c diff --git a/src/analysis/cktmkcur.c b/src/spicelib/devices/analysis/cktmkcur.c similarity index 100% rename from src/analysis/cktmkcur.c rename to src/spicelib/devices/analysis/cktmkcur.c diff --git a/src/analysis/cktmknod.c b/src/spicelib/devices/analysis/cktmknod.c similarity index 100% rename from src/analysis/cktmknod.c rename to src/spicelib/devices/analysis/cktmknod.c diff --git a/src/analysis/cktmkvol.c b/src/spicelib/devices/analysis/cktmkvol.c similarity index 100% rename from src/analysis/cktmkvol.c rename to src/spicelib/devices/analysis/cktmkvol.c diff --git a/src/analysis/cktmpar.c b/src/spicelib/devices/analysis/cktmpar.c similarity index 100% rename from src/analysis/cktmpar.c rename to src/spicelib/devices/analysis/cktmpar.c diff --git a/src/analysis/cktnames.c b/src/spicelib/devices/analysis/cktnames.c similarity index 100% rename from src/analysis/cktnames.c rename to src/spicelib/devices/analysis/cktnames.c diff --git a/src/analysis/cktnewan.c b/src/spicelib/devices/analysis/cktnewan.c similarity index 100% rename from src/analysis/cktnewan.c rename to src/spicelib/devices/analysis/cktnewan.c diff --git a/src/analysis/cktneweq.c b/src/spicelib/devices/analysis/cktneweq.c similarity index 100% rename from src/analysis/cktneweq.c rename to src/spicelib/devices/analysis/cktneweq.c diff --git a/src/analysis/cktnewn.c b/src/spicelib/devices/analysis/cktnewn.c similarity index 100% rename from src/analysis/cktnewn.c rename to src/spicelib/devices/analysis/cktnewn.c diff --git a/src/analysis/cktnodn.c b/src/spicelib/devices/analysis/cktnodn.c similarity index 100% rename from src/analysis/cktnodn.c rename to src/spicelib/devices/analysis/cktnodn.c diff --git a/src/analysis/cktnoise.c b/src/spicelib/devices/analysis/cktnoise.c similarity index 100% rename from src/analysis/cktnoise.c rename to src/spicelib/devices/analysis/cktnoise.c diff --git a/src/analysis/cktntask.c b/src/spicelib/devices/analysis/cktntask.c similarity index 100% rename from src/analysis/cktntask.c rename to src/spicelib/devices/analysis/cktntask.c diff --git a/src/analysis/cktnum2n.c b/src/spicelib/devices/analysis/cktnum2n.c similarity index 100% rename from src/analysis/cktnum2n.c rename to src/spicelib/devices/analysis/cktnum2n.c diff --git a/src/analysis/cktop.c b/src/spicelib/devices/analysis/cktop.c similarity index 100% rename from src/analysis/cktop.c rename to src/spicelib/devices/analysis/cktop.c diff --git a/src/analysis/cktparam.c b/src/spicelib/devices/analysis/cktparam.c similarity index 100% rename from src/analysis/cktparam.c rename to src/spicelib/devices/analysis/cktparam.c diff --git a/src/analysis/cktpartn.c b/src/spicelib/devices/analysis/cktpartn.c similarity index 100% rename from src/analysis/cktpartn.c rename to src/spicelib/devices/analysis/cktpartn.c diff --git a/src/analysis/cktpmnam.c b/src/spicelib/devices/analysis/cktpmnam.c similarity index 100% rename from src/analysis/cktpmnam.c rename to src/spicelib/devices/analysis/cktpmnam.c diff --git a/src/analysis/cktpname.c b/src/spicelib/devices/analysis/cktpname.c similarity index 100% rename from src/analysis/cktpname.c rename to src/spicelib/devices/analysis/cktpname.c diff --git a/src/analysis/cktpzld.c b/src/spicelib/devices/analysis/cktpzld.c similarity index 100% rename from src/analysis/cktpzld.c rename to src/spicelib/devices/analysis/cktpzld.c diff --git a/src/analysis/cktpzset.c b/src/spicelib/devices/analysis/cktpzset.c similarity index 100% rename from src/analysis/cktpzset.c rename to src/spicelib/devices/analysis/cktpzset.c diff --git a/src/analysis/cktpzstr.c b/src/spicelib/devices/analysis/cktpzstr.c similarity index 100% rename from src/analysis/cktpzstr.c rename to src/spicelib/devices/analysis/cktpzstr.c diff --git a/src/analysis/cktsens.c b/src/spicelib/devices/analysis/cktsens.c similarity index 100% rename from src/analysis/cktsens.c rename to src/spicelib/devices/analysis/cktsens.c diff --git a/src/analysis/cktsetap.c b/src/spicelib/devices/analysis/cktsetap.c similarity index 100% rename from src/analysis/cktsetap.c rename to src/spicelib/devices/analysis/cktsetap.c diff --git a/src/analysis/cktsetbk.c b/src/spicelib/devices/analysis/cktsetbk.c similarity index 100% rename from src/analysis/cktsetbk.c rename to src/spicelib/devices/analysis/cktsetbk.c diff --git a/src/analysis/cktsetnp.c b/src/spicelib/devices/analysis/cktsetnp.c similarity index 100% rename from src/analysis/cktsetnp.c rename to src/spicelib/devices/analysis/cktsetnp.c diff --git a/src/analysis/cktsetup.c b/src/spicelib/devices/analysis/cktsetup.c similarity index 100% rename from src/analysis/cktsetup.c rename to src/spicelib/devices/analysis/cktsetup.c diff --git a/src/analysis/cktsgen.c b/src/spicelib/devices/analysis/cktsgen.c similarity index 100% rename from src/analysis/cktsgen.c rename to src/spicelib/devices/analysis/cktsgen.c diff --git a/src/analysis/cktsopt.c b/src/spicelib/devices/analysis/cktsopt.c similarity index 100% rename from src/analysis/cktsopt.c rename to src/spicelib/devices/analysis/cktsopt.c diff --git a/src/analysis/ckttemp.c b/src/spicelib/devices/analysis/ckttemp.c similarity index 100% rename from src/analysis/ckttemp.c rename to src/spicelib/devices/analysis/ckttemp.c diff --git a/src/analysis/cktterr.c b/src/spicelib/devices/analysis/cktterr.c similarity index 100% rename from src/analysis/cktterr.c rename to src/spicelib/devices/analysis/cktterr.c diff --git a/src/analysis/ckttroub.c b/src/spicelib/devices/analysis/ckttroub.c similarity index 100% rename from src/analysis/ckttroub.c rename to src/spicelib/devices/analysis/ckttroub.c diff --git a/src/analysis/ckttrunc.c b/src/spicelib/devices/analysis/ckttrunc.c similarity index 100% rename from src/analysis/ckttrunc.c rename to src/spicelib/devices/analysis/ckttrunc.c diff --git a/src/analysis/ckttyplk.c b/src/spicelib/devices/analysis/ckttyplk.c similarity index 100% rename from src/analysis/ckttyplk.c rename to src/spicelib/devices/analysis/ckttyplk.c diff --git a/src/analysis/daskq.c b/src/spicelib/devices/analysis/daskq.c similarity index 100% rename from src/analysis/daskq.c rename to src/spicelib/devices/analysis/daskq.c diff --git a/src/analysis/dcoaskq.c b/src/spicelib/devices/analysis/dcoaskq.c similarity index 100% rename from src/analysis/dcoaskq.c rename to src/spicelib/devices/analysis/dcoaskq.c diff --git a/src/analysis/dcop.c b/src/spicelib/devices/analysis/dcop.c similarity index 100% rename from src/analysis/dcop.c rename to src/spicelib/devices/analysis/dcop.c diff --git a/src/analysis/dcosetp.c b/src/spicelib/devices/analysis/dcosetp.c similarity index 100% rename from src/analysis/dcosetp.c rename to src/spicelib/devices/analysis/dcosetp.c diff --git a/src/analysis/dctaskq.c b/src/spicelib/devices/analysis/dctaskq.c similarity index 100% rename from src/analysis/dctaskq.c rename to src/spicelib/devices/analysis/dctaskq.c diff --git a/src/analysis/dctran.c b/src/spicelib/devices/analysis/dctran.c similarity index 100% rename from src/analysis/dctran.c rename to src/spicelib/devices/analysis/dctran.c diff --git a/src/analysis/dctrcurv.c b/src/spicelib/devices/analysis/dctrcurv.c similarity index 100% rename from src/analysis/dctrcurv.c rename to src/spicelib/devices/analysis/dctrcurv.c diff --git a/src/analysis/dctsetp.c b/src/spicelib/devices/analysis/dctsetp.c similarity index 100% rename from src/analysis/dctsetp.c rename to src/spicelib/devices/analysis/dctsetp.c diff --git a/src/analysis/distoan.c b/src/spicelib/devices/analysis/distoan.c similarity index 100% rename from src/analysis/distoan.c rename to src/spicelib/devices/analysis/distoan.c diff --git a/src/analysis/dkerproc.c b/src/spicelib/devices/analysis/dkerproc.c similarity index 100% rename from src/analysis/dkerproc.c rename to src/spicelib/devices/analysis/dkerproc.c diff --git a/src/analysis/dloadfns.c b/src/spicelib/devices/analysis/dloadfns.c similarity index 100% rename from src/analysis/dloadfns.c rename to src/spicelib/devices/analysis/dloadfns.c diff --git a/src/analysis/dsetparm.c b/src/spicelib/devices/analysis/dsetparm.c similarity index 100% rename from src/analysis/dsetparm.c rename to src/spicelib/devices/analysis/dsetparm.c diff --git a/src/analysis/naskq.c b/src/spicelib/devices/analysis/naskq.c similarity index 100% rename from src/analysis/naskq.c rename to src/spicelib/devices/analysis/naskq.c diff --git a/src/analysis/nevalsrc.c b/src/spicelib/devices/analysis/nevalsrc.c similarity index 100% rename from src/analysis/nevalsrc.c rename to src/spicelib/devices/analysis/nevalsrc.c diff --git a/src/analysis/ninteg.c b/src/spicelib/devices/analysis/ninteg.c similarity index 100% rename from src/analysis/ninteg.c rename to src/spicelib/devices/analysis/ninteg.c diff --git a/src/analysis/noisean.c b/src/spicelib/devices/analysis/noisean.c similarity index 100% rename from src/analysis/noisean.c rename to src/spicelib/devices/analysis/noisean.c diff --git a/src/analysis/nsetparm.c b/src/spicelib/devices/analysis/nsetparm.c similarity index 100% rename from src/analysis/nsetparm.c rename to src/spicelib/devices/analysis/nsetparm.c diff --git a/src/analysis/pzan.c b/src/spicelib/devices/analysis/pzan.c similarity index 100% rename from src/analysis/pzan.c rename to src/spicelib/devices/analysis/pzan.c diff --git a/src/analysis/pzaskq.c b/src/spicelib/devices/analysis/pzaskq.c similarity index 100% rename from src/analysis/pzaskq.c rename to src/spicelib/devices/analysis/pzaskq.c diff --git a/src/analysis/pzsetp.c b/src/spicelib/devices/analysis/pzsetp.c similarity index 100% rename from src/analysis/pzsetp.c rename to src/spicelib/devices/analysis/pzsetp.c diff --git a/src/analysis/sensaskq.c b/src/spicelib/devices/analysis/sensaskq.c similarity index 100% rename from src/analysis/sensaskq.c rename to src/spicelib/devices/analysis/sensaskq.c diff --git a/src/analysis/senssetp.c b/src/spicelib/devices/analysis/senssetp.c similarity index 100% rename from src/analysis/senssetp.c rename to src/spicelib/devices/analysis/senssetp.c diff --git a/src/analysis/tfanal.c b/src/spicelib/devices/analysis/tfanal.c similarity index 100% rename from src/analysis/tfanal.c rename to src/spicelib/devices/analysis/tfanal.c diff --git a/src/analysis/tfaskq.c b/src/spicelib/devices/analysis/tfaskq.c similarity index 100% rename from src/analysis/tfaskq.c rename to src/spicelib/devices/analysis/tfaskq.c diff --git a/src/analysis/tfsetp.c b/src/spicelib/devices/analysis/tfsetp.c similarity index 100% rename from src/analysis/tfsetp.c rename to src/spicelib/devices/analysis/tfsetp.c diff --git a/src/analysis/tranaskq.c b/src/spicelib/devices/analysis/tranaskq.c similarity index 100% rename from src/analysis/tranaskq.c rename to src/spicelib/devices/analysis/tranaskq.c diff --git a/src/analysis/traninit.c b/src/spicelib/devices/analysis/traninit.c similarity index 100% rename from src/analysis/traninit.c rename to src/spicelib/devices/analysis/traninit.c diff --git a/src/analysis/transetp.c b/src/spicelib/devices/analysis/transetp.c similarity index 100% rename from src/analysis/transetp.c rename to src/spicelib/devices/analysis/transetp.c