diff options
author | 2016-12-25 13:54:27 +1100 | |
---|---|---|
committer | 2016-12-25 13:57:31 +1100 | |
commit | 127fd9b427df4c1af31e3513e32f14c80e3d29cc (patch) | |
tree | ef6bd2e4747e1a1a49895a47a8d9f1e7f37dbeca /src/lib/netlist/devices/nld_74161.cpp | |
parent | ad50cf5fd48de1baf9334a8d844fe456b5799b5b (diff) |
first srcclean pass (nw)
Diffstat (limited to 'src/lib/netlist/devices/nld_74161.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_74161.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/netlist/devices/nld_74161.cpp b/src/lib/netlist/devices/nld_74161.cpp index 4d616d93015..d6e31f36417 100644 --- a/src/lib/netlist/devices/nld_74161.cpp +++ b/src/lib/netlist/devices/nld_74161.cpp @@ -96,31 +96,31 @@ namespace netlist netlist_sig_t tRippleCarryOut = 0; if (!m_CLRQ()) { - m_cnt = 0; + m_cnt = 0; } else if (m_CLK() && !m_last_CLK) { if (!m_LOADQ()) { - m_cnt = (m_D() << 3) | (m_C() << 2) + m_cnt = (m_D() << 3) | (m_C() << 2) | (m_B() << 1) | (m_A() << 0); - } + } else if (m_ENABLET() && m_ENABLEP()) { m_cnt++; if (m_cnt > MAXCNT) m_cnt = 0; - } + } } if (m_ENABLET() && (m_cnt == MAXCNT)) - { - tRippleCarryOut = 1; - } + { + tRippleCarryOut = 1; + } m_last_CLK = m_CLK(); - for (std::size_t i=0; i<4; i++) + for (std::size_t i=0; i<4; i++) m_Q[i].push((m_cnt >> i) & 1, delay[i]); m_RCO.push(tRippleCarryOut, NLTIME_FROM_NS(20)); //FIXME |