summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-05-03 23:01:22 +0200
committer couriersud <couriersud@arcor.de>2016-05-04 00:08:06 +0200
commite85517d6424e152e62826772189e4c0d32834a49 (patch)
tree4ac85fffee6bf5ecad18d6670dbb79952fb1d107
parentca9052ccfea75618c7caab7538ebe41c34a1f52c (diff)
Converted 7410 into macro device.
-rw-r--r--scripts/src/netlist.lua2
-rw-r--r--src/lib/netlist/devices/net_lib.cpp2
-rw-r--r--src/lib/netlist/devices/net_lib.h1
-rw-r--r--src/lib/netlist/devices/nld_7410.cpp63
-rw-r--r--src/lib/netlist/devices/nld_7410.h64
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.cpp56
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.h13
7 files changed, 69 insertions, 132 deletions
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index ba4837a4635..ce50444baac 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -86,8 +86,6 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/nld_4020.h",
MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4066.h",
- MAME_DIR .. "src/lib/netlist/devices/nld_7410.cpp",
- MAME_DIR .. "src/lib/netlist/devices/nld_7410.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7411.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_7411.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7420.cpp",
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp
index 88cbd94b3eb..790ae6c7598 100644
--- a/src/lib/netlist/devices/net_lib.cpp
+++ b/src/lib/netlist/devices/net_lib.cpp
@@ -98,7 +98,6 @@ void initialize_factory(factory_list_t &factory)
ENTRY(switch2, SWITCH2, "-")
ENTRY(nicRSFF, NETDEV_RSFF, "+S,R")
ENTRY(nicDelay, NETDEV_DELAY, "-")
- ENTRY(7410, TTL_7410_NAND, "+A,B,C")
ENTRY(7411, TTL_7411_AND, "+A,B,C")
ENTRY(7420, TTL_7420_NAND, "+A,B,C,D")
ENTRY(7425, TTL_7425_NOR, "+A,B,C,D")
@@ -134,7 +133,6 @@ void initialize_factory(factory_list_t &factory)
ENTRY(NE555, NE555, "-")
ENTRY(r2r_dac, R2R_DAC, "+VIN,R,N")
ENTRY(4538_dip, CD4538_DIP, "-")
- ENTRY(7410_dip, TTL_7410_DIP, "-")
ENTRY(7411_dip, TTL_7411_DIP, "-")
ENTRY(7420_dip, TTL_7420_DIP, "-")
ENTRY(7425_dip, TTL_7425_DIP, "-")
diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h
index db9a7fe2623..f772041c159 100644
--- a/src/lib/netlist/devices/net_lib.h
+++ b/src/lib/netlist/devices/net_lib.h
@@ -17,7 +17,6 @@
#include "nld_4020.h"
#include "nld_4066.h"
-#include "nld_7410.h"
#include "nld_7411.h"
#include "nld_7420.h"
#include "nld_7425.h"
diff --git a/src/lib/netlist/devices/nld_7410.cpp b/src/lib/netlist/devices/nld_7410.cpp
deleted file mode 100644
index 8039afd9625..00000000000
--- a/src/lib/netlist/devices/nld_7410.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-/*
- * nld_7410.c
- *
- */
-
-#include "nld_7410.h"
-
-NETLIB_NAMESPACE_DEVICES_START()
-
-#if (USE_TRUTHTABLE)
-nld_7410::truthtable_t nld_7410::m_ttbl;
-const char *nld_7410::m_desc[] = {
- "A,B,C|Q",
- "0,X,X|1|22",
- "X,0,X|1|22",
- "X,X,0|1|22",
- "1,1,1|0|15",
- ""
-};
-
-#endif
-
-
-NETLIB_START(7410_dip)
-{
- register_sub("1", m_1);
- register_sub("2", m_2);
- register_sub("3", m_3);
-
- register_subalias("1", m_1->m_I[0]);
- register_subalias("2", m_1->m_I[1]);
- register_subalias("3", m_2->m_I[0]);
- register_subalias("4", m_2->m_I[1]);
- register_subalias("5", m_2->m_I[2]);
- register_subalias("6", m_2->m_Q[0]);
-
- register_subalias("8", m_3->m_Q[0]);
- register_subalias("9", m_3->m_I[0]);
- register_subalias("10", m_3->m_I[1]);
- register_subalias("11", m_3->m_I[2]);
-
- register_subalias("12", m_1->m_Q[0]);
- register_subalias("13", m_1->m_I[2]);
-}
-
-NETLIB_UPDATE(7410_dip)
-{
- /* only called during startup */
- m_1->update_dev();
- m_2->update_dev();
- m_3->update_dev();
-}
-
-NETLIB_RESET(7410_dip)
-{
- m_1->do_reset();
- m_2->do_reset();
- m_3->do_reset();
-}
-
-NETLIB_NAMESPACE_DEVICES_END()
diff --git a/src/lib/netlist/devices/nld_7410.h b/src/lib/netlist/devices/nld_7410.h
deleted file mode 100644
index db1fe5f3b4d..00000000000
--- a/src/lib/netlist/devices/nld_7410.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-/*
- * nld_7410.h
- *
- * DM7410: Triple 3-Input NAND Gates
- *
- * +--------------+
- * A1 |1 ++ 14| VCC
- * B1 |2 13| C1
- * A2 |3 12| Y1
- * B2 |4 7410 11| C3
- * C2 |5 10| B3
- * Y2 |6 9| A3
- * GND |7 8| Y3
- * +--------------+
- * ___
- * Y = ABC
- * +---+---+---++---+
- * | A | B | C || Y |
- * +===+===+===++===+
- * | X | X | 0 || 1 |
- * | X | 0 | X || 1 |
- * | 0 | X | X || 1 |
- * | 1 | 1 | 1 || 0 |
- * +---+---+---++---+
- *
- * Naming conventions follow National Semiconductor datasheet
- *
- */
-
-#ifndef NLD_7410_H_
-#define NLD_7410_H_
-
-#include "nld_signal.h"
-#include "nld_truthtable.h"
-
-#define TTL_7410_NAND(_name, _I1, _I2, _I3) \
- NET_REGISTER_DEV(TTL_7410_NAND, _name) \
- NET_CONNECT(_name, A, _I1) \
- NET_CONNECT(_name, B, _I2) \
- NET_CONNECT(_name, C, _I3)
-
-#define TTL_7410_DIP(_name) \
- NET_REGISTER_DEV(TTL_7410_DIP, _name)
-
-NETLIB_NAMESPACE_DEVICES_START()
-
-#if (USE_TRUTHTABLE)
-NETLIB_TRUTHTABLE(7410, 3, 1, 0);
-#else
-NETLIB_SIGNAL(7410, 3, 0, 0);
-#endif
-
-NETLIB_DEVICE(7410_dip,
-
- NETLIB_SUB(7410) m_1;
- NETLIB_SUB(7410) m_2;
- NETLIB_SUB(7410) m_3;
-);
-
-NETLIB_NAMESPACE_DEVICES_END()
-
-#endif /* NLD_7410_H_ */
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp
index d4b1a166856..e8ad31b4f85 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp
@@ -161,6 +161,43 @@ NETLIST_START(TTL_7408_DIP)
NETLIST_END()
/*
+ * DM7410: Triple 3-Input NAND Gates
+ * ___
+ * Y = ABC
+ * +---+---+---++---+
+ * | A | B | C || Y |
+ * +===+===+===++===+
+ * | X | X | 0 || 1 |
+ * | X | 0 | X || 1 |
+ * | 0 | X | X || 1 |
+ * | 1 | 1 | 1 || 0 |
+ * +---+---+---++---+
+ *
+ * Naming conventions follow National Semiconductor datasheet
+ *
+ */
+
+NETLIST_START(TTL_7410_DIP)
+ TTL_7410_GATE(s1)
+ TTL_7410_GATE(s2)
+ TTL_7410_GATE(s3)
+
+ DUMMY_INPUT(GND)
+ DUMMY_INPUT(VCC)
+
+ DIPPINS( /* +--------------+ */
+ s1.A, /* A1 |1 ++ 14| VCC */ VCC.I,
+ s1.B, /* B1 |2 13| C1 */ s1.C,
+ s2.A, /* A2 |3 12| Y1 */ s1.Q,
+ s2.B, /* B2 |4 7400 11| C3 */ s3.C,
+ s2.C, /* C2 |5 10| B3 */ s3.B,
+ s2.Q, /* Y2 |6 9| A3 */ s3.A,
+ GND.I, /* GND |7 8| Y3 */ s3.Q
+ /* +--------------+ */
+ )
+NETLIST_END()
+
+/*
* DM7416: Hex Inverting Buffers with
* High Voltage Open-Collector Outputs
*
@@ -253,6 +290,24 @@ NETLIST_START(TTL74XX_lib)
TT_FAMILY("74XX")
TRUTHTABLE_END()
+ TRUTHTABLE_START(TTL_7410_NAND, 3, 1, 0, "A,B")
+ TT_HEAD("A,B,C|Q ")
+ TT_LINE("0,X,X|1|22")
+ TT_LINE("X,0,X|1|22")
+ TT_LINE("X,X,0|1|22")
+ TT_LINE("1,1,1|0|15")
+ TT_FAMILY("74XX")
+ TRUTHTABLE_END()
+
+ TRUTHTABLE_START(TTL_7410_GATE, 3, 1, 0, "")
+ TT_HEAD("A,B,C|Q ")
+ TT_LINE("0,X,X|1|22")
+ TT_LINE("X,0,X|1|22")
+ TT_LINE("X,X,0|1|22")
+ TT_LINE("1,1,1|0|15")
+ TT_FAMILY("74XX")
+ TRUTHTABLE_END()
+
TRUTHTABLE_START(TTL_7416_GATE, 1, 1, 0, "")
TT_HEAD(" A | Q ")
TT_LINE(" 0 | 1 |15")
@@ -265,5 +320,6 @@ NETLIST_START(TTL74XX_lib)
LOCAL_LIB_ENTRY(TTL_7402_DIP)
LOCAL_LIB_ENTRY(TTL_7404_DIP)
LOCAL_LIB_ENTRY(TTL_7408_DIP)
+ LOCAL_LIB_ENTRY(TTL_7410_DIP)
LOCAL_LIB_ENTRY(TTL_7416_DIP)
NETLIST_END()
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.h b/src/lib/netlist/macro/nlm_ttl74xx.h
index 28b207ea876..ddde19885d8 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.h
+++ b/src/lib/netlist/macro/nlm_ttl74xx.h
@@ -58,6 +58,19 @@
NET_REGISTER_DEV(TTL_7408_DIP, _name)
+#define TTL_7410_GATE(_name) \
+ NET_REGISTER_DEV(TTL_7410_NAND, _name)
+
+#define TTL_7410_NAND(_name, _I1, _I2, _I3) \
+ NET_REGISTER_DEV(TTL_7410_NAND, _name) \
+ NET_CONNECT(_name, A, _I1) \
+ NET_CONNECT(_name, B, _I2) \
+ NET_CONNECT(_name, C, _I3)
+
+#define TTL_7410_DIP(_name) \
+ NET_REGISTER_DEV(TTL_7410_DIP, _name)
+
+
#define TTL_7416_GATE(_name) \
NET_REGISTER_DEV(TTL_7416_GATE, _name)