summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2020-09-07 00:54:14 +0200
committer couriersud <couriersud@gmx.org>2020-09-07 00:54:14 +0200
commit0d247524a0150d3383c8ddd06f3a27f22575de0f (patch)
tree54f45a0eefe8186fe337d563e60802308cf225bc /src/lib
parentd1b841f996232302e9009fda6e16ca5e75ff0a52 (diff)
netlist: second round of header removal
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/netlist/devices/net_lib.cpp121
-rw-r--r--src/lib/netlist/macro/nlm_base_lib.h34
-rw-r--r--src/lib/netlist/macro/nlm_cd4xxx_lib.h107
-rw-r--r--src/lib/netlist/macro/nlm_opamp_lib.h79
-rw-r--r--src/lib/netlist/macro/nlm_otheric_lib.h48
-rw-r--r--src/lib/netlist/macro/nlm_roms_lib.h60
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx_lib.cpp6
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx_lib.h347
-rw-r--r--src/lib/netlist/nl_base.cpp4
-rw-r--r--src/lib/netlist/nl_setup.h2
10 files changed, 4 insertions, 804 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/macro/nlm_base_lib.h b/src/lib/netlist/macro/nlm_base_lib.h
deleted file mode 100644
index 098a0e3b43e..00000000000
--- a/src/lib/netlist/macro/nlm_base_lib.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// license:CC0
-// copyright-holders:Couriersud
-#ifndef NLM_BASE_H_
-#define NLM_BASE_H_
-
-/// \file nlm_base.h
-///
-
-/*
- * Provide base environment for netlist
- *
- */
-
-#ifndef __PLIB_PREPROCESSOR__
-
-#include "../nl_setup.h"
-
-/* ----------------------------------------------------------------------------
- * Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-/* ----------------------------------------------------------------------------
- * DIP only macros
- * ---------------------------------------------------------------------------*/
-
-/* ----------------------------------------------------------------------------
- * External declarations
- * ---------------------------------------------------------------------------*/
-
-NETLIST_EXTERNAL(base_lib)
-
-#endif
-
-#endif
diff --git a/src/lib/netlist/macro/nlm_cd4xxx_lib.h b/src/lib/netlist/macro/nlm_cd4xxx_lib.h
deleted file mode 100644
index e0cf433457b..00000000000
--- a/src/lib/netlist/macro/nlm_cd4xxx_lib.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// license:CC0
-// copyright-holders:Couriersud
-#ifndef NLD_CD4XXX_H_
-#define NLD_CD4XXX_H_
-
-/// \file nlm_cd4xxx.h
-///
-
-#include "../nl_setup.h"
-
-/*
- * Devices:
- *
- * CD4001_NOR : single gate
- * CD4001_DIP : dip package
- * CD4013_DIP : dip package (device model in core)
- * CD4020_DIP : dip package (device model in core)
- * CD4024_DIP : dip package (device model in core)
- * CD4016_DIP : dip package (device model in core)
- * CD4053_DIP : dip package (device model in core)
- * CD4066_DIP : dip package (device model in core)
- *
- */
-
-#ifndef __PLIB_PREPROCESSOR__
-
-/* ----------------------------------------------------------------------------
- * Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-#if !NL_AUTO_DEVICES
-
-#define CD4001_GATE(name) \
- NET_REGISTER_DEV(CD4001_GATE, name)
-
-#define CD4001_DIP(name) \
- NET_REGISTER_DEV(CD4001_DIP, name)
-
-#define CD4011_GATE(name) \
- NET_REGISTER_DEV(CD4011_GATE, name)
-
-#define CD4011_DIP(name) \
- NET_REGISTER_DEV(CD4011_DIP, name)
-
-#define CD4069_GATE(name) \
- NET_REGISTER_DEV(CD4069_GATE, name)
-
-#define CD4069_DIP(name) \
- NET_REGISTER_DEV(CD4069_DIP, name)
-
-#define CD4070_GATE(name) \
- NET_REGISTER_DEV(CD4070_GATE, name)
-
-#define CD4070_DIP(name) \
- NET_REGISTER_DEV(CD4070_DIP, name)
-
-/* ----------------------------------------------------------------------------
- * DIP only macros
- * ---------------------------------------------------------------------------*/
-
-#define CD4006_DIP(name) \
- NET_REGISTER_DEV(CD4006_DIP, name)
-
-#define CD4013_DIP(name) \
- NET_REGISTER_DEV(CD4013_DIP, name)
-
-#define CD4017_DIP(name) \
- NET_REGISTER_DEV(CD4017_DIP, name)
-
-#define CD4022_DIP(name) \
- NET_REGISTER_DEV(CD4022_DIP, name)
-
-#define CD4020_DIP(name) \
- NET_REGISTER_DEV(CD4020_DIP, name)
-
-#define CD4024_DIP(name) \
- NET_REGISTER_DEV(CD4024_DIP, name)
-
-#define CD4053_DIP(name) \
- NET_REGISTER_DEV(CD4053_DIP, name)
-
-#define CD4066_DIP(name) \
- NET_REGISTER_DEV(CD4066_DIP, name)
-
-#define CD4016_DIP(name) \
- NET_REGISTER_DEV(CD4016_DIP, name)
-
-#define CD4316_DIP(name) \
- NET_REGISTER_DEV(CD4016_DIP, name)
-
-#define CD4538_DIP(name) \
- NET_REGISTER_DEV(CD4538_DIP, name)
-
-#define MM5837_DIP(name) \
- NET_REGISTER_DEV(MM5837_DIP, name)
-
-#endif // !NL_AUTO_DEVICES
-
-/* ----------------------------------------------------------------------------
- * External declarations
- * ---------------------------------------------------------------------------*/
-
-// moved to net_lib.h
-
-#endif
-
-#endif // NLD_CD4XXX_H_
diff --git a/src/lib/netlist/macro/nlm_opamp_lib.h b/src/lib/netlist/macro/nlm_opamp_lib.h
deleted file mode 100644
index 3e17d67a7ab..00000000000
--- a/src/lib/netlist/macro/nlm_opamp_lib.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// license:CC0
-// copyright-holders:Couriersud
-
-#ifndef NLM_OPAMP_H_
-#define NLM_OPAMP_H_
-
-///
-/// \file nlm_opamp.h
-///
-
-#include "../nl_setup.h"
-
-#ifndef __PLIB_PREPROCESSOR__
-
-/* ----------------------------------------------------------------------------
- * Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-#if !NL_AUTO_DEVICES
-
-#define MB3614_DIP(name) \
- NET_REGISTER_DEV(MB3614_DIP, name)
-
-#define LM324_DIP(name) \
- NET_REGISTER_DEV(LM324_DIP, name)
-
-#define TL081_DIP(name) \
- NET_REGISTER_DEV(TL081_DIP, name)
-
-#define TL082_DIP(name) \
- NET_REGISTER_DEV(TL082_DIP, name)
-
-#define TL084_DIP(name) \
- NET_REGISTER_DEV(TL084_DIP, name)
-
-#define LM2902_DIP(name) \
- NET_REGISTER_DEV(LM2902_DIP, name)
-
-#define LM358_DIP(name) \
- NET_REGISTER_DEV(LM358_DIP, name)
-
-#define LM3900(name) \
- NET_REGISTER_DEV(LM3900, name)
-
-#define UA741_DIP8(name) \
- NET_REGISTER_DEV(UA741_DIP8, name)
-
-#define UA741_DIP10(name) \
- NET_REGISTER_DEV(UA741_DIP10, name)
-
-#define UA741_DIP14(name) \
- NET_REGISTER_DEV(UA741_DIP14, name)
-
-#define MC1558_DIP(name) \
- NET_REGISTER_DEV(MC1558_DIP, name)
-
-#define LM747_DIP(name) \
- NET_REGISTER_DEV(LM747_DIP, name)
-
-#define LM747A_DIP(name) \
- NET_REGISTER_DEV(LM747A_DIP, name)
-
-#define MC3340_DIP(name) \
- NET_REGISTER_DEV(MC3340_DIP, name)
-
-#define AN6551_SIL(name) \
- NET_REGISTER_DEV(AN6551_SIL, name)
-
-#endif // NL_AUTO_DEVICES
-
-/* ----------------------------------------------------------------------------
- * External declarations
- * ---------------------------------------------------------------------------*/
-
-// moved to net_lib.h
-
-#endif // __PLIB_PREPROCESSOR__
-
-#endif
diff --git a/src/lib/netlist/macro/nlm_otheric_lib.h b/src/lib/netlist/macro/nlm_otheric_lib.h
deleted file mode 100644
index bba6997f39a..00000000000
--- a/src/lib/netlist/macro/nlm_otheric_lib.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// license:CC0
-// copyright-holders:Couriersud
-
-#ifndef NLM_OTHER_H_
-#define NLM_OTHER_H_
-
-///
-/// \file nlm_other.h
-///
-///
-#include "../nl_setup.h"
-
-#ifndef __PLIB_PREPROCESSOR__
-
-/* ----------------------------------------------------------------------------
- * Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-#if !NL_AUTO_DEVICES
-
-#define MC14584B_GATE(name) \
- NET_REGISTER_DEV(MC14584B_GATE, name)
-
-#define MC14584B_DIP(name) \
- NET_REGISTER_DEV(MC14584B_DIP, name)
-
-#define NE566_DIP(name) \
- NET_REGISTER_DEV(NE566_DIP, name)
-
-// usage : NE555_DIP(name)
-#define NE555_DIP(...) \
- NET_REGISTER_DEVEXT(NE555_DIP, __VA_ARGS__)
-
-// usage : MC1455P_DIP(name)
-#define MC1455P_DIP(...) \
- NET_REGISTER_DEVEXT(MC1455P_DIP, __VA_ARGS__)
-
-#endif
-
-/* ----------------------------------------------------------------------------
- * External declarations
- * ---------------------------------------------------------------------------*/
-
-// moved to net_lib.h
-
-#endif
-
-#endif
diff --git a/src/lib/netlist/macro/nlm_roms_lib.h b/src/lib/netlist/macro/nlm_roms_lib.h
deleted file mode 100644
index f2efc1d82ba..00000000000
--- a/src/lib/netlist/macro/nlm_roms_lib.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// license:CC0
-// copyright-holders:Couriersud
-
-#ifndef NLM_ROMS_H_
-#define NLM_ROMS_H_
-
-///
-/// \file nlm_roms.h
-///
-
-#include "../nl_setup.h"
-
-#ifndef __PLIB_PREPROCESSOR__
-
-/* ----------------------------------------------------------------------------
- * Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-#if !NL_AUTO_DEVICES
-
-#define PROM_82S115_DIP(name) \
- NET_REGISTER_DEV(PROM_82S115_DIP, name)
-
-#define PROM_82S126_DIP(name) \
- NET_REGISTER_DEV(PROM_82S126_DIP, name)
-
-#define PROM_82S123_DIP(name) \
- NET_REGISTER_DEV(PROM_82S123_DIP, name)
-
-#define PROM_74S287_DIP(name) \
- NET_REGISTER_DEV(PROM_74S287_DIP, name)
-
-#define PROM_MK28000_DIP(name) \
- NET_REGISTER_DEV(PROM_MK28000_DIP, name)
-
-#define EPROM_2716_DIP(name) \
- NET_REGISTER_DEV(EPROM_2716_DIP, name)
-
-// usage : TTL_82S16_DIP(name)
-#define TTL_82S16_DIP(...) \
- NET_REGISTER_DEVEXT(TTL_82S16_DIP, __VA_ARGS__)
-
-#define RAM_2102A_DIP(name) \
- NET_REGISTER_DEV(RAM_2102A_DIP, name)
-
-#define ROM_TMS4800_DIP(name) \
- NET_REGISTER_DEV(ROM_TMS4800, name)
-
-#endif // NL_AUTO_DEVICES
-
-
-/* ----------------------------------------------------------------------------
- * External declarations
- * ---------------------------------------------------------------------------*/
-
-// moved to net_lib.h
-
-#endif // __PLIB_PREPROCESSOR__
-
-#endif
diff --git a/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp b/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp
index c96310d7f80..bb95592825c 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp
@@ -2235,12 +2235,6 @@ NETLIST_END()
//- +-----+-----+----++---+
//-
#ifndef __PLIB_PREPROCESSOR__
-#if !NL_AUTO_DEVICES
-#define TTL_74279A(name) \
- NET_REGISTER_DEV(TTL_74279A, name)
-#define TTL_74279B(name) \
- NET_REGISTER_DEV(TTL_74279B, name)
-#endif
#endif
static NETLIST_START(TTL_74279_DIP)
diff --git a/src/lib/netlist/macro/nlm_ttl74xx_lib.h b/src/lib/netlist/macro/nlm_ttl74xx_lib.h
deleted file mode 100644
index a077c5e7edf..00000000000
--- a/src/lib/netlist/macro/nlm_ttl74xx_lib.h
+++ /dev/null
@@ -1,347 +0,0 @@
-// license:CC0
-// copyright-holders:Couriersud
-
-#ifndef NLM_TTL74XX_H_
-#define NLM_TTL74XX_H_
-
-///
-/// \file nlm_ttl74xx.h
-///
-
-#include "../nl_setup.h"
-
-#ifndef __PLIB_PREPROCESSOR__
-
-/* ----------------------------------------------------------------------------
- * Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-#if !NL_AUTO_DEVICES
-
-#define TTL_7400_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7400_NAND, __VA_ARGS__)
-
-#define TTL_7400_DIP(name) \
- NET_REGISTER_DEV(TTL_7400_DIP, name)
-
-
-#define TTL_7402_NOR(...) \
- NET_REGISTER_DEVEXT(TTL_7402_NOR, __VA_ARGS__)
-
-#define TTL_7402_DIP(name) \
- NET_REGISTER_DEV(TTL_7402_DIP, name)
-
-#define TTL_7404_INVERT(...) \
- NET_REGISTER_DEVEXT(TTL_7404_INVERT, __VA_ARGS__)
-
-#define TTL_7404_DIP(name) \
- NET_REGISTER_DEV(TTL_7404_DIP, name)
-
-
-#define TTL_7406_GATE(name) \
- NET_REGISTER_DEV(TTL_7406_GATE, name)
-
-#define TTL_7406_DIP(name) \
- NET_REGISTER_DEV(TTL_7406_DIP, name)
-
-
-#define TTL_7407_GATE(name) \
- NET_REGISTER_DEV(TTL_7407_GATE, name)
-
-#define TTL_7407_DIP(name) \
- NET_REGISTER_DEV(TTL_7407_DIP, name)
-
-
-#define TTL_7408_AND(...) \
- NET_REGISTER_DEVEXT(TTL_7408_AND, __VA_ARGS__)
-
-#define TTL_7408_DIP(name) \
- NET_REGISTER_DEV(TTL_7408_DIP, name)
-
-
-#define TTL_7410_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7410_NAND, __VA_ARGS__)
-
-#define TTL_7410_DIP(name) \
- NET_REGISTER_DEV(TTL_7410_DIP, name)
-
-
-#define TTL_7411_AND(...) \
- NET_REGISTER_DEVEXT(TTL_7411_AND, __VA_ARGS__)
-
-#define TTL_7411_DIP(name) \
- NET_REGISTER_DEV(TTL_7411_DIP, name)
-
-
-#define TTL_7414_GATE(name) \
- NET_REGISTER_DEV(TTL_7414_GATE, name)
-
-#define TTL_7414_DIP(name) \
- NET_REGISTER_DEV(TTL_7414_DIP, name)
-
-
-#define TTL_74LS14_GATE(name) \
- NET_REGISTER_DEV(TTL_74LS14_GATE, name)
-
-#define TTL_74LS14_DIP(name) \
- NET_REGISTER_DEV(TTL_74LS14_DIP, name)
-
-
-#define TTL_7416_GATE(name) \
- NET_REGISTER_DEV(TTL_7416_GATE, name)
-
-#define TTL_7416_DIP(name) \
- NET_REGISTER_DEV(TTL_7416_DIP, name)
-
-
-#define TTL_7417_GATE(name) \
- NET_REGISTER_DEV(TTL_7417_GATE, name)
-
-#define TTL_7417_DIP(name) \
- NET_REGISTER_DEV(TTL_7417_DIP, name)
-
-
-#define TTL_7420_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7420_NAND, __VA_ARGS__)
-
-#define TTL_7420_DIP(name) \
- NET_REGISTER_DEV(TTL_7420_DIP, name)
-
-
-#define TTL_7421_AND(...) \
- NET_REGISTER_DEVEXT(TTL_7421_AND, __VA_ARGS__)
-
-#define TTL_7421_DIP(name) \
- NET_REGISTER_DEV(TTL_7421_DIP, name)
-
-
-#define TTL_7425_NOR(...) \
- NET_REGISTER_DEVEXT(TTL_7425_NOR, __VA_ARGS__)
-
-#define TTL_7425_DIP(name) \
- NET_REGISTER_DEV(TTL_7425_DIP, name)
-
-
-#define TTL_7427_NOR(...) \
- NET_REGISTER_DEVEXT(TTL_7427_NOR, __VA_ARGS__)
-
-#define TTL_7427_DIP(name) \
- NET_REGISTER_DEV(TTL_7427_DIP, name)
-
-
-#define TTL_7430_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7430_NAND, __VA_ARGS__)
-
-#define TTL_7430_DIP(name) \
- NET_REGISTER_DEV(TTL_7430_DIP, name)
-
-
-#define TTL_7432_OR(...) \
- NET_REGISTER_DEVEXT(TTL_7432_OR, __VA_ARGS__)
-
-#define TTL_7432_DIP(name) \
- NET_REGISTER_DEV(TTL_7432_DIP, name)
-
-
-#define TTL_7437_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7437_NAND, __VA_ARGS__)
-
-#define TTL_7437_DIP(name) \
- NET_REGISTER_DEV(TTL_7437_DIP, name)
-
-#define TTL_7438_NAND(...) \
- NET_REGISTER_DEVEXT(TTL_7438_NAND, __VA_ARGS__)
-
-#define TTL_7438_DIP(name) \
- NET_REGISTER_DEV(TTL_7438_DIP, name)
-
-
-#define TTL_7442_DIP(name) \
- NET_REGISTER_DEV(TTL_7442_DIP, name)
-
-#define TTL_7448_DIP(name) \
- NET_REGISTER_DEV(TTL_7448_DIP, name)
-
-#define TTL_7450_DIP(name) \
- NET_REGISTER_DEV(TTL_7450_DIP, name)
-
-#define TTL_7473_DIP(name) \
- NET_REGISTER_DEV(TTL_7473_DIP, name)
-
-#define TTL_7473A_DIP(name) \
- NET_REGISTER_DEV(TTL_7473A_DIP, name)
-
-#define TTL_7474_DIP(name) \
- NET_REGISTER_DEV(TTL_7474_DIP, name)
-
-#define TTL_7475_DIP(name) \
- NET_REGISTER_DEV(TTL_7475_DIP, name)
-
-#define TTL_7477_DIP(name) \
- NET_REGISTER_DEV(TTL_7477_DIP, name)
-
-#define TTL_7483_DIP(name) \
- NET_REGISTER_DEV(TTL_7483_DIP, name)
-
-#define TTL_7485_DIP(name) \
- NET_REGISTER_DEV(TTL_7485_DIP, name)
-
-#define TTL_7486_XOR(...) \
- NET_REGISTER_DEVEXT(TTL_7486_XOR, __VA_ARGS__)
-
-#define TTL_7486_DIP(name) \
- NET_REGISTER_DEV(TTL_7486_DIP, name)
-
-#define TTL_7490_DIP(name) \
- NET_REGISTER_DEV(TTL_7490_DIP, name)
-
-#define TTL_7492_DIP(name) \
- NET_REGISTER_DEV(TTL_7492_DIP, name)
-
-#define TTL_7493_DIP(name) \
- NET_REGISTER_DEV(TTL_7493_DIP, name)
-
-#define TTL_7497_DIP(name) \
- NET_REGISTER_DEV(TTL_7497_DIP, name)
-
-#define TTL_74107_DIP(name) \
- NET_REGISTER_DEV(TTL_74107_DIP, name)
-
-#define TTL_74107A_DIP(name) \
- NET_REGISTER_DEV(TTL_74107A_DIP, name)
-
-#define TTL_74113_DIP(name) \
- NET_REGISTER_DEV(TTL_74113_DIP, name)
-
-#define TTL_74113A_DIP(name) \
- NET_REGISTER_DEV(TTL_74113A_DIP, name)
-
-#define TTL_74121_DIP(name) \
- NET_REGISTER_DEV(TTL_74121_DIP, name)
-
-#define TTL_74123_DIP(name) \
- NET_REGISTER_DEV(TTL_74123_DIP, name)
-
-#define TTL_9602_DIP(name) \
- NET_REGISTER_DEV(TTL_9602_DIP, name)
-
-#define TTL_74125_DIP(name) \
- NET_REGISTER_DEV(TTL_74125_DIP, name)
-
-#define TTL_74139_DIP(name) \
- NET_REGISTER_DEV(TTL_74139_DIP, name)
-
-#define TTL_74153_DIP(name) \
- NET_REGISTER_DEV(TTL_74153_DIP, name)
-
-#define TTL_74155_DIP(name) \
- NET_REGISTER_DEV(TTL_74155_DIP, name)
-
-#define TTL_74156_DIP(name) \
- NET_REGISTER_DEV(TTL_74156_DIP, name)
-
-#define TTL_74157_DIP(name) \
- NET_REGISTER_DEV(TTL_74157_DIP, name)
-
-#define TTL_74161_DIP(name) \
- NET_REGISTER_DEV(TTL_74161_DIP, name)
-
-#define TTL_74163_DIP(name) \
- NET_REGISTER_DEV(TTL_74163_DIP, name)
-
-#define TTL_74164_DIP(name) \
- NET_REGISTER_DEV(TTL_74164_DIP, name)
-
-#define TTL_74165_DIP(name) \
- NET_REGISTER_DEV(TTL_74165_DIP, name)
-
-#define TTL_74166_DIP(name) \
- NET_REGISTER_DEV(TTL_74166_DIP, name)
-
-#define TTL_74174_DIP(name) \
- NET_REGISTER_DEV(TTL_74174_DIP, name)
-
-#define TTL_74175_DIP(name) \
- NET_REGISTER_DEV(TTL_74175_DIP, name)
-
-#define TTL_74192_DIP(name) \
- NET_REGISTER_DEV(TTL_74192_DIP, name)
-
-#define TTL_74193_DIP(name) \
- NET_REGISTER_DEV(TTL_74193_DIP, name)
-
-#define TTL_74194_DIP(name) \
- NET_REGISTER_DEV(TTL_74194_DIP, name)
-
-#define TTL_74260_NOR(...) \
- NET_REGISTER_DEVEXT(TTL_74260_NOR, __VA_ARGS__)
-
-#define TTL_74260_DIP(name) \
- NET_REGISTER_DEV(TTL_74260_DIP, name)
-
-#define TTL_74279_DIP(name) \
- NET_REGISTER_DEV(TTL_74279_DIP, name)
-
-#define TTL_74290_DIP(name) \
- NET_REGISTER_DEV(TTL_74290_DIP, name)
-
-#define TTL_74293_DIP(name) \
- NET_REGISTER_DEV(TTL_74293_DIP, name)
-
-#define TTL_74365_DIP(name) \
- NET_REGISTER_DEV(TTL_74365_DIP, name)
-
-#define TTL_74377_DIP(name) \
- NET_REGISTER_DEV(TTL_74377_DIP, name)
-
-#define TTL_74378_DIP(name) \
- NET_REGISTER_DEV(TTL_74378_DIP, name)
-
-#define TTL_74379_DIP(name) \
- NET_REGISTER_DEV(TTL_74379_DIP, name)
-
-#define TTL_74393_DIP(name) \
- NET_REGISTER_DEV(TTL_74393_DIP, name)
-
-#define TTL_9312(...) \
- NET_REGISTER_DEVEXT(TTL_9312, __VA_ARGS__)
-
-#define TTL_9312_DIP(name) \
- NET_REGISTER_DEV(TTL_9312_DIP, name)
-
-#define TTL_9314_DIP(name) \
- NET_REGISTER_DEV(TTL_9314_DIP, name)
-
-#define TTL_9310_DIP(name) \
- NET_REGISTER_DEV(TTL_9310_DIP, name)
-
-#define TTL_9316_DIP(name) \
- NET_REGISTER_DEV(TTL_9316_DIP, name)
-
-#define TTL_9321_DIP(name) \
- NET_REGISTER_DEV(TTL_9321_DIP, name)
-
-#define TTL_9322_DIP(name) \
- NET_REGISTER_DEV(TTL_9322_DIP, name)
-
-#define TTL_9334_DIP(name) \
- NET_REGISTER_DEV(TTL_9334_DIP, name)
-
-#define TTL_8277_DIP(name) \
- NET_REGISTER_DEV(TTL_8277_DIP, name)
-
-#define TTL_AM2847_DIP(name) \
- NET_REGISTER_DEV(TTL_AM2847_DIP, name)
-
-#endif // NL_AUTO_DEVICES
-
-/* ----------------------------------------------------------------------------
- * External declarations
- * ---------------------------------------------------------------------------*/
-
-// moved to net_lib.h
-
-#endif // __PLIB_PREPROCESSOR__
-
-
-#endif // NLM_TTL74XX
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index d3da7ec899b..418fbef22de 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -1,7 +1,6 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
-#include "macro/nlm_base_lib.h"
#include "solver/nld_matrix_solver.h"
#include "solver/nld_solver.h"
@@ -17,6 +16,8 @@
#include "nl_errstr.h"
+#include "devices/net_lib.h"
+
#include <limits>
namespace netlist
@@ -209,7 +210,6 @@ namespace netlist
ENTRY(NL_USE_MEMPOOL)
ENTRY(NL_USE_QUEUE_STATS)
ENTRY(NL_USE_COPY_INSTEAD_OF_REFERENCE)
- ENTRY(NL_AUTO_DEVICES)
ENTRY(NL_USE_FLOAT128)
ENTRY(NL_USE_FLOAT_MATRIX)
ENTRY(NL_USE_LONG_DOUBLE_MATRIX)
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 4534412b946..716288f6153 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -8,8 +8,6 @@
#ifndef NLSETUP_H_
#define NLSETUP_H_
-#define NL_AUTO_DEVICES 1
-
#include "plib/ppreprocessor.h"
#include "plib/psource.h"
#include "plib/pstream.h"