summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2020-08-25 19:41:32 +0200
committer couriersud <couriersud@gmx.org>2020-08-25 19:41:32 +0200
commit0aa5aea84f6749553837c9ef28cdc75e8d4b773d (patch)
treec5e01f3a8c94e7a6d8e1303093f45d67a22de35e /src
parent65abe0cd888078a242744383c8372c46e87f2090 (diff)
netlist: Fix various issues around include directories.
* removed include directory src/lib/netlist from various genie files to avoid potential issues. * Code using netlist should use #include "netlist/*". * Updated includes. * Fixed standalone makefile depend target to properly deal with relative paths.
Diffstat (limited to 'src')
-rw-r--r--src/devices/machine/netlist.cpp1
-rw-r--r--src/lib/netlist/analog/nld_bjt.cpp4
-rw-r--r--src/lib/netlist/analog/nld_bjt.h2
-rw-r--r--src/lib/netlist/analog/nld_fourterm.h2
-rw-r--r--src/lib/netlist/analog/nld_generic_models.h4
-rw-r--r--src/lib/netlist/analog/nld_mosfet.cpp4
-rw-r--r--src/lib/netlist/analog/nld_mosfet.h2
-rw-r--r--src/lib/netlist/analog/nld_opamps.cpp4
-rw-r--r--src/lib/netlist/analog/nld_opamps.h2
-rw-r--r--src/lib/netlist/analog/nld_switches.cpp6
-rw-r--r--src/lib/netlist/analog/nld_switches.h2
-rw-r--r--src/lib/netlist/analog/nld_twoterm.h2
-rw-r--r--src/lib/netlist/analog/nlid_fourterm.cpp4
-rw-r--r--src/lib/netlist/analog/nlid_fourterm.h2
-rw-r--r--src/lib/netlist/analog/nlid_twoterm.cpp4
-rw-r--r--src/lib/netlist/analog/nlid_twoterm.h8
-rw-r--r--src/lib/netlist/build/makefile50
-rw-r--r--src/lib/netlist/devices/net_lib.cpp4
-rw-r--r--src/lib/netlist/devices/net_lib.h14
-rw-r--r--src/lib/netlist/devices/nld_2102A.cpp2
-rw-r--r--src/lib/netlist/devices/nld_2102A.h2
-rw-r--r--src/lib/netlist/devices/nld_4006.h2
-rw-r--r--src/lib/netlist/devices/nld_4013.cpp4
-rw-r--r--src/lib/netlist/devices/nld_4013.h2
-rw-r--r--src/lib/netlist/devices/nld_4017.h2
-rw-r--r--src/lib/netlist/devices/nld_4020.h2
-rw-r--r--src/lib/netlist/devices/nld_4053.cpp4
-rw-r--r--src/lib/netlist/devices/nld_4053.h2
-rw-r--r--src/lib/netlist/devices/nld_4066.cpp4
-rw-r--r--src/lib/netlist/devices/nld_4066.h2
-rw-r--r--src/lib/netlist/devices/nld_4316.cpp4
-rw-r--r--src/lib/netlist/devices/nld_4316.h2
-rw-r--r--src/lib/netlist/devices/nld_74107.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74107.h2
-rw-r--r--src/lib/netlist/devices/nld_74113.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74113.h2
-rw-r--r--src/lib/netlist/devices/nld_74123.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74123.h2
-rw-r--r--src/lib/netlist/devices/nld_74125.h2
-rw-r--r--src/lib/netlist/devices/nld_74153.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74153.h2
-rw-r--r--src/lib/netlist/devices/nld_74164.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74164.h2
-rw-r--r--src/lib/netlist/devices/nld_74165.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74165.h2
-rw-r--r--src/lib/netlist/devices/nld_74166.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74166.h2
-rw-r--r--src/lib/netlist/devices/nld_74174.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74174.h2
-rw-r--r--src/lib/netlist/devices/nld_74175.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74175.h2
-rw-r--r--src/lib/netlist/devices/nld_74192.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74192.h2
-rw-r--r--src/lib/netlist/devices/nld_74193.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74193.h2
-rw-r--r--src/lib/netlist/devices/nld_74194.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74194.h2
-rw-r--r--src/lib/netlist/devices/nld_74365.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74365.h2
-rw-r--r--src/lib/netlist/devices/nld_74377.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74377.h2
-rw-r--r--src/lib/netlist/devices/nld_74393.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74393.h2
-rw-r--r--src/lib/netlist/devices/nld_7448.h2
-rw-r--r--src/lib/netlist/devices/nld_7450.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7450.h2
-rw-r--r--src/lib/netlist/devices/nld_7473.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7473.h2
-rw-r--r--src/lib/netlist/devices/nld_7474.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7474.h2
-rw-r--r--src/lib/netlist/devices/nld_7475.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7475.h2
-rw-r--r--src/lib/netlist/devices/nld_7483.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7483.h2
-rw-r--r--src/lib/netlist/devices/nld_7485.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7485.h2
-rw-r--r--src/lib/netlist/devices/nld_7490.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7490.h2
-rw-r--r--src/lib/netlist/devices/nld_7492.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7492.h2
-rw-r--r--src/lib/netlist/devices/nld_7493.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7493.h2
-rw-r--r--src/lib/netlist/devices/nld_7497.cpp2
-rw-r--r--src/lib/netlist/devices/nld_7497.h2
-rw-r--r--src/lib/netlist/devices/nld_74ls629.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74ls629.h2
-rw-r--r--src/lib/netlist/devices/nld_8277.cpp2
-rw-r--r--src/lib/netlist/devices/nld_8277.h2
-rw-r--r--src/lib/netlist/devices/nld_82S115.cpp2
-rw-r--r--src/lib/netlist/devices/nld_82S115.h2
-rw-r--r--src/lib/netlist/devices/nld_82S16.cpp2
-rw-r--r--src/lib/netlist/devices/nld_82S16.h2
-rw-r--r--src/lib/netlist/devices/nld_9316.h2
-rw-r--r--src/lib/netlist/devices/nld_9321.cpp2
-rw-r--r--src/lib/netlist/devices/nld_9321.h2
-rw-r--r--src/lib/netlist/devices/nld_9322.cpp2
-rw-r--r--src/lib/netlist/devices/nld_9322.h2
-rw-r--r--src/lib/netlist/devices/nld_am2847.cpp2
-rw-r--r--src/lib/netlist/devices/nld_am2847.h2
-rw-r--r--src/lib/netlist/devices/nld_dm9314.cpp2
-rw-r--r--src/lib/netlist/devices/nld_dm9314.h2
-rw-r--r--src/lib/netlist/devices/nld_dm9334.cpp2
-rw-r--r--src/lib/netlist/devices/nld_dm9334.h2
-rw-r--r--src/lib/netlist/devices/nld_legacy.cpp2
-rw-r--r--src/lib/netlist/devices/nld_legacy.h2
-rw-r--r--src/lib/netlist/devices/nld_log.cpp2
-rw-r--r--src/lib/netlist/devices/nld_log.h2
-rw-r--r--src/lib/netlist/devices/nld_mm5837.cpp4
-rw-r--r--src/lib/netlist/devices/nld_mm5837.h2
-rw-r--r--src/lib/netlist/devices/nld_ne555.cpp4
-rw-r--r--src/lib/netlist/devices/nld_ne555.h2
-rw-r--r--src/lib/netlist/devices/nld_r2r_dac.cpp6
-rw-r--r--src/lib/netlist/devices/nld_r2r_dac.h2
-rw-r--r--src/lib/netlist/devices/nld_roms.cpp4
-rw-r--r--src/lib/netlist/devices/nld_roms.h2
-rw-r--r--src/lib/netlist/devices/nld_schmitt.cpp8
-rw-r--r--src/lib/netlist/devices/nld_schmitt.h2
-rw-r--r--src/lib/netlist/devices/nld_system.cpp4
-rw-r--r--src/lib/netlist/devices/nld_system.h2
-rw-r--r--src/lib/netlist/devices/nld_tms4800.cpp2
-rw-r--r--src/lib/netlist/devices/nld_tms4800.h2
-rw-r--r--src/lib/netlist/devices/nld_tristate.cpp2
-rw-r--r--src/lib/netlist/devices/nld_tristate.h2
-rw-r--r--src/lib/netlist/devices/nlid_proxy.h4
-rw-r--r--src/lib/netlist/devices/nlid_system.h12
-rw-r--r--src/lib/netlist/devices/nlid_truthtable.h2
-rw-r--r--src/lib/netlist/examples/bjt_eb.c2
-rw-r--r--src/lib/netlist/examples/cmos_inverter.cpp2
-rw-r--r--src/lib/netlist/examples/cmos_inverter_clk.cpp2
-rw-r--r--src/lib/netlist/examples/lostfound.cpp2
-rw-r--r--src/lib/netlist/examples/nmos_fet.cpp2
-rw-r--r--[-rwxr-xr-x]src/lib/netlist/generated/nld_devinc.h578
-rw-r--r--src/lib/netlist/macro/nlm_base_lib.cpp2
-rw-r--r--src/lib/netlist/macro/nlm_base_lib.h2
-rw-r--r--src/lib/netlist/macro/nlm_cd4xxx_lib.cpp4
-rw-r--r--src/lib/netlist/macro/nlm_cd4xxx_lib.h2
-rw-r--r--src/lib/netlist/macro/nlm_opamp_lib.cpp2
-rw-r--r--src/lib/netlist/macro/nlm_opamp_lib.h2
-rw-r--r--src/lib/netlist/macro/nlm_otheric_lib.cpp2
-rw-r--r--src/lib/netlist/macro/nlm_otheric_lib.h2
-rw-r--r--src/lib/netlist/macro/nlm_roms_lib.cpp4
-rw-r--r--src/lib/netlist/macro/nlm_roms_lib.h2
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx_lib.cpp10
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx_lib.h2
-rw-r--r--src/lib/netlist/nl_base.cpp5
-rw-r--r--src/lib/netlist/nl_dice_compat.h2
-rw-r--r--src/lib/netlist/nltypes.h2
-rw-r--r--src/lib/netlist/prg/nltool.cpp20
-rwxr-xr-xsrc/lib/netlist/prg/nlwav.cpp10
-rw-r--r--src/lib/netlist/solver/nld_matrix_solver.h18
-rw-r--r--src/lib/netlist/solver/nld_solver.cpp4
-rw-r--r--src/lib/netlist/solver/nld_solver.h2
152 files changed, 533 insertions, 527 deletions
diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp
index 3af1570edb5..f4692a29547 100644
--- a/src/devices/machine/netlist.cpp
+++ b/src/devices/machine/netlist.cpp
@@ -16,7 +16,6 @@
#include "netlist/nl_factory.h"
#include "netlist/nl_parser.h"
#include "netlist/nl_interface.h"
-//#include "netlist/devices/nlid_system.h"
#include "netlist/plib/palloc.h"
#include "netlist/plib/pmempool.h"
diff --git a/src/lib/netlist/analog/nld_bjt.cpp b/src/lib/netlist/analog/nld_bjt.cpp
index 4ec7b3c971e..342a636637c 100644
--- a/src/lib/netlist/analog/nld_bjt.cpp
+++ b/src/lib/netlist/analog/nld_bjt.cpp
@@ -1,8 +1,8 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "netlist/solver/nld_solver.h"
-#include "netlist/nl_base.h"
+#include "solver/nld_solver.h"
+#include "nl_base.h"
#include "nlid_twoterm.h"
// FIXME: Remove QBJT_switch - no more use
diff --git a/src/lib/netlist/analog/nld_bjt.h b/src/lib/netlist/analog/nld_bjt.h
index f6ee74e3872..2dd12ea82d8 100644
--- a/src/lib/netlist/analog/nld_bjt.h
+++ b/src/lib/netlist/analog/nld_bjt.h
@@ -8,7 +8,7 @@
/// \file nld_bjt.h
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// -----------------------------------------------------------------------------
// Macros
diff --git a/src/lib/netlist/analog/nld_fourterm.h b/src/lib/netlist/analog/nld_fourterm.h
index 5912f374ece..12fb0035d29 100644
--- a/src/lib/netlist/analog/nld_fourterm.h
+++ b/src/lib/netlist/analog/nld_fourterm.h
@@ -8,7 +8,7 @@
/// \file nld_fourterm.h
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// ----------------------------------------------------------------------------------------
// Macros
diff --git a/src/lib/netlist/analog/nld_generic_models.h b/src/lib/netlist/analog/nld_generic_models.h
index 5ccf386f6fa..246c7c1a14e 100644
--- a/src/lib/netlist/analog/nld_generic_models.h
+++ b/src/lib/netlist/analog/nld_generic_models.h
@@ -8,8 +8,8 @@
/// \file nld_generic_models.h
///
-#include "netlist/nl_base.h"
-#include "netlist/nl_setup.h"
+#include "nl_base.h"
+#include "../nl_setup.h"
//
// Set to 0 to use a linearized diode model in the range exceeding
diff --git a/src/lib/netlist/analog/nld_mosfet.cpp b/src/lib/netlist/analog/nld_mosfet.cpp
index 3e74ac617c3..1cb41eca913 100644
--- a/src/lib/netlist/analog/nld_mosfet.cpp
+++ b/src/lib/netlist/analog/nld_mosfet.cpp
@@ -18,8 +18,8 @@
// Stefan Jahn, Michael Margraf, Vincent Habchi and Raimund Jacob, "Qucs Technical Papers" (2007)
//
-#include "netlist/solver/nld_solver.h"
-#include "netlist/nl_setup.h"
+#include "solver/nld_solver.h"
+#include "../nl_setup.h"
#include "nlid_twoterm.h"
#define BODY_CONNECTED_TO_SOURCE (1)
diff --git a/src/lib/netlist/analog/nld_mosfet.h b/src/lib/netlist/analog/nld_mosfet.h
index 23c6cacc3bd..38e7a91c339 100644
--- a/src/lib/netlist/analog/nld_mosfet.h
+++ b/src/lib/netlist/analog/nld_mosfet.h
@@ -4,7 +4,7 @@
#ifndef NLD_MOSFET_H_
#define NLD_MOSFET_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
///
/// \file nld_mosfet.h
diff --git a/src/lib/netlist/analog/nld_opamps.cpp b/src/lib/netlist/analog/nld_opamps.cpp
index fa9c64e0e9a..b3d9b868a48 100644
--- a/src/lib/netlist/analog/nld_opamps.cpp
+++ b/src/lib/netlist/analog/nld_opamps.cpp
@@ -2,8 +2,8 @@
// copyright-holders:Couriersud
#include "nld_opamps.h"
-#include "netlist/nl_base.h"
-#include "netlist/nl_errstr.h"
+#include "nl_base.h"
+#include "nl_errstr.h"
#include "nlid_fourterm.h"
#include "nlid_twoterm.h"
diff --git a/src/lib/netlist/analog/nld_opamps.h b/src/lib/netlist/analog/nld_opamps.h
index aa59eb3d442..dcef1f84f03 100644
--- a/src/lib/netlist/analog/nld_opamps.h
+++ b/src/lib/netlist/analog/nld_opamps.h
@@ -8,7 +8,7 @@
/// \file nld_opamps.h
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// ----------------------------------------------------------------------------------------
// Macros
diff --git a/src/lib/netlist/analog/nld_switches.cpp b/src/lib/netlist/analog/nld_switches.cpp
index 061ea0a7995..8d61976cdc8 100644
--- a/src/lib/netlist/analog/nld_switches.cpp
+++ b/src/lib/netlist/analog/nld_switches.cpp
@@ -2,9 +2,9 @@
// copyright-holders:Couriersud
#include "nlid_twoterm.h"
-#include "netlist/nl_base.h"
-#include "netlist/nl_factory.h"
-#include "netlist/solver/nld_solver.h"
+#include "nl_base.h"
+#include "nl_factory.h"
+#include "solver/nld_solver.h"
// FIXME : convert to parameters
diff --git a/src/lib/netlist/analog/nld_switches.h b/src/lib/netlist/analog/nld_switches.h
index 969db12112b..cab638402f1 100644
--- a/src/lib/netlist/analog/nld_switches.h
+++ b/src/lib/netlist/analog/nld_switches.h
@@ -8,7 +8,7 @@
/// \file nld_switches.h
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// ----------------------------------------------------------------------------------------
// Macros
diff --git a/src/lib/netlist/analog/nld_twoterm.h b/src/lib/netlist/analog/nld_twoterm.h
index c90e29b5a93..f4a18898818 100644
--- a/src/lib/netlist/analog/nld_twoterm.h
+++ b/src/lib/netlist/analog/nld_twoterm.h
@@ -8,7 +8,7 @@
/// \file nld_twoterm.h
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// -----------------------------------------------------------------------------
// Macros
diff --git a/src/lib/netlist/analog/nlid_fourterm.cpp b/src/lib/netlist/analog/nlid_fourterm.cpp
index 14276fcb66b..2abcd3b0500 100644
--- a/src/lib/netlist/analog/nlid_fourterm.cpp
+++ b/src/lib/netlist/analog/nlid_fourterm.cpp
@@ -1,8 +1,8 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "netlist/solver/nld_solver.h"
-#include "netlist/nl_factory.h"
+#include "solver/nld_solver.h"
+#include "nl_factory.h"
#include "nlid_fourterm.h"
namespace netlist
diff --git a/src/lib/netlist/analog/nlid_fourterm.h b/src/lib/netlist/analog/nlid_fourterm.h
index dc47483a9e1..02ca5a9563b 100644
--- a/src/lib/netlist/analog/nlid_fourterm.h
+++ b/src/lib/netlist/analog/nlid_fourterm.h
@@ -8,7 +8,7 @@
/// \file nlid_fourterm.h
///
-#include "netlist/nl_base.h"
+#include "nl_base.h"
#include "plib/putil.h"
namespace netlist {
diff --git a/src/lib/netlist/analog/nlid_twoterm.cpp b/src/lib/netlist/analog/nlid_twoterm.cpp
index 9b6d10ccd7c..12ff0711041 100644
--- a/src/lib/netlist/analog/nlid_twoterm.cpp
+++ b/src/lib/netlist/analog/nlid_twoterm.cpp
@@ -1,9 +1,9 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "netlist/solver/nld_solver.h"
+#include "solver/nld_solver.h"
-#include "netlist/nl_factory.h"
+#include "nl_factory.h"
#include "nlid_twoterm.h"
namespace netlist
diff --git a/src/lib/netlist/analog/nlid_twoterm.h b/src/lib/netlist/analog/nlid_twoterm.h
index 6f42e90b3bf..5d4852142f0 100644
--- a/src/lib/netlist/analog/nlid_twoterm.h
+++ b/src/lib/netlist/analog/nlid_twoterm.h
@@ -34,10 +34,10 @@
///
//
-#include "netlist/nl_base.h"
-#include "netlist/nl_setup.h"
-#include "netlist/plib/pfunction.h"
-#include "netlist/solver/nld_solver.h"
+#include "nl_base.h"
+#include "../nl_setup.h"
+#include "plib/pfunction.h"
+#include "solver/nld_solver.h"
#include "nld_generic_models.h"
// -----------------------------------------------------------------------------
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
index ab3ce830df7..5a479c181bc 100644
--- a/src/lib/netlist/build/makefile
+++ b/src/lib/netlist/build/makefile
@@ -23,6 +23,8 @@
.DEFAULT_GOAL := all
SRC = ..
+#SRC = $(abspath ..)
+
PSRC = $(SRC)/plib
VSBUILD = $(SRC)/buildVS
DOC = $(SRC)/documentation
@@ -91,7 +93,7 @@ TIDY_DB = $(OBJ)/compile_commands.json
#LTO decreases performance :-(
#LTO = -flto=4 -fuse-linker-plugin -Wodr
-CCOREFLAGS = -g -O3 -std=c++14 -I$(CURDIR)/.. -I$(CURDIR)/../..
+CCOREFLAGS = -g -O3 -std=c++14 -I$(SRC)
CFLAGS = $(LTO) $(CCOREFLAGS) $(CEXTRAFLAGS)
LDFLAGS = $(LTO) -g -O3 -std=c++14 $(LDEXTRAFLAGS)
@@ -130,10 +132,10 @@ OBJDIRS = $(OBJ) \
$(OBJ)/prg \
$(OBJ)/generated \
-DEVSOURCES = $(wildcard $(SRC)/devices/*.cpp)
+DEVSOURCES = $(SRC)/solver/nld_solver.cpp
+DEVSOURCES += $(wildcard $(SRC)/devices/*.cpp)
DEVSOURCES += $(wildcard $(SRC)/analog/*.cpp)
DEVSOURCES += $(wildcard $(SRC)/macro/*.cpp)
-DEVSOURCES += $(SRC)/solver/nld_solver.cpp
TESTSOURCES = $(wildcard $(SRC)/tests/*.cpp)
@@ -210,7 +212,7 @@ BUILD_DIRS = $(OBJDIRS) man html
# all
#-------------------------------------------------
-all: maketree generated $(DEPEND) $(TARGETS)
+all: maketree $(DEPEND) $(TARGETS)
#-------------------------------------------------
# clean
@@ -225,11 +227,11 @@ clean:
nltool$(EXESUFFIX): $(OBJ)/prg/nltool.o $(OBJS)
@echo Linking $@...
- $(LD) -o $@ $(LDFLAGS) $^ $(LIBS)
+ @$(LD) -o $@ $(LDFLAGS) $^ $(LIBS)
nlwav$(EXESUFFIX): $(OBJ)/prg/nlwav.o $(OBJS)
@echo Linking $@...
- $(LD) -o $@ $(LDFLAGS) $^ $(LIBS)
+ @$(LD) -o $@ $(LDFLAGS) $^ $(LIBS)
#-------------------------------------------------
# directories
@@ -315,32 +317,19 @@ doc:
$(DOXYGEN) doxygen.conf
#-------------------------------------------------
-# generated
-#-------------------------------------------------
-
-../generated/lib_entries.hxx: $(DEVSOURCES)
- @echo creating $@
- $(PYTHON) create_lib_entries.py $^ > $@
-
-../generated/nld_devinc.h: $(DEVSOURCES)
- @echo creating $@
- $(PYTHON) create_devinc.py $^ > $@
-
-.PHONY: generated
-generated: ../generated/lib_entries.hxx ../generated/nld_devinc.h
-
-#-------------------------------------------------
# depends
#-------------------------------------------------
.PHONY: depend
depend: $(DEPEND)
-$(DEPEND): $(OBJ) | $(ALLSOURCES)
+$(DEPEND): $(ALLSOURCES) | $(OBJ)
@echo creating $(DEPEND)
@$(RM) -f $(DEPEND)
@for i in $(ALLSOURCES); do \
- $(DEPENDCC) $(CCOREFLAGS) -MM $$i -MT `echo $$i | sed -e 's+$(SRC)+$(OBJ)+' -e 's+.cpp+.o+' ` >> $(DEPEND); \
+ $(DEPENDCC) $(CCOREFLAGS) -MM $$i -MT `echo $$i \
+ | sed -e 's+$(SRC)+$(OBJ)+' -e 's+.cpp+.o+' ` \
+ | sed -e 's_\.\./[a-z]*/\.\./_../_g' >> $(DEPEND); \
done
# Include only if the goal needs it
@@ -349,6 +338,21 @@ ifeq ($(filter $(MAKECMDGOALS),$(MAKEFILE_TARGETS_WITHOUT_INCLUDE)),)
endif
#-------------------------------------------------
+# generated
+#-------------------------------------------------
+
+$(SRC)/generated/lib_entries.hxx: $(DEVSOURCES)
+ @echo creating $@
+ $(PYTHON) create_lib_entries.py $^ > $@
+
+$(SRC)/generated/nld_devinc.h: $(DEVSOURCES)
+ @echo creating $@
+ $(PYTHON) create_devinc.py $^ > $@
+
+.PHONY: generated
+generated: ../generated/lib_entries.hxx ../generated/nld_devinc.h
+
+#-------------------------------------------------
# clang tidy
#-------------------------------------------------
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp
index 14f7de04222..4475ee32c9b 100644
--- a/src/lib/netlist/devices/net_lib.cpp
+++ b/src/lib/netlist/devices/net_lib.cpp
@@ -8,8 +8,8 @@
// ***************************************************************************
#include "net_lib.h"
-#include "netlist/nl_factory.h"
-#include "netlist/solver/nld_solver.h"
+#include "nl_factory.h"
+#include "solver/nld_solver.h"
#define NETLIB_DEVICE_DECL(chip) extern factory::constructor_ptr_t decl_ ## chip
diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h
index aa6b6f922e6..b5fd52bf032 100644
--- a/src/lib/netlist/devices/net_lib.h
+++ b/src/lib/netlist/devices/net_lib.h
@@ -10,7 +10,7 @@
/// Discrete netlist implementation.
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#ifdef RES_R
#warning "Do not include rescap.h in a netlist environment"
@@ -108,12 +108,12 @@ NETLIST_EXTERNAL(base_lib)
#include "../macro/nlm_roms_lib.h"
#include "../macro/nlm_ttl74xx_lib.h"
-#include "netlist/analog/nld_bjt.h"
-#include "netlist/analog/nld_fourterm.h"
-#include "netlist/analog/nld_mosfet.h"
-#include "netlist/analog/nld_opamps.h"
-#include "netlist/analog/nld_switches.h"
-#include "netlist/analog/nld_twoterm.h"
+#include "../analog/nld_bjt.h"
+#include "../analog/nld_fourterm.h"
+#include "../analog/nld_mosfet.h"
+#include "../analog/nld_opamps.h"
+#include "../analog/nld_switches.h"
+#include "../analog/nld_twoterm.h"
#include "nld_legacy.h"
#endif
diff --git a/src/lib/netlist/devices/nld_2102A.cpp b/src/lib/netlist/devices/nld_2102A.cpp
index e2fcd7ef9e1..0fddde0bd2d 100644
--- a/src/lib/netlist/devices/nld_2102A.cpp
+++ b/src/lib/netlist/devices/nld_2102A.cpp
@@ -22,7 +22,7 @@
*/
#include "nld_2102A.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
#define ADDR2BYTE(a) ((a) >> 3)
#define ADDR2BIT(a) ((a) & 0x7)
diff --git a/src/lib/netlist/devices/nld_2102A.h b/src/lib/netlist/devices/nld_2102A.h
index 30e693f0e00..fb0693e1012 100644
--- a/src/lib/netlist/devices/nld_2102A.h
+++ b/src/lib/netlist/devices/nld_2102A.h
@@ -4,7 +4,7 @@
#ifndef NLD_2102A_H_
#define NLD_2102A_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// expects: RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI)
#define RAM_2102A(...) \
diff --git a/src/lib/netlist/devices/nld_4006.h b/src/lib/netlist/devices/nld_4006.h
index 86092c254dc..c86d7ad86ee 100644
--- a/src/lib/netlist/devices/nld_4006.h
+++ b/src/lib/netlist/devices/nld_4006.h
@@ -4,7 +4,7 @@
#ifndef NLD_4006_H_
#define NLD_4006_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define CD4006(name) \
NET_REGISTER_DEV(CD4006, name)
diff --git a/src/lib/netlist/devices/nld_4013.cpp b/src/lib/netlist/devices/nld_4013.cpp
index 66d03e09fbd..eca94c328a5 100644
--- a/src/lib/netlist/devices/nld_4013.cpp
+++ b/src/lib/netlist/devices/nld_4013.cpp
@@ -39,8 +39,8 @@
* FIXME: Check that (*) is emulated properly
*/
-#include "netlist/nl_base.h"
-#include "netlist/nl_factory.h"
+#include "nl_base.h"
+#include "nl_factory.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_4013.h b/src/lib/netlist/devices/nld_4013.h
index 7a2623bb8df..1569358357b 100644
--- a/src/lib/netlist/devices/nld_4013.h
+++ b/src/lib/netlist/devices/nld_4013.h
@@ -4,7 +4,7 @@
#ifndef NLD_4013_H_
#define NLD_4013_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: CD4013(name, cCLOCK, cDATA, cRESET, cSET)
#define CD4013(...) \
diff --git a/src/lib/netlist/devices/nld_4017.h b/src/lib/netlist/devices/nld_4017.h
index e97c45586ca..7f89c4b9cfe 100644
--- a/src/lib/netlist/devices/nld_4017.h
+++ b/src/lib/netlist/devices/nld_4017.h
@@ -4,7 +4,7 @@
#ifndef NLD_4017_H_
#define NLD_4017_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define CD4017(name) \
NET_REGISTER_DEV(CD4017, name)
diff --git a/src/lib/netlist/devices/nld_4020.h b/src/lib/netlist/devices/nld_4020.h
index 440a164910c..e80156045df 100644
--- a/src/lib/netlist/devices/nld_4020.h
+++ b/src/lib/netlist/devices/nld_4020.h
@@ -4,7 +4,7 @@
#ifndef NLD_4020_H_
#define NLD_4020_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : CD4020(name)
#define CD4020(...) \
diff --git a/src/lib/netlist/devices/nld_4053.cpp b/src/lib/netlist/devices/nld_4053.cpp
index fb61415f01d..38b37fd3393 100644
--- a/src/lib/netlist/devices/nld_4053.cpp
+++ b/src/lib/netlist/devices/nld_4053.cpp
@@ -25,8 +25,8 @@
#include "nld_4053.h"
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/solver/nld_solver.h"
+#include "analog/nlid_twoterm.h"
+#include "solver/nld_solver.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_4053.h b/src/lib/netlist/devices/nld_4053.h
index 83636ef636c..6c6334b349f 100644
--- a/src/lib/netlist/devices/nld_4053.h
+++ b/src/lib/netlist/devices/nld_4053.h
@@ -3,7 +3,7 @@
#ifndef NLD_4053_H_
#define NLD_4053_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// FIXME: Implement pure CMOS version
diff --git a/src/lib/netlist/devices/nld_4066.cpp b/src/lib/netlist/devices/nld_4066.cpp
index 8260cf0303e..8cfa07f3b71 100644
--- a/src/lib/netlist/devices/nld_4066.cpp
+++ b/src/lib/netlist/devices/nld_4066.cpp
@@ -23,8 +23,8 @@
#include "nld_4066.h"
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/solver/nld_solver.h"
+#include "analog/nlid_twoterm.h"
+#include "solver/nld_solver.h"
namespace netlist
diff --git a/src/lib/netlist/devices/nld_4066.h b/src/lib/netlist/devices/nld_4066.h
index f30369f28d3..7815466aa08 100644
--- a/src/lib/netlist/devices/nld_4066.h
+++ b/src/lib/netlist/devices/nld_4066.h
@@ -4,7 +4,7 @@
#ifndef NLD_4066_H_
#define NLD_4066_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// FIXME: Implement pure CMOS version
diff --git a/src/lib/netlist/devices/nld_4316.cpp b/src/lib/netlist/devices/nld_4316.cpp
index 0c6c10cc71f..1eed4fa9ba6 100644
--- a/src/lib/netlist/devices/nld_4316.cpp
+++ b/src/lib/netlist/devices/nld_4316.cpp
@@ -23,8 +23,8 @@
*/
#include "nld_4316.h"
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/solver/nld_solver.h"
+#include "analog/nlid_twoterm.h"
+#include "solver/nld_solver.h"
namespace netlist { namespace devices {
diff --git a/src/lib/netlist/devices/nld_4316.h b/src/lib/netlist/devices/nld_4316.h
index 35c94bd30a0..599430f4576 100644
--- a/src/lib/netlist/devices/nld_4316.h
+++ b/src/lib/netlist/devices/nld_4316.h
@@ -4,7 +4,7 @@
#ifndef NLD_4316_H_
#define NLD_4316_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define CD4316_GATE(name) \
NET_REGISTER_DEV(CD4316_GATE, name)
diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp
index b176d460d5c..1e52368b417 100644
--- a/src/lib/netlist/devices/nld_74107.cpp
+++ b/src/lib/netlist/devices/nld_74107.cpp
@@ -62,7 +62,7 @@
*/
#include "nld_74107.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74107.h b/src/lib/netlist/devices/nld_74107.h
index 91b21f6be7d..c3d65523a9f 100644
--- a/src/lib/netlist/devices/nld_74107.h
+++ b/src/lib/netlist/devices/nld_74107.h
@@ -4,7 +4,7 @@
#ifndef NLD_74107_H_
#define NLD_74107_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define TTL_74107(...) \
NET_REGISTER_DEVEXT(TTL_74107, __VA_ARGS__)
diff --git a/src/lib/netlist/devices/nld_74113.cpp b/src/lib/netlist/devices/nld_74113.cpp
index fe8e6054d71..98a8de63e01 100644
--- a/src/lib/netlist/devices/nld_74113.cpp
+++ b/src/lib/netlist/devices/nld_74113.cpp
@@ -58,7 +58,7 @@
*/
#include "nld_74113.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
// FIXME: this can probably be merged with nld_7473.cpp
// FIXME: timing, see 74107 for example, use template
diff --git a/src/lib/netlist/devices/nld_74113.h b/src/lib/netlist/devices/nld_74113.h
index 0a33de8cac6..e0b531daadc 100644
--- a/src/lib/netlist/devices/nld_74113.h
+++ b/src/lib/netlist/devices/nld_74113.h
@@ -4,7 +4,7 @@
#ifndef NLD_74113_H_
#define NLD_74113_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_74113(name, cCLK, cJ, cK, cCLRQ)
#define TTL_74113(...) \
diff --git a/src/lib/netlist/devices/nld_74123.cpp b/src/lib/netlist/devices/nld_74123.cpp
index a7651c9de6c..00a5047f764 100644
--- a/src/lib/netlist/devices/nld_74123.cpp
+++ b/src/lib/netlist/devices/nld_74123.cpp
@@ -46,7 +46,7 @@
*
*/
-#include "netlist/analog/nlid_twoterm.h"
+#include "analog/nlid_twoterm.h"
#include "nlid_system.h"
namespace netlist
diff --git a/src/lib/netlist/devices/nld_74123.h b/src/lib/netlist/devices/nld_74123.h
index be07c60f6d4..3c780fb83a6 100644
--- a/src/lib/netlist/devices/nld_74123.h
+++ b/src/lib/netlist/devices/nld_74123.h
@@ -4,7 +4,7 @@
#ifndef NLD_74123_H_
#define NLD_74123_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define TTL_74123(name) \
NET_REGISTER_DEV(TTL_74123, name)
diff --git a/src/lib/netlist/devices/nld_74125.h b/src/lib/netlist/devices/nld_74125.h
index d192d776977..07d749e0c02 100644
--- a/src/lib/netlist/devices/nld_74125.h
+++ b/src/lib/netlist/devices/nld_74125.h
@@ -8,7 +8,7 @@
#ifndef NLD_74125_H_
#define NLD_74125_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define TTL_74125_GATE(...) \
NET_REGISTER_DEV(TTL_74125_GATE, __VA_ARGS__)
diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp
index d26de50819e..9e5a68149c5 100644
--- a/src/lib/netlist/devices/nld_74153.cpp
+++ b/src/lib/netlist/devices/nld_74153.cpp
@@ -43,7 +43,7 @@
*/
#include "nld_74153.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74153.h b/src/lib/netlist/devices/nld_74153.h
index b291e1dd231..11bfe0e2bb4 100644
--- a/src/lib/netlist/devices/nld_74153.h
+++ b/src/lib/netlist/devices/nld_74153.h
@@ -4,7 +4,7 @@
#ifndef NLD_74153_H_
#define NLD_74153_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_74153(name, cC0, cC1, cC2, cC3, cA, cB, cG)
#define TTL_74153(...) \
diff --git a/src/lib/netlist/devices/nld_74164.cpp b/src/lib/netlist/devices/nld_74164.cpp
index 36d794e315e..25331e8f3ae 100644
--- a/src/lib/netlist/devices/nld_74164.cpp
+++ b/src/lib/netlist/devices/nld_74164.cpp
@@ -47,7 +47,7 @@
**********************************************************************/
#include "nld_74164.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
// FIXME: clk input to be separated - only falling edge relevant
diff --git a/src/lib/netlist/devices/nld_74164.h b/src/lib/netlist/devices/nld_74164.h
index f732301e1f9..9ec3b98c10c 100644
--- a/src/lib/netlist/devices/nld_74164.h
+++ b/src/lib/netlist/devices/nld_74164.h
@@ -4,7 +4,7 @@
#ifndef NLD_74164_H_
#define NLD_74164_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_74164(name, cA, cB, cCLRQ, cCLK)
#define TTL_74164(...) \
diff --git a/src/lib/netlist/devices/nld_74165.cpp b/src/lib/netlist/devices/nld_74165.cpp
index 1da604aef36..15647afb6d7 100644
--- a/src/lib/netlist/devices/nld_74165.cpp
+++ b/src/lib/netlist/devices/nld_74165.cpp
@@ -25,7 +25,7 @@
*/
#include "nld_74165.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74165.h b/src/lib/netlist/devices/nld_74165.h
index 72e1a415342..5b0b2820135 100644
--- a/src/lib/netlist/devices/nld_74165.h
+++ b/src/lib/netlist/devices/nld_74165.h
@@ -4,7 +4,7 @@
#ifndef NLD_74165_H_
#define NLD_74165_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH)
#define TTL_74165(...) \
diff --git a/src/lib/netlist/devices/nld_74166.cpp b/src/lib/netlist/devices/nld_74166.cpp
index e2b7901ff3c..243281ca527 100644
--- a/src/lib/netlist/devices/nld_74166.cpp
+++ b/src/lib/netlist/devices/nld_74166.cpp
@@ -25,7 +25,7 @@
*/
#include "nld_74166.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
// FIXME: separate handlers for inputs
diff --git a/src/lib/netlist/devices/nld_74166.h b/src/lib/netlist/devices/nld_74166.h
index 8184c2610d3..00434994d80 100644
--- a/src/lib/netlist/devices/nld_74166.h
+++ b/src/lib/netlist/devices/nld_74166.h
@@ -4,7 +4,7 @@
#ifndef NLD_74166_H_
#define NLD_74166_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ)
#define TTL_74166(...) \
diff --git a/src/lib/netlist/devices/nld_74174.cpp b/src/lib/netlist/devices/nld_74174.cpp
index 9949503ef42..1414ddd3145 100644
--- a/src/lib/netlist/devices/nld_74174.cpp
+++ b/src/lib/netlist/devices/nld_74174.cpp
@@ -34,7 +34,7 @@
*/
#include "nld_74174.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74174.h b/src/lib/netlist/devices/nld_74174.h
index 572cf560aae..91cef8fdd74 100644
--- a/src/lib/netlist/devices/nld_74174.h
+++ b/src/lib/netlist/devices/nld_74174.h
@@ -4,7 +4,7 @@
#ifndef NLD_74174_H_
#define NLD_74174_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ)
#define TTL_74174(...) \
diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp
index aa7993ada7b..0b2f125d1b1 100644
--- a/src/lib/netlist/devices/nld_74175.cpp
+++ b/src/lib/netlist/devices/nld_74175.cpp
@@ -34,7 +34,7 @@
*/
#include "nld_74175.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
// FIXME: optimize
diff --git a/src/lib/netlist/devices/nld_74175.h b/src/lib/netlist/devices/nld_74175.h
index ae9faa9bae0..377320b14f0 100644
--- a/src/lib/netlist/devices/nld_74175.h
+++ b/src/lib/netlist/devices/nld_74175.h
@@ -4,7 +4,7 @@
#ifndef NLD_74175_H_
#define NLD_74175_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : TTL_74175(name, pCLK, pD1, pD2, pD3, pD4, pCLRQ)
// auto connect: VCC, GND
diff --git a/src/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp
index f7c49bdd56d..0c1864f4394 100644
--- a/src/lib/netlist/devices/nld_74192.cpp
+++ b/src/lib/netlist/devices/nld_74192.cpp
@@ -27,7 +27,7 @@
*/
#include "nld_74192.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74192.h b/src/lib/netlist/devices/nld_74192.h
index 2331c151bb9..1248a07961c 100644
--- a/src/lib/netlist/devices/nld_74192.h
+++ b/src/lib/netlist/devices/nld_74192.h
@@ -4,7 +4,7 @@
#ifndef NLD_74192_H_
#define NLD_74192_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : TTL_74192(name, pA, pB, pC, pD, pCLEAR, pLOADQ, pCU, pCD)
// auto connect: VCC, GND
diff --git a/src/lib/netlist/devices/nld_74193.cpp b/src/lib/netlist/devices/nld_74193.cpp
index 1fcec366aa5..5754cd2eea1 100644
--- a/src/lib/netlist/devices/nld_74193.cpp
+++ b/src/lib/netlist/devices/nld_74193.cpp
@@ -24,7 +24,7 @@
*/
#include "nld_74193.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74193.h b/src/lib/netlist/devices/nld_74193.h
index fc9a1254c2f..42c790107a2 100644
--- a/src/lib/netlist/devices/nld_74193.h
+++ b/src/lib/netlist/devices/nld_74193.h
@@ -4,7 +4,7 @@
#ifndef NLD_74193_H_
#define NLD_74193_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : TTL_74193(name, pA, pB, pC, pD, pCLEAR, pLOADQ, pCU, pCD)
// auto connect: VCC, GND
diff --git a/src/lib/netlist/devices/nld_74194.cpp b/src/lib/netlist/devices/nld_74194.cpp
index e29fb947228..cc0b048d95d 100644
--- a/src/lib/netlist/devices/nld_74194.cpp
+++ b/src/lib/netlist/devices/nld_74194.cpp
@@ -25,7 +25,7 @@
#include "nld_74194.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74194.h b/src/lib/netlist/devices/nld_74194.h
index 43830f8fa0e..c380190d6fe 100644
--- a/src/lib/netlist/devices/nld_74194.h
+++ b/src/lib/netlist/devices/nld_74194.h
@@ -3,7 +3,7 @@
#ifndef NLD_74194_H_
#define NLD_74194_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : TTL_74194(name, pCLK, pS0, pS1, pSRIN, pA, pB, pC, pD, pSLIN, pCLRQ)
// auto connect: VCC, GND
diff --git a/src/lib/netlist/devices/nld_74365.cpp b/src/lib/netlist/devices/nld_74365.cpp
index 6906547fc35..ce93d336158 100644
--- a/src/lib/netlist/devices/nld_74365.cpp
+++ b/src/lib/netlist/devices/nld_74365.cpp
@@ -23,7 +23,7 @@
*/
#include "nld_74365.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74365.h b/src/lib/netlist/devices/nld_74365.h
index 1084bce6d85..5900991e156 100644
--- a/src/lib/netlist/devices/nld_74365.h
+++ b/src/lib/netlist/devices/nld_74365.h
@@ -3,7 +3,7 @@
#ifndef NLD_74365_H_
#define NLD_74365_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : TTL_74365(name, pG1Q, pG2Q, pA1, pA2, pA3, pA4, pA5, pA6)
// auto connect: VCC, GND
diff --git a/src/lib/netlist/devices/nld_74377.cpp b/src/lib/netlist/devices/nld_74377.cpp
index 8d5381ce92a..45427bde827 100644
--- a/src/lib/netlist/devices/nld_74377.cpp
+++ b/src/lib/netlist/devices/nld_74377.cpp
@@ -49,7 +49,7 @@
*/
#include "nld_74377.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74377.h b/src/lib/netlist/devices/nld_74377.h
index 9b3d2b87210..7157abec99f 100644
--- a/src/lib/netlist/devices/nld_74377.h
+++ b/src/lib/netlist/devices/nld_74377.h
@@ -4,7 +4,7 @@
#ifndef NLD_74377_H_
#define NLD_74377_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define TTL_74377_GATE(name) \
diff --git a/src/lib/netlist/devices/nld_74393.cpp b/src/lib/netlist/devices/nld_74393.cpp
index 38e42475eda..765c73a7880 100644
--- a/src/lib/netlist/devices/nld_74393.cpp
+++ b/src/lib/netlist/devices/nld_74393.cpp
@@ -20,7 +20,7 @@
*/
#include "nld_74393.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74393.h b/src/lib/netlist/devices/nld_74393.h
index cf4d3b82932..664b7ce91eb 100644
--- a/src/lib/netlist/devices/nld_74393.h
+++ b/src/lib/netlist/devices/nld_74393.h
@@ -4,7 +4,7 @@
#ifndef NLD_74393_H_
#define NLD_74393_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_74393(name, cCP, cMR)
#define TTL_74393(...) \
diff --git a/src/lib/netlist/devices/nld_7448.h b/src/lib/netlist/devices/nld_7448.h
index d9b6d49078d..937ea87e090 100644
--- a/src/lib/netlist/devices/nld_7448.h
+++ b/src/lib/netlist/devices/nld_7448.h
@@ -4,7 +4,7 @@
#ifndef NLD_7448_H_
#define NLD_7448_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : TTL_7448(name, pA, pB, pC, pD, pLTQ, pBIQ, pRBIQ)
// auto connect: VCC, GND
diff --git a/src/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp
index 429958d02d5..35487bd12f9 100644
--- a/src/lib/netlist/devices/nld_7450.cpp
+++ b/src/lib/netlist/devices/nld_7450.cpp
@@ -22,7 +22,7 @@
*/
#include "nld_7450.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_7450.h b/src/lib/netlist/devices/nld_7450.h
index f12d1b6d844..7a58605f20c 100644
--- a/src/lib/netlist/devices/nld_7450.h
+++ b/src/lib/netlist/devices/nld_7450.h
@@ -4,7 +4,7 @@
#ifndef NLD_7450_H_
#define NLD_7450_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_7450_ANDORINVERT(name, cI1, cI2, cI3, cI4)
#define TTL_7450_ANDORINVERT(...) \
diff --git a/src/lib/netlist/devices/nld_7473.cpp b/src/lib/netlist/devices/nld_7473.cpp
index 805321e997e..8826df0239d 100644
--- a/src/lib/netlist/devices/nld_7473.cpp
+++ b/src/lib/netlist/devices/nld_7473.cpp
@@ -58,7 +58,7 @@
*/
#include "nld_7473.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_7473.h b/src/lib/netlist/devices/nld_7473.h
index 0ba195d4476..6aedd619dac 100644
--- a/src/lib/netlist/devices/nld_7473.h
+++ b/src/lib/netlist/devices/nld_7473.h
@@ -4,7 +4,7 @@
#ifndef NLD_7473_H_
#define NLD_7473_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_7473(name, cCLK, cJ, cK, cCLRQ)
#define TTL_7473(...) \
diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp
index 2bf97703374..42d5acfc9af 100644
--- a/src/lib/netlist/devices/nld_7474.cpp
+++ b/src/lib/netlist/devices/nld_7474.cpp
@@ -41,7 +41,7 @@
*/
#include "nld_7474.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
#include <array>
diff --git a/src/lib/netlist/devices/nld_7474.h b/src/lib/netlist/devices/nld_7474.h
index d44a2759e67..7ae42fc750b 100644
--- a/src/lib/netlist/devices/nld_7474.h
+++ b/src/lib/netlist/devices/nld_7474.h
@@ -4,7 +4,7 @@
#ifndef NLD_7474_H_
#define NLD_7474_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_7474(name, cCLK, cD, cCLRQ, cPREQ)
#define TTL_7474(...) \
diff --git a/src/lib/netlist/devices/nld_7475.cpp b/src/lib/netlist/devices/nld_7475.cpp
index 785906e7b9b..d8b6bbe84db 100644
--- a/src/lib/netlist/devices/nld_7475.cpp
+++ b/src/lib/netlist/devices/nld_7475.cpp
@@ -35,7 +35,7 @@
*/
#include "nld_7475.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_7475.h b/src/lib/netlist/devices/nld_7475.h
index 0e44886f7de..988061e3c6b 100644
--- a/src/lib/netlist/devices/nld_7475.h
+++ b/src/lib/netlist/devices/nld_7475.h
@@ -4,7 +4,7 @@
#ifndef NLD_7475_H_
#define NLD_7475_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define TTL_7475_GATE(...) \
NET_REGISTER_DEVEXT(TTL_7475_GATE, __VA_ARGS__)
diff --git a/src/lib/netlist/devices/nld_7483.cpp b/src/lib/netlist/devices/nld_7483.cpp
index 08905727ef4..0e20ab76b63 100644
--- a/src/lib/netlist/devices/nld_7483.cpp
+++ b/src/lib/netlist/devices/nld_7483.cpp
@@ -25,7 +25,7 @@
*/
#include "nld_7483.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_7483.h b/src/lib/netlist/devices/nld_7483.h
index a8751f2a7c5..e2ede42246a 100644
--- a/src/lib/netlist/devices/nld_7483.h
+++ b/src/lib/netlist/devices/nld_7483.h
@@ -4,7 +4,7 @@
#ifndef NLD_7483_H_
#define NLD_7483_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_7483(name, cA1, cA2, cA3, cA4, cB1, cB2, cB3, cB4, cCI)
#define TTL_7483(...) \
diff --git a/src/lib/netlist/devices/nld_7485.cpp b/src/lib/netlist/devices/nld_7485.cpp
index 0d960ac9006..7cce2fa8ad8 100644
--- a/src/lib/netlist/devices/nld_7485.cpp
+++ b/src/lib/netlist/devices/nld_7485.cpp
@@ -23,7 +23,7 @@
*/
#include "nld_7485.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_7485.h b/src/lib/netlist/devices/nld_7485.h
index 1211c47c4d5..8d140b57c4d 100644
--- a/src/lib/netlist/devices/nld_7485.h
+++ b/src/lib/netlist/devices/nld_7485.h
@@ -4,7 +4,7 @@
#ifndef NLD_7485_H_
#define NLD_7485_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN)
#define TTL_7485(...) \
diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp
index aa8388c2615..8dcf6ab2655 100644
--- a/src/lib/netlist/devices/nld_7490.cpp
+++ b/src/lib/netlist/devices/nld_7490.cpp
@@ -53,7 +53,7 @@
*/
#include "nld_7490.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_7490.h b/src/lib/netlist/devices/nld_7490.h
index 725ebb8b949..06a18f19c8d 100644
--- a/src/lib/netlist/devices/nld_7490.h
+++ b/src/lib/netlist/devices/nld_7490.h
@@ -4,7 +4,7 @@
#ifndef NLD_7490_H_
#define NLD_7490_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92)
#define TTL_7490(...) \
diff --git a/src/lib/netlist/devices/nld_7492.cpp b/src/lib/netlist/devices/nld_7492.cpp
index 56a579dcb8a..3bf120f3c68 100644
--- a/src/lib/netlist/devices/nld_7492.cpp
+++ b/src/lib/netlist/devices/nld_7492.cpp
@@ -50,7 +50,7 @@
*
*/
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_7492.h b/src/lib/netlist/devices/nld_7492.h
index c4cab8909e8..366e1c079c6 100644
--- a/src/lib/netlist/devices/nld_7492.h
+++ b/src/lib/netlist/devices/nld_7492.h
@@ -4,7 +4,7 @@
#ifndef NLD_7492_H_
#define NLD_7492_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_7492(name, cA, cB, cR1, cR2)
#define TTL_7492(...) \
diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp
index 2fce9523c0b..17cf8eb5ff1 100644
--- a/src/lib/netlist/devices/nld_7493.cpp
+++ b/src/lib/netlist/devices/nld_7493.cpp
@@ -55,7 +55,7 @@
*/
#include "nld_7493.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
diff --git a/src/lib/netlist/devices/nld_7493.h b/src/lib/netlist/devices/nld_7493.h
index 34041d61373..86bbc6a1482 100644
--- a/src/lib/netlist/devices/nld_7493.h
+++ b/src/lib/netlist/devices/nld_7493.h
@@ -4,7 +4,7 @@
#ifndef NLD_7493_H_
#define NLD_7493_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_7493(name, cCLKA, cCLKB, cR1, cR2)
#define TTL_7493(...) \
diff --git a/src/lib/netlist/devices/nld_7497.cpp b/src/lib/netlist/devices/nld_7497.cpp
index 6f5f30e8811..b43ff7dcfe2 100644
--- a/src/lib/netlist/devices/nld_7497.cpp
+++ b/src/lib/netlist/devices/nld_7497.cpp
@@ -38,7 +38,7 @@
*/
#include "nld_7497.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_7497.h b/src/lib/netlist/devices/nld_7497.h
index c187ad24b3b..befebb8d64e 100644
--- a/src/lib/netlist/devices/nld_7497.h
+++ b/src/lib/netlist/devices/nld_7497.h
@@ -4,7 +4,7 @@
#ifndef NLD_7497_H_
#define NLD_7497_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_7497(name, cCLK, cSTRB, cEN, cUNITY, cCLR, cB0, cB1, cB2, cB3, cB4, cB5)
#define TTL_7497(...) \
diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp
index d9822492c80..27eee588957 100644
--- a/src/lib/netlist/devices/nld_74ls629.cpp
+++ b/src/lib/netlist/devices/nld_74ls629.cpp
@@ -60,7 +60,7 @@
#include "nld_74ls629.h"
-#include "netlist/analog/nlid_twoterm.h"
+#include "analog/nlid_twoterm.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_74ls629.h b/src/lib/netlist/devices/nld_74ls629.h
index 840dae357b8..ff467d46cea 100644
--- a/src/lib/netlist/devices/nld_74ls629.h
+++ b/src/lib/netlist/devices/nld_74ls629.h
@@ -4,7 +4,7 @@
#ifndef NLD_74LS629_H_
#define NLD_74LS629_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define SN74LS629(name, ...) \
NET_REGISTER_DEVEXT(SN74LS629, name,__VA_ARGS__)
diff --git a/src/lib/netlist/devices/nld_8277.cpp b/src/lib/netlist/devices/nld_8277.cpp
index e7f87c9336f..939f1a32ecc 100644
--- a/src/lib/netlist/devices/nld_8277.cpp
+++ b/src/lib/netlist/devices/nld_8277.cpp
@@ -19,7 +19,7 @@
*/
#include "nld_8277.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_8277.h b/src/lib/netlist/devices/nld_8277.h
index 0b98e15760b..54deeccb230 100644
--- a/src/lib/netlist/devices/nld_8277.h
+++ b/src/lib/netlist/devices/nld_8277.h
@@ -4,7 +4,7 @@
#ifndef NLD_8277_H_
#define NLD_8277_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : TTL_8277(name, pRESET, pCLK, pCLKA, pD0A, pD1A, pDSA, pCLKB, pD0B, pD1B, pDSB)
// auto connect: VCC, GND
diff --git a/src/lib/netlist/devices/nld_82S115.cpp b/src/lib/netlist/devices/nld_82S115.cpp
index 317b16e5e80..d96be04c053 100644
--- a/src/lib/netlist/devices/nld_82S115.cpp
+++ b/src/lib/netlist/devices/nld_82S115.cpp
@@ -26,7 +26,7 @@
*/
#include "nld_82S115.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_82S115.h b/src/lib/netlist/devices/nld_82S115.h
index c3f22dffee4..b5d6dcf58a5 100644
--- a/src/lib/netlist/devices/nld_82S115.h
+++ b/src/lib/netlist/devices/nld_82S115.h
@@ -4,7 +4,7 @@
#ifndef NLD_82S115_H_
#define NLD_82S115_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// expects: PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE)
#define PROM_82S115(...) \
diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp
index ee798e11eb5..bdc6a15132d 100644
--- a/src/lib/netlist/devices/nld_82S16.cpp
+++ b/src/lib/netlist/devices/nld_82S16.cpp
@@ -23,7 +23,7 @@
*/
#include "nld_82S16.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_82S16.h b/src/lib/netlist/devices/nld_82S16.h
index 60e6fb22994..ef73e631b16 100644
--- a/src/lib/netlist/devices/nld_82S16.h
+++ b/src/lib/netlist/devices/nld_82S16.h
@@ -4,7 +4,7 @@
#ifndef NLD_82S16_H_
#define NLD_82S16_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define TTL_82S16(name) \
NET_REGISTER_DEV(TTL_82S16, name)
diff --git a/src/lib/netlist/devices/nld_9316.h b/src/lib/netlist/devices/nld_9316.h
index 008104888ef..baefb42a758 100644
--- a/src/lib/netlist/devices/nld_9316.h
+++ b/src/lib/netlist/devices/nld_9316.h
@@ -4,7 +4,7 @@
#ifndef NLD_9316_H_
#define NLD_9316_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_9316(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD)
#define TTL_9316(...) \
diff --git a/src/lib/netlist/devices/nld_9321.cpp b/src/lib/netlist/devices/nld_9321.cpp
index 1634e4f13f0..81bd6a86a7e 100644
--- a/src/lib/netlist/devices/nld_9321.cpp
+++ b/src/lib/netlist/devices/nld_9321.cpp
@@ -19,7 +19,7 @@
*/
#include "nld_9321.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_9321.h b/src/lib/netlist/devices/nld_9321.h
index 41bf89fed2a..8283dbde20c 100644
--- a/src/lib/netlist/devices/nld_9321.h
+++ b/src/lib/netlist/devices/nld_9321.h
@@ -4,7 +4,7 @@
#ifndef NLD_9321_H_
#define NLD_9321_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_9321(name, cAE, cA0, cA1, cBE, cB0, cB1)
#define TTL_9321(...) \
diff --git a/src/lib/netlist/devices/nld_9322.cpp b/src/lib/netlist/devices/nld_9322.cpp
index bfc643b27ae..1167ece79d9 100644
--- a/src/lib/netlist/devices/nld_9322.cpp
+++ b/src/lib/netlist/devices/nld_9322.cpp
@@ -19,7 +19,7 @@
*/
#include "nld_9322.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_9322.h b/src/lib/netlist/devices/nld_9322.h
index 8a33f66959b..0584974da2e 100644
--- a/src/lib/netlist/devices/nld_9322.h
+++ b/src/lib/netlist/devices/nld_9322.h
@@ -4,7 +4,7 @@
#ifndef NLD_9322_H_
#define NLD_9322_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage: TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE)
#define TTL_9322(...) \
diff --git a/src/lib/netlist/devices/nld_am2847.cpp b/src/lib/netlist/devices/nld_am2847.cpp
index 89034dc518b..9a35b5f8ac9 100644
--- a/src/lib/netlist/devices/nld_am2847.cpp
+++ b/src/lib/netlist/devices/nld_am2847.cpp
@@ -19,7 +19,7 @@
*/
#include "nld_am2847.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_am2847.h b/src/lib/netlist/devices/nld_am2847.h
index abf91184f4d..bf7c3b8a635 100644
--- a/src/lib/netlist/devices/nld_am2847.h
+++ b/src/lib/netlist/devices/nld_am2847.h
@@ -4,7 +4,7 @@
#ifndef NLD_AM2847_H_
#define NLD_AM2847_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define TTL_AM2847(...) \
NET_REGISTER_DEVEXT(TTL_AM2847, __VA_ARGS__)
diff --git a/src/lib/netlist/devices/nld_dm9314.cpp b/src/lib/netlist/devices/nld_dm9314.cpp
index 8aa842c0214..215316f9d42 100644
--- a/src/lib/netlist/devices/nld_dm9314.cpp
+++ b/src/lib/netlist/devices/nld_dm9314.cpp
@@ -19,7 +19,7 @@
*/
#include "nld_dm9314.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_dm9314.h b/src/lib/netlist/devices/nld_dm9314.h
index 107b25464a6..03aebb16f14 100644
--- a/src/lib/netlist/devices/nld_dm9314.h
+++ b/src/lib/netlist/devices/nld_dm9314.h
@@ -4,7 +4,7 @@
#ifndef NLD_DM9314_H_
#define NLD_DM9314_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : TTL_9314(name, pEQ, pMRQ, pS0Q, pS1Q, pS2Q, pS3Q, pD0, pD1, pD2, pD3)
// auto connect: VCC, GND
diff --git a/src/lib/netlist/devices/nld_dm9334.cpp b/src/lib/netlist/devices/nld_dm9334.cpp
index aa69d2c949d..251604bdf93 100644
--- a/src/lib/netlist/devices/nld_dm9334.cpp
+++ b/src/lib/netlist/devices/nld_dm9334.cpp
@@ -63,7 +63,7 @@
*/
#include "nld_dm9334.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_dm9334.h b/src/lib/netlist/devices/nld_dm9334.h
index 052ab58fc82..9e48fbf2cb3 100644
--- a/src/lib/netlist/devices/nld_dm9334.h
+++ b/src/lib/netlist/devices/nld_dm9334.h
@@ -4,7 +4,7 @@
#ifndef NLD_DM9334_H_
#define NLD_DM9334_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : TTL_9334(name, pCQ, pEQ, pD, pA0, pA1, pA2)
// auto connect: VCC, GND
diff --git a/src/lib/netlist/devices/nld_legacy.cpp b/src/lib/netlist/devices/nld_legacy.cpp
index ba66ae1bf94..ca8893a59aa 100644
--- a/src/lib/netlist/devices/nld_legacy.cpp
+++ b/src/lib/netlist/devices/nld_legacy.cpp
@@ -6,7 +6,7 @@
*/
#include "nld_legacy.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_legacy.h b/src/lib/netlist/devices/nld_legacy.h
index f33ec9eedf2..a91074a4056 100644
--- a/src/lib/netlist/devices/nld_legacy.h
+++ b/src/lib/netlist/devices/nld_legacy.h
@@ -11,7 +11,7 @@
#ifndef NLD_LEGACY_H_
#define NLD_LEGACY_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// ----------------------------------------------------------------------------------------
// Macros
diff --git a/src/lib/netlist/devices/nld_log.cpp b/src/lib/netlist/devices/nld_log.cpp
index dacc208f5a0..f60029748ce 100644
--- a/src/lib/netlist/devices/nld_log.cpp
+++ b/src/lib/netlist/devices/nld_log.cpp
@@ -15,7 +15,7 @@
*
*/
-#include "netlist/nl_base.h"
+#include "nl_base.h"
#include "nld_log.h"
#include "plib/pfmtlog.h"
#include "plib/pmulti_threading.h"
diff --git a/src/lib/netlist/devices/nld_log.h b/src/lib/netlist/devices/nld_log.h
index 470506a430e..cf52e52a4f9 100644
--- a/src/lib/netlist/devices/nld_log.h
+++ b/src/lib/netlist/devices/nld_log.h
@@ -4,7 +4,7 @@
#ifndef NLD_LOG_H_
#define NLD_LOG_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define LOG(name, cI) \
NET_REGISTER_DEV(LOG, name) \
diff --git a/src/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp
index b55593eb10d..cf33660005a 100644
--- a/src/lib/netlist/devices/nld_mm5837.cpp
+++ b/src/lib/netlist/devices/nld_mm5837.cpp
@@ -17,8 +17,8 @@
*/
#include "nld_mm5837.h"
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/solver/nld_matrix_solver.h"
+#include "analog/nlid_twoterm.h"
+#include "solver/nld_matrix_solver.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_mm5837.h b/src/lib/netlist/devices/nld_mm5837.h
index 9c8380c8220..1bc6b5addee 100644
--- a/src/lib/netlist/devices/nld_mm5837.h
+++ b/src/lib/netlist/devices/nld_mm5837.h
@@ -4,7 +4,7 @@
#ifndef NLD_MM5837_H_
#define NLD_MM5837_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define MM5837(name) \
NET_REGISTER_DEV(MM5837, name)
diff --git a/src/lib/netlist/devices/nld_ne555.cpp b/src/lib/netlist/devices/nld_ne555.cpp
index 2175ae2c7f5..c132a88eda3 100644
--- a/src/lib/netlist/devices/nld_ne555.cpp
+++ b/src/lib/netlist/devices/nld_ne555.cpp
@@ -3,8 +3,8 @@
#include "nld_ne555.h"
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/solver/nld_solver.h"
+#include "analog/nlid_twoterm.h"
+#include "solver/nld_solver.h"
#include "plib/pmath.h"
diff --git a/src/lib/netlist/devices/nld_ne555.h b/src/lib/netlist/devices/nld_ne555.h
index 2c7fc8c22aa..1033b00cb67 100644
--- a/src/lib/netlist/devices/nld_ne555.h
+++ b/src/lib/netlist/devices/nld_ne555.h
@@ -4,7 +4,7 @@
#ifndef NLD_NE555_H_
#define NLD_NE555_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : NE555(name)
#define NE555(...) \
diff --git a/src/lib/netlist/devices/nld_r2r_dac.cpp b/src/lib/netlist/devices/nld_r2r_dac.cpp
index 703ba3a536e..da571930601 100644
--- a/src/lib/netlist/devices/nld_r2r_dac.cpp
+++ b/src/lib/netlist/devices/nld_r2r_dac.cpp
@@ -43,9 +43,9 @@
*
*/
-#include "netlist/nl_base.h"
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/nl_factory.h"
+#include "nl_base.h"
+#include "analog/nlid_twoterm.h"
+#include "nl_factory.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_r2r_dac.h b/src/lib/netlist/devices/nld_r2r_dac.h
index 85af880bddb..8a8f1c90f47 100644
--- a/src/lib/netlist/devices/nld_r2r_dac.h
+++ b/src/lib/netlist/devices/nld_r2r_dac.h
@@ -4,7 +4,7 @@
#ifndef NLD_R2R_DAC_H_
#define NLD_R2R_DAC_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define R2R_DAC(name, p_VIN, p_R, p_N) \
NET_REGISTER_DEVEXT(R2R_DAC, name, p_VIN, p_R, p_N)
diff --git a/src/lib/netlist/devices/nld_roms.cpp b/src/lib/netlist/devices/nld_roms.cpp
index f873f357d1e..de440b4a8d2 100644
--- a/src/lib/netlist/devices/nld_roms.cpp
+++ b/src/lib/netlist/devices/nld_roms.cpp
@@ -5,8 +5,8 @@
*
*/
-#include "netlist/nl_base.h"
-#include "netlist/nl_factory.h"
+#include "nl_base.h"
+#include "nl_factory.h"
template <typename N, typename T>
constexpr bool TOR(N n, T &a)
diff --git a/src/lib/netlist/devices/nld_roms.h b/src/lib/netlist/devices/nld_roms.h
index e8cf1b2398c..0a8c09d8cf1 100644
--- a/src/lib/netlist/devices/nld_roms.h
+++ b/src/lib/netlist/devices/nld_roms.h
@@ -8,7 +8,7 @@
#ifndef NLD_ROMS_H_
#define NLD_ROMS_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// PROM_82S126(name, cCE1Q, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7)
#define PROM_82S126(...) \
diff --git a/src/lib/netlist/devices/nld_schmitt.cpp b/src/lib/netlist/devices/nld_schmitt.cpp
index e201fe822d1..6b49739e107 100644
--- a/src/lib/netlist/devices/nld_schmitt.cpp
+++ b/src/lib/netlist/devices/nld_schmitt.cpp
@@ -7,10 +7,10 @@
#include "nld_schmitt.h"
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/nl_base.h"
-#include "netlist/nl_errstr.h"
-#include "netlist/solver/nld_solver.h"
+#include "analog/nlid_twoterm.h"
+#include "nl_base.h"
+#include "nl_errstr.h"
+#include "solver/nld_solver.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_schmitt.h b/src/lib/netlist/devices/nld_schmitt.h
index fbc10706b23..87b8626edda 100644
--- a/src/lib/netlist/devices/nld_schmitt.h
+++ b/src/lib/netlist/devices/nld_schmitt.h
@@ -8,7 +8,7 @@
#ifndef NLD_SCHMITT_H_
#define NLD_SCHMITT_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// ----------------------------------------------------------------------------------------
// Macros
diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp
index a1477b6dce4..a633e8074f7 100644
--- a/src/lib/netlist/devices/nld_system.cpp
+++ b/src/lib/netlist/devices/nld_system.cpp
@@ -5,8 +5,8 @@
*
*/
-#include "netlist/solver/nld_solver.h"
-#include "netlist/solver/nld_matrix_solver.h"
+#include "solver/nld_solver.h"
+#include "solver/nld_matrix_solver.h"
#include "nlid_system.h"
namespace netlist
diff --git a/src/lib/netlist/devices/nld_system.h b/src/lib/netlist/devices/nld_system.h
index 36317a6b1b9..2f174731dde 100644
--- a/src/lib/netlist/devices/nld_system.h
+++ b/src/lib/netlist/devices/nld_system.h
@@ -9,7 +9,7 @@
#ifndef NLD_SYSTEM_H_
#define NLD_SYSTEM_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// -----------------------------------------------------------------------------
// Macros
diff --git a/src/lib/netlist/devices/nld_tms4800.cpp b/src/lib/netlist/devices/nld_tms4800.cpp
index b52af34ca6a..abe63edda6e 100644
--- a/src/lib/netlist/devices/nld_tms4800.cpp
+++ b/src/lib/netlist/devices/nld_tms4800.cpp
@@ -26,7 +26,7 @@
*/
#include "nld_tms4800.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nld_tms4800.h b/src/lib/netlist/devices/nld_tms4800.h
index 57abe34e031..dc2eaa7a16d 100644
--- a/src/lib/netlist/devices/nld_tms4800.h
+++ b/src/lib/netlist/devices/nld_tms4800.h
@@ -4,7 +4,7 @@
#ifndef NLD_TMS4800_H_
#define NLD_TMS4800_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
// usage : ROM_TMS4800(name, pAR, pOE1, pOE2, pA0, pA1, pA2, pA3, pA4, pA5, pA6, pA7, pA8, pA9, pA10)
// auto connect: VCC, GND
diff --git a/src/lib/netlist/devices/nld_tristate.cpp b/src/lib/netlist/devices/nld_tristate.cpp
index 013a0514420..97dbb0a7750 100644
--- a/src/lib/netlist/devices/nld_tristate.cpp
+++ b/src/lib/netlist/devices/nld_tristate.cpp
@@ -8,7 +8,7 @@
*/
#include "nld_tristate.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
// FIXME: netlist now supports proper tristate outputs. All of this is legacy
// now and needs to be removed at some time.
diff --git a/src/lib/netlist/devices/nld_tristate.h b/src/lib/netlist/devices/nld_tristate.h
index 0cb32c73d12..3c60846cb31 100644
--- a/src/lib/netlist/devices/nld_tristate.h
+++ b/src/lib/netlist/devices/nld_tristate.h
@@ -4,7 +4,7 @@
#ifndef NLD_TRISTATE_H_
#define NLD_TRISTATE_H_
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#define TTL_TRISTATE(name, cCEQ1, cD1, cCEQ2, cD2) \
NET_REGISTER_DEV(TTL_TRISTATE, name) \
diff --git a/src/lib/netlist/devices/nlid_proxy.h b/src/lib/netlist/devices/nlid_proxy.h
index bdae6c1b851..74ad3469d63 100644
--- a/src/lib/netlist/devices/nlid_proxy.h
+++ b/src/lib/netlist/devices/nlid_proxy.h
@@ -11,8 +11,8 @@
#ifndef NLID_PROXY_H_
#define NLID_PROXY_H_
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/nl_base.h"
+#include "analog/nlid_twoterm.h"
+#include "nl_base.h"
namespace netlist
{
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index d00339e852b..2e43544339a 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -7,12 +7,12 @@
/// \file nlid_system.h
///
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/nl_base.h"
-#include "netlist/nl_factory.h"
-#include "netlist/plib/prandom.h"
-#include "netlist/plib/pstonum.h"
-#include "netlist/plib/putil.h"
+#include "analog/nlid_twoterm.h"
+#include "nl_base.h"
+#include "nl_factory.h"
+#include "plib/prandom.h"
+#include "plib/pstonum.h"
+#include "plib/putil.h"
#include <random>
diff --git a/src/lib/netlist/devices/nlid_truthtable.h b/src/lib/netlist/devices/nlid_truthtable.h
index e9daa32e47d..fade2a6087e 100644
--- a/src/lib/netlist/devices/nlid_truthtable.h
+++ b/src/lib/netlist/devices/nlid_truthtable.h
@@ -9,7 +9,7 @@
#define NLID_TRUTHTABLE_H_
#include "nl_factory.h"
-#include "nl_setup.h"
+#include "../nl_setup.h"
#define USE_TT_ALTERNATIVE (0)
diff --git a/src/lib/netlist/examples/bjt_eb.c b/src/lib/netlist/examples/bjt_eb.c
index 75a43827e69..554cacd967d 100644
--- a/src/lib/netlist/examples/bjt_eb.c
+++ b/src/lib/netlist/examples/bjt_eb.c
@@ -7,7 +7,7 @@
#include "netlist/devices/net_lib.h"
-#include "netlist/analog/nld_twoterm.h"
+#include "netlist/devices/net_lib.h"
NETLIST_START(bjt)
/* Standard stuff */
diff --git a/src/lib/netlist/examples/cmos_inverter.cpp b/src/lib/netlist/examples/cmos_inverter.cpp
index a80deb66075..9261a1e5919 100644
--- a/src/lib/netlist/examples/cmos_inverter.cpp
+++ b/src/lib/netlist/examples/cmos_inverter.cpp
@@ -7,7 +7,7 @@
#include "netlist/devices/net_lib.h"
-#include "netlist/analog/nld_twoterm.h"
+#include "netlist/devices/net_lib.h"
NETLIST_START(cmos_inverter)
/* Standard stuff */
diff --git a/src/lib/netlist/examples/cmos_inverter_clk.cpp b/src/lib/netlist/examples/cmos_inverter_clk.cpp
index 5d60761f939..7429b077245 100644
--- a/src/lib/netlist/examples/cmos_inverter_clk.cpp
+++ b/src/lib/netlist/examples/cmos_inverter_clk.cpp
@@ -7,7 +7,7 @@
#include "netlist/devices/net_lib.h"
-#include "netlist/analog/nld_twoterm.h"
+#include "netlist/devices/net_lib.h"
#define USE_CLOCK (1)
diff --git a/src/lib/netlist/examples/lostfound.cpp b/src/lib/netlist/examples/lostfound.cpp
index 38c9376d1b6..ef6b5cf1e9e 100644
--- a/src/lib/netlist/examples/lostfound.cpp
+++ b/src/lib/netlist/examples/lostfound.cpp
@@ -211,5 +211,5 @@ private:
nld_power_pins m_supply;
};
-// NETLIB_DEVICE_IMPL(CD4066_GATE_DYNAMIC, "CD4066_GATE_DYNAMIC", "")
+// NETLIB_DEVICE_IMPL(CD4066_GATE_DYNAMIC, "CD4066_GATE_DYNAMIC", "")
diff --git a/src/lib/netlist/examples/nmos_fet.cpp b/src/lib/netlist/examples/nmos_fet.cpp
index 6746abce8e7..e970c49bfba 100644
--- a/src/lib/netlist/examples/nmos_fet.cpp
+++ b/src/lib/netlist/examples/nmos_fet.cpp
@@ -7,7 +7,7 @@
#include "netlist/devices/net_lib.h"
-#include "netlist/analog/nld_twoterm.h"
+#include "netlist/devices/net_lib.h"
NETLIST_START(nmos)
/* Standard stuff */
diff --git a/src/lib/netlist/generated/nld_devinc.h b/src/lib/netlist/generated/nld_devinc.h
index 2ef20a9ff7d..13fe99f0c9a 100755..100644
--- a/src/lib/netlist/generated/nld_devinc.h
+++ b/src/lib/netlist/generated/nld_devinc.h
@@ -1,1124 +1,1124 @@
// ---------------------------------------------------------------------
+// Source: ../solver/nld_solver.cpp
+// ---------------------------------------------------------------------
+// usage : SOLVER(name, FREQ)
+#define SOLVER(...) \
+ NET_REGISTER_DEVEXT(SOLVER, __VA_ARGS__)
+// ---------------------------------------------------------------------
// Source: ../devices/nld_9321.cpp
// ---------------------------------------------------------------------
// usage : TTL_9321(name, E, A0, A1)
#define TTL_9321(...) \
- NET_REGISTER_DEVEXT(TTL_9321, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9321, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_log.cpp
// ---------------------------------------------------------------------
// usage : LOG(name, I)
#define LOG(...) \
- NET_REGISTER_DEVEXT(LOG, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LOG, __VA_ARGS__)
// usage : LOGD(name, I, I2)
#define LOGD(...) \
- NET_REGISTER_DEVEXT(LOGD, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LOGD, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_dm9334.cpp
// ---------------------------------------------------------------------
// usage : TTL_9334(name, CQ, EQ, D, A0, A1, A2)
// auto connect: VCC, GND
#define TTL_9334(...) \
- NET_REGISTER_DEVEXT(TTL_9334, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9334, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74174.cpp
// ---------------------------------------------------------------------
// usage : TTL_74174(name, CLK, D1, D2, D3, D4, D5, D6, CLRQ)
// auto connect: VCC, GND
#define TTL_74174(...) \
- NET_REGISTER_DEVEXT(TTL_74174, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74174, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7497.cpp
// ---------------------------------------------------------------------
// usage : TTL_7497(name, CLK, STRBQ, ENQ, UNITYQ, CLR, B0, B1, B2, B3, B4, B5)
// auto connect: VCC, GND
#define TTL_7497(...) \
- NET_REGISTER_DEVEXT(TTL_7497, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7497, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_9316.cpp
// ---------------------------------------------------------------------
// usage : TTL_9316(name, CLK, ENP, ENT, CLRQ, LOADQ, A, B, C, D)
// auto connect: VCC, GND
#define TTL_9316(...) \
- NET_REGISTER_DEVEXT(TTL_9316, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9316, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74123.cpp
// ---------------------------------------------------------------------
// usage : TTL_74123(name, )
#define TTL_74123(...) \
- NET_REGISTER_DEVEXT(TTL_74123, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74123, __VA_ARGS__)
// usage : TTL_74121(name, )
#define TTL_74121(...) \
- NET_REGISTER_DEVEXT(TTL_74121, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74121, __VA_ARGS__)
// usage : CD4538(name, )
#define CD4538(...) \
- NET_REGISTER_DEVEXT(CD4538, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4538, __VA_ARGS__)
// usage : TTL_9602(name, )
#define TTL_9602(...) \
- NET_REGISTER_DEVEXT(TTL_9602, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9602, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7474.cpp
// ---------------------------------------------------------------------
// usage : TTL_7474(name, CLK, D, CLRQ, PREQ)
// auto connect: VCC, GND
#define TTL_7474(...) \
- NET_REGISTER_DEVEXT(TTL_7474, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7474, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_9310.cpp
// ---------------------------------------------------------------------
// usage : TTL_9310(name, CLK, ENP, ENT, CLRQ, LOADQ, A, B, C, D)
// auto connect: VCC, GND
#define TTL_9310(...) \
- NET_REGISTER_DEVEXT(TTL_9310, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9310, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7485.cpp
// ---------------------------------------------------------------------
// usage : TTL_7485(name, A0, A1, A2, A3, B0, B1, B2, B3, LTIN, EQIN, GTIN)
// auto connect: VCC, GND
#define TTL_7485(...) \
- NET_REGISTER_DEVEXT(TTL_7485, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7485, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_9322.cpp
// ---------------------------------------------------------------------
// usage : TTL_9322(name, SELECT, A1, B1, A2, B2, A3, B3, A4, B4, STROBE)
// auto connect: VCC, GND
#define TTL_9322(...) \
- NET_REGISTER_DEVEXT(TTL_9322, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9322, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74165.cpp
// ---------------------------------------------------------------------
// usage : TTL_74165(name, CLK, CLKINH, SH_LDQ, SER, A, B, C, D, E, F, G, H)
// auto connect: VCC, GND
#define TTL_74165(...) \
- NET_REGISTER_DEVEXT(TTL_74165, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74165, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_82S16.cpp
// ---------------------------------------------------------------------
// usage : TTL_82S16(name, )
#define TTL_82S16(...) \
- NET_REGISTER_DEVEXT(TTL_82S16, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_82S16, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_4006.cpp
// ---------------------------------------------------------------------
// usage : CD4006(name, CLOCK, D1, D2, D3, D4, D1P4, D1P4S, D2P4, D2P5, D3P4, D4P4, D4P5)
// auto connect: VCC, GND
#define CD4006(...) \
- NET_REGISTER_DEVEXT(CD4006, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4006, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_schmitt.cpp
// ---------------------------------------------------------------------
// usage : SCHMITT_TRIGGER(name, STMODEL)
#define SCHMITT_TRIGGER(...) \
- NET_REGISTER_DEVEXT(SCHMITT_TRIGGER, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(SCHMITT_TRIGGER, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74125.cpp
// ---------------------------------------------------------------------
// usage : TTL_74125_GATE(name, )
#define TTL_74125_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_74125_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74125_GATE, __VA_ARGS__)
// usage : TTL_74126_GATE(name, )
#define TTL_74126_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_74126_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74126_GATE, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74163.cpp
// ---------------------------------------------------------------------
// usage : TTL_74163(name, CLK, ENP, ENT, CLRQ, LOADQ, A, B, C, D)
// auto connect: VCC, GND
#define TTL_74163(...) \
- NET_REGISTER_DEVEXT(TTL_74163, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74163, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74113.cpp
// ---------------------------------------------------------------------
// usage : TTL_74113(name, CLK, J, K, CLRQ)
// auto connect: VCC, GND
#define TTL_74113(...) \
- NET_REGISTER_DEVEXT(TTL_74113, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74113, __VA_ARGS__)
// usage : TTL_74113A(name, CLK, J, K, CLRQ)
// auto connect: VCC, GND
#define TTL_74113A(...) \
- NET_REGISTER_DEVEXT(TTL_74113A, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74113A, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74192.cpp
// ---------------------------------------------------------------------
// usage : TTL_74192(name, A, B, C, D, CLEAR, LOADQ, CU, CD)
// auto connect: VCC, GND
#define TTL_74192(...) \
- NET_REGISTER_DEVEXT(TTL_74192, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74192, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_4316.cpp
// ---------------------------------------------------------------------
// usage : CD4316_GATE(name, )
#define CD4316_GATE(...) \
- NET_REGISTER_DEVEXT(CD4316_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4316_GATE, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_2102A.cpp
// ---------------------------------------------------------------------
// usage : RAM_2102A(name, CEQ, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, RWQ, DI)
// auto connect: VCC, GND
#define RAM_2102A(...) \
- NET_REGISTER_DEVEXT(RAM_2102A, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(RAM_2102A, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_8277.cpp
// ---------------------------------------------------------------------
// usage : TTL_8277(name, RESET, CLK, CLKA, D0A, D1A, DSA, CLKB, D0B, D1B, DSB)
// auto connect: VCC, GND
#define TTL_8277(...) \
- NET_REGISTER_DEVEXT(TTL_8277, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_8277, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7448.cpp
// ---------------------------------------------------------------------
// usage : TTL_7448(name, A, B, C, D, LTQ, BIQ, RBIQ)
// auto connect: VCC, GND
#define TTL_7448(...) \
- NET_REGISTER_DEVEXT(TTL_7448, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7448, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_dm9314.cpp
// ---------------------------------------------------------------------
// usage : TTL_9314(name, EQ, MRQ, S0Q, S1Q, S2Q, S3Q, D0, D1, D2, D3)
// auto connect: VCC, GND
#define TTL_9314(...) \
- NET_REGISTER_DEVEXT(TTL_9314, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9314, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7490.cpp
// ---------------------------------------------------------------------
// usage : TTL_7490(name, A, B, R1, R2, R91, R92)
// auto connect: VCC, GND
#define TTL_7490(...) \
- NET_REGISTER_DEVEXT(TTL_7490, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7490, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74107.cpp
// ---------------------------------------------------------------------
// usage : TTL_74107(name, CLK, J, K, CLRQ)
// auto connect: VCC, GND
#define TTL_74107(...) \
- NET_REGISTER_DEVEXT(TTL_74107, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74107, __VA_ARGS__)
// usage : TTL_74107A(name, CLK, J, K, CLRQ)
// auto connect: VCC, GND
#define TTL_74107A(...) \
- NET_REGISTER_DEVEXT(TTL_74107A, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74107A, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74194.cpp
// ---------------------------------------------------------------------
// usage : TTL_74194(name, CLK, S0, S1, SRIN, A, B, C, D, SLIN, CLRQ)
// auto connect: VCC, GND
#define TTL_74194(...) \
- NET_REGISTER_DEVEXT(TTL_74194, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74194, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74153.cpp
// ---------------------------------------------------------------------
// usage : TTL_74153(name, C0, C1, C2, C3, A, B, G)
// auto connect: VCC, GND
#define TTL_74153(...) \
- NET_REGISTER_DEVEXT(TTL_74153, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74153, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74166.cpp
// ---------------------------------------------------------------------
// usage : TTL_74166(name, CLK, CLKINH, SH_LDQ, SER, A, B, C, D, E, F, G, H, CLRQ)
// auto connect: VCC, GND
#define TTL_74166(...) \
- NET_REGISTER_DEVEXT(TTL_74166, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74166, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_4020.cpp
// ---------------------------------------------------------------------
// usage : CD4020(name, IP, RESET, VDD, VSS)
#define CD4020(...) \
- NET_REGISTER_DEVEXT(CD4020, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4020, __VA_ARGS__)
// usage : CD4024(name, )
#define CD4024(...) \
- NET_REGISTER_DEVEXT(CD4024, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4024, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74365.cpp
// ---------------------------------------------------------------------
// usage : TTL_74365(name, G1Q, G2Q, A1, A2, A3, A4, A5, A6)
// auto connect: VCC, GND
#define TTL_74365(...) \
- NET_REGISTER_DEVEXT(TTL_74365, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74365, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74393.cpp
// ---------------------------------------------------------------------
// usage : TTL_74393(name, CP, MR)
// auto connect: VCC, GND
#define TTL_74393(...) \
- NET_REGISTER_DEVEXT(TTL_74393, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74393, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_4013.cpp
// ---------------------------------------------------------------------
// usage : CD4013(name, CLOCK, DATA, RESET, SET)
// auto connect: VDD, VSS
#define CD4013(...) \
- NET_REGISTER_DEVEXT(CD4013, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4013, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_4017.cpp
// ---------------------------------------------------------------------
// usage : CD4017(name, )
#define CD4017(...) \
- NET_REGISTER_DEVEXT(CD4017, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4017, __VA_ARGS__)
// usage : CD4022(name, )
#define CD4022(...) \
- NET_REGISTER_DEVEXT(CD4022, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4022, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74175.cpp
// ---------------------------------------------------------------------
// usage : TTL_74175(name, CLK, D1, D2, D3, D4, CLRQ)
// auto connect: VCC, GND
#define TTL_74175(...) \
- NET_REGISTER_DEVEXT(TTL_74175, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74175, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_system.cpp
// ---------------------------------------------------------------------
// usage : PARAMETER(name, )
#define PARAMETER(...) \
- NET_REGISTER_DEVEXT(PARAMETER, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PARAMETER, __VA_ARGS__)
// usage : NC_PIN(name, )
#define NC_PIN(...) \
- NET_REGISTER_DEVEXT(NC_PIN, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(NC_PIN, __VA_ARGS__)
// usage : FRONTIER_DEV(name, I, G, Q)
#define FRONTIER_DEV(...) \
- NET_REGISTER_DEVEXT(FRONTIER_DEV, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(FRONTIER_DEV, __VA_ARGS__)
// usage : AFUNC(name, N, FUNC)
#define AFUNC(...) \
- NET_REGISTER_DEVEXT(AFUNC, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(AFUNC, __VA_ARGS__)
// usage : ANALOG_INPUT(name, IN)
#define ANALOG_INPUT(...) \
- NET_REGISTER_DEVEXT(ANALOG_INPUT, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(ANALOG_INPUT, __VA_ARGS__)
// usage : CLOCK(name, FREQ)
#define CLOCK(...) \
- NET_REGISTER_DEVEXT(CLOCK, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CLOCK, __VA_ARGS__)
// usage : VARCLOCK(name, N, FUNC)
#define VARCLOCK(...) \
- NET_REGISTER_DEVEXT(VARCLOCK, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(VARCLOCK, __VA_ARGS__)
// usage : EXTCLOCK(name, FREQ, PATTERN)
#define EXTCLOCK(...) \
- NET_REGISTER_DEVEXT(EXTCLOCK, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(EXTCLOCK, __VA_ARGS__)
// usage : SYS_DSW(name, I, 1, 2)
#define SYS_DSW(...) \
- NET_REGISTER_DEVEXT(SYS_DSW, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(SYS_DSW, __VA_ARGS__)
// usage : SYS_DSW2(name, )
#define SYS_DSW2(...) \
- NET_REGISTER_DEVEXT(SYS_DSW2, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(SYS_DSW2, __VA_ARGS__)
// usage : SYS_COMPD(name, )
#define SYS_COMPD(...) \
- NET_REGISTER_DEVEXT(SYS_COMPD, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(SYS_COMPD, __VA_ARGS__)
// usage : SYS_NOISE_MT_U(name, SIGMA)
#define SYS_NOISE_MT_U(...) \
- NET_REGISTER_DEVEXT(SYS_NOISE_MT_U, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(SYS_NOISE_MT_U, __VA_ARGS__)
// usage : SYS_NOISE_MT_N(name, SIGMA)
#define SYS_NOISE_MT_N(...) \
- NET_REGISTER_DEVEXT(SYS_NOISE_MT_N, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(SYS_NOISE_MT_N, __VA_ARGS__)
// usage : MAINCLOCK(name, FREQ)
#define MAINCLOCK(...) \
- NET_REGISTER_DEVEXT(MAINCLOCK, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MAINCLOCK, __VA_ARGS__)
// usage : GNDA(name, )
#define GNDA(...) \
- NET_REGISTER_DEVEXT(GNDA, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(GNDA, __VA_ARGS__)
// usage : LOGIC_INPUT8(name, IN, MODEL)
#define LOGIC_INPUT8(...) \
- NET_REGISTER_DEVEXT(LOGIC_INPUT8, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LOGIC_INPUT8, __VA_ARGS__)
// usage : LOGIC_INPUT(name, IN, MODEL)
#define LOGIC_INPUT(...) \
- NET_REGISTER_DEVEXT(LOGIC_INPUT, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LOGIC_INPUT, __VA_ARGS__)
// usage : TTL_INPUT(name, IN)
#define TTL_INPUT(...) \
- NET_REGISTER_DEVEXT(TTL_INPUT, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_INPUT, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74164.cpp
// ---------------------------------------------------------------------
// usage : TTL_74164(name, A, B, CLRQ, CLK)
// auto connect: VCC, GND
#define TTL_74164(...) \
- NET_REGISTER_DEVEXT(TTL_74164, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74164, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_am2847.cpp
// ---------------------------------------------------------------------
// usage : TTL_AM2847(name, CP, INA, INB, INC, IND, RCA, RCB, RCC, RCD)
// auto connect: VSS, VDD
#define TTL_AM2847(...) \
- NET_REGISTER_DEVEXT(TTL_AM2847, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_AM2847, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_tms4800.cpp
// ---------------------------------------------------------------------
// usage : ROM_TMS4800(name, AR, OE1, OE2, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)
// auto connect: VCC, GND
#define ROM_TMS4800(...) \
- NET_REGISTER_DEVEXT(ROM_TMS4800, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(ROM_TMS4800, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74ls629.cpp
// ---------------------------------------------------------------------
// usage : SN74LS629(name, CAP)
// auto connect: VCC, GND
#define SN74LS629(...) \
- NET_REGISTER_DEVEXT(SN74LS629, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(SN74LS629, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_roms.cpp
// ---------------------------------------------------------------------
// usage : PROM_82S126(name, CE1Q, CE2Q, A0, A1, A2, A3, A4, A5, A6, A7)
// auto connect: VCC, GND
#define PROM_82S126(...) \
- NET_REGISTER_DEVEXT(PROM_82S126, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PROM_82S126, __VA_ARGS__)
// usage : PROM_74S287(name, CE1Q, CE2Q, A0, A1, A2, A3, A4, A5, A6, A7)
// auto connect: VCC, GND
#define PROM_74S287(...) \
- NET_REGISTER_DEVEXT(PROM_74S287, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PROM_74S287, __VA_ARGS__)
// usage : PROM_82S123(name, CEQ, A0, A1, A2, A3, A4)
// auto connect: VCC, GND
#define PROM_82S123(...) \
- NET_REGISTER_DEVEXT(PROM_82S123, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PROM_82S123, __VA_ARGS__)
// usage : EPROM_2716(name, CE2Q, CE1Q, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)
// auto connect: VCC, GND
#define EPROM_2716(...) \
- NET_REGISTER_DEVEXT(EPROM_2716, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(EPROM_2716, __VA_ARGS__)
// usage : PROM_MK28000(name, OE1, OE2, ARQ, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11)
// auto connect: VCC, GND
#define PROM_MK28000(...) \
- NET_REGISTER_DEVEXT(PROM_MK28000, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PROM_MK28000, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_mm5837.cpp
// ---------------------------------------------------------------------
// usage : MM5837(name, )
#define MM5837(...) \
- NET_REGISTER_DEVEXT(MM5837, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MM5837, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_legacy.cpp
// ---------------------------------------------------------------------
// usage : NETDEV_RSFF(name, )
#define NETDEV_RSFF(...) \
- NET_REGISTER_DEVEXT(NETDEV_RSFF, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(NETDEV_RSFF, __VA_ARGS__)
// usage : NETDEV_DELAY(name, )
#define NETDEV_DELAY(...) \
- NET_REGISTER_DEVEXT(NETDEV_DELAY, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(NETDEV_DELAY, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7492.cpp
// ---------------------------------------------------------------------
// usage : TTL_7492(name, A, B, R1, R2)
// auto connect: VCC, GND
#define TTL_7492(...) \
- NET_REGISTER_DEVEXT(TTL_7492, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7492, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7475.cpp
// ---------------------------------------------------------------------
// usage : TTL_7475_GATE(name, )
#define TTL_7475_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7475_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7475_GATE, __VA_ARGS__)
// usage : TTL_7477_GATE(name, )
#define TTL_7477_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7477_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7477_GATE, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_4053.cpp
// ---------------------------------------------------------------------
// usage : CD4053_GATE(name, )
#define CD4053_GATE(...) \
- NET_REGISTER_DEVEXT(CD4053_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4053_GATE, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7493.cpp
// ---------------------------------------------------------------------
// usage : TTL_7493(name, CLKA, CLKB, R1, R2)
// auto connect: VCC, GND
#define TTL_7493(...) \
- NET_REGISTER_DEVEXT(TTL_7493, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7493, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74193.cpp
// ---------------------------------------------------------------------
// usage : TTL_74193(name, A, B, C, D, CLEAR, LOADQ, CU, CD)
// auto connect: VCC, GND
#define TTL_74193(...) \
- NET_REGISTER_DEVEXT(TTL_74193, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74193, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_tristate.cpp
// ---------------------------------------------------------------------
// usage : TTL_TRISTATE(name, CEQ1, D1, CEQ2, D2)
#define TTL_TRISTATE(...) \
- NET_REGISTER_DEVEXT(TTL_TRISTATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_TRISTATE, __VA_ARGS__)
// usage : TTL_TRISTATE3(name, )
#define TTL_TRISTATE3(...) \
- NET_REGISTER_DEVEXT(TTL_TRISTATE3, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_TRISTATE3, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_r2r_dac.cpp
// ---------------------------------------------------------------------
// usage : R2R_DAC(name, VIN, R, N)
#define R2R_DAC(...) \
- NET_REGISTER_DEVEXT(R2R_DAC, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(R2R_DAC, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7473.cpp
// ---------------------------------------------------------------------
// usage : TTL_7473(name, CLK, J, K, CLRQ)
// auto connect: VCC, GND
#define TTL_7473(...) \
- NET_REGISTER_DEVEXT(TTL_7473, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7473, __VA_ARGS__)
// usage : TTL_7473A(name, CLK, J, K, CLRQ)
// auto connect: VCC, GND
#define TTL_7473A(...) \
- NET_REGISTER_DEVEXT(TTL_7473A, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7473A, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7450.cpp
// ---------------------------------------------------------------------
// usage : TTL_7450_ANDORINVERT(name, A, B, C, D)
// auto connect: VCC, GND
#define TTL_7450_ANDORINVERT(...) \
- NET_REGISTER_DEVEXT(TTL_7450_ANDORINVERT, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7450_ANDORINVERT, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_4066.cpp
// ---------------------------------------------------------------------
// usage : CD4066_GATE(name, )
#define CD4066_GATE(...) \
- NET_REGISTER_DEVEXT(CD4066_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4066_GATE, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_ne555.cpp
// ---------------------------------------------------------------------
// usage : NE555(name, )
#define NE555(...) \
- NET_REGISTER_DEVEXT(NE555, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(NE555, __VA_ARGS__)
// usage : MC1455P(name, )
#define MC1455P(...) \
- NET_REGISTER_DEVEXT(MC1455P, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MC1455P, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_7483.cpp
// ---------------------------------------------------------------------
// usage : TTL_7483(name, A1, A2, A3, A4, B1, B2, B3, B4, C0)
// auto connect: VCC, GND
#define TTL_7483(...) \
- NET_REGISTER_DEVEXT(TTL_7483, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7483, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74161.cpp
// ---------------------------------------------------------------------
// usage : TTL_74161(name, CLK, ENP, ENT, CLRQ, LOADQ, A, B, C, D)
// auto connect: VCC, GND
#define TTL_74161(...) \
- NET_REGISTER_DEVEXT(TTL_74161, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74161, __VA_ARGS__)
// usage : TTL_74161_FIXME(name, A, B, C, D, CLRQ, LOADQ, CLK, ENP, ENT)
// auto connect: VCC, GND
#define TTL_74161_FIXME(...) \
- NET_REGISTER_DEVEXT(TTL_74161_FIXME, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74161_FIXME, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_82S115.cpp
// ---------------------------------------------------------------------
// usage : PROM_82S115(name, CE1Q, CE2, A0, A1, A2, A3, A4, A5, A6, A7, A8, STROBE)
// auto connect: VCC, GND
#define PROM_82S115(...) \
- NET_REGISTER_DEVEXT(PROM_82S115, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PROM_82S115, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../devices/nld_74377.cpp
// ---------------------------------------------------------------------
// usage : TTL_74377_GATE(name, )
#define TTL_74377_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_74377_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74377_GATE, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../analog/nlid_fourterm.cpp
// ---------------------------------------------------------------------
// usage : VCVS(name, G)
#define VCVS(...) \
- NET_REGISTER_DEVEXT(VCVS, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(VCVS, __VA_ARGS__)
// usage : VCCS(name, G)
#define VCCS(...) \
- NET_REGISTER_DEVEXT(VCCS, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(VCCS, __VA_ARGS__)
// usage : CCCS(name, G)
#define CCCS(...) \
- NET_REGISTER_DEVEXT(CCCS, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CCCS, __VA_ARGS__)
// usage : CCVS(name, G)
#define CCVS(...) \
- NET_REGISTER_DEVEXT(CCVS, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CCVS, __VA_ARGS__)
// usage : LVCCS(name, )
#define LVCCS(...) \
- NET_REGISTER_DEVEXT(LVCCS, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LVCCS, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../analog/nld_switches.cpp
// ---------------------------------------------------------------------
// usage : SWITCH(name, )
#define SWITCH(...) \
- NET_REGISTER_DEVEXT(SWITCH, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(SWITCH, __VA_ARGS__)
// usage : SWITCH2(name, )
#define SWITCH2(...) \
- NET_REGISTER_DEVEXT(SWITCH2, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(SWITCH2, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../analog/nld_mosfet.cpp
// ---------------------------------------------------------------------
// usage : MOSFET(name, MODEL)
#define MOSFET(...) \
- NET_REGISTER_DEVEXT(MOSFET, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MOSFET, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../analog/nlid_twoterm.cpp
// ---------------------------------------------------------------------
// usage : RES(name, R)
#define RES(...) \
- NET_REGISTER_DEVEXT(RES, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(RES, __VA_ARGS__)
// usage : POT(name, R)
#define POT(...) \
- NET_REGISTER_DEVEXT(POT, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(POT, __VA_ARGS__)
// usage : POT2(name, R)
#define POT2(...) \
- NET_REGISTER_DEVEXT(POT2, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(POT2, __VA_ARGS__)
// usage : CAP(name, C)
#define CAP(...) \
- NET_REGISTER_DEVEXT(CAP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CAP, __VA_ARGS__)
// usage : IND(name, L)
#define IND(...) \
- NET_REGISTER_DEVEXT(IND, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(IND, __VA_ARGS__)
// usage : DIODE(name, MODEL)
#define DIODE(...) \
- NET_REGISTER_DEVEXT(DIODE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(DIODE, __VA_ARGS__)
// usage : ZDIODE(name, MODEL)
#define ZDIODE(...) \
- NET_REGISTER_DEVEXT(ZDIODE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(ZDIODE, __VA_ARGS__)
// usage : VS(name, V)
#define VS(...) \
- NET_REGISTER_DEVEXT(VS, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(VS, __VA_ARGS__)
// usage : CS(name, I)
#define CS(...) \
- NET_REGISTER_DEVEXT(CS, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CS, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../analog/nld_opamps.cpp
// ---------------------------------------------------------------------
// usage : OPAMP(name, MODEL)
#define OPAMP(...) \
- NET_REGISTER_DEVEXT(OPAMP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(OPAMP, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../analog/nld_bjt.cpp
// ---------------------------------------------------------------------
// usage : QBJT_EB(name, MODEL)
#define QBJT_EB(...) \
- NET_REGISTER_DEVEXT(QBJT_EB, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(QBJT_EB, __VA_ARGS__)
// usage : QBJT_SW(name, MODEL)
#define QBJT_SW(...) \
- NET_REGISTER_DEVEXT(QBJT_SW, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(QBJT_SW, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../macro/nlm_ttl74xx_lib.cpp
// ---------------------------------------------------------------------
// usage : TTL_7400_NAND(name, A, B)
// auto connect: VCC, GND
#define TTL_7400_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7400_NAND, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7400_NAND, __VA_ARGS__)
// usage : TTL_7402_NOR(name, A, B)
// auto connect: VCC, GND
#define TTL_7402_NOR(...) \
- NET_REGISTER_DEVEXT(TTL_7402_NOR, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7402_NOR, __VA_ARGS__)
// usage : TTL_7404_INVERT(name, A)
// auto connect: VCC, GND
#define TTL_7404_INVERT(...) \
- NET_REGISTER_DEVEXT(TTL_7404_INVERT, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7404_INVERT, __VA_ARGS__)
// usage : TTL_7406_GATE(name, )
#define TTL_7406_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7406_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7406_GATE, __VA_ARGS__)
// usage : TTL_7407_GATE(name, )
#define TTL_7407_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7407_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7407_GATE, __VA_ARGS__)
// usage : TTL_7408_GATE(name, )
#define TTL_7408_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7408_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7408_GATE, __VA_ARGS__)
// usage : TTL_7408_AND(name, A, B)
// auto connect: VCC, GND
#define TTL_7408_AND(...) \
- NET_REGISTER_DEVEXT(TTL_7408_AND, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7408_AND, __VA_ARGS__)
// usage : TTL_7410_NAND(name, A, B, C)
// auto connect: VCC, GND
#define TTL_7410_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7410_NAND, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7410_NAND, __VA_ARGS__)
// usage : TTL_7410_GATE(name, )
#define TTL_7410_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7410_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7410_GATE, __VA_ARGS__)
// usage : TTL_7411_AND(name, A, B, C)
// auto connect: VCC, GND
#define TTL_7411_AND(...) \
- NET_REGISTER_DEVEXT(TTL_7411_AND, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7411_AND, __VA_ARGS__)
// usage : TTL_7411_GATE(name, )
#define TTL_7411_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7411_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7411_GATE, __VA_ARGS__)
// usage : TTL_7416_GATE(name, )
#define TTL_7416_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7416_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7416_GATE, __VA_ARGS__)
// usage : TTL_7417_GATE(name, )
#define TTL_7417_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7417_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7417_GATE, __VA_ARGS__)
// usage : TTL_7420_NAND(name, A, B, C, D)
// auto connect: VCC, GND
#define TTL_7420_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7420_NAND, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7420_NAND, __VA_ARGS__)
// usage : TTL_7421_AND(name, A, B, C, D)
// auto connect: VCC, GND
#define TTL_7421_AND(...) \
- NET_REGISTER_DEVEXT(TTL_7421_AND, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7421_AND, __VA_ARGS__)
// usage : TTL_7425_NOR(name, A, B, C, D)
// auto connect: VCC, GND
#define TTL_7425_NOR(...) \
- NET_REGISTER_DEVEXT(TTL_7425_NOR, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7425_NOR, __VA_ARGS__)
// usage : TTL_7427_NOR(name, A, B, C)
// auto connect: VCC, GND
#define TTL_7427_NOR(...) \
- NET_REGISTER_DEVEXT(TTL_7427_NOR, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7427_NOR, __VA_ARGS__)
// usage : TTL_7430_NAND(name, A, B, C, D, E, F, G, H)
// auto connect: VCC, GND
#define TTL_7430_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7430_NAND, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7430_NAND, __VA_ARGS__)
// usage : TTL_7432_OR(name, A, B)
// auto connect: VCC, GND
#define TTL_7432_OR(...) \
- NET_REGISTER_DEVEXT(TTL_7432_OR, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7432_OR, __VA_ARGS__)
// usage : TTL_7437_NAND(name, A, B)
#define TTL_7437_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7437_NAND, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7437_NAND, __VA_ARGS__)
// usage : TTL_7438_NAND(name, A, B)
#define TTL_7438_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7438_NAND, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7438_NAND, __VA_ARGS__)
// usage : TTL_7442(name, )
#define TTL_7442(...) \
- NET_REGISTER_DEVEXT(TTL_7442, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7442, __VA_ARGS__)
// usage : TTL_7486_XOR(name, A, B)
// auto connect: VCC, GND
#define TTL_7486_XOR(...) \
- NET_REGISTER_DEVEXT(TTL_7486_XOR, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7486_XOR, __VA_ARGS__)
// usage : TTL_74139_GATE(name, )
#define TTL_74139_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_74139_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74139_GATE, __VA_ARGS__)
// usage : TTL_74155A_GATE(name, )
#define TTL_74155A_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_74155A_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74155A_GATE, __VA_ARGS__)
// usage : TTL_74155B_GATE(name, )
#define TTL_74155B_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_74155B_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74155B_GATE, __VA_ARGS__)
// usage : TTL_74156A_GATE(name, )
#define TTL_74156A_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_74156A_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74156A_GATE, __VA_ARGS__)
// usage : TTL_74156B_GATE(name, )
#define TTL_74156B_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_74156B_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74156B_GATE, __VA_ARGS__)
// usage : TTL_74157_GATE(name, )
#define TTL_74157_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_74157_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74157_GATE, __VA_ARGS__)
// usage : TTL_74260_NOR(name, A, B, C, D, E)
// auto connect: VCC, GND
#define TTL_74260_NOR(...) \
- NET_REGISTER_DEVEXT(TTL_74260_NOR, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74260_NOR, __VA_ARGS__)
// usage : TTL_74279A(name, )
#define TTL_74279A(...) \
- NET_REGISTER_DEVEXT(TTL_74279A, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74279A, __VA_ARGS__)
// usage : TTL_74279B(name, )
#define TTL_74279B(...) \
- NET_REGISTER_DEVEXT(TTL_74279B, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74279B, __VA_ARGS__)
// usage : TTL_9312(name, A, B, C, G, D0, D1, D2, D3, D4, D5, D6, D7)
// auto connect: VCC, GND
#define TTL_9312(...) \
- NET_REGISTER_DEVEXT(TTL_9312, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9312, __VA_ARGS__)
// usage : TTL_7400_DIP(name, )
#define TTL_7400_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7400_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7400_DIP, __VA_ARGS__)
// usage : TTL_7402_DIP(name, )
#define TTL_7402_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7402_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7402_DIP, __VA_ARGS__)
// usage : TTL_7404_DIP(name, )
#define TTL_7404_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7404_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7404_DIP, __VA_ARGS__)
// usage : TTL_7406_DIP(name, )
#define TTL_7406_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7406_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7406_DIP, __VA_ARGS__)
// usage : TTL_7407_DIP(name, )
#define TTL_7407_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7407_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7407_DIP, __VA_ARGS__)
// usage : TTL_7408_DIP(name, )
#define TTL_7408_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7408_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7408_DIP, __VA_ARGS__)
// usage : TTL_7410_DIP(name, )
#define TTL_7410_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7410_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7410_DIP, __VA_ARGS__)
// usage : TTL_7411_DIP(name, )
#define TTL_7411_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7411_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7411_DIP, __VA_ARGS__)
// usage : TTL_7414_GATE(name, )
#define TTL_7414_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7414_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7414_GATE, __VA_ARGS__)
// usage : TTL_74LS14_GATE(name, )
#define TTL_74LS14_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_74LS14_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74LS14_GATE, __VA_ARGS__)
// usage : TTL_7414_DIP(name, )
#define TTL_7414_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7414_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7414_DIP, __VA_ARGS__)
// usage : TTL_74LS14_DIP(name, )
#define TTL_74LS14_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74LS14_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74LS14_DIP, __VA_ARGS__)
// usage : TTL_7416_DIP(name, )
#define TTL_7416_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7416_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7416_DIP, __VA_ARGS__)
// usage : TTL_7417_DIP(name, )
#define TTL_7417_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7417_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7417_DIP, __VA_ARGS__)
// usage : TTL_7420_DIP(name, )
#define TTL_7420_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7420_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7420_DIP, __VA_ARGS__)
// usage : TTL_7421_DIP(name, )
#define TTL_7421_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7421_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7421_DIP, __VA_ARGS__)
// usage : TTL_7425_DIP(name, )
#define TTL_7425_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7425_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7425_DIP, __VA_ARGS__)
// usage : TTL_7427_DIP(name, )
#define TTL_7427_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7427_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7427_DIP, __VA_ARGS__)
// usage : TTL_7430_DIP(name, )
#define TTL_7430_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7430_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7430_DIP, __VA_ARGS__)
// usage : TTL_7432_DIP(name, )
#define TTL_7432_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7432_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7432_DIP, __VA_ARGS__)
// usage : TTL_7437_DIP(name, )
#define TTL_7437_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7437_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7437_DIP, __VA_ARGS__)
// usage : TTL_7438_DIP(name, )
#define TTL_7438_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7438_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7438_DIP, __VA_ARGS__)
// usage : TTL_7442_DIP(name, )
#define TTL_7442_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7442_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7442_DIP, __VA_ARGS__)
// usage : TTL_7448_DIP(name, )
#define TTL_7448_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7448_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7448_DIP, __VA_ARGS__)
// usage : TTL_7450_DIP(name, )
#define TTL_7450_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7450_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7450_DIP, __VA_ARGS__)
// usage : TTL_7473_DIP(name, )
#define TTL_7473_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7473_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7473_DIP, __VA_ARGS__)
// usage : TTL_7473A_DIP(name, )
#define TTL_7473A_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7473A_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7473A_DIP, __VA_ARGS__)
// usage : TTL_7474_DIP(name, )
#define TTL_7474_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7474_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7474_DIP, __VA_ARGS__)
// usage : TTL_7475_DIP(name, )
#define TTL_7475_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7475_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7475_DIP, __VA_ARGS__)
// usage : TTL_7477_DIP(name, )
#define TTL_7477_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7477_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7477_DIP, __VA_ARGS__)
// usage : TTL_7483_DIP(name, )
#define TTL_7483_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7483_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7483_DIP, __VA_ARGS__)
// usage : TTL_7485_DIP(name, )
#define TTL_7485_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7485_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7485_DIP, __VA_ARGS__)
// usage : TTL_7486_DIP(name, )
#define TTL_7486_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7486_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7486_DIP, __VA_ARGS__)
// usage : TTL_7490_DIP(name, )
#define TTL_7490_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7490_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7490_DIP, __VA_ARGS__)
// usage : TTL_7492_DIP(name, )
#define TTL_7492_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7492_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7492_DIP, __VA_ARGS__)
// usage : TTL_7493_DIP(name, )
#define TTL_7493_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7493_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7493_DIP, __VA_ARGS__)
// usage : TTL_7497_DIP(name, )
#define TTL_7497_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_7497_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_7497_DIP, __VA_ARGS__)
// usage : TTL_74107_DIP(name, )
#define TTL_74107_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74107_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74107_DIP, __VA_ARGS__)
// usage : TTL_74107A_DIP(name, )
#define TTL_74107A_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74107A_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74107A_DIP, __VA_ARGS__)
// usage : TTL_74113_DIP(name, )
#define TTL_74113_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74113_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74113_DIP, __VA_ARGS__)
// usage : TTL_74113A_DIP(name, )
#define TTL_74113A_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74113A_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74113A_DIP, __VA_ARGS__)
// usage : TTL_74121_DIP(name, )
#define TTL_74121_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74121_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74121_DIP, __VA_ARGS__)
// usage : TTL_74123_DIP(name, )
#define TTL_74123_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74123_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74123_DIP, __VA_ARGS__)
// usage : TTL_9602_DIP(name, )
#define TTL_9602_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_9602_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9602_DIP, __VA_ARGS__)
// usage : TTL_74125_DIP(name, )
#define TTL_74125_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74125_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74125_DIP, __VA_ARGS__)
// usage : TTL_74126_DIP(name, )
#define TTL_74126_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74126_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74126_DIP, __VA_ARGS__)
// usage : TTL_74139_DIP(name, )
#define TTL_74139_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74139_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74139_DIP, __VA_ARGS__)
// usage : TTL_74153_DIP(name, )
#define TTL_74153_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74153_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74153_DIP, __VA_ARGS__)
// usage : TTL_74155_DIP(name, )
#define TTL_74155_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74155_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74155_DIP, __VA_ARGS__)
// usage : TTL_74156_DIP(name, )
#define TTL_74156_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74156_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74156_DIP, __VA_ARGS__)
// usage : TTL_74157_DIP(name, )
#define TTL_74157_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74157_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74157_DIP, __VA_ARGS__)
// usage : TTL_74161_DIP(name, )
#define TTL_74161_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74161_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74161_DIP, __VA_ARGS__)
// usage : TTL_74163_DIP(name, )
#define TTL_74163_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74163_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74163_DIP, __VA_ARGS__)
// usage : TTL_74164_DIP(name, )
#define TTL_74164_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74164_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74164_DIP, __VA_ARGS__)
// usage : TTL_74165_DIP(name, )
#define TTL_74165_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74165_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74165_DIP, __VA_ARGS__)
// usage : TTL_74166_DIP(name, )
#define TTL_74166_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74166_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74166_DIP, __VA_ARGS__)
// usage : TTL_74174_DIP(name, )
#define TTL_74174_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74174_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74174_DIP, __VA_ARGS__)
// usage : TTL_74175_DIP(name, )
#define TTL_74175_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74175_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74175_DIP, __VA_ARGS__)
// usage : TTL_74192_DIP(name, )
#define TTL_74192_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74192_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74192_DIP, __VA_ARGS__)
// usage : TTL_74193_DIP(name, )
#define TTL_74193_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74193_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74193_DIP, __VA_ARGS__)
// usage : TTL_74194_DIP(name, )
#define TTL_74194_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74194_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74194_DIP, __VA_ARGS__)
// usage : TTL_74260_DIP(name, )
#define TTL_74260_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74260_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74260_DIP, __VA_ARGS__)
// usage : TTL_74279_DIP(name, )
#define TTL_74279_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74279_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74279_DIP, __VA_ARGS__)
// usage : TTL_74290_DIP(name, )
#define TTL_74290_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74290_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74290_DIP, __VA_ARGS__)
// usage : TTL_74293_DIP(name, )
#define TTL_74293_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74293_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74293_DIP, __VA_ARGS__)
// usage : TTL_74365_DIP(name, )
#define TTL_74365_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74365_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74365_DIP, __VA_ARGS__)
// usage : TTL_74377_DIP(name, )
#define TTL_74377_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74377_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74377_DIP, __VA_ARGS__)
// usage : TTL_74378_DIP(name, )
#define TTL_74378_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74378_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74378_DIP, __VA_ARGS__)
// usage : TTL_74379_DIP(name, )
#define TTL_74379_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74379_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74379_DIP, __VA_ARGS__)
// usage : TTL_74393_DIP(name, )
#define TTL_74393_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_74393_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_74393_DIP, __VA_ARGS__)
// usage : SN74LS629_DIP(name, )
#define SN74LS629_DIP(...) \
- NET_REGISTER_DEVEXT(SN74LS629_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(SN74LS629_DIP, __VA_ARGS__)
// usage : TTL_9310_DIP(name, )
#define TTL_9310_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_9310_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9310_DIP, __VA_ARGS__)
// usage : TTL_9312_DIP(name, )
#define TTL_9312_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_9312_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9312_DIP, __VA_ARGS__)
// usage : TTL_9314_DIP(name, )
#define TTL_9314_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_9314_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9314_DIP, __VA_ARGS__)
// usage : TTL_9316_DIP(name, )
#define TTL_9316_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_9316_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9316_DIP, __VA_ARGS__)
// usage : TTL_9321_DIP(name, )
#define TTL_9321_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_9321_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9321_DIP, __VA_ARGS__)
// usage : TTL_9322_DIP(name, )
#define TTL_9322_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_9322_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9322_DIP, __VA_ARGS__)
// usage : TTL_9334_DIP(name, )
#define TTL_9334_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_9334_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_9334_DIP, __VA_ARGS__)
// usage : TTL_8277_DIP(name, )
#define TTL_8277_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_8277_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_8277_DIP, __VA_ARGS__)
// usage : TTL_AM2847_DIP(name, )
#define TTL_AM2847_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_AM2847_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_AM2847_DIP, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../macro/nlm_cd4xxx_lib.cpp
// ---------------------------------------------------------------------
// usage : CD4001_GATE(name, )
#define CD4001_GATE(...) \
- NET_REGISTER_DEVEXT(CD4001_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4001_GATE, __VA_ARGS__)
// usage : CD4011_GATE(name, )
#define CD4011_GATE(...) \
- NET_REGISTER_DEVEXT(CD4011_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4011_GATE, __VA_ARGS__)
// usage : CD4069_GATE(name, )
#define CD4069_GATE(...) \
- NET_REGISTER_DEVEXT(CD4069_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4069_GATE, __VA_ARGS__)
// usage : CD4070_GATE(name, )
#define CD4070_GATE(...) \
- NET_REGISTER_DEVEXT(CD4070_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4070_GATE, __VA_ARGS__)
// usage : CD4001_DIP(name, )
#define CD4001_DIP(...) \
- NET_REGISTER_DEVEXT(CD4001_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4001_DIP, __VA_ARGS__)
// usage : CD4011_DIP(name, )
#define CD4011_DIP(...) \
- NET_REGISTER_DEVEXT(CD4011_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4011_DIP, __VA_ARGS__)
// usage : CD4069_DIP(name, )
#define CD4069_DIP(...) \
- NET_REGISTER_DEVEXT(CD4069_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4069_DIP, __VA_ARGS__)
// usage : CD4070_DIP(name, )
#define CD4070_DIP(...) \
- NET_REGISTER_DEVEXT(CD4070_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4070_DIP, __VA_ARGS__)
// usage : CD4006_DIP(name, )
#define CD4006_DIP(...) \
- NET_REGISTER_DEVEXT(CD4006_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4006_DIP, __VA_ARGS__)
// usage : CD4013_DIP(name, )
#define CD4013_DIP(...) \
- NET_REGISTER_DEVEXT(CD4013_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4013_DIP, __VA_ARGS__)
// usage : CD4017_DIP(name, )
#define CD4017_DIP(...) \
- NET_REGISTER_DEVEXT(CD4017_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4017_DIP, __VA_ARGS__)
// usage : CD4022_DIP(name, )
#define CD4022_DIP(...) \
- NET_REGISTER_DEVEXT(CD4022_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4022_DIP, __VA_ARGS__)
// usage : CD4020_DIP(name, )
#define CD4020_DIP(...) \
- NET_REGISTER_DEVEXT(CD4020_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4020_DIP, __VA_ARGS__)
// usage : CD4024_DIP(name, )
#define CD4024_DIP(...) \
- NET_REGISTER_DEVEXT(CD4024_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4024_DIP, __VA_ARGS__)
// usage : CD4053_DIP(name, )
#define CD4053_DIP(...) \
- NET_REGISTER_DEVEXT(CD4053_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4053_DIP, __VA_ARGS__)
// usage : CD4066_DIP(name, )
#define CD4066_DIP(...) \
- NET_REGISTER_DEVEXT(CD4066_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4066_DIP, __VA_ARGS__)
// usage : CD4016_DIP(name, )
#define CD4016_DIP(...) \
- NET_REGISTER_DEVEXT(CD4016_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4016_DIP, __VA_ARGS__)
// usage : CD4316_DIP(name, )
#define CD4316_DIP(...) \
- NET_REGISTER_DEVEXT(CD4316_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4316_DIP, __VA_ARGS__)
// usage : CD4538_DIP(name, )
#define CD4538_DIP(...) \
- NET_REGISTER_DEVEXT(CD4538_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(CD4538_DIP, __VA_ARGS__)
// usage : MM5837_DIP(name, )
#define MM5837_DIP(...) \
- NET_REGISTER_DEVEXT(MM5837_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MM5837_DIP, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../macro/nlm_roms_lib.cpp
// ---------------------------------------------------------------------
// usage : PROM_82S123_DIP(name, )
#define PROM_82S123_DIP(...) \
- NET_REGISTER_DEVEXT(PROM_82S123_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PROM_82S123_DIP, __VA_ARGS__)
// usage : PROM_82S126_DIP(name, )
#define PROM_82S126_DIP(...) \
- NET_REGISTER_DEVEXT(PROM_82S126_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PROM_82S126_DIP, __VA_ARGS__)
// usage : PROM_74S287_DIP(name, )
#define PROM_74S287_DIP(...) \
- NET_REGISTER_DEVEXT(PROM_74S287_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PROM_74S287_DIP, __VA_ARGS__)
// usage : EPROM_2716_DIP(name, )
#define EPROM_2716_DIP(...) \
- NET_REGISTER_DEVEXT(EPROM_2716_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(EPROM_2716_DIP, __VA_ARGS__)
// usage : TTL_82S16_DIP(name, )
#define TTL_82S16_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_82S16_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TTL_82S16_DIP, __VA_ARGS__)
// usage : PROM_82S115_DIP(name, )
#define PROM_82S115_DIP(...) \
- NET_REGISTER_DEVEXT(PROM_82S115_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PROM_82S115_DIP, __VA_ARGS__)
// usage : PROM_MK28000_DIP(name, )
#define PROM_MK28000_DIP(...) \
- NET_REGISTER_DEVEXT(PROM_MK28000_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(PROM_MK28000_DIP, __VA_ARGS__)
// usage : RAM_2102A_DIP(name, )
#define RAM_2102A_DIP(...) \
- NET_REGISTER_DEVEXT(RAM_2102A_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(RAM_2102A_DIP, __VA_ARGS__)
// usage : ROM_TMS4800_DIP(name, )
#define ROM_TMS4800_DIP(...) \
- NET_REGISTER_DEVEXT(ROM_TMS4800_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(ROM_TMS4800_DIP, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../macro/nlm_otheric_lib.cpp
// ---------------------------------------------------------------------
// usage : MC14584B_GATE(name, )
#define MC14584B_GATE(...) \
- NET_REGISTER_DEVEXT(MC14584B_GATE, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MC14584B_GATE, __VA_ARGS__)
// usage : MC14584B_DIP(name, )
#define MC14584B_DIP(...) \
- NET_REGISTER_DEVEXT(MC14584B_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MC14584B_DIP, __VA_ARGS__)
// usage : NE566_DIP(name, )
#define NE566_DIP(...) \
- NET_REGISTER_DEVEXT(NE566_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(NE566_DIP, __VA_ARGS__)
// usage : NE555_DIP(name, )
#define NE555_DIP(...) \
- NET_REGISTER_DEVEXT(NE555_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(NE555_DIP, __VA_ARGS__)
// usage : MC1455P_DIP(name, )
#define MC1455P_DIP(...) \
- NET_REGISTER_DEVEXT(MC1455P_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MC1455P_DIP, __VA_ARGS__)
// ---------------------------------------------------------------------
// Source: ../macro/nlm_opamp_lib.cpp
// ---------------------------------------------------------------------
// usage : opamp_layout_4_4_11(name, )
#define opamp_layout_4_4_11(...) \
- NET_REGISTER_DEVEXT(opamp_layout_4_4_11, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(opamp_layout_4_4_11, __VA_ARGS__)
// usage : opamp_layout_2_8_4(name, )
#define opamp_layout_2_8_4(...) \
- NET_REGISTER_DEVEXT(opamp_layout_2_8_4, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(opamp_layout_2_8_4, __VA_ARGS__)
// usage : opamp_layout_2_13_9_4(name, )
#define opamp_layout_2_13_9_4(...) \
- NET_REGISTER_DEVEXT(opamp_layout_2_13_9_4, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(opamp_layout_2_13_9_4, __VA_ARGS__)
// usage : opamp_layout_1_7_4(name, )
#define opamp_layout_1_7_4(...) \
- NET_REGISTER_DEVEXT(opamp_layout_1_7_4, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(opamp_layout_1_7_4, __VA_ARGS__)
// usage : opamp_layout_1_8_5(name, )
#define opamp_layout_1_8_5(...) \
- NET_REGISTER_DEVEXT(opamp_layout_1_8_5, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(opamp_layout_1_8_5, __VA_ARGS__)
// usage : opamp_layout_1_11_6(name, )
#define opamp_layout_1_11_6(...) \
- NET_REGISTER_DEVEXT(opamp_layout_1_11_6, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(opamp_layout_1_11_6, __VA_ARGS__)
// usage : MB3614_DIP(name, )
#define MB3614_DIP(...) \
- NET_REGISTER_DEVEXT(MB3614_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MB3614_DIP, __VA_ARGS__)
// usage : MC3340_DIP(name, )
#define MC3340_DIP(...) \
- NET_REGISTER_DEVEXT(MC3340_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MC3340_DIP, __VA_ARGS__)
// usage : TL081_DIP(name, )
#define TL081_DIP(...) \
- NET_REGISTER_DEVEXT(TL081_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TL081_DIP, __VA_ARGS__)
// usage : TL082_DIP(name, )
#define TL082_DIP(...) \
- NET_REGISTER_DEVEXT(TL082_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TL082_DIP, __VA_ARGS__)
// usage : TL084_DIP(name, )
#define TL084_DIP(...) \
- NET_REGISTER_DEVEXT(TL084_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(TL084_DIP, __VA_ARGS__)
// usage : LM324_DIP(name, )
#define LM324_DIP(...) \
- NET_REGISTER_DEVEXT(LM324_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LM324_DIP, __VA_ARGS__)
// usage : LM358_DIP(name, )
#define LM358_DIP(...) \
- NET_REGISTER_DEVEXT(LM358_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LM358_DIP, __VA_ARGS__)
// usage : LM2902_DIP(name, )
#define LM2902_DIP(...) \
- NET_REGISTER_DEVEXT(LM2902_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LM2902_DIP, __VA_ARGS__)
// usage : UA741_DIP8(name, )
#define UA741_DIP8(...) \
- NET_REGISTER_DEVEXT(UA741_DIP8, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(UA741_DIP8, __VA_ARGS__)
// usage : UA741_DIP10(name, )
#define UA741_DIP10(...) \
- NET_REGISTER_DEVEXT(UA741_DIP10, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(UA741_DIP10, __VA_ARGS__)
// usage : UA741_DIP14(name, )
#define UA741_DIP14(...) \
- NET_REGISTER_DEVEXT(UA741_DIP14, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(UA741_DIP14, __VA_ARGS__)
// usage : MC1558_DIP(name, )
#define MC1558_DIP(...) \
- NET_REGISTER_DEVEXT(MC1558_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(MC1558_DIP, __VA_ARGS__)
// usage : LM747_DIP(name, )
#define LM747_DIP(...) \
- NET_REGISTER_DEVEXT(LM747_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LM747_DIP, __VA_ARGS__)
// usage : LM747A_DIP(name, )
#define LM747A_DIP(...) \
- NET_REGISTER_DEVEXT(LM747A_DIP, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LM747A_DIP, __VA_ARGS__)
// usage : LM3900(name, )
#define LM3900(...) \
- NET_REGISTER_DEVEXT(LM3900, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(LM3900, __VA_ARGS__)
// usage : AN6551_SIL(name, )
#define AN6551_SIL(...) \
- NET_REGISTER_DEVEXT(AN6551_SIL, __VA_ARGS__)
-// ---------------------------------------------------------------------
-// Source: ../solver/nld_solver.cpp
-// ---------------------------------------------------------------------
-// usage : SOLVER(name, FREQ)
-#define SOLVER(...) \
- NET_REGISTER_DEVEXT(SOLVER, __VA_ARGS__)
+ NET_REGISTER_DEVEXT(AN6551_SIL, __VA_ARGS__)
diff --git a/src/lib/netlist/macro/nlm_base_lib.cpp b/src/lib/netlist/macro/nlm_base_lib.cpp
index 51969930564..395eea3b1f1 100644
--- a/src/lib/netlist/macro/nlm_base_lib.cpp
+++ b/src/lib/netlist/macro/nlm_base_lib.cpp
@@ -1,6 +1,6 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "netlist/devices/net_lib.h"
+#include "devices/net_lib.h"
/* ----------------------------------------------------------------------------
* External declarations
diff --git a/src/lib/netlist/macro/nlm_base_lib.h b/src/lib/netlist/macro/nlm_base_lib.h
index 1da4bb8d172..97e8d7e5c94 100644
--- a/src/lib/netlist/macro/nlm_base_lib.h
+++ b/src/lib/netlist/macro/nlm_base_lib.h
@@ -13,7 +13,7 @@
#ifndef __PLIB_PREPROCESSOR__
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
/* ----------------------------------------------------------------------------
* Netlist Macros
diff --git a/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp b/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
index 7dc97b02407..292692da7fd 100644
--- a/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
+++ b/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
@@ -1,7 +1,7 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "netlist/devices/net_lib.h"
+#include "devices/net_lib.h"
//- Identifier: CD4001_DIP
//- Title: CD4001BM/CD4001BC Quad 2-Input NOR Buffered B Series Gate
@@ -566,7 +566,7 @@ static NETLIST_START(MM5837_DIP)
A.VGG, /* VGG |2 7| NC */ NC.I,
A.OUT, /* OUT |3 6| NC */ NC.I,
A.VSS, /* VSS |4 5| NC */ NC.I,
- /* +--------+ */
+ /* +--------+ */
)
NETLIST_END()
diff --git a/src/lib/netlist/macro/nlm_cd4xxx_lib.h b/src/lib/netlist/macro/nlm_cd4xxx_lib.h
index 64fbaed5bde..b567500ec32 100644
--- a/src/lib/netlist/macro/nlm_cd4xxx_lib.h
+++ b/src/lib/netlist/macro/nlm_cd4xxx_lib.h
@@ -6,7 +6,7 @@
/// \file nlm_cd4xxx.h
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
/*
* Devices:
diff --git a/src/lib/netlist/macro/nlm_opamp_lib.cpp b/src/lib/netlist/macro/nlm_opamp_lib.cpp
index 8be7732792c..e48ac0ed7df 100644
--- a/src/lib/netlist/macro/nlm_opamp_lib.cpp
+++ b/src/lib/netlist/macro/nlm_opamp_lib.cpp
@@ -1,7 +1,7 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "netlist/devices/net_lib.h"
+#include "devices/net_lib.h"
/*
* 0 = Basic hack (Norton with just amplification, no voltage cutting)
diff --git a/src/lib/netlist/macro/nlm_opamp_lib.h b/src/lib/netlist/macro/nlm_opamp_lib.h
index f2de947f5db..a52816e6fa9 100644
--- a/src/lib/netlist/macro/nlm_opamp_lib.h
+++ b/src/lib/netlist/macro/nlm_opamp_lib.h
@@ -8,7 +8,7 @@
/// \file nlm_opamp.h
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#ifndef __PLIB_PREPROCESSOR__
diff --git a/src/lib/netlist/macro/nlm_otheric_lib.cpp b/src/lib/netlist/macro/nlm_otheric_lib.cpp
index 2879829fc99..87cc6eee495 100644
--- a/src/lib/netlist/macro/nlm_otheric_lib.cpp
+++ b/src/lib/netlist/macro/nlm_otheric_lib.cpp
@@ -1,7 +1,7 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "netlist/devices/net_lib.h"
+#include "devices/net_lib.h"
/*
* MC14584B: Hex Schmitt Trigger
diff --git a/src/lib/netlist/macro/nlm_otheric_lib.h b/src/lib/netlist/macro/nlm_otheric_lib.h
index c0e22cba635..ffc969588d7 100644
--- a/src/lib/netlist/macro/nlm_otheric_lib.h
+++ b/src/lib/netlist/macro/nlm_otheric_lib.h
@@ -8,7 +8,7 @@
/// \file nlm_other.h
///
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#ifndef __PLIB_PREPROCESSOR__
diff --git a/src/lib/netlist/macro/nlm_roms_lib.cpp b/src/lib/netlist/macro/nlm_roms_lib.cpp
index 0b09d3a8451..db141ca450e 100644
--- a/src/lib/netlist/macro/nlm_roms_lib.cpp
+++ b/src/lib/netlist/macro/nlm_roms_lib.cpp
@@ -1,7 +1,7 @@
// license:CC0
// copyright-holders:Couriersud
-#include "netlist/devices/net_lib.h"
+#include "devices/net_lib.h"
//- Identifier: PROM_82S126_DIP
@@ -447,7 +447,7 @@ static NETLIST_START(ROM_TMS4800_DIP)
A.A9, /* A9 |10 15| A11 */ A.A11,
A.A8, /* A8 |11 14| OE2 */ A.OE2,
A.A7, /* A7 |12 13| AR */ A.AR
- /* +----------------+ */
+ /* +----------------+ */
)
NETLIST_END()
diff --git a/src/lib/netlist/macro/nlm_roms_lib.h b/src/lib/netlist/macro/nlm_roms_lib.h
index aca01bbcf91..54207b3230a 100644
--- a/src/lib/netlist/macro/nlm_roms_lib.h
+++ b/src/lib/netlist/macro/nlm_roms_lib.h
@@ -8,7 +8,7 @@
/// \file nlm_roms.h
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#ifndef __PLIB_PREPROCESSOR__
diff --git a/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp b/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp
index 734a0676917..cf7969a3c7b 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp
@@ -1,7 +1,7 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "netlist/devices/net_lib.h"
+#include "devices/net_lib.h"
//- Identifier: TTL_7400_DIP
//- Title: 5400/DM5400/DM7400 Quad 2-Input NAND Gates
@@ -3082,7 +3082,7 @@ static NETLIST_START(TTL_9314_DIP)
A.D2, /* D2 |6 11| /S3 */ A.S3Q,
A.D3, /* D3 |7 10| Q3 */ A.Q3,
A.GND, /* GND |8 9| /MR */ A.MRQ
- /* +--------------+ */
+ /* +--------------+ */
)
NETLIST_END()
@@ -3221,7 +3221,7 @@ static NETLIST_START(TTL_9334_DIP)
A.Q2, /* Q2 |6 11| Q6 */ A.Q6,
A.Q3, /* Q3 |7 10| Q5 */ A.Q5,
A.GND,/* GND |8 9| Q4 */ A.Q4
- /* +--------------+ */
+ /* +--------------+ */
)
NETLIST_END()
@@ -3287,7 +3287,7 @@ static NETLIST_START(TTL_8277_DIP)
A.D0A, /* D0A |6 11| D0B */ A.D0B,
A.CLKA, /* CLKA |7 10| CLKB */ A.CLKB,
A.GND, /* GND |8 9| CLK */ A.CLK
- /* +--------------+ */
+ /* +--------------+ */
)
NETLIST_END()
@@ -3304,7 +3304,7 @@ static NETLIST_START(TTL_AM2847_DIP)
A.INB, /* INB |6 11| CP */ A.CP,
A.OUTC, /* OUTC |7 10| INC */ A.INC,
A.VDD, /* VDD |8 9| RCC */ A.RCC
- /* +--------------+ */
+ /* +--------------+ */
)
NETLIST_END()
diff --git a/src/lib/netlist/macro/nlm_ttl74xx_lib.h b/src/lib/netlist/macro/nlm_ttl74xx_lib.h
index bfafb2d2627..77e4a109693 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx_lib.h
+++ b/src/lib/netlist/macro/nlm_ttl74xx_lib.h
@@ -8,7 +8,7 @@
/// \file nlm_ttl74xx.h
///
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
#ifndef __PLIB_PREPROCESSOR__
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index f4aaaa930cc..91e192240df 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -139,14 +139,17 @@ namespace netlist
"#define IND_N(ind) ((ind) * 1e-9) \n"
"#define IND_P(ind) ((ind) * 1e-12) \n";
m_setup->parser().add_include<plib::psource_str_t>("netlist/devices/net_lib.h", content);
+
+ // This is for core macro libraries
+ m_setup->parser().add_include<plib::psource_str_t>("devices/net_lib.h", content);
#if 1
NETLIST_NAME(base_lib)(m_setup->parser());
#else
- // FIXME: This is very slow - need optimized parsing scanning
#if 1
m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/nlm_{1}.cpp");
m_setup->parser().include("base_lib");
#else
+ // FIXME: This is very slow - need optimized parsing scanning
pstring dir = "src/lib/netlist/macro/";
//m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/nlm_{}.cpp");
m_setup->parser().register_source<source_file_t>(dir + "nlm_base_lib.cpp");
diff --git a/src/lib/netlist/nl_dice_compat.h b/src/lib/netlist/nl_dice_compat.h
index 00464d71d02..cfe00ffda3d 100644
--- a/src/lib/netlist/nl_dice_compat.h
+++ b/src/lib/netlist/nl_dice_compat.h
@@ -25,7 +25,7 @@ sed -e 's/#define \(.*\)"\(.*\)"[ \t]*,[ \t]*\(.*\)/NET_ALIAS(\1,\2.\3)/' src/ma
#define NL_DICE_COMPAT_H_
#ifndef NL_CONVERT_CPP
-#include "devices/net_lib.h"
+#include "netlist/devices/net_lib.h"
#endif
diff --git a/src/lib/netlist/nltypes.h b/src/lib/netlist/nltypes.h
index 70fbad6bb17..d22c634ab27 100644
--- a/src/lib/netlist/nltypes.h
+++ b/src/lib/netlist/nltypes.h
@@ -280,7 +280,7 @@ namespace netlist
{
return N == 0 ? NLTIME_FROM_NS(value0) :
N == 1 ? NLTIME_FROM_NS(value1) :
- NLTIME_FROM_NS(value2);
+ NLTIME_FROM_NS(value2);
}
};
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index ef6c54ad34e..3336a39fdad 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -9,16 +9,16 @@
//
// ***************************************************************************
-#include "netlist/plib/pdynlib.h"
-#include "netlist/core/setup.h"
-#include "netlist/devices/net_lib.h"
-#include "netlist/nl_errstr.h"
-#include "netlist/nl_parser.h"
-#include "netlist/nl_setup.h"
-#include "netlist/plib/pmain.h"
-#include "netlist/plib/pstrutil.h"
-#include "netlist/solver/nld_solver.h"
-#include "netlist/tools/nl_convert.h"
+#include "plib/pdynlib.h"
+#include "core/setup.h"
+#include "devices/net_lib.h"
+#include "nl_errstr.h"
+#include "nl_parser.h"
+#include "nl_setup.h"
+#include "plib/pmain.h"
+#include "plib/pstrutil.h"
+#include "solver/nld_solver.h"
+#include "tools/nl_convert.h"
#include "plib/ptests.h"
diff --git a/src/lib/netlist/prg/nlwav.cpp b/src/lib/netlist/prg/nlwav.cpp
index 221a91fbe27..d506fb31f5b 100755
--- a/src/lib/netlist/prg/nlwav.cpp
+++ b/src/lib/netlist/prg/nlwav.cpp
@@ -1,10 +1,10 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "netlist/plib/pstring.h"
-#include "netlist/plib/pmain.h"
-#include "netlist/plib/ppmf.h"
-#include "netlist/plib/pstream.h"
-#include "netlist/plib/pstrutil.h"
+#include "plib/pstring.h"
+#include "plib/pmain.h"
+#include "plib/ppmf.h"
+#include "plib/pstream.h"
+#include "plib/pstrutil.h"
#include <cstdio>
diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h
index a5bda6a070e..4e392c88770 100644
--- a/src/lib/netlist/solver/nld_matrix_solver.h
+++ b/src/lib/netlist/solver/nld_matrix_solver.h
@@ -8,15 +8,15 @@
/// \file nld_matrix_solver.h
///
-#include "netlist/nl_base.h"
-#include "netlist/nl_errstr.h"
-#include "netlist/plib/mat_cr.h"
-#include "netlist/plib/palloc.h"
-#include "netlist/plib/penum.h"
-#include "netlist/plib/pmatrix2d.h"
-#include "netlist/plib/pmempool.h"
-#include "netlist/plib/putil.h"
-#include "netlist/plib/vector_ops.h"
+#include "nl_base.h"
+#include "nl_errstr.h"
+#include "plib/mat_cr.h"
+#include "plib/palloc.h"
+#include "plib/penum.h"
+#include "plib/pmatrix2d.h"
+#include "plib/pmempool.h"
+#include "plib/putil.h"
+#include "plib/vector_ops.h"
#include <numeric>
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 53f501ecbd6..34e1ae16cb3 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -2,9 +2,9 @@
// copyright-holders:Couriersud
-#include "netlist/nl_factory.h"
+#include "nl_factory.h"
#include "core/setup.h"
-#include "netlist/nl_setup.h" // FIXME: only needed for splitter code
+#include "nl_setup.h" // FIXME: only needed for splitter code
#include "nld_matrix_solver.h"
#include "nld_ms_direct.h"
#include "nld_ms_direct1.h"
diff --git a/src/lib/netlist/solver/nld_solver.h b/src/lib/netlist/solver/nld_solver.h
index 8014830e4a0..4b30d545bd2 100644
--- a/src/lib/netlist/solver/nld_solver.h
+++ b/src/lib/netlist/solver/nld_solver.h
@@ -9,7 +9,7 @@
///
#include "../plib/pstream.h"
-#include "netlist/nl_base.h"
+#include "../nl_base.h"
#include "nld_matrix_solver.h"
#include <map>