diff options
Diffstat (limited to 'src/lib/netlist/devices/nld_74ls629.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_74ls629.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp index 6e28feffdfc..11cbc8aeb0d 100644 --- a/src/lib/netlist/devices/nld_74ls629.cpp +++ b/src/lib/netlist/devices/nld_74ls629.cpp @@ -1,4 +1,4 @@ -// license:GPL-2.0+ +// license:BSD-3-Clause // copyright-holders:Couriersud /* * nld_SN74LS629.cpp @@ -60,15 +60,12 @@ #include "analog/nlid_twoterm.h" -namespace netlist -{ - namespace devices - { +namespace netlist::devices { struct SN74LS629clk { SN74LS629clk(device_t &owner) - : m_FB(owner, "FB", nldelegate(&SN74LS629clk::fb, this)) + : m_FB(owner, "FB", nl_delegate(&SN74LS629clk::fb, this)) , m_Y(owner, "Y") , m_enableq(owner, "m_enableq", 0) , m_out(owner, "m_out", 0) @@ -124,8 +121,8 @@ namespace netlist private: NETLIB_RESETI() { - m_R_FC.set_R( nlconst::magic(90000.0)); - m_R_RNG.set_R(nlconst::magic(90000.0)); + m_R_FC().set_R( nlconst::magic(90000.0)); + m_R_RNG().set_R(nlconst::magic(90000.0)); } NETLIB_UPDATE_PARAMI() @@ -134,8 +131,8 @@ namespace netlist } SN74LS629clk m_clock; - analog::NETLIB_SUB(R_base) m_R_FC; - analog::NETLIB_SUB(R_base) m_R_RNG; + NETLIB_SUB_NS(analog, R_base) m_R_FC; + NETLIB_SUB_NS(analog, R_base) m_R_RNG; logic_input_t m_ENQ; analog_input_t m_RNG; @@ -207,5 +204,4 @@ namespace netlist NETLIB_DEVICE_IMPL(SN74LS629, "SN74LS629", "CAP,@VCC,@GND") - } //namespace devices -} // namespace netlist +} // namespace netlist::devices |