diff options
Diffstat (limited to 'src/lib/netlist/devices/nld_7448.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_7448.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/lib/netlist/devices/nld_7448.cpp b/src/lib/netlist/devices/nld_7448.cpp index 4500229a1c5..cc2e60f23b7 100644 --- a/src/lib/netlist/devices/nld_7448.cpp +++ b/src/lib/netlist/devices/nld_7448.cpp @@ -5,10 +5,8 @@ * */ +#include "nlid_truthtable.h" #include "nld_7448.h" -#include "nlid_truthtable.h" - -#include <array> namespace netlist { @@ -135,9 +133,9 @@ namespace netlist #else -#define BITS7(b6,b5,b4,b3,b2,b1,b0) ((b6)<<6) | ((b5)<<5) | ((b4)<<4) | ((b3)<<3) | ((b2)<<2) | ((b1)<<1) | ((b0)<<0) +#define BITS7(b6,b5,b4,b3,b2,b1,b0) (b6<<6) | (b5<<5) | (b4<<4) | (b3<<3) | (b2<<2) | (b1<<1) | (b0<<0) - static constexpr const std::array<uint8_t, 16> tab7448 = + static constexpr uint8_t tab7448[16] = { BITS7( 1, 1, 1, 1, 1, 1, 0 ), /* 00 - not blanked ! */ BITS7( 0, 1, 1, 0, 0, 0, 0 ), /* 01 */ @@ -190,13 +188,11 @@ namespace netlist NETLIB_RESET(7448) { m_state = 0; -#if 0 - m_A.set_state(logic_t::STATE_INP_PASSIVE); - m_B.set_state(logic_t::STATE_INP_PASSIVE); - m_C.set_state(logic_t::STATE_INP_PASSIVE); - m_D.set_state(logic_t::STATE_INP_PASSIVE); - m_RBIQ.set_state(logic_t::STATE_INP_PASSIVE); -#endif + m_A.inactivate(); + m_B.inactivate(); + m_C.inactivate(); + m_D.inactivate(); + m_RBIQ.inactivate(); } NETLIB_FUNC_VOID(7448, update_outputs, (unsigned v)) @@ -215,8 +211,8 @@ namespace netlist #endif - NETLIB_DEVICE_IMPL(7448, "TTL_7448", "+A,+B,+C,+D,+LTQ,+BIQ,+RBIQ") - NETLIB_DEVICE_IMPL(7448_dip, "TTL_7448_DIP", "") + NETLIB_DEVICE_IMPL(7448) + NETLIB_DEVICE_IMPL(7448_dip) } //namespace devices |