diff options
Diffstat (limited to 'src/lib/netlist/devices/nld_system.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_system.cpp | 57 |
1 files changed, 7 insertions, 50 deletions
diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp index 54ef14fa1d0..e81824cc1b9 100644 --- a/src/lib/netlist/devices/nld_system.cpp +++ b/src/lib/netlist/devices/nld_system.cpp @@ -11,8 +11,8 @@ namespace netlist { - namespace devices - { +namespace devices +{ // ---------------------------------------------------------------------------------------- // netlistparams // ---------------------------------------------------------------------------------------- @@ -60,53 +60,10 @@ namespace netlist m_feedback.m_delegate.set(&NETLIB_NAME(extclock)::clk2, this); } - // ----------------------------------------------------------------------------- - // nld_res_sw - // ----------------------------------------------------------------------------- - - NETLIB_RESET(res_sw) - { - m_last_state = 0; - m_R.set_R(m_ROFF()); - } - - NETLIB_UPDATE(res_sw) - { - const netlist_sig_t state = m_I(); - if (state != m_last_state) - { - m_last_state = state; - const nl_fptype R = state ? m_RON() : m_ROFF(); - - // FIXME: We only need to update the net first if this is a time stepping net - m_R.update(); - m_R.set_R(R); - m_R.solve_later(); - } - } - - /* ----------------------------------------------------------------------------- - * nld_function - * ----------------------------------------------------------------------------- */ - - NETLIB_RESET(function) - { - //m_Q.initial(0.0); - } - - NETLIB_UPDATE(function) - { - for (std::size_t i=0; i < static_cast<unsigned>(m_N()); i++) - { - m_vals[i] = (*m_I[i])(); - } - m_Q.push(m_compiled.evaluate(m_vals)); - } - - NETLIB_DEVICE_IMPL(dummy_input, "DUMMY_INPUT", "") - NETLIB_DEVICE_IMPL(frontier, "FRONTIER_DEV", "+I,+G,+Q") - NETLIB_DEVICE_IMPL(function, "AFUNC", "N,FUNC") + NETLIB_DEVICE_IMPL(dummy_input, "DUMMY_INPUT", "") + NETLIB_DEVICE_IMPL(frontier, "FRONTIER_DEV", "+I,+G,+Q") + NETLIB_DEVICE_IMPL(function, "AFUNC", "N,FUNC") NETLIB_DEVICE_IMPL(analog_input, "ANALOG_INPUT", "IN") NETLIB_DEVICE_IMPL(clock, "CLOCK", "FREQ") NETLIB_DEVICE_IMPL(varclock, "VARCLOCK", "FUNC") @@ -116,8 +73,8 @@ namespace netlist NETLIB_DEVICE_IMPL(gnd, "GND", "") NETLIB_DEVICE_IMPL(netlistparams, "PARAMETER", "") - NETLIB_DEVICE_IMPL(logic_input, "LOGIC_INPUT", "IN,FAMILY") + NETLIB_DEVICE_IMPL(logic_input, "LOGIC_INPUT", "IN,FAMILY") NETLIB_DEVICE_IMPL_ALIAS(logic_input_ttl, logic_input, "TTL_INPUT", "IN") - } //namespace devices +} // namespace devices } // namespace netlist |