diff options
author | couriersud <couriersud@gmx.org> | 2017-04-09 04:25:09 +0200 |
---|---|---|
committer | couriersud <couriersud@gmx.org> | 2017-04-09 04:25:09 +0200 |
commit | 5a24cab4456396bbc22757bf74936e08126d8842 (patch) | |
tree | 89e80c44224aee795040a149fd862a060fb296c6 /src/lib/netlist | |
parent | 6e9637196d7803f3a22189b91ccdf53ec05b62b0 (diff) |
More work on 9316. (nw)
Diffstat (limited to 'src/lib/netlist')
-rw-r--r-- | src/lib/netlist/devices/nld_9316.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp index 58085f04c77..943fc85aaee 100644 --- a/src/lib/netlist/devices/nld_9316.cpp +++ b/src/lib/netlist/devices/nld_9316.cpp @@ -28,10 +28,7 @@ namespace netlist , m_B(*this, "B", NETLIB_DELEGATE(9316, noop)) , m_C(*this, "C", NETLIB_DELEGATE(9316, noop)) , m_D(*this, "D", NETLIB_DELEGATE(9316, noop)) - , m_QA(*this, "QA") - , m_QB(*this, "QB") - , m_QC(*this, "QC") - , m_QD(*this, "QD") + , m_Q(*this, {{ "QA", "QB", "QC", "QD" }}) , m_RC(*this, "RC") { } @@ -56,20 +53,18 @@ namespace netlist logic_input_t m_C; logic_input_t m_D; - logic_output_t m_QA; - logic_output_t m_QB; - logic_output_t m_QC; - logic_output_t m_QD; + object_array_t<logic_output_t, 4> m_Q; logic_output_t m_RC; private: - void update_outputs_all(const unsigned &cnt, const netlist_time &out_delay) noexcept + //inline void update_outputs_all(const unsigned &cnt, const netlist_time &out_delay) noexcept + inline void update_outputs_all(const unsigned &cnt, const netlist_time &out_delay) noexcept { - m_QA.push((cnt >> 0) & 1, out_delay); - m_QB.push((cnt >> 1) & 1, out_delay); - m_QC.push((cnt >> 2) & 1, out_delay); - m_QD.push((cnt >> 3) & 1, out_delay); + m_Q[0].push((cnt >> 0) & 1, out_delay); + m_Q[1].push((cnt >> 1) & 1, out_delay); + m_Q[2].push((cnt >> 2) & 1, out_delay); + m_Q[3].push((cnt >> 3) & 1, out_delay); } }; |