diff options
author | 2016-04-23 23:35:27 +0200 | |
---|---|---|
committer | 2016-05-02 21:56:57 +0200 | |
commit | 576189b1695936f35f077918fbb9191ed68ad8df (patch) | |
tree | b20669555c740ced035d9ffb78f71d1619cf7dd9 /src/lib/netlist/devices/nld_system.cpp | |
parent | 28eeb49676eb5550180d481b87f5a6ca86564828 (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_system.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_system.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp index 3e4565d09d2..77317f778e4 100644 --- a/src/lib/netlist/devices/nld_system.cpp +++ b/src/lib/netlist/devices/nld_system.cpp @@ -196,7 +196,7 @@ void nld_d_to_a_proxy::start() { nld_base_d_to_a_proxy::start(); - register_sub("RV", m_RV); + register_sub(m_RV); register_terminal("1", m_RV.m_P); register_terminal("2", m_RV.m_N); @@ -248,8 +248,8 @@ NETLIB_START(res_sw) register_param("RON", m_RON, 1.0); register_param("ROFF", m_ROFF, 1.0E20); - register_subalias("1", m_R.m_P); - register_subalias("2", m_R.m_N); + register_subalias("1", m_R->m_P); + register_subalias("2", m_R->m_N); save(NLNAME(m_last_state)); } @@ -257,7 +257,7 @@ NETLIB_START(res_sw) NETLIB_RESET(res_sw) { m_last_state = 0; - m_R.set_R(m_ROFF.Value()); + m_R->set_R(m_ROFF.Value()); } NETLIB_UPDATE(res_sw) @@ -269,17 +269,17 @@ NETLIB_UPDATE(res_sw) const nl_double R = state ? m_RON.Value() : m_ROFF.Value(); // We only need to update the net first if this is a time stepping net - if (0) // m_R.m_P.net().as_analog().solver()->is_timestep()) + if (0) // m_R->m_P.net().as_analog().solver()->is_timestep()) { - m_R.update_dev(); - m_R.set_R(R); - m_R.m_P.schedule_after(NLTIME_FROM_NS(1)); + m_R->update_dev(); + m_R->set_R(R); + m_R->m_P.schedule_after(NLTIME_FROM_NS(1)); } else { - m_R.set_R(R); - m_R.m_P.schedule_after(NLTIME_FROM_NS(1)); - //m_R.update_dev(); + m_R->set_R(R); + m_R->m_P.schedule_after(NLTIME_FROM_NS(1)); + //m_R->update_dev(); } } } |