summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/devices
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/devices')
-rw-r--r--src/lib/netlist/devices/net_lib.cpp121
-rw-r--r--src/lib/netlist/devices/net_lib.h91
-rw-r--r--src/lib/netlist/devices/nld_2102A.cpp1
-rw-r--r--src/lib/netlist/devices/nld_2102A.h13
-rw-r--r--src/lib/netlist/devices/nld_4006.cpp1
-rw-r--r--src/lib/netlist/devices/nld_4006.h12
-rw-r--r--src/lib/netlist/devices/nld_4013.h13
-rw-r--r--src/lib/netlist/devices/nld_4017.cpp1
-rw-r--r--src/lib/netlist/devices/nld_4017.h15
-rw-r--r--src/lib/netlist/devices/nld_4020.cpp1
-rw-r--r--src/lib/netlist/devices/nld_4020.h17
-rw-r--r--src/lib/netlist/devices/nld_4053.cpp2
-rw-r--r--src/lib/netlist/devices/nld_4053.h13
-rw-r--r--src/lib/netlist/devices/nld_4066.cpp2
-rw-r--r--src/lib/netlist/devices/nld_4066.h14
-rw-r--r--src/lib/netlist/devices/nld_4316.cpp1
-rw-r--r--src/lib/netlist/devices/nld_4316.h12
-rw-r--r--src/lib/netlist/devices/nld_74107.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74107.h16
-rw-r--r--src/lib/netlist/devices/nld_74113.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74113.h17
-rw-r--r--src/lib/netlist/devices/nld_74123.h21
-rw-r--r--src/lib/netlist/devices/nld_74125.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74125.h19
-rw-r--r--src/lib/netlist/devices/nld_74153.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74153.h13
-rw-r--r--src/lib/netlist/devices/nld_74164.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74164.h13
-rw-r--r--src/lib/netlist/devices/nld_74165.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74165.h13
-rw-r--r--src/lib/netlist/devices/nld_74166.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74166.h13
-rw-r--r--src/lib/netlist/devices/nld_74174.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74174.h13
-rw-r--r--src/lib/netlist/devices/nld_74175.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74175.h14
-rw-r--r--src/lib/netlist/devices/nld_74192.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74192.h14
-rw-r--r--src/lib/netlist/devices/nld_74193.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74193.h14
-rw-r--r--src/lib/netlist/devices/nld_74194.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74194.h13
-rw-r--r--src/lib/netlist/devices/nld_74365.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74365.h13
-rw-r--r--src/lib/netlist/devices/nld_74377.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74377.h14
-rw-r--r--src/lib/netlist/devices/nld_74393.cpp1
-rw-r--r--src/lib/netlist/devices/nld_74393.h13
-rw-r--r--src/lib/netlist/devices/nld_7448.h14
-rw-r--r--src/lib/netlist/devices/nld_7450.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7450.h13
-rw-r--r--src/lib/netlist/devices/nld_7473.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7473.h16
-rw-r--r--src/lib/netlist/devices/nld_7474.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7474.h13
-rw-r--r--src/lib/netlist/devices/nld_7475.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7475.h15
-rw-r--r--src/lib/netlist/devices/nld_7483.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7483.h13
-rw-r--r--src/lib/netlist/devices/nld_7485.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7485.h13
-rw-r--r--src/lib/netlist/devices/nld_7490.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7490.h13
-rw-r--r--src/lib/netlist/devices/nld_7492.h13
-rw-r--r--src/lib/netlist/devices/nld_7493.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7493.h13
-rw-r--r--src/lib/netlist/devices/nld_7497.cpp1
-rw-r--r--src/lib/netlist/devices/nld_7497.h13
-rw-r--r--src/lib/netlist/devices/nld_74ls629.cpp2
-rw-r--r--src/lib/netlist/devices/nld_74ls629.h12
-rw-r--r--src/lib/netlist/devices/nld_8277.cpp1
-rw-r--r--src/lib/netlist/devices/nld_8277.h14
-rw-r--r--src/lib/netlist/devices/nld_82S115.cpp1
-rw-r--r--src/lib/netlist/devices/nld_82S115.h13
-rw-r--r--src/lib/netlist/devices/nld_82S16.cpp1
-rw-r--r--src/lib/netlist/devices/nld_82S16.h12
-rw-r--r--src/lib/netlist/devices/nld_9316.h25
-rw-r--r--src/lib/netlist/devices/nld_9321.cpp1
-rw-r--r--src/lib/netlist/devices/nld_9321.h13
-rw-r--r--src/lib/netlist/devices/nld_9322.cpp1
-rw-r--r--src/lib/netlist/devices/nld_9322.h13
-rw-r--r--src/lib/netlist/devices/nld_am2847.cpp1
-rw-r--r--src/lib/netlist/devices/nld_am2847.h12
-rw-r--r--src/lib/netlist/devices/nld_dm9314.cpp1
-rw-r--r--src/lib/netlist/devices/nld_dm9314.h14
-rw-r--r--src/lib/netlist/devices/nld_dm9334.cpp1
-rw-r--r--src/lib/netlist/devices/nld_dm9334.h14
-rw-r--r--src/lib/netlist/devices/nld_legacy.cpp1
-rw-r--r--src/lib/netlist/devices/nld_legacy.h37
-rw-r--r--src/lib/netlist/devices/nld_log.cpp1
-rw-r--r--src/lib/netlist/devices/nld_log.h18
-rw-r--r--src/lib/netlist/devices/nld_mm5837.cpp1
-rw-r--r--src/lib/netlist/devices/nld_mm5837.h12
-rw-r--r--src/lib/netlist/devices/nld_ne555.cpp1
-rw-r--r--src/lib/netlist/devices/nld_ne555.h17
-rw-r--r--src/lib/netlist/devices/nld_r2r_dac.h12
-rw-r--r--src/lib/netlist/devices/nld_roms.h33
-rw-r--r--src/lib/netlist/devices/nld_schmitt.cpp2
-rw-r--r--src/lib/netlist/devices/nld_schmitt.h21
-rw-r--r--src/lib/netlist/devices/nld_system.h92
-rw-r--r--src/lib/netlist/devices/nld_tms4800.cpp1
-rw-r--r--src/lib/netlist/devices/nld_tms4800.h14
-rw-r--r--src/lib/netlist/devices/nld_tristate.cpp1
-rw-r--r--src/lib/netlist/devices/nld_tristate.h25
104 files changed, 6 insertions, 1173 deletions
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp
index 4475ee32c9b..3fc11f177cf 100644
--- a/src/lib/netlist/devices/net_lib.cpp
+++ b/src/lib/netlist/devices/net_lib.cpp
@@ -27,126 +27,9 @@ namespace devices
// the entries.
// FIXME: the list should be either included or the whole
// initialize factory code should be created programmatically.
-#if (NL_AUTO_DEVICES)
+
#include "../generated/lib_entries.hxx"
-#else
- LIB_ENTRY(R)
- LIB_ENTRY(POT)
- LIB_ENTRY(POT2)
- LIB_ENTRY(C)
- LIB_ENTRY(L)
- LIB_ENTRY(D)
- LIB_ENTRY(Z)
- LIB_ENTRY(VS)
- LIB_ENTRY(CS)
- LIB_ENTRY(VCVS)
- LIB_ENTRY(VCCS)
- LIB_ENTRY(CCCS)
- LIB_ENTRY(CCVS)
- LIB_ENTRY(LVCCS)
- LIB_ENTRY(opamp)
- LIB_ENTRY(nc_pin)
- LIB_ENTRY(frontier) // not intended to be used directly
- LIB_ENTRY(function) // only for macro devices - NO FEEDBACK loops
- LIB_ENTRY(QBJT_EB)
- LIB_ENTRY(QBJT_switch)
- LIB_ENTRY(MOSFET)
- LIB_ENTRY(logic_input_ttl)
- LIB_ENTRY(logic_input)
- LIB_ENTRY(logic_input8)
- LIB_ENTRY(analog_input)
- LIB_ENTRY(log)
- LIB_ENTRY(logD)
- LIB_ENTRY(clock)
- LIB_ENTRY(varclock)
- LIB_ENTRY(extclock)
- LIB_ENTRY(mainclock)
- LIB_ENTRY(gnd)
- LIB_ENTRY(netlistparams)
- LIB_ENTRY(solver)
- LIB_ENTRY(sys_dsw1)
- LIB_ENTRY(sys_dsw2)
- LIB_ENTRY(sys_compd)
- LIB_ENTRY(sys_noise_mt_u)
- LIB_ENTRY(sys_noise_mt_n)
- LIB_ENTRY(switch1)
- LIB_ENTRY(switch2)
- LIB_ENTRY(nicRSFF)
- LIB_ENTRY(nicDelay)
- LIB_ENTRY(2102A)
- LIB_ENTRY(2716)
- LIB_ENTRY(7448)
- LIB_ENTRY(MK28000)
- LIB_ENTRY(7450)
- LIB_ENTRY(7473)
- LIB_ENTRY(7473A)
- LIB_ENTRY(7474)
- LIB_ENTRY(7475_GATE)
- LIB_ENTRY(7477_GATE)
- LIB_ENTRY(7483)
- LIB_ENTRY(7485)
- LIB_ENTRY(7490)
- LIB_ENTRY(7492)
- LIB_ENTRY(7493)
- LIB_ENTRY(7497)
- LIB_ENTRY(74107)
- LIB_ENTRY(74107A)
- LIB_ENTRY(74113)
- LIB_ENTRY(74113A)
- LIB_ENTRY(74121)
- LIB_ENTRY(74123)
- LIB_ENTRY(74125)
- LIB_ENTRY(74126)
- LIB_ENTRY(74153)
- LIB_ENTRY(74161)
- LIB_ENTRY(74161_fixme)
- LIB_ENTRY(74163)
- LIB_ENTRY(74164)
- LIB_ENTRY(74165)
- LIB_ENTRY(74166)
- LIB_ENTRY(74174)
- LIB_ENTRY(74175)
- LIB_ENTRY(74192)
- LIB_ENTRY(74193)
- LIB_ENTRY(74194)
- LIB_ENTRY(74365)
- LIB_ENTRY(74377_GATE)
- LIB_ENTRY(74393)
- //ENTRY(74279, TTL_74279, "") // only dip available
- LIB_ENTRY(SN74LS629)
- LIB_ENTRY(82S16)
- LIB_ENTRY(82S115)
- LIB_ENTRY(82S123)
- LIB_ENTRY(82S126)
- LIB_ENTRY(74S287)
- LIB_ENTRY(8277)
- LIB_ENTRY(9310)
- LIB_ENTRY(9314)
- LIB_ENTRY(9316)
- LIB_ENTRY(9321)
- LIB_ENTRY(9322)
- LIB_ENTRY(9334)
- LIB_ENTRY(AM2847)
- LIB_ENTRY(CD4006)
- LIB_ENTRY(CD4013)
- LIB_ENTRY(CD4017)
- LIB_ENTRY(CD4022)
- LIB_ENTRY(CD4020)
- LIB_ENTRY(CD4024)
- LIB_ENTRY(CD4053_GATE)
- LIB_ENTRY(CD4066_GATE)
- LIB_ENTRY(CD4316_GATE)
- LIB_ENTRY(4538)
- LIB_ENTRY(schmitt_trigger)
- LIB_ENTRY(NE555)
- LIB_ENTRY(MC1455P)
- LIB_ENTRY(TMS4800)
- LIB_ENTRY(r2r_dac)
- LIB_ENTRY(tristate)
- LIB_ENTRY(tristate3)
- LIB_ENTRY(9602)
- LIB_ENTRY(MM5837)
-#endif
+
}
} //namespace devices
diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h
index 9326a616647..db3f9c1519d 100644
--- a/src/lib/netlist/devices/net_lib.h
+++ b/src/lib/netlist/devices/net_lib.h
@@ -7,7 +7,7 @@
///
/// \file net_lib.h
///
-/// Discrete netlist implementation.
+/// This file is included by all netlist implementations.
///
#include "../nl_setup.h"
@@ -30,92 +30,7 @@
NETLIST_EXTERNAL(base_lib)
-#if NL_AUTO_DEVICES
+#include "../generated/nld_devinc.h"
- #include "../generated/nld_devinc.h"
-#else
-
-#define SOLVER(name, freq) \
- NET_REGISTER_DEVEXT(SOLVER, name, freq)
-
-#include "nld_system.h"
-
-#include "nld_2102A.h"
-#include "nld_4006.h"
-#include "nld_4013.h"
-#include "nld_4017.h"
-#include "nld_4020.h"
-#include "nld_4053.h"
-#include "nld_4066.h"
-#include "nld_4316.h"
-#include "nld_74107.h"
-#include "nld_74113.h"
-#include "nld_74123.h"
-#include "nld_74125.h"
-#include "nld_74153.h"
-#include "nld_74164.h"
-#include "nld_74165.h"
-#include "nld_74166.h"
-#include "nld_74174.h"
-#include "nld_74175.h"
-#include "nld_74192.h"
-#include "nld_74193.h"
-#include "nld_74194.h"
-#include "nld_74365.h"
-#include "nld_74377.h"
-#include "nld_74393.h"
-#include "nld_7448.h"
-#include "nld_7450.h"
-#include "nld_7473.h"
-#include "nld_7474.h"
-#include "nld_7475.h"
-#include "nld_7483.h"
-#include "nld_7485.h"
-#include "nld_7490.h"
-#include "nld_7492.h"
-#include "nld_7493.h"
-#include "nld_7497.h"
-#include "nld_74ls629.h"
-#include "nld_82S115.h"
-#include "nld_82S16.h"
-#include "nld_9316.h"
-#include "nld_9321.h"
-#include "nld_9322.h"
-#include "nld_tms4800.h"
-
-#include "nld_8277.h"
-#include "nld_am2847.h"
-#include "nld_dm9314.h"
-#include "nld_dm9334.h"
-
-#include "nld_mm5837.h"
-#include "nld_ne555.h"
-
-#include "nld_r2r_dac.h"
-
-#include "nld_roms.h"
-
-#include "nld_schmitt.h"
-
-#include "nld_tristate.h"
-
-#include "nld_log.h"
-
-#include "../macro/nlm_cd4xxx_lib.h"
-#include "../macro/nlm_opamp_lib.h"
-#include "../macro/nlm_otheric_lib.h"
-#include "../macro/nlm_roms_lib.h"
-#include "../macro/nlm_ttl74xx_lib.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
-
-#endif
+#endif // NET_LIB_H
diff --git a/src/lib/netlist/devices/nld_2102A.cpp b/src/lib/netlist/devices/nld_2102A.cpp
index 0fddde0bd2d..91c7c6b7ee0 100644
--- a/src/lib/netlist/devices/nld_2102A.cpp
+++ b/src/lib/netlist/devices/nld_2102A.cpp
@@ -21,7 +21,6 @@
*
*/
-#include "nld_2102A.h"
#include "nl_base.h"
#define ADDR2BYTE(a) ((a) >> 3)
diff --git a/src/lib/netlist/devices/nld_2102A.h b/src/lib/netlist/devices/nld_2102A.h
deleted file mode 100644
index fb0693e1012..00000000000
--- a/src/lib/netlist/devices/nld_2102A.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_2102A_H_
-#define NLD_2102A_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(...) \
- NET_REGISTER_DEVEXT(RAM_2102A, __VA_ARGS__)
-
-#endif /* NLD_2102A_H_ */
diff --git a/src/lib/netlist/devices/nld_4006.cpp b/src/lib/netlist/devices/nld_4006.cpp
index 7d0deef61ec..cd0e441c6b5 100644
--- a/src/lib/netlist/devices/nld_4006.cpp
+++ b/src/lib/netlist/devices/nld_4006.cpp
@@ -39,7 +39,6 @@
*
*/
-#include "nld_4006.h"
#include "nl_base.h"
namespace netlist
diff --git a/src/lib/netlist/devices/nld_4006.h b/src/lib/netlist/devices/nld_4006.h
deleted file mode 100644
index c86d7ad86ee..00000000000
--- a/src/lib/netlist/devices/nld_4006.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_4006_H_
-#define NLD_4006_H_
-
-#include "../nl_setup.h"
-
-#define CD4006(name) \
- NET_REGISTER_DEV(CD4006, name)
-
-#endif /* NLD_4006_H_ */
diff --git a/src/lib/netlist/devices/nld_4013.h b/src/lib/netlist/devices/nld_4013.h
deleted file mode 100644
index 1569358357b..00000000000
--- a/src/lib/netlist/devices/nld_4013.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_4013_H_
-#define NLD_4013_H_
-
-#include "../nl_setup.h"
-
-// usage: CD4013(name, cCLOCK, cDATA, cRESET, cSET)
-#define CD4013(...) \
- NET_REGISTER_DEVEXT(CD4013, __VA_ARGS__)
-
-#endif /* NLD_4013_H_ */
diff --git a/src/lib/netlist/devices/nld_4017.cpp b/src/lib/netlist/devices/nld_4017.cpp
index e721d4502f1..249fa8c3b59 100644
--- a/src/lib/netlist/devices/nld_4017.cpp
+++ b/src/lib/netlist/devices/nld_4017.cpp
@@ -37,7 +37,6 @@
*
*/
-#include "nld_4017.h"
#include "nl_base.h"
#include "nl_factory.h"
diff --git a/src/lib/netlist/devices/nld_4017.h b/src/lib/netlist/devices/nld_4017.h
deleted file mode 100644
index 7f89c4b9cfe..00000000000
--- a/src/lib/netlist/devices/nld_4017.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_4017_H_
-#define NLD_4017_H_
-
-#include "../nl_setup.h"
-
-#define CD4017(name) \
- NET_REGISTER_DEV(CD4017, name)
-
-#define CD4022(name) \
- NET_REGISTER_DEV(CD4022, name)
-
-#endif /* NLD_4017_H_ */
diff --git a/src/lib/netlist/devices/nld_4020.cpp b/src/lib/netlist/devices/nld_4020.cpp
index dad41bd0626..6ceecd6846e 100644
--- a/src/lib/netlist/devices/nld_4020.cpp
+++ b/src/lib/netlist/devices/nld_4020.cpp
@@ -37,7 +37,6 @@
*
*/
-#include "nld_4020.h"
#include "nl_base.h"
#include "nl_factory.h"
diff --git a/src/lib/netlist/devices/nld_4020.h b/src/lib/netlist/devices/nld_4020.h
deleted file mode 100644
index e80156045df..00000000000
--- a/src/lib/netlist/devices/nld_4020.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_4020_H_
-#define NLD_4020_H_
-
-#include "../nl_setup.h"
-
-// usage : CD4020(name)
-#define CD4020(...) \
- NET_REGISTER_DEVEXT(CD4020, __VA_ARGS__)
-
-// usage : CD4024(name)
-#define CD4024(...) \
- NET_REGISTER_DEVEXT(CD4024, __VA_ARGS__)
-
-#endif /* NLD_4020_H_ */
diff --git a/src/lib/netlist/devices/nld_4053.cpp b/src/lib/netlist/devices/nld_4053.cpp
index 7a000d98a84..29634e9fdeb 100644
--- a/src/lib/netlist/devices/nld_4053.cpp
+++ b/src/lib/netlist/devices/nld_4053.cpp
@@ -23,8 +23,6 @@
*/
-#include "nld_4053.h"
-
#include "analog/nlid_twoterm.h"
#include "solver/nld_solver.h"
diff --git a/src/lib/netlist/devices/nld_4053.h b/src/lib/netlist/devices/nld_4053.h
deleted file mode 100644
index 6c6334b349f..00000000000
--- a/src/lib/netlist/devices/nld_4053.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-#ifndef NLD_4053_H_
-#define NLD_4053_H_
-
-#include "../nl_setup.h"
-
-// FIXME: Implement pure CMOS version
-
-#define CD4053_GATE(name) \
- NET_REGISTER_DEV(CD4053_GATE, name)
-
-#endif /* NLD_4053_H_ */
diff --git a/src/lib/netlist/devices/nld_4066.cpp b/src/lib/netlist/devices/nld_4066.cpp
index 8cfa07f3b71..9e7d7e7c7fe 100644
--- a/src/lib/netlist/devices/nld_4066.cpp
+++ b/src/lib/netlist/devices/nld_4066.cpp
@@ -21,8 +21,6 @@
*
*/
-#include "nld_4066.h"
-
#include "analog/nlid_twoterm.h"
#include "solver/nld_solver.h"
diff --git a/src/lib/netlist/devices/nld_4066.h b/src/lib/netlist/devices/nld_4066.h
deleted file mode 100644
index 7815466aa08..00000000000
--- a/src/lib/netlist/devices/nld_4066.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_4066_H_
-#define NLD_4066_H_
-
-#include "../nl_setup.h"
-
-// FIXME: Implement pure CMOS version
-
-#define CD4066_GATE(name) \
- NET_REGISTER_DEV(CD4066_GATE, name)
-
-#endif /* NLD_4066_H_ */
diff --git a/src/lib/netlist/devices/nld_4316.cpp b/src/lib/netlist/devices/nld_4316.cpp
index 1eed4fa9ba6..d7668c7822a 100644
--- a/src/lib/netlist/devices/nld_4316.cpp
+++ b/src/lib/netlist/devices/nld_4316.cpp
@@ -22,7 +22,6 @@
*
*/
-#include "nld_4316.h"
#include "analog/nlid_twoterm.h"
#include "solver/nld_solver.h"
diff --git a/src/lib/netlist/devices/nld_4316.h b/src/lib/netlist/devices/nld_4316.h
deleted file mode 100644
index 599430f4576..00000000000
--- a/src/lib/netlist/devices/nld_4316.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Vas Crabb
-
-#ifndef NLD_4316_H_
-#define NLD_4316_H_
-
-#include "../nl_setup.h"
-
-#define CD4316_GATE(name) \
- NET_REGISTER_DEV(CD4316_GATE, name)
-
-#endif /* NLD_4316_H_ */
diff --git a/src/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp
index 1e52368b417..f49ed439d1e 100644
--- a/src/lib/netlist/devices/nld_74107.cpp
+++ b/src/lib/netlist/devices/nld_74107.cpp
@@ -61,7 +61,6 @@
*
*/
-#include "nld_74107.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
deleted file mode 100644
index c3d65523a9f..00000000000
--- a/src/lib/netlist/devices/nld_74107.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_74107_H_
-#define NLD_74107_H_
-
-#include "../nl_setup.h"
-
-#define TTL_74107(...) \
- NET_REGISTER_DEVEXT(TTL_74107, __VA_ARGS__)
-
-// usage: TTL_74107A(name, cCLK, cJ, cK, cCLRQ)
-#define TTL_74107A(...) \
- NET_REGISTER_DEVEXT(TTL_74107A, __VA_ARGS__)
-
-#endif /* NLD_74107_H_ */
diff --git a/src/lib/netlist/devices/nld_74113.cpp b/src/lib/netlist/devices/nld_74113.cpp
index 98a8de63e01..d4fc729b2bc 100644
--- a/src/lib/netlist/devices/nld_74113.cpp
+++ b/src/lib/netlist/devices/nld_74113.cpp
@@ -57,7 +57,6 @@
*
*/
-#include "nld_74113.h"
#include "nl_base.h"
// FIXME: this can probably be merged with nld_7473.cpp
diff --git a/src/lib/netlist/devices/nld_74113.h b/src/lib/netlist/devices/nld_74113.h
deleted file mode 100644
index e0b531daadc..00000000000
--- a/src/lib/netlist/devices/nld_74113.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_74113_H_
-#define NLD_74113_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_74113(name, cCLK, cJ, cK, cCLRQ)
-#define TTL_74113(...) \
- NET_REGISTER_DEVEXT(TTL_74113, __VA_ARGS__)
-
-// usage: TTL_74113A(name, cCLK, cJ, cK, cCLRQ)
-#define TTL_74113A(...) \
- NET_REGISTER_DEVEXT(TTL_74113, __VA_ARGS__)
-
-#endif /* NLD_74113_H_ */
diff --git a/src/lib/netlist/devices/nld_74123.h b/src/lib/netlist/devices/nld_74123.h
deleted file mode 100644
index 3c780fb83a6..00000000000
--- a/src/lib/netlist/devices/nld_74123.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_74123_H_
-#define NLD_74123_H_
-
-#include "../nl_setup.h"
-
-#define TTL_74123(name) \
- NET_REGISTER_DEV(TTL_74123, name)
-
-#define TTL_74121(name) \
- NET_REGISTER_DEV(TTL_74121, name)
-
-#define TTL_9602(name) \
- NET_REGISTER_DEV(TTL_9602, name)
-
-#define CD4538(name) \
- NET_REGISTER_DEV(CD4538, name)
-
-#endif /* NLD_74123_H_ */
diff --git a/src/lib/netlist/devices/nld_74125.cpp b/src/lib/netlist/devices/nld_74125.cpp
index f60d5b37c5c..1240619e1d6 100644
--- a/src/lib/netlist/devices/nld_74125.cpp
+++ b/src/lib/netlist/devices/nld_74125.cpp
@@ -5,7 +5,6 @@
*
*/
-#include "nld_74125.h"
#include "nl_base.h"
#include <type_traits>
diff --git a/src/lib/netlist/devices/nld_74125.h b/src/lib/netlist/devices/nld_74125.h
deleted file mode 100644
index 07d749e0c02..00000000000
--- a/src/lib/netlist/devices/nld_74125.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-/*
- * nld_74125.h
- *
- */
-
-#ifndef NLD_74125_H_
-#define NLD_74125_H_
-
-#include "../nl_setup.h"
-
-#define TTL_74125_GATE(...) \
- NET_REGISTER_DEV(TTL_74125_GATE, __VA_ARGS__)
-
-#define TTL_74126_GATE(...) \
- NET_REGISTER_DEV(TTL_74126_GATE, __VA_ARGS__)
-
-#endif /* NLD_74125_H_ */
diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp
index 9e5a68149c5..bc2b54bcb98 100644
--- a/src/lib/netlist/devices/nld_74153.cpp
+++ b/src/lib/netlist/devices/nld_74153.cpp
@@ -42,7 +42,6 @@
*
*/
-#include "nld_74153.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
deleted file mode 100644
index 11bfe0e2bb4..00000000000
--- a/src/lib/netlist/devices/nld_74153.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_74153_H_
-#define NLD_74153_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_74153(name, cC0, cC1, cC2, cC3, cA, cB, cG)
-#define TTL_74153(...) \
- NET_REGISTER_DEVEXT(TTL_74153, __VA_ARGS__)
-
-#endif /* NLD_74153_H_ */
diff --git a/src/lib/netlist/devices/nld_74164.cpp b/src/lib/netlist/devices/nld_74164.cpp
index 25331e8f3ae..74096cf4147 100644
--- a/src/lib/netlist/devices/nld_74164.cpp
+++ b/src/lib/netlist/devices/nld_74164.cpp
@@ -46,7 +46,6 @@
**********************************************************************/
-#include "nld_74164.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
deleted file mode 100644
index 9ec3b98c10c..00000000000
--- a/src/lib/netlist/devices/nld_74164.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Joakim Larsson Edstrom
-
-#ifndef NLD_74164_H_
-#define NLD_74164_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_74164(name, cA, cB, cCLRQ, cCLK)
-#define TTL_74164(...) \
- NET_REGISTER_DEVEXT(TTL_74164, __VA_ARGS__)
-
-#endif /* NLD_74164_H_ */
diff --git a/src/lib/netlist/devices/nld_74165.cpp b/src/lib/netlist/devices/nld_74165.cpp
index 15647afb6d7..19eb2267e02 100644
--- a/src/lib/netlist/devices/nld_74165.cpp
+++ b/src/lib/netlist/devices/nld_74165.cpp
@@ -24,7 +24,6 @@
*
*/
-#include "nld_74165.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
deleted file mode 100644
index 5b0b2820135..00000000000
--- a/src/lib/netlist/devices/nld_74165.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_74165_H_
-#define NLD_74165_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(...) \
- NET_REGISTER_DEVEXT(TTL_74165, __VA_ARGS__)
-
-#endif /* NLD_74165_H_ */
diff --git a/src/lib/netlist/devices/nld_74166.cpp b/src/lib/netlist/devices/nld_74166.cpp
index 243281ca527..69082d89363 100644
--- a/src/lib/netlist/devices/nld_74166.cpp
+++ b/src/lib/netlist/devices/nld_74166.cpp
@@ -24,7 +24,6 @@
*
*/
-#include "nld_74166.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
deleted file mode 100644
index 00434994d80..00000000000
--- a/src/lib/netlist/devices/nld_74166.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_74166_H_
-#define NLD_74166_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(...) \
- NET_REGISTER_DEVEXT(TTL_74166, __VA_ARGS__)
-
-#endif /* NLD_74166_H_ */
diff --git a/src/lib/netlist/devices/nld_74174.cpp b/src/lib/netlist/devices/nld_74174.cpp
index 1414ddd3145..32bc0f5d1a0 100644
--- a/src/lib/netlist/devices/nld_74174.cpp
+++ b/src/lib/netlist/devices/nld_74174.cpp
@@ -33,7 +33,6 @@
*
*/
-#include "nld_74174.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
deleted file mode 100644
index 91cef8fdd74..00000000000
--- a/src/lib/netlist/devices/nld_74174.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_74174_H_
-#define NLD_74174_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ)
-#define TTL_74174(...) \
- NET_REGISTER_DEVEXT(TTL_74174, __VA_ARGS__)
-
-#endif /* NLD_74174_H_ */
diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp
index 0b2f125d1b1..3329ff18893 100644
--- a/src/lib/netlist/devices/nld_74175.cpp
+++ b/src/lib/netlist/devices/nld_74175.cpp
@@ -33,7 +33,6 @@
*
*/
-#include "nld_74175.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
deleted file mode 100644
index 377320b14f0..00000000000
--- a/src/lib/netlist/devices/nld_74175.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_74175_H_
-#define NLD_74175_H_
-
-#include "../nl_setup.h"
-
-// usage : TTL_74175(name, pCLK, pD1, pD2, pD3, pD4, pCLRQ)
-// auto connect: VCC, GND
-#define TTL_74175(...) \
- NET_REGISTER_DEVEXT(TTL_74175, __VA_ARGS__)
-
-#endif /* NLD_74175_H_ */
diff --git a/src/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp
index 0c1864f4394..5f56f67dc93 100644
--- a/src/lib/netlist/devices/nld_74192.cpp
+++ b/src/lib/netlist/devices/nld_74192.cpp
@@ -26,7 +26,7 @@
*
*/
-#include "nld_74192.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
deleted file mode 100644
index 1248a07961c..00000000000
--- a/src/lib/netlist/devices/nld_74192.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_74192_H_
-#define NLD_74192_H_
-
-#include "../nl_setup.h"
-
-// usage : TTL_74192(name, pA, pB, pC, pD, pCLEAR, pLOADQ, pCU, pCD)
-// auto connect: VCC, GND
-#define TTL_74192(...) \
- NET_REGISTER_DEVEXT(TTL_74192, __VA_ARGS__)
-
-#endif /* NLD_74192_H_ */
diff --git a/src/lib/netlist/devices/nld_74193.cpp b/src/lib/netlist/devices/nld_74193.cpp
index 5754cd2eea1..e4dec831f68 100644
--- a/src/lib/netlist/devices/nld_74193.cpp
+++ b/src/lib/netlist/devices/nld_74193.cpp
@@ -23,7 +23,6 @@
*
*/
-#include "nld_74193.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
deleted file mode 100644
index 42c790107a2..00000000000
--- a/src/lib/netlist/devices/nld_74193.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_74193_H_
-#define NLD_74193_H_
-
-#include "../nl_setup.h"
-
-// usage : TTL_74193(name, pA, pB, pC, pD, pCLEAR, pLOADQ, pCU, pCD)
-// auto connect: VCC, GND
-#define TTL_74193(...) \
- NET_REGISTER_DEVEXT(TTL_74193, __VA_ARGS__)
-
-#endif /* NLD_74193_H_ */
diff --git a/src/lib/netlist/devices/nld_74194.cpp b/src/lib/netlist/devices/nld_74194.cpp
index cc0b048d95d..c20f4b96021 100644
--- a/src/lib/netlist/devices/nld_74194.cpp
+++ b/src/lib/netlist/devices/nld_74194.cpp
@@ -23,8 +23,6 @@
*
*/
-
-#include "nld_74194.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
deleted file mode 100644
index c380190d6fe..00000000000
--- a/src/lib/netlist/devices/nld_74194.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-#ifndef NLD_74194_H_
-#define NLD_74194_H_
-
-#include "../nl_setup.h"
-
-// usage : TTL_74194(name, pCLK, pS0, pS1, pSRIN, pA, pB, pC, pD, pSLIN, pCLRQ)
-// auto connect: VCC, GND
-#define TTL_74194(...) \
- NET_REGISTER_DEVEXT(TTL_74194, __VA_ARGS__)
-
-#endif /* NLD_74194_H_ */
diff --git a/src/lib/netlist/devices/nld_74365.cpp b/src/lib/netlist/devices/nld_74365.cpp
index ce93d336158..8f078743773 100644
--- a/src/lib/netlist/devices/nld_74365.cpp
+++ b/src/lib/netlist/devices/nld_74365.cpp
@@ -22,7 +22,6 @@
* is not a "real" bus driver, it simply outputs 0 if the chip is not enabled.
*/
-#include "nld_74365.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
deleted file mode 100644
index 5900991e156..00000000000
--- a/src/lib/netlist/devices/nld_74365.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-#ifndef NLD_74365_H_
-#define NLD_74365_H_
-
-#include "../nl_setup.h"
-
-// usage : TTL_74365(name, pG1Q, pG2Q, pA1, pA2, pA3, pA4, pA5, pA6)
-// auto connect: VCC, GND
-#define TTL_74365(...) \
- NET_REGISTER_DEVEXT(TTL_74365, __VA_ARGS__)
-
-#endif /* NLD_74365_H_ */
diff --git a/src/lib/netlist/devices/nld_74377.cpp b/src/lib/netlist/devices/nld_74377.cpp
index 45427bde827..dc38dbc0d2d 100644
--- a/src/lib/netlist/devices/nld_74377.cpp
+++ b/src/lib/netlist/devices/nld_74377.cpp
@@ -48,7 +48,6 @@
*
*/
-#include "nld_74377.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
deleted file mode 100644
index 7157abec99f..00000000000
--- a/src/lib/netlist/devices/nld_74377.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud,Aaron Giles
-
-#ifndef NLD_74377_H_
-#define NLD_74377_H_
-
-#include "../nl_setup.h"
-
-
-#define TTL_74377_GATE(name) \
- NET_REGISTER_DEV(TTL_74377_GATE, name)
-
-
-#endif /* NLD_74377_H_ */
diff --git a/src/lib/netlist/devices/nld_74393.cpp b/src/lib/netlist/devices/nld_74393.cpp
index 765c73a7880..5e9cef831d0 100644
--- a/src/lib/netlist/devices/nld_74393.cpp
+++ b/src/lib/netlist/devices/nld_74393.cpp
@@ -19,7 +19,6 @@
*
*/
-#include "nld_74393.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
deleted file mode 100644
index 664b7ce91eb..00000000000
--- a/src/lib/netlist/devices/nld_74393.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_74393_H_
-#define NLD_74393_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_74393(name, cCP, cMR)
-#define TTL_74393(...) \
- NET_REGISTER_DEVEXT(TTL_74393, __VA_ARGS__)
-
-#endif /* NLD_74193_H_ */
diff --git a/src/lib/netlist/devices/nld_7448.h b/src/lib/netlist/devices/nld_7448.h
deleted file mode 100644
index 937ea87e090..00000000000
--- a/src/lib/netlist/devices/nld_7448.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_7448_H_
-#define NLD_7448_H_
-
-#include "../nl_setup.h"
-
-// usage : TTL_7448(name, pA, pB, pC, pD, pLTQ, pBIQ, pRBIQ)
-// auto connect: VCC, GND
-#define TTL_7448(...) \
- NET_REGISTER_DEVEXT(TTL_7448, __VA_ARGS__)
-
-#endif /* NLD_7448_H_ */
diff --git a/src/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp
index 35487bd12f9..d4fc9319b0f 100644
--- a/src/lib/netlist/devices/nld_7450.cpp
+++ b/src/lib/netlist/devices/nld_7450.cpp
@@ -21,7 +21,6 @@
*
*/
-#include "nld_7450.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
deleted file mode 100644
index 7a58605f20c..00000000000
--- a/src/lib/netlist/devices/nld_7450.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_7450_H_
-#define NLD_7450_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_7450_ANDORINVERT(name, cI1, cI2, cI3, cI4)
-#define TTL_7450_ANDORINVERT(...) \
- NET_REGISTER_DEVEXT(TTL_7450_ANDORINVERT, __VA_ARGS__)
-
-#endif /* NLD_7450_H_ */
diff --git a/src/lib/netlist/devices/nld_7473.cpp b/src/lib/netlist/devices/nld_7473.cpp
index 8826df0239d..dbfedecb72e 100644
--- a/src/lib/netlist/devices/nld_7473.cpp
+++ b/src/lib/netlist/devices/nld_7473.cpp
@@ -57,7 +57,6 @@
*
*/
-#include "nld_7473.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
deleted file mode 100644
index 6aedd619dac..00000000000
--- a/src/lib/netlist/devices/nld_7473.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_7473_H_
-#define NLD_7473_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_7473(name, cCLK, cJ, cK, cCLRQ)
-#define TTL_7473(...) \
- NET_REGISTER_DEVEXT(TTL_7473, __VA_ARGS__)
-
-#define TTL_7473A(...) \
- TTL_7473(__VA_ARGS__)
-
-#endif /* NLD_7473_H_ */
diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp
index 42d5acfc9af..16a259312dd 100644
--- a/src/lib/netlist/devices/nld_7474.cpp
+++ b/src/lib/netlist/devices/nld_7474.cpp
@@ -40,7 +40,6 @@
* FIXME: Check that (*) is emulated properly
*/
-#include "nld_7474.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
deleted file mode 100644
index 7ae42fc750b..00000000000
--- a/src/lib/netlist/devices/nld_7474.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_7474_H_
-#define NLD_7474_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_7474(name, cCLK, cD, cCLRQ, cPREQ)
-#define TTL_7474(...) \
- NET_REGISTER_DEVEXT(TTL_7474, __VA_ARGS__)
-
-#endif /* NLD_7474_H_ */
diff --git a/src/lib/netlist/devices/nld_7475.cpp b/src/lib/netlist/devices/nld_7475.cpp
index b73bc8e4fad..1e5e9c82b1c 100644
--- a/src/lib/netlist/devices/nld_7475.cpp
+++ b/src/lib/netlist/devices/nld_7475.cpp
@@ -34,7 +34,6 @@
*
*/
-#include "nld_7475.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
deleted file mode 100644
index 988061e3c6b..00000000000
--- a/src/lib/netlist/devices/nld_7475.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_7475_H_
-#define NLD_7475_H_
-
-#include "../nl_setup.h"
-
-#define TTL_7475_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7475_GATE, __VA_ARGS__)
-
-#define TTL_7477_GATE(...) \
- NET_REGISTER_DEVEXT(TTL_7477_GATE, __VA_ARGS__)
-
-#endif /* NLD_7475_H_ */
diff --git a/src/lib/netlist/devices/nld_7483.cpp b/src/lib/netlist/devices/nld_7483.cpp
index 0e20ab76b63..d6708cbd3b6 100644
--- a/src/lib/netlist/devices/nld_7483.cpp
+++ b/src/lib/netlist/devices/nld_7483.cpp
@@ -24,7 +24,6 @@
*
*/
-#include "nld_7483.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
deleted file mode 100644
index e2ede42246a..00000000000
--- a/src/lib/netlist/devices/nld_7483.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_7483_H_
-#define NLD_7483_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_7483(name, cA1, cA2, cA3, cA4, cB1, cB2, cB3, cB4, cCI)
-#define TTL_7483(...) \
- NET_REGISTER_DEVEXT(TTL_7483, __VA_ARGS__)
-
-#endif /* NLD_7483_H_ */
diff --git a/src/lib/netlist/devices/nld_7485.cpp b/src/lib/netlist/devices/nld_7485.cpp
index 7cce2fa8ad8..40a4831e1f7 100644
--- a/src/lib/netlist/devices/nld_7485.cpp
+++ b/src/lib/netlist/devices/nld_7485.cpp
@@ -22,7 +22,6 @@
*
*/
-#include "nld_7485.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
deleted file mode 100644
index 8d140b57c4d..00000000000
--- a/src/lib/netlist/devices/nld_7485.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_7485_H_
-#define NLD_7485_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN)
-#define TTL_7485(...) \
- NET_REGISTER_DEVEXT(TTL_7485, __VA_ARGS__)
-
-#endif /* NLD_7485_H_ */
diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp
index 8dcf6ab2655..abf93a4189b 100644
--- a/src/lib/netlist/devices/nld_7490.cpp
+++ b/src/lib/netlist/devices/nld_7490.cpp
@@ -52,7 +52,6 @@
*
*/
-#include "nld_7490.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
deleted file mode 100644
index 06a18f19c8d..00000000000
--- a/src/lib/netlist/devices/nld_7490.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_7490_H_
-#define NLD_7490_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92)
-#define TTL_7490(...) \
- NET_REGISTER_DEVEXT(TTL_7490, __VA_ARGS__)
-
-#endif /* NLD_7490_H_ */
diff --git a/src/lib/netlist/devices/nld_7492.h b/src/lib/netlist/devices/nld_7492.h
deleted file mode 100644
index 366e1c079c6..00000000000
--- a/src/lib/netlist/devices/nld_7492.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_7492_H_
-#define NLD_7492_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_7492(name, cA, cB, cR1, cR2)
-#define TTL_7492(...) \
- NET_REGISTER_DEVEXT(TTL_7492, __VA_ARGS__)
-
-#endif /* NLD_7492_H_ */
diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp
index 17cf8eb5ff1..c52418f8d2e 100644
--- a/src/lib/netlist/devices/nld_7493.cpp
+++ b/src/lib/netlist/devices/nld_7493.cpp
@@ -54,7 +54,6 @@
*
*/
-#include "nld_7493.h"
#include "nl_base.h"
diff --git a/src/lib/netlist/devices/nld_7493.h b/src/lib/netlist/devices/nld_7493.h
deleted file mode 100644
index 86bbc6a1482..00000000000
--- a/src/lib/netlist/devices/nld_7493.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_7493_H_
-#define NLD_7493_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_7493(name, cCLKA, cCLKB, cR1, cR2)
-#define TTL_7493(...) \
- NET_REGISTER_DEVEXT(TTL_7493, __VA_ARGS__)
-
-#endif /* NLD_7493_H_ */
diff --git a/src/lib/netlist/devices/nld_7497.cpp b/src/lib/netlist/devices/nld_7497.cpp
index b43ff7dcfe2..895f8b5a07f 100644
--- a/src/lib/netlist/devices/nld_7497.cpp
+++ b/src/lib/netlist/devices/nld_7497.cpp
@@ -37,7 +37,6 @@
* Unity/cascade is used to inhibit output Y (UNITY L -> Y H)
*/
-#include "nld_7497.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
deleted file mode 100644
index befebb8d64e..00000000000
--- a/src/lib/netlist/devices/nld_7497.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Sergey Svishchev
-
-#ifndef NLD_7497_H_
-#define NLD_7497_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_7497(name, cCLK, cSTRB, cEN, cUNITY, cCLR, cB0, cB1, cB2, cB3, cB4, cB5)
-#define TTL_7497(...) \
- NET_REGISTER_DEVEXT(TTL_7497, __VA_ARGS__)
-
-#endif /* NLD_7497_H_ */
diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp
index 27eee588957..6e28feffdfc 100644
--- a/src/lib/netlist/devices/nld_74ls629.cpp
+++ b/src/lib/netlist/devices/nld_74ls629.cpp
@@ -58,8 +58,6 @@
* Then just use that to toggle a waveform.
*/
-
-#include "nld_74ls629.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
deleted file mode 100644
index ff467d46cea..00000000000
--- a/src/lib/netlist/devices/nld_74ls629.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_74LS629_H_
-#define NLD_74LS629_H_
-
-#include "../nl_setup.h"
-
-#define SN74LS629(name, ...) \
- NET_REGISTER_DEVEXT(SN74LS629, name,__VA_ARGS__)
-
-#endif /* NLD_74LS629_H_ */
diff --git a/src/lib/netlist/devices/nld_8277.cpp b/src/lib/netlist/devices/nld_8277.cpp
index 939f1a32ecc..9832a2857cc 100644
--- a/src/lib/netlist/devices/nld_8277.cpp
+++ b/src/lib/netlist/devices/nld_8277.cpp
@@ -18,7 +18,6 @@
*
*/
-#include "nld_8277.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
deleted file mode 100644
index 54deeccb230..00000000000
--- a/src/lib/netlist/devices/nld_8277.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_8277_H_
-#define NLD_8277_H_
-
-#include "../nl_setup.h"
-
-// usage : TTL_8277(name, pRESET, pCLK, pCLKA, pD0A, pD1A, pDSA, pCLKB, pD0B, pD1B, pDSB)
-// auto connect: VCC, GND
-#define TTL_8277(...) \
- NET_REGISTER_DEVEXT(TTL_8277, __VA_ARGS__)
-
-#endif /* NLD_2877_H_ */
diff --git a/src/lib/netlist/devices/nld_82S115.cpp b/src/lib/netlist/devices/nld_82S115.cpp
index d96be04c053..f1e49bd9f83 100644
--- a/src/lib/netlist/devices/nld_82S115.cpp
+++ b/src/lib/netlist/devices/nld_82S115.cpp
@@ -25,7 +25,6 @@
*
*/
-#include "nld_82S115.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
deleted file mode 100644
index b5d6dcf58a5..00000000000
--- a/src/lib/netlist/devices/nld_82S115.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_82S115_H_
-#define NLD_82S115_H_
-
-#include "../nl_setup.h"
-
-// expects: PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE)
-#define PROM_82S115(...) \
- NET_REGISTER_DEVEXT(PROM_82S115, __VA_ARGS__)
-
-#endif /* NLD_82S115_H_ */
diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp
index bdc6a15132d..2fc92adfe30 100644
--- a/src/lib/netlist/devices/nld_82S16.cpp
+++ b/src/lib/netlist/devices/nld_82S16.cpp
@@ -22,7 +22,6 @@
*
*/
-#include "nld_82S16.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
deleted file mode 100644
index ef73e631b16..00000000000
--- a/src/lib/netlist/devices/nld_82S16.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_82S16_H_
-#define NLD_82S16_H_
-
-#include "../nl_setup.h"
-
-#define TTL_82S16(name) \
- NET_REGISTER_DEV(TTL_82S16, name)
-
-#endif /* NLD_82S16_H_ */
diff --git a/src/lib/netlist/devices/nld_9316.h b/src/lib/netlist/devices/nld_9316.h
deleted file mode 100644
index baefb42a758..00000000000
--- a/src/lib/netlist/devices/nld_9316.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_9316_H_
-#define NLD_9316_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_9316(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD)
-#define TTL_9316(...) \
- NET_REGISTER_DEVEXT(TTL_74161, __VA_ARGS__)
-
-#define TTL_74161(...) \
- NET_REGISTER_DEVEXT(TTL_74161, __VA_ARGS__)
-
-#define TTL_74161_FIXME(...) \
- NET_REGISTER_DEVEXT(TTL_74161_FIXME, __VA_ARGS__)
-
-#define TTL_74163(...) \
- NET_REGISTER_DEVEXT(TTL_74163, __VA_ARGS__)
-
-#define TTL_9310(...) \
- NET_REGISTER_DEVEXT(TTL_9310, __VA_ARGS__)
-
-#endif /* NLD_9316_H_ */
diff --git a/src/lib/netlist/devices/nld_9321.cpp b/src/lib/netlist/devices/nld_9321.cpp
index 68e09fd233e..5adffc3a313 100644
--- a/src/lib/netlist/devices/nld_9321.cpp
+++ b/src/lib/netlist/devices/nld_9321.cpp
@@ -18,7 +18,6 @@
*
*/
-#include "nld_9321.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
deleted file mode 100644
index 8283dbde20c..00000000000
--- a/src/lib/netlist/devices/nld_9321.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_9321_H_
-#define NLD_9321_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_9321(name, cAE, cA0, cA1, cBE, cB0, cB1)
-#define TTL_9321(...) \
- NET_REGISTER_DEVEXT(TTL_9321, __VA_ARGS__)
-
-#endif /* NLD_9321_H_ */
diff --git a/src/lib/netlist/devices/nld_9322.cpp b/src/lib/netlist/devices/nld_9322.cpp
index 1167ece79d9..2d952487a02 100644
--- a/src/lib/netlist/devices/nld_9322.cpp
+++ b/src/lib/netlist/devices/nld_9322.cpp
@@ -18,7 +18,6 @@
*
*/
-#include "nld_9322.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
deleted file mode 100644
index 0584974da2e..00000000000
--- a/src/lib/netlist/devices/nld_9322.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_9322_H_
-#define NLD_9322_H_
-
-#include "../nl_setup.h"
-
-// usage: TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE)
-#define TTL_9322(...) \
- NET_REGISTER_DEVEXT(TTL_9322, __VA_ARGS__)
-
-#endif /* NLD_9322_H_ */
diff --git a/src/lib/netlist/devices/nld_am2847.cpp b/src/lib/netlist/devices/nld_am2847.cpp
index 9a35b5f8ac9..fb4cc384aea 100644
--- a/src/lib/netlist/devices/nld_am2847.cpp
+++ b/src/lib/netlist/devices/nld_am2847.cpp
@@ -18,7 +18,6 @@
*
*/
-#include "nld_am2847.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
deleted file mode 100644
index bf7c3b8a635..00000000000
--- a/src/lib/netlist/devices/nld_am2847.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_AM2847_H_
-#define NLD_AM2847_H_
-
-#include "../nl_setup.h"
-
-#define TTL_AM2847(...) \
- NET_REGISTER_DEVEXT(TTL_AM2847, __VA_ARGS__)
-
-#endif /* NLD_AM2847_H_ */
diff --git a/src/lib/netlist/devices/nld_dm9314.cpp b/src/lib/netlist/devices/nld_dm9314.cpp
index 215316f9d42..0f3980df98b 100644
--- a/src/lib/netlist/devices/nld_dm9314.cpp
+++ b/src/lib/netlist/devices/nld_dm9314.cpp
@@ -18,7 +18,6 @@
*
*/
-#include "nld_dm9314.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
deleted file mode 100644
index 03aebb16f14..00000000000
--- a/src/lib/netlist/devices/nld_dm9314.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Felipe Sanches
-
-#ifndef NLD_DM9314_H_
-#define NLD_DM9314_H_
-
-#include "../nl_setup.h"
-
-// usage : TTL_9314(name, pEQ, pMRQ, pS0Q, pS1Q, pS2Q, pS3Q, pD0, pD1, pD2, pD3)
-// auto connect: VCC, GND
-#define TTL_9314(...) \
- NET_REGISTER_DEVEXT(TTL_9314, __VA_ARGS__)
-
-#endif /* NLD_DM9314_H_ */
diff --git a/src/lib/netlist/devices/nld_dm9334.cpp b/src/lib/netlist/devices/nld_dm9334.cpp
index 251604bdf93..d3989935f77 100644
--- a/src/lib/netlist/devices/nld_dm9334.cpp
+++ b/src/lib/netlist/devices/nld_dm9334.cpp
@@ -62,7 +62,6 @@
*
*/
-#include "nld_dm9334.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
deleted file mode 100644
index 9e48fbf2cb3..00000000000
--- a/src/lib/netlist/devices/nld_dm9334.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_DM9334_H_
-#define NLD_DM9334_H_
-
-#include "../nl_setup.h"
-
-// usage : TTL_9334(name, pCQ, pEQ, pD, pA0, pA1, pA2)
-// auto connect: VCC, GND
-#define TTL_9334(...) \
- NET_REGISTER_DEVEXT(TTL_9334, __VA_ARGS__)
-
-#endif /* NLD_DM9334_H_ */
diff --git a/src/lib/netlist/devices/nld_legacy.cpp b/src/lib/netlist/devices/nld_legacy.cpp
index ca8893a59aa..338aeef73c9 100644
--- a/src/lib/netlist/devices/nld_legacy.cpp
+++ b/src/lib/netlist/devices/nld_legacy.cpp
@@ -5,7 +5,6 @@
*
*/
-#include "nld_legacy.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
deleted file mode 100644
index a91074a4056..00000000000
--- a/src/lib/netlist/devices/nld_legacy.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-/*
- * nld_legacy.h
- *
- * All of the devices below needs to disappear at some time .....
- *
- *
- */
-
-#ifndef NLD_LEGACY_H_
-#define NLD_LEGACY_H_
-
-#include "../nl_setup.h"
-
-// ----------------------------------------------------------------------------------------
-// Macros
-// ----------------------------------------------------------------------------------------
-
-#define NETDEV_RSFF(name) \
- NET_REGISTER_DEV(NETDEV_RSFF, name)
-
-#define NETDEV_DELAY(name) \
- NET_REGISTER_DEV(NETDEV_DELAY, name)
-
-// ----------------------------------------------------------------------------------------
-// Devices ...
-// ----------------------------------------------------------------------------------------
-
-namespace netlist
-{
- namespace devices
- {
- } //namespace devices
-} // namespace netlist
-
-#endif /* NLD_LEGACY_H_ */
diff --git a/src/lib/netlist/devices/nld_log.cpp b/src/lib/netlist/devices/nld_log.cpp
index f60029748ce..75a22ddca32 100644
--- a/src/lib/netlist/devices/nld_log.cpp
+++ b/src/lib/netlist/devices/nld_log.cpp
@@ -16,7 +16,6 @@
*/
#include "nl_base.h"
-#include "nld_log.h"
#include "plib/pfmtlog.h"
#include "plib/pmulti_threading.h"
#include "plib/pstream.h"
diff --git a/src/lib/netlist/devices/nld_log.h b/src/lib/netlist/devices/nld_log.h
deleted file mode 100644
index cf52e52a4f9..00000000000
--- a/src/lib/netlist/devices/nld_log.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_LOG_H_
-#define NLD_LOG_H_
-
-#include "../nl_setup.h"
-
-#define LOG(name, cI) \
- NET_REGISTER_DEV(LOG, name) \
- NET_CONNECT(name, I, cI)
-
-#define LOGD(name, cI, cI2) \
- NET_REGISTER_DEV(LOGD, name) \
- NET_CONNECT(name, I, cI) \
- NET_CONNECT(name, I2, cI2)
-
-#endif /* NLD_LOG_H_ */
diff --git a/src/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp
index cf33660005a..45b97ade9ef 100644
--- a/src/lib/netlist/devices/nld_mm5837.cpp
+++ b/src/lib/netlist/devices/nld_mm5837.cpp
@@ -16,7 +16,6 @@
*
*/
-#include "nld_mm5837.h"
#include "analog/nlid_twoterm.h"
#include "solver/nld_matrix_solver.h"
diff --git a/src/lib/netlist/devices/nld_mm5837.h b/src/lib/netlist/devices/nld_mm5837.h
deleted file mode 100644
index 1bc6b5addee..00000000000
--- a/src/lib/netlist/devices/nld_mm5837.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_MM5837_H_
-#define NLD_MM5837_H_
-
-#include "../nl_setup.h"
-
-#define MM5837(name) \
- NET_REGISTER_DEV(MM5837, name)
-
-#endif /* NLD_MM5837_H_ */
diff --git a/src/lib/netlist/devices/nld_ne555.cpp b/src/lib/netlist/devices/nld_ne555.cpp
index c132a88eda3..3f1238681e2 100644
--- a/src/lib/netlist/devices/nld_ne555.cpp
+++ b/src/lib/netlist/devices/nld_ne555.cpp
@@ -2,7 +2,6 @@
// copyright-holders:Couriersud
-#include "nld_ne555.h"
#include "analog/nlid_twoterm.h"
#include "solver/nld_solver.h"
diff --git a/src/lib/netlist/devices/nld_ne555.h b/src/lib/netlist/devices/nld_ne555.h
deleted file mode 100644
index 1033b00cb67..00000000000
--- a/src/lib/netlist/devices/nld_ne555.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_NE555_H_
-#define NLD_NE555_H_
-
-#include "../nl_setup.h"
-
-// usage : NE555(name)
-#define NE555(...) \
- NET_REGISTER_DEVEXT(NE555, __VA_ARGS__)
-
-/// usage : MC1455P(name)
-#define MC1455P(...) \
- NET_REGISTER_DEVEXT(MC1455P, __VA_ARGS__)
-
-#endif /* NLD_NE555_H_ */
diff --git a/src/lib/netlist/devices/nld_r2r_dac.h b/src/lib/netlist/devices/nld_r2r_dac.h
deleted file mode 100644
index 8a8f1c90f47..00000000000
--- a/src/lib/netlist/devices/nld_r2r_dac.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLD_R2R_DAC_H_
-#define NLD_R2R_DAC_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)
-
-#endif /* NLD_R2R_DAC_H_ */
diff --git a/src/lib/netlist/devices/nld_roms.h b/src/lib/netlist/devices/nld_roms.h
deleted file mode 100644
index 0a8c09d8cf1..00000000000
--- a/src/lib/netlist/devices/nld_roms.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-/*
- * nld_roms.h
- *
- */
-
-#ifndef NLD_ROMS_H_
-#define NLD_ROMS_H_
-
-#include "../nl_setup.h"
-
-// PROM_82S126(name, cCE1Q, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7)
-#define PROM_82S126(...) \
- NET_REGISTER_DEVEXT(PROM_82S126, __VA_ARGS__)
-
-// PROM_74S287(name, cCE1Q, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7)
-#define PROM_74S287(...) \
- NET_REGISTER_DEVEXT(PROM_74S287, __VA_ARGS__)
-
-// PROM_82S123(name, cCEQ, cA0, cA1, cA2, cA3, cA4)
-#define PROM_82S123(...) \
- NET_REGISTER_DEVEXT(PROM_82S123, __VA_ARGS__)
-
-// EPROM_2716(name, cGQ, cEPQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cA10)
-#define EPROM_2716(...) \
- NET_REGISTER_DEVEXT(EPROM_2716, __VA_ARGS__)
-
-// PROM_MK28000(name, cOE1, cOE2, cAR, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cA10, cA11)
-#define PROM_MK28000(...) \
- NET_REGISTER_DEVEXT(PROM_MK28000, __VA_ARGS__)
-
-#endif /* NLD_ROMS_H_ */
diff --git a/src/lib/netlist/devices/nld_schmitt.cpp b/src/lib/netlist/devices/nld_schmitt.cpp
index 6b49739e107..898e642ad53 100644
--- a/src/lib/netlist/devices/nld_schmitt.cpp
+++ b/src/lib/netlist/devices/nld_schmitt.cpp
@@ -5,8 +5,6 @@
*
*/
-#include "nld_schmitt.h"
-
#include "analog/nlid_twoterm.h"
#include "nl_base.h"
#include "nl_errstr.h"
diff --git a/src/lib/netlist/devices/nld_schmitt.h b/src/lib/netlist/devices/nld_schmitt.h
deleted file mode 100644
index 87b8626edda..00000000000
--- a/src/lib/netlist/devices/nld_schmitt.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Vas Crabb
-/*
- * nld_schmitt.h
- *
- */
-
-#ifndef NLD_SCHMITT_H_
-#define NLD_SCHMITT_H_
-
-#include "../nl_setup.h"
-
-// ----------------------------------------------------------------------------------------
-// Macros
-// ----------------------------------------------------------------------------------------
-
-#define SCHMITT_TRIGGER(name, model) \
- NET_REGISTER_DEV(SCHMITT_TRIGGER, name) \
- NETDEV_PARAMI(name, STMODEL, model)
-
-#endif /* NLD_SCHMITT_H_ */
diff --git a/src/lib/netlist/devices/nld_system.h b/src/lib/netlist/devices/nld_system.h
deleted file mode 100644
index 2f174731dde..00000000000
--- a/src/lib/netlist/devices/nld_system.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-/*
- * nld_system.h
- *
- * netlist devices defined in the core
- */
-
-#ifndef NLD_SYSTEM_H_
-#define NLD_SYSTEM_H_
-
-#include "../nl_setup.h"
-
-// -----------------------------------------------------------------------------
-// Macros
-// -----------------------------------------------------------------------------
-
-#define TTL_INPUT(name, v) \
- NET_REGISTER_DEV(TTL_INPUT, name) \
- PARAM(name.IN, v)
-
-#define LOGIC_INPUT(name, v, family) \
- NET_REGISTER_DEV(LOGIC_INPUT, name) \
- PARAM(name.IN, v) \
- PARAM(name.MODEL, family)
-
-#define LOGIC_INPUT8(name, v, family) \
- NET_REGISTER_DEV(LOGIC_INPUT8, name) \
- PARAM(name.IN, v) \
- PARAM(name.MODEL, family)
-
-#define ANALOG_INPUT(name, v) \
- NET_REGISTER_DEV(ANALOG_INPUT, name) \
- PARAM(name.IN, v)
-
-#define MAINCLOCK(name, freq) \
- NET_REGISTER_DEVEXT(MAINCLOCK, name, freq)
-
-#define CLOCK(name, freq) \
- NET_REGISTER_DEV(CLOCK, name) \
- PARAM(name.FREQ, freq)
-
-#define VARCLOCK(name, n, func) \
- NET_REGISTER_DEV(VARCLOCK, name) \
- PARAM(name.N, n) \
- PARAM(name.FUNC, func)
-
-#define EXTCLOCK(name, freq, pattern) \
- NET_REGISTER_DEV(EXTCLOCK, name) \
- PARAM(name.FREQ, freq) \
- PARAM(name.PATTERN, pattern)
-
-#define GNDA() \
- NET_REGISTER_DEV(GNDA, GND)
-
-#define NC_PIN(name) \
- NET_REGISTER_DEV(NC_PIN, name)
-
-//FIXME: Usage discouraged, use OPTIMIZE_FRONTIER instead
-#define FRONTIER_DEV(name, cIN, cG, cOUT) \
- NET_REGISTER_DEV(FRONTIER_DEV, name) \
- NET_C(cIN, name.I) \
- NET_C(cG, name.G) \
- NET_C(cOUT, name.Q)
-
-// FIXME ... remove parameters
-#define SYS_DSW(name, pI, p1, p2) \
- NET_REGISTER_DEVEXT(SYS_DSW, name, pI, p1, p2)
-
-#define SYS_DSW2(name) \
- NET_REGISTER_DEV(SYS_DSW2, name)
-
-#define SYS_COMPD(name) \
- NET_REGISTER_DEV(SYS_COMPD, name)
-
-#define SYS_NOISE_MT_U(name, pSIGMA) \
- NET_REGISTER_DEVEXT(SYS_NOISE_MT_U, name, pSIGMA)
-
-#define SYS_NOISE_MT_N(name, pSIGMA) \
- NET_REGISTER_DEVEXT(SYS_NOISE_MT_N, name, pSIGMA)
-
-/* Default device to hold netlist parameters */
-#define PARAMETERS(name) \
- NET_REGISTER_DEV(PARAMETERS, name)
-
-#define AFUNC(name, p_N, p_F) \
- NET_REGISTER_DEV(AFUNC, name) \
- PARAM(name.N, p_N) \
- PARAM(name.FUNC, p_F)
-
-
-#endif /* NLD_SYSTEM_H_ */
diff --git a/src/lib/netlist/devices/nld_tms4800.cpp b/src/lib/netlist/devices/nld_tms4800.cpp
index abe63edda6e..f9ac6d00715 100644
--- a/src/lib/netlist/devices/nld_tms4800.cpp
+++ b/src/lib/netlist/devices/nld_tms4800.cpp
@@ -25,7 +25,6 @@
* http://bitsavers.trailing-edge.com/components/ti/_dataBooks/1975_TI_The_Semiconductor_Memory_Data_Book.pdf
*/
-#include "nld_tms4800.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
deleted file mode 100644
index dc2eaa7a16d..00000000000
--- a/src/lib/netlist/devices/nld_tms4800.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Felipe Sanches
-
-#ifndef NLD_TMS4800_H_
-#define NLD_TMS4800_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
-#define ROM_TMS4800(...) \
- NET_REGISTER_DEVEXT(ROM_TMS4800, __VA_ARGS__)
-
-#endif /* NLD_TMS4800_H_ */
diff --git a/src/lib/netlist/devices/nld_tristate.cpp b/src/lib/netlist/devices/nld_tristate.cpp
index 97dbb0a7750..cf4295bb39b 100644
--- a/src/lib/netlist/devices/nld_tristate.cpp
+++ b/src/lib/netlist/devices/nld_tristate.cpp
@@ -7,7 +7,6 @@
*
*/
-#include "nld_tristate.h"
#include "nl_base.h"
// FIXME: netlist now supports proper tristate outputs. All of this is legacy
diff --git a/src/lib/netlist/devices/nld_tristate.h b/src/lib/netlist/devices/nld_tristate.h
deleted file mode 100644
index 3c60846cb31..00000000000
--- a/src/lib/netlist/devices/nld_tristate.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-
-#ifndef NLD_TRISTATE_H_
-#define NLD_TRISTATE_H_
-
-#include "../nl_setup.h"
-
-#define TTL_TRISTATE(name, cCEQ1, cD1, cCEQ2, cD2) \
- NET_REGISTER_DEV(TTL_TRISTATE, name) \
- NET_CONNECT(name, CEQ1, cCEQ1) \
- NET_CONNECT(name, D1, cD1) \
- NET_CONNECT(name, CEQ2, cCEQ2) \
- NET_CONNECT(name, D2, cD2)
-
-#define TTL_TRISTATE3(name, cCEQ1, cD1, cCEQ2, cD2, cCEQ3, cD3) \
- NET_REGISTER_DEV(TTL_TRISTATE3, name) \
- NET_CONNECT(name, CEQ1, cCEQ1) \
- NET_CONNECT(name, D1, cD1) \
- NET_CONNECT(name, CEQ2, cCEQ2) \
- NET_CONNECT(name, D2, cD2) \
- NET_CONNECT(name, CEQ3, cCEQ3) \
- NET_CONNECT(name, D3, cD3)
-
-#endif /* NLD_TRISTATE_H_ */