diff options
author | 2020-08-01 18:24:40 +0200 | |
---|---|---|
committer | 2020-08-01 18:27:17 +0200 | |
commit | bcfc49f5b8872e04ece9dd17a0d9d7241bceee18 (patch) | |
tree | 9567b9f27b3312d844ed7ca3f6584679dd4de4c4 /src | |
parent | 47f2b1b1612fd395bf3e4b6e533c10a119e3292a (diff) |
netlist: Fix CD4053 device
* also fix signedness warning (clang) in CD4020
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/netlist/devices/nld_4020.cpp | 4 | ||||
-rw-r--r-- | src/lib/netlist/devices/nld_4053.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/netlist/devices/nld_4020.cpp b/src/lib/netlist/devices/nld_4020.cpp index a92ecd2cbd4..b6ae2b45bd1 100644 --- a/src/lib/netlist/devices/nld_4020.cpp +++ b/src/lib/netlist/devices/nld_4020.cpp @@ -49,7 +49,7 @@ namespace netlist m_cnt = 0; m_IP.inactivate(); /* static */ const netlist_time reset_time = netlist_time::from_nsec(140); - for (int i = 0; i < MAX_BITS; i++) + for (unsigned i = 0; i < MAX_BITS; i++) if (((_LiveBitmask >> i) & 1) != 0) m_Q[i].push(0, reset_time); } @@ -70,7 +70,7 @@ namespace netlist NLTIME_FROM_NS(1380), NLTIME_FROM_NS(1480), }; - for (int i = 0; i < MAX_BITS; i++) + for (unsigned i = 0; i < MAX_BITS; i++) if (((_LiveBitmask >> i) & 1) != 0) m_Q[i].push(cnt & 1, out_delayQn[i]); } diff --git a/src/lib/netlist/devices/nld_4053.cpp b/src/lib/netlist/devices/nld_4053.cpp index 649a944c14e..f4b9b03ebd2 100644 --- a/src/lib/netlist/devices/nld_4053.cpp +++ b/src/lib/netlist/devices/nld_4053.cpp @@ -96,7 +96,7 @@ namespace netlist nl_fptype sup = (m_supply.VCC().Q_Analog() - m_supply.GND().Q_Analog()); Rval = m_base_r() * nlconst::magic(5.0) / sup; } - R.change_state([this, Rval]() -> void { this->m_RX.set_R(Rval);}); + R.change_state([&R, Rval]() -> void { R.set_R(Rval);}); } analog::NETLIB_SUB(R_base) m_RX; |