summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/macro
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/macro')
-rw-r--r--src/lib/netlist/macro/nlm_base.cpp1
-rw-r--r--src/lib/netlist/macro/nlm_cd4xxx.h7
-rw-r--r--src/lib/netlist/macro/nlm_opamp.h2
-rw-r--r--src/lib/netlist/macro/nlm_other.h2
-rw-r--r--src/lib/netlist/macro/nlm_roms.h2
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.cpp24
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.h20
7 files changed, 26 insertions, 32 deletions
diff --git a/src/lib/netlist/macro/nlm_base.cpp b/src/lib/netlist/macro/nlm_base.cpp
index 1185f482e73..f18ae337afb 100644
--- a/src/lib/netlist/macro/nlm_base.cpp
+++ b/src/lib/netlist/macro/nlm_base.cpp
@@ -1,7 +1,6 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
#include "netlist/devices/net_lib.h"
-#include "nlm_base.h"
/* ----------------------------------------------------------------------------
* Diode Models
diff --git a/src/lib/netlist/macro/nlm_cd4xxx.h b/src/lib/netlist/macro/nlm_cd4xxx.h
index ba90ad0fe64..a18f917d5df 100644
--- a/src/lib/netlist/macro/nlm_cd4xxx.h
+++ b/src/lib/netlist/macro/nlm_cd4xxx.h
@@ -64,13 +64,14 @@
#define CD4538_DIP(name) \
NET_REGISTER_DEV(CD4538_DIP, name)
-#endif
+#endif // !NL_AUTO_DEVICES
+
/* ----------------------------------------------------------------------------
* External declarations
* ---------------------------------------------------------------------------*/
-NETLIST_EXTERNAL(CD4XXX_lib)
+// moved to net_lib.h
#endif
-#endif
+#endif // NLD_CD4XXX_H_
diff --git a/src/lib/netlist/macro/nlm_opamp.h b/src/lib/netlist/macro/nlm_opamp.h
index 06c31acc71b..eefb95b478d 100644
--- a/src/lib/netlist/macro/nlm_opamp.h
+++ b/src/lib/netlist/macro/nlm_opamp.h
@@ -60,7 +60,7 @@
* External declarations
* ---------------------------------------------------------------------------*/
-NETLIST_EXTERNAL(OPAMP_lib)
+// moved to net_lib.h
#endif // __PLIB_PREPROCESSOR__
diff --git a/src/lib/netlist/macro/nlm_other.h b/src/lib/netlist/macro/nlm_other.h
index b028d829e4b..c69b4d61224 100644
--- a/src/lib/netlist/macro/nlm_other.h
+++ b/src/lib/netlist/macro/nlm_other.h
@@ -33,7 +33,7 @@
* External declarations
* ---------------------------------------------------------------------------*/
-NETLIST_EXTERNAL(otheric_lib)
+// moved to net_lib.h
#endif
diff --git a/src/lib/netlist/macro/nlm_roms.h b/src/lib/netlist/macro/nlm_roms.h
index 1900e693e04..d838d7a13b1 100644
--- a/src/lib/netlist/macro/nlm_roms.h
+++ b/src/lib/netlist/macro/nlm_roms.h
@@ -37,7 +37,7 @@
* External declarations
* ---------------------------------------------------------------------------*/
-NETLIST_EXTERNAL(ROMS_lib)
+// moved to net_lib.h
#endif // __PLIB_PREPROCESSOR__
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp
index 4c51e01055b..802e5537203 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp
@@ -3,6 +3,20 @@
#include "netlist/devices/net_lib.h"
+#ifndef NL_USE_TRUTHTABLE_74107
+#define NL_USE_TRUTHTABLE_74107 0
+#endif
+
+#ifndef NL_USE_TRUTHTABLE_7448
+#define NL_USE_TRUTHTABLE_7448 0
+#endif
+
+#if 1
+//
+#elif %&/()
+//
+#endif
+
/*
* DM7400: Quad 2-Input NAND Gates
*
@@ -1139,9 +1153,8 @@ NETLIST_END()
* Naming conventions follow Fairchild Semiconductor datasheet
*
*/
-
-#if !NL_AUTO_DEVICES
#ifndef __PLIB_PREPROCESSOR__
+#if !NL_AUTO_DEVICES
#define TTL_74279A(name) \
NET_REGISTER_DEV(TTL_74279A, name)
#define TTL_74279B(name) \
@@ -1299,13 +1312,8 @@ NETLIST_END()
*
*/
-#ifndef __PLIB_PREPROCESSOR__
-#define DM9312_TT(name) \
- NET_REGISTER_DEV(DM9312, name)
-#endif
-
static NETLIST_START(DM9312_DIP)
- DM9312_TT(s)
+ DM9312(s)
DIPPINS( /* +--------------+ */
s.D0, /* D0 |1 ++ 16| VCC */ s.VCC,
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.h b/src/lib/netlist/macro/nlm_ttl74xx.h
index d041a9e6e3d..bf1a791c841 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.h
+++ b/src/lib/netlist/macro/nlm_ttl74xx.h
@@ -333,22 +333,8 @@
#define TTL_74379_DIP(name) \
NET_REGISTER_DEV(TTL_74379_DIP, name)
-#define DM9312(name, cA, cB, cC, cSTROBE, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7) \
- NET_REGISTER_DEV(DM9312, name) \
- NET_CONNECT(name, VCC, VCC) \
- NET_CONNECT(name, GND, GND) \
- NET_CONNECT(name, A, cA) \
- NET_CONNECT(name, B, cB) \
- NET_CONNECT(name, C, cC) \
- NET_CONNECT(name, G, cSTROBE) \
- NET_CONNECT(name, D0, cD0) \
- NET_CONNECT(name, D1, cD1) \
- NET_CONNECT(name, D2, cD2) \
- NET_CONNECT(name, D3, cD3) \
- NET_CONNECT(name, D4, cD4) \
- NET_CONNECT(name, D5, cD5) \
- NET_CONNECT(name, D6, cD6) \
- NET_CONNECT(name, D7, cD7)
+#define DM9312(...) \
+ NET_REGISTER_DEVEXT(DM9312, __VA_ARGS__)
#define DM9312_DIP(name) \
NET_REGISTER_DEV(DM9312_DIP, name)
@@ -359,7 +345,7 @@
* External declarations
* ---------------------------------------------------------------------------*/
-NETLIST_EXTERNAL(TTL74XX_lib)
+// moved to net_lib.h
#endif // __PLIB_PREPROCESSOR__