summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/devices/nld_74153.cpp
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-04-23 23:35:27 +0200
committer couriersud <couriersud@arcor.de>2016-05-02 21:56:57 +0200
commit576189b1695936f35f077918fbb9191ed68ad8df (patch)
treeb20669555c740ced035d9ffb78f71d1619cf7dd9 /src/lib/netlist/devices/nld_74153.cpp
parent28eeb49676eb5550180d481b87f5a6ca86564828 (diff)
Converted most subdevices to unique_ptr. This is a temporary measure
until the device initialisation is moved into the constructor. Started converting constructors of devices to be passed name and netlist. (nw)
Diffstat (limited to 'src/lib/netlist/devices/nld_74153.cpp')
-rw-r--r--src/lib/netlist/devices/nld_74153.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp
index ab52808c4cc..5d0a6caf2f9 100644
--- a/src/lib/netlist/devices/nld_74153.cpp
+++ b/src/lib/netlist/devices/nld_74153.cpp
@@ -53,15 +53,15 @@ NETLIB_START(74153)
{
register_sub("sub", m_sub);
- register_subalias("C0", m_sub.m_C[0]);
- register_subalias("C1", m_sub.m_C[1]);
- register_subalias("C2", m_sub.m_C[2]);
- register_subalias("C3", m_sub.m_C[3]);
+ register_subalias("C0", m_sub->m_C[0]);
+ register_subalias("C1", m_sub->m_C[1]);
+ register_subalias("C2", m_sub->m_C[2]);
+ register_subalias("C3", m_sub->m_C[3]);
register_input("A", m_A);
register_input("B", m_B);
- register_subalias("G", m_sub.m_G);
+ register_subalias("G", m_sub->m_G);
- register_subalias("AY", m_sub.m_Y); //FIXME: Change netlists
+ register_subalias("AY", m_sub->m_Y); //FIXME: Change netlists
}
NETLIB_RESET(74153)
@@ -72,8 +72,8 @@ NETLIB_RESET(74153)
NETLIB_UPDATE(74153)
{
- m_sub.m_chan = (INPLOGIC(m_A) | (INPLOGIC(m_B)<<1));
- m_sub.update();
+ m_sub->m_chan = (INPLOGIC(m_A) | (INPLOGIC(m_B)<<1));
+ m_sub->update();
}
@@ -82,35 +82,35 @@ NETLIB_START(74153_dip)
register_sub("1", m_1);
register_sub("2", m_2);
- register_subalias("1", m_1.m_G);
- register_input("2", m_B); // m_2.m_B
- register_subalias("3", m_1.m_C[3]);
- register_subalias("4", m_1.m_C[2]);
- register_subalias("5", m_1.m_C[1]);
- register_subalias("6", m_1.m_C[0]);
- register_subalias("7", m_1.m_Y);
-
- register_subalias("9", m_2.m_Y);
- register_subalias("10", m_2.m_C[0]);
- register_subalias("11", m_2.m_C[1]);
- register_subalias("12", m_2.m_C[2]);
- register_subalias("13", m_2.m_C[3]);
-
- register_input("14", m_A); // m_2.m_B
- register_subalias("15", m_2.m_G);
+ register_subalias("1", m_1->m_G);
+ register_input("2", m_B); // m_2->m_B
+ register_subalias("3", m_1->m_C[3]);
+ register_subalias("4", m_1->m_C[2]);
+ register_subalias("5", m_1->m_C[1]);
+ register_subalias("6", m_1->m_C[0]);
+ register_subalias("7", m_1->m_Y);
+
+ register_subalias("9", m_2->m_Y);
+ register_subalias("10", m_2->m_C[0]);
+ register_subalias("11", m_2->m_C[1]);
+ register_subalias("12", m_2->m_C[2]);
+ register_subalias("13", m_2->m_C[3]);
+
+ register_input("14", m_A); // m_2->m_B
+ register_subalias("15", m_2->m_G);
}
NETLIB_UPDATE(74153_dip)
{
- m_2.m_chan = m_1.m_chan = (INPLOGIC(m_A) | (INPLOGIC(m_B)<<1));
- m_1.update();
- m_2.update();
+ m_2->m_chan = m_1->m_chan = (INPLOGIC(m_A) | (INPLOGIC(m_B)<<1));
+ m_1->update();
+ m_2->update();
}
NETLIB_RESET(74153_dip)
{
- m_1.do_reset();
- m_2.do_reset();
+ m_1->do_reset();
+ m_2->do_reset();
}
NETLIB_NAMESPACE_DEVICES_END()