diff options
author | couriersud <couriersud@arcor.de> | 2016-07-21 11:05:55 +0200 |
---|---|---|
committer | couriersud <couriersud@arcor.de> | 2016-07-21 11:05:55 +0200 |
commit | 1e40d95e8b47d834d1ede706921dc19850aaaff2 (patch) | |
tree | f2e74d4451a527313fdc52f49b10955153f1dbd5 /src/lib/netlist/devices/nld_74153.cpp | |
parent | 7a69d48edd6e1f59c92271eb7fa217eaf0a714c7 (diff) |
Netlist updates:
- Removed trampolines (OUTLOGIC, INPLOGIC and friends).
- Started using doxygen comment and documentation style. Added doxygen
files to documentation folder.
- Refactored code triggered by doxygen output.
- Moved internal and support classes into namespace detail.
- Use an anordered map in parser.
- -Wconversion fixes - All done now.
- Fixed -Wold-style-cast warnings in netlist code.
- Added iterators to pstring.
- Moved two macros, added more RAII and improved exceptions. Fixed some
bugs in parser code.
- Fixed a number of bugs in parser code and exception handling.
[Couriersud]
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 5f9df45dfdb..f6ab482d332 100644 --- a/src/lib/netlist/devices/nld_74153.cpp +++ b/src/lib/netlist/devices/nld_74153.cpp @@ -104,28 +104,28 @@ namespace netlist NETLIB_UPDATE(74153sub) { const netlist_time delay[2] = { NLTIME_FROM_NS(23), NLTIME_FROM_NS(18) }; - if (!INPLOGIC(m_G)) + if (!m_G()) { - uint_fast8_t t = INPLOGIC(m_C[m_chan]); - OUTLOGIC(m_Y, t, delay[t] ); + auto t = m_C[m_chan](); + m_Y.push(t, delay[t]); } else { - OUTLOGIC(m_Y, 0, delay[0]); + m_Y.push(0, delay[0]); } } NETLIB_UPDATE(74153) { - m_sub.m_chan = (INPLOGIC(m_A) | (INPLOGIC(m_B)<<1)); + m_sub.m_chan = (m_A() | (m_B()<<1)); m_sub.do_update(); } NETLIB_UPDATE(74153_dip) { - m_2.m_chan = m_1.m_chan = (INPLOGIC(m_A) | (INPLOGIC(m_B)<<1)); + m_2.m_chan = m_1.m_chan = (m_A() | (m_B()<<1)); m_1.do_update(); m_2.do_update(); } |