summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/src/netlist.lua2
-rw-r--r--src/lib/netlist/build/makefile1
-rw-r--r--src/lib/netlist/devices/net_lib.cpp5
-rw-r--r--src/lib/netlist/devices/net_lib.h1
-rw-r--r--src/lib/netlist/devices/nld_74174.cpp140
-rw-r--r--src/lib/netlist/devices/nld_74174.h47
-rw-r--r--src/lib/netlist/devices/nld_82S126.cpp2
7 files changed, 196 insertions, 2 deletions
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 7a3bf069b84..0e9877e2bcc 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -117,6 +117,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/nld_74153.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74161.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74161.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74174.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74174.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74175.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74175.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74192.cpp",
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
index f262f17fc1a..2c38085dc07 100644
--- a/src/lib/netlist/build/makefile
+++ b/src/lib/netlist/build/makefile
@@ -79,6 +79,7 @@ NLOBJS := \
$(NLOBJ)/devices/nld_74123.o \
$(NLOBJ)/devices/nld_74153.o \
$(NLOBJ)/devices/nld_74161.o \
+ $(NLOBJ)/devices/nld_74174.o \
$(NLOBJ)/devices/nld_74175.o \
$(NLOBJ)/devices/nld_74192.o \
$(NLOBJ)/devices/nld_74193.o \
diff --git a/src/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp
index 02cfe14f692..ee3cd54c073 100644
--- a/src/lib/netlist/devices/net_lib.cpp
+++ b/src/lib/netlist/devices/net_lib.cpp
@@ -118,7 +118,8 @@ static void initialize_factory(factory_list_t &factory)
ENTRYX(74107A, TTL_74107A, "+CLK,J,K,CLRQ")
ENTRYX(74123, TTL_74123, "-")
ENTRYX(74153, TTL_74153, "+C0,C1,C2,C3,A,B,G")
- ENTRYX(74161, TTL_74175, "-")
+ ENTRYX(74161, TTL_74161, "-")
+ ENTRYX(74174, TTL_74174, "-")
ENTRYX(74175, TTL_74175, "-")
ENTRYX(74192, TTL_74192, "-")
ENTRYX(74193, TTL_74193, "-")
@@ -150,6 +151,8 @@ static void initialize_factory(factory_list_t &factory)
ENTRYX(74107_dip, TTL_74107_DIP, "-")
ENTRYX(74123_dip, TTL_74123_DIP, "-")
ENTRYX(74153_dip, TTL_74153_DIP, "-")
+ ENTRYX(74161_dip, TTL_74161_DIP, "-")
+ ENTRYX(74174_dip, TTL_74174_DIP, "-")
ENTRYX(74175_dip, TTL_74175_DIP, "-")
ENTRYX(74192_dip, TTL_74192_DIP, "-")
ENTRYX(74193_dip, TTL_74193_DIP, "-")
diff --git a/src/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h
index 02d36402d01..cc678b09f3a 100644
--- a/src/lib/netlist/devices/net_lib.h
+++ b/src/lib/netlist/devices/net_lib.h
@@ -27,6 +27,7 @@
#include "nld_74123.h"
#include "nld_74153.h"
#include "nld_74161.h"
+#include "nld_74174.h"
#include "nld_74175.h"
#include "nld_74192.h"
#include "nld_74193.h"
diff --git a/src/lib/netlist/devices/nld_74174.cpp b/src/lib/netlist/devices/nld_74174.cpp
new file mode 100644
index 00000000000..64698423435
--- /dev/null
+++ b/src/lib/netlist/devices/nld_74174.cpp
@@ -0,0 +1,140 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_74174.cpp
+ *
+ */
+
+#include "nld_74174.h"
+
+namespace netlist
+{
+ namespace devices
+ {
+ NETLIB_OBJECT(74174_sub)
+ {
+ NETLIB_CONSTRUCTOR(74174_sub)
+ , m_CLK(*this, "CLK")
+ , m_Q(*this, {{"Q1", "Q2", "Q3", "Q4", "Q5", "Q6"}})
+ , m_clrq(*this, "m_clr", 0)
+ , m_data(*this, "m_data", 0)
+ {
+ }
+
+ NETLIB_RESETI();
+ NETLIB_UPDATEI();
+
+ public:
+ logic_input_t m_CLK;
+ object_array_t<logic_output_t, 6> m_Q;
+
+ state_var<netlist_sig_t> m_clrq;
+ state_var<unsigned> m_data;
+ };
+
+ NETLIB_OBJECT(74174)
+ {
+ NETLIB_CONSTRUCTOR(74174)
+ , m_sub(*this, "sub")
+ , m_D(*this, {{"D1", "D2", "D3", "D4", "D5", "D6"}})
+ , m_CLRQ(*this, "CLRQ")
+ {
+ register_subalias("CLK", m_sub.m_CLK);
+
+ register_subalias("Q1", m_sub.m_Q[0]);
+ register_subalias("Q2", m_sub.m_Q[1]);
+ register_subalias("Q3", m_sub.m_Q[2]);
+ register_subalias("Q4", m_sub.m_Q[3]);
+ register_subalias("Q5", m_sub.m_Q[4]);
+ register_subalias("Q6", m_sub.m_Q[5]);
+ }
+
+ NETLIB_RESETI();
+ NETLIB_UPDATEI();
+
+ protected:
+ NETLIB_SUB(74174_sub) m_sub;
+ object_array_t<logic_input_t, 6> m_D;
+ logic_input_t m_CLRQ;
+ };
+
+ NETLIB_OBJECT_DERIVED(74174_dip, 74174)
+ {
+ NETLIB_CONSTRUCTOR_DERIVED(74174_dip, 74174)
+ {
+ register_subalias("1", m_CLRQ);
+ register_subalias("9", m_sub.m_CLK);
+
+ register_subalias("3", m_D[0]);
+ register_subalias("2", m_sub.m_Q[0]);
+
+ register_subalias("4", m_D[1]);
+ register_subalias("5", m_sub.m_Q[1]);
+
+ register_subalias("6", m_D[2]);
+ register_subalias("7", m_sub.m_Q[2]);
+
+ register_subalias("11", m_D[3]);
+ register_subalias("10", m_sub.m_Q[3]);
+
+ register_subalias("13", m_D[4]);
+ register_subalias("12", m_sub.m_Q[4]);
+
+ register_subalias("14", m_D[5]);
+ register_subalias("15", m_sub.m_Q[5]);
+ }
+ };
+
+ NETLIB_RESET(74174_sub)
+ {
+ m_CLK.set_state(logic_t::STATE_INP_LH);
+ m_clrq = 0;
+ m_data = 0xFF;
+ }
+
+ NETLIB_UPDATE(74174_sub)
+ {
+ if (m_clrq)
+ {
+ for (std::size_t i=0; i<6; i++)
+ {
+ netlist_sig_t d = (m_data >> i) & 1;
+ m_Q[i].push(d, NLTIME_FROM_NS(25));
+ }
+ m_CLK.inactivate();
+ }
+ }
+
+ NETLIB_UPDATE(74174)
+ {
+ uint_fast8_t d = 0;
+ for (std::size_t i=0; i<6; i++)
+ {
+ d |= (m_D[i]() << i);
+ }
+ m_sub.m_clrq = m_CLRQ();
+ if (!m_sub.m_clrq)
+ {
+ for (std::size_t i=0; i<6; i++)
+ {
+ m_sub.m_Q[i].push(0, NLTIME_FROM_NS(40));
+ }
+ m_sub.m_data = 0;
+ } else if (d != m_sub.m_data)
+ {
+ m_sub.m_data = d;
+ m_sub.m_CLK.activate_lh();
+ }
+ }
+
+
+ NETLIB_RESET(74174)
+ {
+ //m_sub.do_reset();
+ }
+
+ NETLIB_DEVICE_IMPL(74174)
+ NETLIB_DEVICE_IMPL(74174_dip)
+
+ } //namespace devices
+} // namespace netlist
diff --git a/src/lib/netlist/devices/nld_74174.h b/src/lib/netlist/devices/nld_74174.h
new file mode 100644
index 00000000000..785902f8875
--- /dev/null
+++ b/src/lib/netlist/devices/nld_74174.h
@@ -0,0 +1,47 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_74174.h
+ *
+ * DM74174: hEX D Flip-Flops with Clear
+ *
+ * +--------------+
+ * CLR |1 ++ 16| VCC
+ * Q1 |2 15| Q6
+ * D1 |3 14| D6
+ * D2 |4 74174 13| D5
+ * Q2 |5 12| Q5
+ * D3 |6 11| D4
+ * Q3 |7 10| Q4
+ * GND |8 9| CLK
+ * +--------------+
+ *
+ * +-----+-----+---++---+-----+
+ * | CLR | CLK | D || Q | QQ |
+ * +=====+=====+===++===+=====+
+ * | 0 | X | X || 0 | 1 |
+ * | 1 | R | 1 || 1 | 0 |
+ * | 1 | R | 0 || 0 | 1 |
+ * | 1 | 0 | X || Q0| Q0Q |
+ * +-----+-----+---++---+-----+
+ *
+ * Q0 The output logic level of Q before the indicated input conditions were established
+ *
+ * R: 0 -> 1
+ *
+ * Naming conventions follow National Semiconductor datasheet
+ *
+ */
+
+#ifndef NLD_74174_H_
+#define NLD_74174_H_
+
+#include "nl_setup.h"
+
+#define TTL_74174(name) \
+ NET_REGISTER_DEV(TTL_74174, name)
+#define TTL_74174_DIP(name) \
+ NET_REGISTER_DEV(TTL_74174_DIP, name)
+
+
+#endif /* NLD_74174_H_ */
diff --git a/src/lib/netlist/devices/nld_82S126.cpp b/src/lib/netlist/devices/nld_82S126.cpp
index ac9e51587ca..29c2813c751 100644
--- a/src/lib/netlist/devices/nld_82S126.cpp
+++ b/src/lib/netlist/devices/nld_82S126.cpp
@@ -28,7 +28,7 @@ namespace netlist
object_array_t<logic_input_t, 8> m_A;
logic_input_t m_CE1Q;
logic_input_t m_CE2Q;
- object_array_t<logic_output_t, 8> m_O;
+ object_array_t<logic_output_t, 4> m_O;
param_rom_t m_ROM; // 1024 bits, 32x32, used as 256x4
};