From 35876ea66415f26306629b9aa52a143c8c9223ec Mon Sep 17 00:00:00 2001 From: Couriersud Date: Wed, 9 Oct 2013 18:23:22 +0000 Subject: All netlist device setup now takes place in constructors. --- src/emu/machine/net_lib.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/emu/machine/net_lib.c') diff --git a/src/emu/machine/net_lib.c b/src/emu/machine/net_lib.c index 5c742657353..50b469525fc 100644 --- a/src/emu/machine/net_lib.c +++ b/src/emu/machine/net_lib.c @@ -47,7 +47,7 @@ #include "net_lib.h" -NETLIB_START(netdev_logic_input) +NETLIB_CONSTRUCTOR(netdev_logic_input) { register_output("Q", m_Q); } @@ -56,7 +56,7 @@ NETLIB_UPDATE(netdev_logic_input) { } -NETLIB_START(netdev_analog_input) +NETLIB_CONSTRUCTOR(netdev_analog_input) { register_output("Q", m_Q); } @@ -65,7 +65,7 @@ NETLIB_UPDATE(netdev_analog_input) { } -NETLIB_START(netdev_clock) +NETLIB_CONSTRUCTOR(netdev_clock) { register_output("Q", m_Q); //register_input("FB", m_feedback); @@ -87,7 +87,7 @@ NETLIB_UPDATE(netdev_clock) m_Q.setToNoCheck(!m_Q.new_Q(), m_inc ); } -NETLIB_START(nicMultiSwitch) +NETLIB_CONSTRUCTOR(nicMultiSwitch) { static const char *sIN[8] = { "i1", "i2", "i3", "i4", "i5", "i6", "i7", "i8" }; int i; @@ -119,7 +119,7 @@ NETLIB_UPDATE_PARAM(nicMultiSwitch) update(); } -NETLIB_START(nicMixer8) +NETLIB_CONSTRUCTOR(nicMixer8) { static const char *sI[8] = { "I1", "I2", "I3", "I4", "I5", "I6", "I7", "I8" }; static const char *sR[8] = { "R1", "R2", "R3", "R4", "R5", "R6", "R7", "R8" }; @@ -165,7 +165,7 @@ NETLIB_UPDATE_PARAM(nicMixer8) -NETLIB_START(nicRSFF) +NETLIB_CONSTRUCTOR(nicRSFF) { register_input("S", m_S); register_input("R", m_R); @@ -190,7 +190,7 @@ NETLIB_UPDATE(nicRSFF) } -NETLIB_START(nicNE555N_MSTABLE) +NETLIB_CONSTRUCTOR(nicNE555N_MSTABLE) { register_input("TRIG", m_trigger); register_input("CV", m_CV); @@ -273,7 +273,7 @@ NETLIB_UPDATE(nicNE555N_MSTABLE) m_last = out; } -NETLIB_START(nic7404) +NETLIB_CONSTRUCTOR(nic7404) { register_input("I1", m_I); register_output("Q", m_Q); @@ -287,7 +287,7 @@ NETLIB_UPDATE(nic7404) m_Q.setTo(t, delay[t]); } -NETLIB_START(nic7486) +NETLIB_CONSTRUCTOR(nic7486) { register_input("I1", m_I0); register_input("I2", m_I1); @@ -301,11 +301,11 @@ NETLIB_UPDATE(nic7486) m_Q.setTo(t, delay[t]); } -NETLIB_START(nic7448) +NETLIB_CONSTRUCTOR(nic7448) { register_subdevice(sub); - //sub.m_state = 0; + sub.m_state = 0; register_input(sub, "A0", sub.m_A0); register_input(sub, "A1", sub.m_A1); @@ -400,7 +400,7 @@ const UINT8 nic7448_sub::tab7448[16][7] = { 0, 0, 0, 0, 0, 0, 0 }, /* 15 */ }; -NETLIB_START(nic7450) +NETLIB_CONSTRUCTOR(nic7450) { register_input("I1", m_I0); register_input("I2", m_I1); @@ -451,7 +451,7 @@ NETLIB_UPDATE(nic7474) sub.m_clk.activate_lh(); } -NETLIB_START(nic7474) +NETLIB_CONSTRUCTOR(nic7474) { register_subdevice(sub); @@ -467,7 +467,7 @@ NETLIB_START(nic7474) sub.m_QQ.initial(0); } -NETLIB_START(nic7483) +NETLIB_CONSTRUCTOR(nic7483) { m_lastr = 0; @@ -506,7 +506,7 @@ NETLIB_UPDATE(nic7483) } } -NETLIB_START(nic7490) +NETLIB_CONSTRUCTOR(nic7490) { m_cnt = 0; @@ -564,7 +564,7 @@ NETLIB_FUNC_VOID(nic7490, update_outputs, (void)) } #endif #if 1 -NETLIB_START(nic7493) +NETLIB_CONSTRUCTOR(nic7493) { register_subdevice(A); register_subdevice(B); @@ -620,7 +620,7 @@ NETLIB_UPDATE(nic7493) } #else -NETLIB_START(nic7493) +NETLIB_CONSTRUCTOR(nic7493) { m_cnt = 0; @@ -695,7 +695,7 @@ NETLIB_FUNC_VOID(nic7493, update_outputs) } #endif -NETLIB_START(nic74107A) +NETLIB_CONSTRUCTOR(nic74107A) { register_subdevice(sub); @@ -766,7 +766,7 @@ NETLIB_UPDATE(nic74107A) sub.m_clk.activate_hl(); } -NETLIB_START(nic74153) +NETLIB_CONSTRUCTOR(nic74153) { register_input("A1", m_I[0]); register_input("A2", m_I[1]); @@ -794,7 +794,7 @@ NETLIB_UPDATE(nic74153) } } -NETLIB_START(nic9316) +NETLIB_CONSTRUCTOR(nic9316) { register_subdevice(sub); sub.m_cnt = 0; -- cgit v1.2.3-70-g09d2