diff options
Diffstat (limited to 'src/lib/netlist/devices/nld_7490.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_7490.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp index acbe0fa4d7a..13e69c6aa31 100644 --- a/src/lib/netlist/devices/nld_7490.cpp +++ b/src/lib/netlist/devices/nld_7490.cpp @@ -6,7 +6,7 @@ */ #include "nld_7490.h" -#include "netlist/nl_base.h" +#include "../nl_base.h" namespace netlist { @@ -28,10 +28,10 @@ namespace netlist { } - private: NETLIB_UPDATEI(); NETLIB_RESETI(); + protected: void update_outputs(); logic_input_t m_A; @@ -52,22 +52,22 @@ namespace netlist { NETLIB_CONSTRUCTOR_DERIVED(7490_dip, 7490) { - register_subalias("1", "B"); - register_subalias("2", "R1"); - register_subalias("3", "R2"); + register_subalias("1", m_B); + register_subalias("2", m_R1); + register_subalias("3", m_R2); // register_subalias("4", ); --> NC // register_subalias("5", ); --> VCC - register_subalias("6", "R91"); - register_subalias("7", "R92"); + register_subalias("6", m_R91); + register_subalias("7", m_R92); - register_subalias("8", "QC"); - register_subalias("9", "QB"); + register_subalias("8", m_Q[2]); + register_subalias("9", m_Q[1]); // register_subalias("10", ); --> GND - register_subalias("11", "QD"); - register_subalias("12", "QA"); + register_subalias("11", m_Q[3]); + register_subalias("12", m_Q[0]); // register_subalias("13", ); --> NC - register_subalias("14", "A"); + register_subalias("14", m_A); } }; @@ -78,13 +78,12 @@ namespace netlist m_last_B = 0; } - static constexpr const netlist_time delay[4] = + static C14CONSTEXPR const netlist_time delay[4] = { NLTIME_FROM_NS(18), NLTIME_FROM_NS(36) - NLTIME_FROM_NS(18), NLTIME_FROM_NS(54) - NLTIME_FROM_NS(18), - NLTIME_FROM_NS(72) - NLTIME_FROM_NS(18) - }; + NLTIME_FROM_NS(72) - NLTIME_FROM_NS(18)}; NETLIB_UPDATE(7490) { @@ -120,14 +119,14 @@ namespace netlist m_last_B = new_B; } - NETLIB_FUNC_VOID(7490, update_outputs, ()) + NETLIB_FUNC_VOID(7490, update_outputs, (void)) { for (std::size_t i=0; i<4; i++) m_Q[i].push((m_cnt >> i) & 1, delay[i]); } - NETLIB_DEVICE_IMPL(7490, "TTL_7490", "+A,+B,+R1,+R2,+R91,+R92") - NETLIB_DEVICE_IMPL(7490_dip, "TTL_7490_DIP", "") + NETLIB_DEVICE_IMPL(7490) + NETLIB_DEVICE_IMPL(7490_dip) } //namespace devices } // namespace netlist |