diff options
Diffstat (limited to 'src/lib/netlist/devices/nld_4316.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_4316.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/lib/netlist/devices/nld_4316.cpp b/src/lib/netlist/devices/nld_4316.cpp index d7668c7822a..c875a4e5840 100644 --- a/src/lib/netlist/devices/nld_4316.cpp +++ b/src/lib/netlist/devices/nld_4316.cpp @@ -25,7 +25,7 @@ #include "analog/nlid_twoterm.h" #include "solver/nld_solver.h" -namespace netlist { namespace devices { +namespace netlist::devices { // FIXME: tristate outputs? @@ -42,30 +42,29 @@ namespace netlist { namespace devices { NETLIB_RESETI() { - m_R.set_R(plib::reciprocal(exec().gmin())); + m_R().set_R(plib::reciprocal(exec().gmin())); } NETLIB_HANDLERI(inputs) { - m_R.change_state([this]() + m_R().change_state([this]() { if (m_S() && !m_E()) - m_R.set_R(m_base_r()); + m_R().set_R(m_base_r()); else - m_R.set_R(plib::reciprocal(exec().gmin())); + m_R().set_R(plib::reciprocal(exec().gmin())); }); } private: - analog::NETLIB_SUB(R_base) m_R; + NETLIB_SUB_NS(analog, R_base) m_R; - logic_input_t m_S; - logic_input_t m_E; - param_fp_t m_base_r; - nld_power_pins m_supply; + logic_input_t m_S; + logic_input_t m_E; + param_fp_t m_base_r; + nld_power_pins m_supply; }; NETLIB_DEVICE_IMPL(CD4316_GATE, "CD4316_GATE", "") -} // namespace devices - } // namespace netlist +} // namespace netlist::devices |