From 847d473163ad20a902b61385bd123b173a5794bc Mon Sep 17 00:00:00 2001 From: couriersud Date: Thu, 16 Jul 2020 09:55:50 +0200 Subject: [PATCH] netlist: comment out empty reset and update calls --- src/lib/netlist/analog/nld_mosfet.cpp | 2 +- src/lib/netlist/analog/nlid_twoterm.h | 6 +++--- src/lib/netlist/devices/nld_2102A.cpp | 4 ++-- src/lib/netlist/devices/nld_4006.cpp | 2 +- src/lib/netlist/devices/nld_4013.cpp | 12 ++---------- src/lib/netlist/devices/nld_4020.cpp | 2 +- src/lib/netlist/devices/nld_74165.cpp | 4 ++-- src/lib/netlist/devices/nld_74166.cpp | 4 ++-- src/lib/netlist/devices/nld_74174.cpp | 4 ++-- src/lib/netlist/devices/nld_74175.cpp | 4 ++-- src/lib/netlist/devices/nld_74192.cpp | 4 ++-- src/lib/netlist/devices/nld_74193.cpp | 4 ++-- src/lib/netlist/devices/nld_74194.cpp | 4 ++-- src/lib/netlist/devices/nld_74365.cpp | 4 ++-- src/lib/netlist/devices/nld_74393.cpp | 4 ++-- src/lib/netlist/devices/nld_7442.cpp | 4 ++-- src/lib/netlist/devices/nld_7474.cpp | 12 ++---------- src/lib/netlist/devices/nld_7475.cpp | 8 ++++---- src/lib/netlist/devices/nld_7483.cpp | 4 ++-- src/lib/netlist/devices/nld_7485.cpp | 4 ++-- src/lib/netlist/devices/nld_7490.cpp | 4 ++-- src/lib/netlist/devices/nld_7492.cpp | 4 ++-- src/lib/netlist/devices/nld_7493.cpp | 4 ++-- src/lib/netlist/devices/nld_7497.cpp | 4 ++-- src/lib/netlist/devices/nld_74ls629.cpp | 2 +- src/lib/netlist/devices/nld_82S115.cpp | 4 ++-- src/lib/netlist/devices/nld_82S16.cpp | 4 ++-- src/lib/netlist/devices/nld_9322.cpp | 4 ++-- src/lib/netlist/devices/nld_am2847.cpp | 4 ++-- src/lib/netlist/devices/nld_dm9334.cpp | 4 ++-- src/lib/netlist/devices/nld_log.cpp | 2 +- src/lib/netlist/devices/nld_ne555.cpp | 2 +- src/lib/netlist/devices/nld_tms4800.cpp | 4 ++-- src/lib/netlist/devices/nlid_proxy.cpp | 4 ---- src/lib/netlist/devices/nlid_proxy.h | 2 +- src/lib/netlist/devices/nlid_system.h | 18 +++++++++--------- src/lib/netlist/nl_base.cpp | 2 ++ src/lib/netlist/nl_base.h | 4 ++-- src/lib/netlist/nl_factory.cpp | 4 ++-- 39 files changed, 79 insertions(+), 97 deletions(-) diff --git a/src/lib/netlist/analog/nld_mosfet.cpp b/src/lib/netlist/analog/nld_mosfet.cpp index 9d6f3b440d0..653063dd243 100644 --- a/src/lib/netlist/analog/nld_mosfet.cpp +++ b/src/lib/netlist/analog/nld_mosfet.cpp @@ -162,7 +162,7 @@ namespace analog NETLIB_IS_DYNAMIC(true) //NETLIB_RESETI(); - NETLIB_UPDATEI() { } + //NETLIB_UPDATEI() {} q_type qtype() const noexcept { return m_qtype; } bool is_qtype(q_type atype) const noexcept { return m_qtype == atype; } diff --git a/src/lib/netlist/analog/nlid_twoterm.h b/src/lib/netlist/analog/nlid_twoterm.h index 2c6340705b0..937917dc09b 100644 --- a/src/lib/netlist/analog/nlid_twoterm.h +++ b/src/lib/netlist/analog/nlid_twoterm.h @@ -32,7 +32,7 @@ /// current source. This is suitable to model voltage sources, current sources, /// resistors, capacitors, inductances and diodes. /// -//// +// #include "netlist/nl_base.h" #include "netlist/nl_setup.h" @@ -85,7 +85,7 @@ namespace analog } //NETLIB_UPDATE_TERMINALSI() { } - //NETLIB_RESETI() { } + //NETLIB_RESETI() {} public: @@ -221,7 +221,7 @@ namespace analog protected: - //NETLIB_UPDATEI() { } + //NETLIB_UPDATEI() {} NETLIB_RESETI() { set_R(std::max(m_R(), exec().gmin())); diff --git a/src/lib/netlist/devices/nld_2102A.cpp b/src/lib/netlist/devices/nld_2102A.cpp index 71b13a7e484..2f673fadd53 100644 --- a/src/lib/netlist/devices/nld_2102A.cpp +++ b/src/lib/netlist/devices/nld_2102A.cpp @@ -105,8 +105,8 @@ namespace netlist register_subalias("9", "A.GND"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(2102A) A; }; diff --git a/src/lib/netlist/devices/nld_4006.cpp b/src/lib/netlist/devices/nld_4006.cpp index 86c0dac98bb..5f4e93ad7ae 100644 --- a/src/lib/netlist/devices/nld_4006.cpp +++ b/src/lib/netlist/devices/nld_4006.cpp @@ -95,7 +95,7 @@ namespace netlist register_subalias("14", "A.VDD"); } - NETLIB_UPDATEI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(CD4006) A; }; diff --git a/src/lib/netlist/devices/nld_4013.cpp b/src/lib/netlist/devices/nld_4013.cpp index 030a2ebee5a..34a44962ce5 100644 --- a/src/lib/netlist/devices/nld_4013.cpp +++ b/src/lib/netlist/devices/nld_4013.cpp @@ -116,22 +116,14 @@ namespace netlist connect("A.VSS", "B.VSS"); connect("A.VDD", "B.VDD"); } - NETLIB_UPDATEI(); - NETLIB_RESETI(); + //NETLIB_UPDATEI(); + //NETLIB_RESETI(); private: NETLIB_SUB(CD4013) m_A; NETLIB_SUB(CD4013) m_B; }; - NETLIB_RESET(CD4013_dip) - { - } - - NETLIB_UPDATE(CD4013_dip) - { - } - NETLIB_DEVICE_IMPL(CD4013, "CD4013", "+CLOCK,+DATA,+RESET,+SET,@VDD,@VSS") NETLIB_DEVICE_IMPL(CD4013_dip, "CD4013_DIP", "") diff --git a/src/lib/netlist/devices/nld_4020.cpp b/src/lib/netlist/devices/nld_4020.cpp index 2ca7c03b554..31dfaae34e9 100644 --- a/src/lib/netlist/devices/nld_4020.cpp +++ b/src/lib/netlist/devices/nld_4020.cpp @@ -89,7 +89,7 @@ namespace netlist register_subalias("VSS", "sub.VSS"); } - NETLIB_RESETI() { } + //NETLIB_RESETI() {} NETLIB_HANDLERI(inputs) { diff --git a/src/lib/netlist/devices/nld_74165.cpp b/src/lib/netlist/devices/nld_74165.cpp index c7440ae5448..47106269b91 100644 --- a/src/lib/netlist/devices/nld_74165.cpp +++ b/src/lib/netlist/devices/nld_74165.cpp @@ -109,8 +109,8 @@ namespace netlist register_subalias("15", A.m_CLKINH); register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(74165) A; }; diff --git a/src/lib/netlist/devices/nld_74166.cpp b/src/lib/netlist/devices/nld_74166.cpp index e31b7a22246..fd45d32730f 100644 --- a/src/lib/netlist/devices/nld_74166.cpp +++ b/src/lib/netlist/devices/nld_74166.cpp @@ -128,8 +128,8 @@ namespace netlist register_subalias("15", A.m_SH_LDQ); register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(74166) A; }; diff --git a/src/lib/netlist/devices/nld_74174.cpp b/src/lib/netlist/devices/nld_74174.cpp index c93d71b6645..88825593e46 100644 --- a/src/lib/netlist/devices/nld_74174.cpp +++ b/src/lib/netlist/devices/nld_74174.cpp @@ -114,8 +114,8 @@ namespace devices register_subalias("8", "A.GND"); register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(74174) A; }; diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp index 44ba6527979..c0bb9ae67a5 100644 --- a/src/lib/netlist/devices/nld_74175.cpp +++ b/src/lib/netlist/devices/nld_74175.cpp @@ -119,8 +119,8 @@ namespace netlist register_subalias("8", "A.GND"); register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(74175) A; }; diff --git a/src/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp index b7a608eba5d..e5fc34e1e1a 100644 --- a/src/lib/netlist/devices/nld_74192.cpp +++ b/src/lib/netlist/devices/nld_74192.cpp @@ -159,8 +159,8 @@ namespace netlist register_subalias("15", A.m_A); register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(74192) A; }; diff --git a/src/lib/netlist/devices/nld_74193.cpp b/src/lib/netlist/devices/nld_74193.cpp index cc6e77f1aca..b33854bd25c 100644 --- a/src/lib/netlist/devices/nld_74193.cpp +++ b/src/lib/netlist/devices/nld_74193.cpp @@ -147,8 +147,8 @@ namespace netlist register_subalias("15", A.m_A); register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(74193) A; }; diff --git a/src/lib/netlist/devices/nld_74194.cpp b/src/lib/netlist/devices/nld_74194.cpp index c6f5ec5a017..15fd6d68840 100644 --- a/src/lib/netlist/devices/nld_74194.cpp +++ b/src/lib/netlist/devices/nld_74194.cpp @@ -123,8 +123,8 @@ namespace netlist register_subalias("16", "VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(74194) A; }; diff --git a/src/lib/netlist/devices/nld_74365.cpp b/src/lib/netlist/devices/nld_74365.cpp index 98129016d00..f7d33d7e9b4 100644 --- a/src/lib/netlist/devices/nld_74365.cpp +++ b/src/lib/netlist/devices/nld_74365.cpp @@ -82,8 +82,8 @@ namespace netlist register_subalias("15", A.m_G2Q); register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(74365) A; }; diff --git a/src/lib/netlist/devices/nld_74393.cpp b/src/lib/netlist/devices/nld_74393.cpp index a10b81724f9..c8dfce300e5 100644 --- a/src/lib/netlist/devices/nld_74393.cpp +++ b/src/lib/netlist/devices/nld_74393.cpp @@ -103,8 +103,8 @@ namespace netlist connect("A.GND", "B.GND"); connect("A.VCC", "B.VCC"); } - NETLIB_UPDATEI() { } - NETLIB_RESETI() { } + //NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} private: NETLIB_SUB(74393) m_A; diff --git a/src/lib/netlist/devices/nld_7442.cpp b/src/lib/netlist/devices/nld_7442.cpp index d3c52ebe3af..c389ed2d85c 100644 --- a/src/lib/netlist/devices/nld_7442.cpp +++ b/src/lib/netlist/devices/nld_7442.cpp @@ -98,8 +98,8 @@ namespace devices register_subalias("15", "A.A"); register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(7442) A; }; diff --git a/src/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp index 2b7b3980db0..01fc479f5e3 100644 --- a/src/lib/netlist/devices/nld_7474.cpp +++ b/src/lib/netlist/devices/nld_7474.cpp @@ -112,22 +112,14 @@ namespace netlist connect("A.GND", "B.GND"); connect("A.VCC", "B.VCC"); } - NETLIB_UPDATEI(); - NETLIB_RESETI(); + //NETLIB_UPDATEI(); + //NETLIB_RESETI(); private: NETLIB_SUB(7474) m_A; NETLIB_SUB(7474) m_B; }; - NETLIB_RESET(7474_dip) - { - } - - NETLIB_UPDATE(7474_dip) - { - } - NETLIB_DEVICE_IMPL(7474, "TTL_7474", "+CLK,+D,+CLRQ,+PREQ,@VCC,@GND") NETLIB_DEVICE_IMPL(7474_dip, "TTL_7474_DIP", "") diff --git a/src/lib/netlist/devices/nld_7475.cpp b/src/lib/netlist/devices/nld_7475.cpp index 2633e7c76f4..6dc05a44ed8 100644 --- a/src/lib/netlist/devices/nld_7475.cpp +++ b/src/lib/netlist/devices/nld_7475.cpp @@ -178,8 +178,8 @@ namespace netlist register_subalias("15", A.m_Q[1]); register_subalias("16", A.m_Q[0]); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(7475) A; }; @@ -205,8 +205,8 @@ namespace netlist register_subalias("13", A.m_Q[1]); register_subalias("14", A.m_Q[0]); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(7477) A; }; diff --git a/src/lib/netlist/devices/nld_7483.cpp b/src/lib/netlist/devices/nld_7483.cpp index eaa35f87ef1..93f1dd44610 100644 --- a/src/lib/netlist/devices/nld_7483.cpp +++ b/src/lib/netlist/devices/nld_7483.cpp @@ -120,8 +120,8 @@ namespace netlist register_subalias("15", A.m_S4); register_subalias("16", A.m_B4); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(7483) A; }; diff --git a/src/lib/netlist/devices/nld_7485.cpp b/src/lib/netlist/devices/nld_7485.cpp index 675f4eb3a37..cd276ce2ee2 100644 --- a/src/lib/netlist/devices/nld_7485.cpp +++ b/src/lib/netlist/devices/nld_7485.cpp @@ -102,8 +102,8 @@ namespace netlist register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(7485) A; }; diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp index 5e786fb0f96..2b19eff4227 100644 --- a/src/lib/netlist/devices/nld_7490.cpp +++ b/src/lib/netlist/devices/nld_7490.cpp @@ -122,8 +122,8 @@ namespace devices // register_subalias("13", ); --> NC register_subalias("14", "A.A"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(7490) A; }; diff --git a/src/lib/netlist/devices/nld_7492.cpp b/src/lib/netlist/devices/nld_7492.cpp index a13ed9c3253..dd2a9291feb 100644 --- a/src/lib/netlist/devices/nld_7492.cpp +++ b/src/lib/netlist/devices/nld_7492.cpp @@ -115,8 +115,8 @@ namespace devices // register_subalias("13", ); --> NC register_subalias("14", "A.A"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(7492) A; }; diff --git a/src/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp index cf17c5ae78c..131be393592 100644 --- a/src/lib/netlist/devices/nld_7493.cpp +++ b/src/lib/netlist/devices/nld_7493.cpp @@ -176,8 +176,8 @@ namespace netlist // register_subalias("13", ); -. NC register_subalias("14", "A.CLKA"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(7493) A; }; diff --git a/src/lib/netlist/devices/nld_7497.cpp b/src/lib/netlist/devices/nld_7497.cpp index 5fa1d17d35b..6645adea53e 100644 --- a/src/lib/netlist/devices/nld_7497.cpp +++ b/src/lib/netlist/devices/nld_7497.cpp @@ -169,8 +169,8 @@ namespace netlist register_subalias("15", A.m_B[2]); // B3 register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(7497) A; }; diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp index e733312fa2e..8c56528458d 100644 --- a/src/lib/netlist/devices/nld_74ls629.cpp +++ b/src/lib/netlist/devices/nld_74ls629.cpp @@ -227,7 +227,7 @@ namespace netlist register_subalias("14", m_B.m_RNG); } - NETLIB_UPDATEI() { } + //NETLIB_UPDATEI() {} NETLIB_RESETI() { diff --git a/src/lib/netlist/devices/nld_82S115.cpp b/src/lib/netlist/devices/nld_82S115.cpp index d98674f448f..883e13f6f9c 100644 --- a/src/lib/netlist/devices/nld_82S115.cpp +++ b/src/lib/netlist/devices/nld_82S115.cpp @@ -113,8 +113,8 @@ namespace netlist register_subalias("12", "A.GND"); register_subalias("24", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(82S115) A; }; diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82S16.cpp index 1981f7a9832..53213deb02f 100644 --- a/src/lib/netlist/devices/nld_82S16.cpp +++ b/src/lib/netlist/devices/nld_82S16.cpp @@ -136,8 +136,8 @@ namespace netlist register_subalias("8", "A.GND"); register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(82S16) A; }; diff --git a/src/lib/netlist/devices/nld_9322.cpp b/src/lib/netlist/devices/nld_9322.cpp index 09b662969cb..154c51a8c95 100644 --- a/src/lib/netlist/devices/nld_9322.cpp +++ b/src/lib/netlist/devices/nld_9322.cpp @@ -135,8 +135,8 @@ namespace netlist register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(9322) A; }; diff --git a/src/lib/netlist/devices/nld_am2847.cpp b/src/lib/netlist/devices/nld_am2847.cpp index ecd41c3197b..5777de6dc3c 100644 --- a/src/lib/netlist/devices/nld_am2847.cpp +++ b/src/lib/netlist/devices/nld_am2847.cpp @@ -147,8 +147,8 @@ namespace netlist register_subalias("15", A.m_D.m_IN); register_subalias("16", "A.VSS"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(AM2847) A; }; diff --git a/src/lib/netlist/devices/nld_dm9334.cpp b/src/lib/netlist/devices/nld_dm9334.cpp index f7424b244f9..9dd94b8e2c8 100644 --- a/src/lib/netlist/devices/nld_dm9334.cpp +++ b/src/lib/netlist/devices/nld_dm9334.cpp @@ -149,8 +149,8 @@ namespace netlist register_subalias("16", "A.VCC"); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(9334) A; }; diff --git a/src/lib/netlist/devices/nld_log.cpp b/src/lib/netlist/devices/nld_log.cpp index 87599f31600..864f77f1135 100644 --- a/src/lib/netlist/devices/nld_log.cpp +++ b/src/lib/netlist/devices/nld_log.cpp @@ -142,7 +142,7 @@ namespace netlist log_value(static_cast(m_I() - m_I2())); } - NETLIB_RESETI() { } + //NETLIB_RESETI() {} analog_input_t m_I2; }; diff --git a/src/lib/netlist/devices/nld_ne555.cpp b/src/lib/netlist/devices/nld_ne555.cpp index 8ce5ea2a0d4..f388bf0fd8c 100644 --- a/src/lib/netlist/devices/nld_ne555.cpp +++ b/src/lib/netlist/devices/nld_ne555.cpp @@ -214,7 +214,7 @@ namespace netlist // The reset on R_Base executed after NE555 reset will // overwrite values. NETLIB_RESETI() { A.reset(); } - NETLIB_UPDATEI() { } + //NETLIB_UPDATEI() {} private: NETLIB_SUB(NE555) A; }; diff --git a/src/lib/netlist/devices/nld_tms4800.cpp b/src/lib/netlist/devices/nld_tms4800.cpp index aeccfa8141a..9ce94e518c5 100644 --- a/src/lib/netlist/devices/nld_tms4800.cpp +++ b/src/lib/netlist/devices/nld_tms4800.cpp @@ -104,8 +104,8 @@ namespace netlist register_subalias("17", A.m_D[6]); register_subalias("16", A.m_D[7]); } - NETLIB_RESETI() {} - NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_SUB(TMS4800) A; diff --git a/src/lib/netlist/devices/nlid_proxy.cpp b/src/lib/netlist/devices/nlid_proxy.cpp index 3ef03a16544..5723797c53b 100644 --- a/src/lib/netlist/devices/nlid_proxy.cpp +++ b/src/lib/netlist/devices/nlid_proxy.cpp @@ -89,10 +89,6 @@ namespace netlist { } - NETLIB_RESET(a_to_d_proxy) - { - } - NETLIB_HANDLER(a_to_d_proxy, input) { const auto v(m_I.Q_Analog()); diff --git a/src/lib/netlist/devices/nlid_proxy.h b/src/lib/netlist/devices/nlid_proxy.h index 5081b80e7fd..664fcc3dc24 100644 --- a/src/lib/netlist/devices/nlid_proxy.h +++ b/src/lib/netlist/devices/nlid_proxy.h @@ -69,7 +69,7 @@ namespace devices } protected: - NETLIB_RESETI(); + //NETLIB_RESETI(); NETLIB_UPDATEI() { input(); diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h index 7995d1eb685..d8f1ec0b0b4 100644 --- a/src/lib/netlist/devices/nlid_system.h +++ b/src/lib/netlist/devices/nlid_system.h @@ -33,8 +33,8 @@ namespace devices , m_max_link_loops(*this, "MAX_LINK_RESOLVE_LOOPS", 100) { } - //NETLIB_UPDATEI() { } - //NETLIB_RESETI() { } + //NETLIB_UPDATEI() {} + //NETLIB_RESETI() {} //NETLIB_UPDATE_PARAMI() { } public: param_logic_t m_use_deactivate; @@ -261,7 +261,7 @@ namespace devices { } - //NETLIB_UPDATEI() { } + //NETLIB_UPDATEI() {} NETLIB_RESETI() { m_Q.initial(0); } NETLIB_UPDATE_PARAMI() { @@ -286,7 +286,7 @@ namespace devices { } - //NETLIB_UPDATEI() { } + //NETLIB_UPDATEI() {} NETLIB_RESETI() { for (auto &q : m_Q) q.initial(0); } NETLIB_UPDATE_PARAMI() { @@ -310,7 +310,7 @@ namespace devices { } - //NETLIB_UPDATEI() { } + //NETLIB_UPDATEI() {} NETLIB_RESETI() { m_Q.initial(nlconst::zero()); } NETLIB_UPDATE_PARAMI() { m_Q.push(m_IN()); } @@ -330,13 +330,13 @@ namespace devices { } - //NETLIB_UPDATEI() { } + //NETLIB_UPDATEI() {} NETLIB_UPDATE_PARAMI() { m_Q.push(nlconst::zero()); } - //NETLIB_RESETI() { } + //NETLIB_RESETI() {} protected: analog_output_t m_Q; }; @@ -354,8 +354,8 @@ namespace devices } protected: - //NETLIB_RESETI() { } - //NETLIB_UPDATEI() { } + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} private: NETLIB_HANDLERI(noop) diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp index e61bb0d6617..a949e8cf8b7 100644 --- a/src/lib/netlist/nl_base.cpp +++ b/src/lib/netlist/nl_base.cpp @@ -340,6 +340,8 @@ namespace netlist for (auto &dev : m_devices) if (!plib::container::contains(d, dev.second.get())) { + // FIXME: doesn't seem to be needed, use cases include + // analog output devices. Check and remove log().verbose("\t ...{1}", dev.second->name()); dev.second->update(); } diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index b99ad7734e2..18cb487510f 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -1441,7 +1441,7 @@ namespace netlist void connect(const detail::core_terminal_t &t1, const detail::core_terminal_t &t2); protected: - //NETLIB_UPDATEI() { } + //NETLIB_UPDATEI() {} //NETLIB_UPDATE_TERMINALSI() { } private: @@ -1473,7 +1473,7 @@ namespace netlist protected: - //NETLIB_UPDATEI() { } + //NETLIB_UPDATEI() {} //NETLIB_UPDATE_TERMINALSI() { } private: diff --git a/src/lib/netlist/nl_factory.cpp b/src/lib/netlist/nl_factory.cpp index 519c4ea029c..6018b2fa640 100644 --- a/src/lib/netlist/nl_factory.cpp +++ b/src/lib/netlist/nl_factory.cpp @@ -23,8 +23,8 @@ namespace factory { { } protected: - NETLIB_RESETI() { } - NETLIB_UPDATEI() { } + //NETLIB_RESETI() {} + //NETLIB_UPDATEI() {} }; element_t::element_t(const pstring &name, properties &&props)