diff options
Diffstat (limited to 'src/lib/netlist/analog/nld_opamps.cpp')
-rw-r--r-- | src/lib/netlist/analog/nld_opamps.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/netlist/analog/nld_opamps.cpp b/src/lib/netlist/analog/nld_opamps.cpp index 5f55a26f5d0..8c3c655bfa9 100644 --- a/src/lib/netlist/analog/nld_opamps.cpp +++ b/src/lib/netlist/analog/nld_opamps.cpp @@ -6,10 +6,10 @@ */ #include "nld_opamps.h" -#include "../nl_base.h" -#include "../nl_errstr.h" -#include "nlid_twoterm.h" +#include "netlist/nl_base.h" +#include "netlist/nl_errstr.h" #include "nlid_fourterm.h" +#include "nlid_twoterm.h" #include <cmath> @@ -129,10 +129,10 @@ namespace netlist } else if (m_type == 3) { - register_sub("CP1", m_CP); - register_sub("EBUF", m_EBUF); - register_sub("DN", m_DN, "D(IS=1e-15 N=1)"); - register_sub("DP", m_DP, "D(IS=1e-15 N=1)"); + create_and_register_subdevice("CP1", m_CP); + create_and_register_subdevice("EBUF", m_EBUF); + create_and_register_subdevice("DN", m_DN, "D(IS=1e-15 N=1)"); + create_and_register_subdevice("DP", m_DP, "D(IS=1e-15 N=1)"); //m_DP->m_model.setTo("D(IS=1e-15 N=1)"); //m_DN->m_model.setTo("D(IS=1e-15 N=1)"); @@ -201,7 +201,7 @@ namespace netlist NETLIB_RESET(opamp) { - m_G1.do_reset(); + m_G1.reset(); m_G1.m_RI.setTo(m_model.m_RI); if (m_type == 1) @@ -213,11 +213,11 @@ namespace netlist } else if (m_type == 3) { - m_EBUF->do_reset(); - m_DP->do_reset(); - m_DN->do_reset(); - m_CP->do_reset(); - m_RP.do_reset(); + m_EBUF->reset(); + m_DP->reset(); + m_DN->reset(); + m_CP->reset(); + m_RP.reset(); m_EBUF->m_G.setTo(1.0); m_EBUF->m_RO.setTo(m_model.m_RO); @@ -239,6 +239,6 @@ namespace netlist } //namespace analog namespace devices { - NETLIB_DEVICE_IMPL_NS(analog, opamp) - } + NETLIB_DEVICE_IMPL_NS(analog, opamp, "OPAMP", "MODEL") + } // namespace devices } // namespace netlist |