diff options
Diffstat (limited to 'src/lib/netlist/devices/nld_7450.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_7450.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp index aacab46a021..af9b9afada1 100644 --- a/src/lib/netlist/devices/nld_7450.cpp +++ b/src/lib/netlist/devices/nld_7450.cpp @@ -6,7 +6,7 @@ */ #include "nld_7450.h" -#include "netlist/nl_base.h" +#include "../nl_base.h" namespace netlist { @@ -68,10 +68,10 @@ namespace netlist m_B.activate(); m_C.activate(); m_D.activate(); - auto t1 = m_A() & m_B(); - auto t2 = m_C() & m_D(); + unsigned t1 = m_A() & m_B(); + unsigned t2 = m_C() & m_D(); - const netlist_time times[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22) }; + const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) }; uint_fast8_t res = 0; if (t1 ^ 1) @@ -85,20 +85,18 @@ namespace netlist m_A.inactivate(); m_B.inactivate(); } - } - else - { + } else { if (t2 ^ 1) { m_C.inactivate(); m_D.inactivate(); } } - m_Q.push(res, times[res]);// ? 22000 : 15000); + m_Q.push(res, times[1 - res]);// ? 22000 : 15000); } - NETLIB_DEVICE_IMPL(7450, "TTL_7450_ANDORINVERT", "+A,+B,+C,+D") - NETLIB_DEVICE_IMPL(7450_dip, "TTL_7450_DIP", "") + NETLIB_DEVICE_IMPL(7450) + NETLIB_DEVICE_IMPL(7450_dip) } //namespace devices } // namespace netlist |