diff options
Diffstat (limited to 'src/lib/netlist/devices/nld_74175.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_74175.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp index e927c485e20..4d8e3608ee8 100644 --- a/src/lib/netlist/devices/nld_74175.cpp +++ b/src/lib/netlist/devices/nld_74175.cpp @@ -105,11 +105,11 @@ namespace netlist { if (m_clrq) { - for (int i=0; i<4; i++) + for (std::size_t i=0; i<4; i++) { netlist_sig_t d = (m_data >> i) & 1; - OUTLOGIC(m_Q[i], d, delay[d]); - OUTLOGIC(m_QQ[i], d ^ 1, delay[d ^ 1]); + m_Q[i].push(d, delay[d]); + m_QQ[i].push(d ^ 1, delay[d ^ 1]); } m_CLK.inactivate(); } @@ -118,17 +118,17 @@ namespace netlist NETLIB_UPDATE(74175) { uint_fast8_t d = 0; - for (int i=0; i<4; i++) + for (std::size_t i=0; i<4; i++) { - d |= (INPLOGIC(m_D[i]) << i); + d |= (m_D[i]() << i); } - m_sub.m_clrq = INPLOGIC(m_CLRQ); + m_sub.m_clrq = m_CLRQ(); if (!m_sub.m_clrq) { - for (int i=0; i<4; i++) + for (std::size_t i=0; i<4; i++) { - OUTLOGIC(m_sub.m_Q[i], 0, delay_clear[0]); - OUTLOGIC(m_sub.m_QQ[i], 1, delay_clear[1]); + m_sub.m_Q[i].push(0, delay_clear[0]); + m_sub.m_QQ[i].push(1, delay_clear[1]); } m_sub.m_data = 0; } else if (d != m_sub.m_data) |