summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/devices/nld_ne555.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/devices/nld_ne555.cpp')
-rw-r--r--src/lib/netlist/devices/nld_ne555.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/netlist/devices/nld_ne555.cpp b/src/lib/netlist/devices/nld_ne555.cpp
index 31b5f091fa4..840dafeb5be 100644
--- a/src/lib/netlist/devices/nld_ne555.cpp
+++ b/src/lib/netlist/devices/nld_ne555.cpp
@@ -80,7 +80,7 @@ namespace netlist
inline nl_double NETLIB_NAME(NE555)::clamp(const nl_double v, const nl_double a, const nl_double b)
{
nl_double ret = v;
- nl_double vcc = TERMANALOG(m_R1.m_P);
+ nl_double vcc = m_R1.m_P();
if (ret > vcc - a)
ret = vcc - a;
@@ -108,9 +108,9 @@ namespace netlist
{
// FIXME: assumes GND is connected to 0V.
- nl_double vt = clamp(TERMANALOG(m_R2.m_P), 0.7, 1.4);
- bool bthresh = (INPANALOG(m_THRES) > vt);
- bool btrig = (INPANALOG(m_TRIG) > clamp(TERMANALOG(m_R2.m_N), 0.7, 1.4));
+ nl_double vt = clamp(m_R2.m_P(), 0.7, 1.4);
+ bool bthresh = (m_THRES() > vt);
+ bool btrig = (m_TRIG() > clamp(m_R2.m_N(), 0.7, 1.4));
if (!btrig)
{
@@ -121,19 +121,19 @@ namespace netlist
m_ff = false;
}
- bool out = (!INPLOGIC(m_RESET) ? false : m_ff);
+ bool out = (!m_RESET() ? false : m_ff);
if (m_last_out && !out)
{
m_RDIS.update_dev();
- OUTANALOG(m_OUT, TERMANALOG(m_R3.m_N));
+ m_OUT.push(m_R3.m_N());
m_RDIS.set_R(R_ON);
}
else if (!m_last_out && out)
{
m_RDIS.update_dev();
// FIXME: Should be delayed by 100ns
- OUTANALOG(m_OUT, TERMANALOG(m_R1.m_P));
+ m_OUT.push(m_R1.m_P());
m_RDIS.set_R(R_OFF);
}
m_last_out = out;