diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/lib/netlist/devices/nld_74153.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/lib/netlist/devices/nld_74153.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_74153.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp index 136fe61520b..b74c09f8cc0 100644 --- a/src/lib/netlist/devices/nld_74153.cpp +++ b/src/lib/netlist/devices/nld_74153.cpp @@ -6,7 +6,7 @@ */ #include "nld_74153.h" -#include "netlist/nl_base.h" +#include "../nl_base.h" namespace netlist { @@ -120,19 +120,19 @@ namespace netlist NETLIB_UPDATE(74153) { m_sub.m_chan = (m_A() | (m_B()<<1)); - m_sub.update(); + m_sub.update_dev(); } NETLIB_UPDATE(74153_dip) { m_2.m_chan = m_1.m_chan = (m_A() | (m_B()<<1)); - m_1.update(); - m_2.update(); + m_1.update_dev(); + m_2.update_dev(); } - NETLIB_DEVICE_IMPL(74153, "TTL_74153", "+C0,+C1,+C2,+C3,+A,+B,+G") - NETLIB_DEVICE_IMPL(74153_dip, "TTL_74153_DIP", "") + NETLIB_DEVICE_IMPL(74153) + NETLIB_DEVICE_IMPL(74153_dip) } //namespace devices } // namespace netlist |