From 1ea05793beb3a94e6251e6186873b3314cf7eb56 Mon Sep 17 00:00:00 2001 From: couriersud Date: Wed, 4 May 2016 00:06:05 +0200 Subject: [PATCH] Converted 7437 to macro device --- scripts/src/netlist.lua | 2 - src/lib/netlist/devices/net_lib.cpp | 2 - src/lib/netlist/devices/net_lib.h | 1 - src/lib/netlist/devices/nld_7437.cpp | 65 -------------------------- src/lib/netlist/devices/nld_7437.h | 67 --------------------------- src/lib/netlist/macro/nlm_ttl74xx.cpp | 62 +++++++++++++++++++++++++ src/lib/netlist/macro/nlm_ttl74xx.h | 12 +++++ 7 files changed, 74 insertions(+), 137 deletions(-) delete mode 100644 src/lib/netlist/devices/nld_7437.cpp delete mode 100644 src/lib/netlist/devices/nld_7437.h diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 9a9d49976f1..22f4e14f257 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -94,8 +94,6 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_7430.h", MAME_DIR .. "src/lib/netlist/devices/nld_7432.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_7432.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7437.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7437.h", MAME_DIR .. "src/lib/netlist/devices/nld_7448.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_7448.h", MAME_DIR .. "src/lib/netlist/devices/nld_7450.cpp", diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp index f570f7dfd08..b7a0f50a7e7 100644 --- a/src/lib/netlist/devices/net_lib.cpp +++ b/src/lib/netlist/devices/net_lib.cpp @@ -102,7 +102,6 @@ void initialize_factory(factory_list_t &factory) ENTRY(7425, TTL_7425_NOR, "+A,B,C,D") ENTRY(7430, TTL_7430_NAND, "+A,B,C,D,E,F,G,H") ENTRY(7432, TTL_7432_OR, "+A,B") - ENTRY(7437, TTL_7437_NAND, "+A,B") ENTRY(7450, TTL_7450_ANDORINVERT, "+A,B,C,D") ENTRY(7486, TTL_7486_XOR, "+A,B") ENTRY(7448, TTL_7448, "+A,B,C,D,LTQ,BIQ,RBIQ") @@ -135,7 +134,6 @@ void initialize_factory(factory_list_t &factory) ENTRY(7425_dip, TTL_7425_DIP, "-") ENTRY(7430_dip, TTL_7430_DIP, "-") ENTRY(7432_dip, TTL_7432_DIP, "-") - ENTRY(7437_dip, TTL_7437_DIP, "-") ENTRY(7448_dip, TTL_7448_DIP, "-") ENTRY(7450_dip, TTL_7450_DIP, "-") ENTRY(7474_dip, TTL_7474_DIP, "-") diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h index f219f654db0..4e998d99586 100644 --- a/src/lib/netlist/devices/net_lib.h +++ b/src/lib/netlist/devices/net_lib.h @@ -20,7 +20,6 @@ #include "nld_7425.h" #include "nld_7430.h" #include "nld_7432.h" -#include "nld_7437.h" #include "nld_7448.h" #include "nld_7450.h" #include "nld_7474.h" diff --git a/src/lib/netlist/devices/nld_7437.cpp b/src/lib/netlist/devices/nld_7437.cpp deleted file mode 100644 index bc1fdf83727..00000000000 --- a/src/lib/netlist/devices/nld_7437.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// license:GPL-2.0+ -// copyright-holders:Couriersud -/* - * nld_7437.c - * - */ - -#include "nld_7437.h" - -NETLIB_NAMESPACE_DEVICES_START() - -#if (USE_TRUTHTABLE) -nld_7437::truthtable_t nld_7437::m_ttbl; -const char *nld_7437::m_desc[] = { - "A , B | Q ", - "0,X|1|22", - "X,0|1|22", - "1,1|0|15", - "" -}; - -#endif - -NETLIB_START(7437_dip) -{ - register_sub("1", m_1); - register_sub("2", m_2); - register_sub("3", m_3); - register_sub("4", m_4); - - register_subalias("1", m_1->m_I[0]); - register_subalias("2", m_1->m_I[1]); - register_subalias("3", m_1->m_Q[0]); - - register_subalias("4", m_2->m_I[0]); - register_subalias("5", m_2->m_I[1]); - register_subalias("6", m_2->m_Q[0]); - - register_subalias("9", m_3->m_I[0]); - register_subalias("10", m_3->m_I[1]); - register_subalias("8", m_3->m_Q[0]); - - register_subalias("12", m_4->m_I[0]); - register_subalias("13", m_4->m_I[1]); - register_subalias("11", m_4->m_Q[0]); -} - -NETLIB_UPDATE(7437_dip) -{ - /* only called during startup */ - m_1->update_dev(); - m_2->update_dev(); - m_3->update_dev(); - m_4->update_dev(); -} - -NETLIB_RESET(7437_dip) -{ - m_1->do_reset(); - m_2->do_reset(); - m_3->do_reset(); - m_4->do_reset(); -} - -NETLIB_NAMESPACE_DEVICES_END() diff --git a/src/lib/netlist/devices/nld_7437.h b/src/lib/netlist/devices/nld_7437.h deleted file mode 100644 index 0d7f421e2bc..00000000000 --- a/src/lib/netlist/devices/nld_7437.h +++ /dev/null @@ -1,67 +0,0 @@ -// license:GPL-2.0+ -// copyright-holders:Couriersud -/* - * nld_7437.h - * - * DM7437: Quad 2-Input NAND Gates - * - * +--------------+ - * A1 |1 ++ 14| VCC - * B1 |2 13| B4 - * Y1 |3 12| A4 - * A2 |4 7437 11| Y4 - * B2 |5 10| B3 - * Y2 |6 9| A3 - * GND |7 8| Y3 - * +--------------+ - * __ - * Y = AB - * +---+---++---+ - * | A | B || Y | - * +===+===++===+ - * | 0 | 0 || 1 | - * | 0 | 1 || 1 | - * | 1 | 0 || 1 | - * | 1 | 1 || 0 | - * +---+---++---+ - * - * Naming conventions follow National Semiconductor datasheet - * - * FIXME: Same as 7400, but drains higher output currents. - * Netlist currently does not model over currents (should it ever?) - * - */ - -#ifndef NLD_7437_H_ -#define NLD_7437_H_ - -#include "nld_signal.h" -#include "nld_truthtable.h" - -#define TTL_7437_NAND(_name, _A, _B) \ - NET_REGISTER_DEV(TTL_7437_NAND, _name) \ - NET_CONNECT(_name, A, _A) \ - NET_CONNECT(_name, B, _B) - -#define TTL_7437_DIP(_name) \ - NET_REGISTER_DEV(TTL_7437_DIP, _name) - -NETLIB_NAMESPACE_DEVICES_START() - -#if (USE_TRUTHTABLE) -NETLIB_TRUTHTABLE(7437, 2, 1, 0); -#else -NETLIB_SIGNAL(7437, 2, 0, 0); -#endif - -NETLIB_DEVICE(7437_dip, - - NETLIB_SUB(7437) m_1; - NETLIB_SUB(7437) m_2; - NETLIB_SUB(7437) m_3; - NETLIB_SUB(7437) m_4; -); - -NETLIB_NAMESPACE_DEVICES_END() - -#endif /* NLD_7437_H_ */ diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp index c72e6ee9ce2..f06320504f0 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.cpp +++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp @@ -301,6 +301,47 @@ NETLIST_START(TTL_7427_DIP) ) NETLIST_END() +/* + * DM7400: Quad 2-Input NAND Gates + * + * __ + * Y = AB + * +---+---++---+ + * | A | B || Y | + * +===+===++===+ + * | 0 | 0 || 1 | + * | 0 | 1 || 1 | + * | 1 | 0 || 1 | + * | 1 | 1 || 0 | + * +---+---++---+ + * + * Naming conventions follow National Semiconductor datasheet + * + * FIXME: Same as 7400, but drains higher output currents. + * Netlist currently does not model over currents (should it ever?) + */ + +NETLIST_START(TTL_7437_DIP) + TTL_7437_GATE(s1) + TTL_7437_GATE(s2) + TTL_7437_GATE(s3) + TTL_7437_GATE(s4) + + DUMMY_INPUT(GND) + DUMMY_INPUT(VCC) + + DIPPINS( /* +--------------+ */ + s1.A, /* A1 |1 ++ 14| VCC */ VCC.I, + s1.B, /* B1 |2 13| B4 */ s4.B, + s1.Q, /* Y1 |3 12| A4 */ s4.A, + s2.A, /* A2 |4 7400 11| Y4 */ s4.Q, + s2.B, /* B2 |5 10| B3 */ s3.B, + s2.Q, /* Y2 |6 9| A3 */ s3.A, + GND.I, /* GND |7 8| Y3 */ s3.Q + /* +--------------+ */ + ) +NETLIST_END() + NETLIST_START(TTL74XX_lib) @@ -428,6 +469,26 @@ NETLIST_START(TTL74XX_lib) TT_FAMILY("74XX") TRUTHTABLE_END() + /* FIXME: Same as 7400, but drains higher output currents. + * Netlist currently does not model over currents (should it ever?) + */ + + TRUTHTABLE_START(TTL_7437_GATE, 2, 1, 0, "") + TT_HEAD("A,B|Q ") + TT_LINE("0,X|1|22") + TT_LINE("X,0|1|22") + TT_LINE("1,1|0|15") + TT_FAMILY("74XX") + TRUTHTABLE_END() + + TRUTHTABLE_START(TTL_7437_NAND, 2, 1, 0, "A,B") + TT_HEAD("A,B|Q ") + TT_LINE("0,X|1|22") + TT_LINE("X,0|1|22") + TT_LINE("1,1|0|15") + TT_FAMILY("74XX") + TRUTHTABLE_END() + LOCAL_LIB_ENTRY(TTL_7400_DIP) LOCAL_LIB_ENTRY(TTL_7402_DIP) LOCAL_LIB_ENTRY(TTL_7404_DIP) @@ -436,4 +497,5 @@ NETLIST_START(TTL74XX_lib) LOCAL_LIB_ENTRY(TTL_7411_DIP) LOCAL_LIB_ENTRY(TTL_7416_DIP) LOCAL_LIB_ENTRY(TTL_7427_DIP) + LOCAL_LIB_ENTRY(TTL_7437_DIP) NETLIST_END() diff --git a/src/lib/netlist/macro/nlm_ttl74xx.h b/src/lib/netlist/macro/nlm_ttl74xx.h index 54d7a634010..b65c944f463 100644 --- a/src/lib/netlist/macro/nlm_ttl74xx.h +++ b/src/lib/netlist/macro/nlm_ttl74xx.h @@ -103,6 +103,18 @@ #define TTL_7427_DIP(_name) \ NET_REGISTER_DEV(TTL_7427_DIP, _name) + +#define TTL_7437_GATE(_name) \ + NET_REGISTER_DEV(TTL_7437_GATE, _name) + +#define TTL_7437_NAND(_name, _A, _B) \ + NET_REGISTER_DEV(TTL_7437_NAND, _name) \ + NET_CONNECT(_name, A, _A) \ + NET_CONNECT(_name, B, _B) + +#define TTL_7437_DIP(_name) \ + NET_REGISTER_DEV(TTL_7437_DIP, _name) + /* ---------------------------------------------------------------------------- * External declarations * ---------------------------------------------------------------------------*/