diff options
Diffstat (limited to 'src/lib/netlist/devices/nld_7497.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_7497.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/lib/netlist/devices/nld_7497.cpp b/src/lib/netlist/devices/nld_7497.cpp index 895f8b5a07f..7d80c580d14 100644 --- a/src/lib/netlist/devices/nld_7497.cpp +++ b/src/lib/netlist/devices/nld_7497.cpp @@ -1,4 +1,4 @@ -// license:GPL-2.0+ +// license:BSD-3-Clause // copyright-holders:Sergey Svishchev /* * nld_7497.cpp @@ -39,10 +39,7 @@ #include "nl_base.h" -namespace netlist -{ - namespace devices - { +namespace netlist::devices { static constexpr const std::array<netlist_time, 2> out_delay_CLK_Y = { NLTIME_FROM_NS(20), NLTIME_FROM_NS(26) }; // tPHL, tPLH static constexpr const std::array<netlist_time, 2> out_delay_CLK_Z = { NLTIME_FROM_NS(17), NLTIME_FROM_NS(12) }; @@ -64,7 +61,7 @@ namespace netlist , m_cnt(*this, "_m_cnt", 0) , m_rate(*this, "_m_rate", 0) , m_state(*this, "_m_state", 0) - , m_lastclock(*this, "_m_lastclock", 0) + , m_last_clock(*this, "_m_lastclock", 0) , m_power_pins(*this) { } @@ -74,7 +71,7 @@ namespace netlist { m_cnt = 0; m_rate = 0; - m_lastclock = 0; + m_last_clock = 0; } NETLIB_HANDLERI(unity) @@ -92,12 +89,12 @@ namespace netlist { netlist_sig_t clk = m_CLK(); - if (!m_lastclock && clk && !m_ENQ() && !m_CLR()) + if (!m_last_clock && clk && !m_ENQ() && !m_CLR()) { m_cnt++; m_cnt &= 63; } - m_lastclock = clk; + m_last_clock = clk; const netlist_sig_t clk_strb = (clk ^ 1) & (m_STRBQ() ^ 1); @@ -143,7 +140,7 @@ namespace netlist state_var_u8 m_cnt; state_var_u8 m_rate; state_var_sig m_state; - state_var_sig m_lastclock; + state_var_sig m_last_clock; nld_power_pins m_power_pins; void newstate(const netlist_sig_t state) @@ -168,5 +165,4 @@ namespace netlist NETLIB_DEVICE_IMPL(7497, "TTL_7497", "+CLK,+STRBQ,+ENQ,+UNITYQ,+CLR,+B0,+B1,+B2,+B3,+B4,+B5,@VCC,@GND") - } //namespace devices -} // namespace netlist +} // namespace netlist::devices |