diff options
Diffstat (limited to 'src/lib/netlist/devices/nld_schmitt.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_schmitt.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/netlist/devices/nld_schmitt.cpp b/src/lib/netlist/devices/nld_schmitt.cpp index f3d3a1e7a57..a6134f3a953 100644 --- a/src/lib/netlist/devices/nld_schmitt.cpp +++ b/src/lib/netlist/devices/nld_schmitt.cpp @@ -66,18 +66,18 @@ namespace netlist::devices { connect("A", "RVI.1"); // FIXME: need a symbolic reference from connect as well - connect(m_supply.GND(), m_RVI.N()); - connect(m_supply.GND(), m_RVO.N()); + connect(m_supply.GND(), m_RVI().N()); + connect(m_supply.GND(), m_RVO().N()); } protected: NETLIB_RESETI() { m_last_state = 1; - m_RVI.reset(); - m_RVO.reset(); - m_RVI.set_G_V_I(plib::reciprocal(m_modacc.m_RI()), m_modacc.m_VI, nlconst::zero()); - m_RVO.set_G_V_I(plib::reciprocal(m_modacc.m_ROL()), m_modacc.m_VOL, nlconst::zero()); + m_RVI().reset(); + m_RVO().reset(); + m_RVI().set_G_V_I(plib::reciprocal(m_modacc.m_RI()), m_modacc.m_VI, nlconst::zero()); + m_RVO().set_G_V_I(plib::reciprocal(m_modacc.m_ROL()), m_modacc.m_VOL, nlconst::zero()); } private: @@ -89,9 +89,9 @@ namespace netlist::devices { if (va < m_modacc.m_VTM) { m_last_state = 0; - m_RVO.change_state([this]() + m_RVO().change_state([this]() { - m_RVO.set_G_V_I(plib::reciprocal(m_modacc.m_ROH()), m_modacc.m_VOH, nlconst::zero()); + m_RVO().set_G_V_I(plib::reciprocal(m_modacc.m_ROH()), m_modacc.m_VOH, nlconst::zero()); }); } } @@ -100,9 +100,9 @@ namespace netlist::devices { if (va > m_modacc.m_VTP) { m_last_state = 1; - m_RVO.change_state([this]() + m_RVO().change_state([this]() { - m_RVO.set_G_V_I(plib::reciprocal(m_modacc.m_ROL()), m_modacc.m_VOL, nlconst::zero()); + m_RVO().set_G_V_I(plib::reciprocal(m_modacc.m_ROL()), m_modacc.m_VOL, nlconst::zero()); }); } } @@ -110,8 +110,8 @@ namespace netlist::devices { analog_input_t m_A; NETLIB_NAME(power_pins) m_supply; - analog::NETLIB_SUB(two_terminal) m_RVI; - analog::NETLIB_SUB(two_terminal) m_RVO; + NETLIB_SUB_NS(analog, two_terminal) m_RVI; + NETLIB_SUB_NS(analog, two_terminal) m_RVO; param_model_t m_stmodel; schmitt_trigger_model_t m_modacc; state_var<int> m_last_state; |