Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 00:11:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

netlist: Fix visibility in some devices.

Browse Source 
* private rules.
This commit is contained in:
couriersud 2020-08-23 15:55:17 +02:00
parent 113de38237
commit d1c74db666
8 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/netlist/devices/nld_4017.cpp
View File

@ -60,6 +60,7 @@ namespace netlist
{
}
private:
NETLIB_RESETI()
{
m_CLK.set_state(logic_t::STATE_INP_LH);
@ -90,7 +91,6 @@ namespace netlist
}
}
public:
void update_outputs(const unsigned cnt) noexcept
{
for (std::size_t i = 0; i < _MaxCount; i++)

6
src/lib/netlist/devices/nld_74113.cpp
View File

@ -60,7 +60,8 @@
#include "nld_74113.h"
#include "netlist/nl_base.h"
// Note: this can probably be merged with nld_7473.cpp
// FIXME: this can probably be merged with nld_7473.cpp
// FIXME: timing, see 74107 for example, use template
namespace netlist
{
@ -81,6 +82,7 @@ namespace netlist
{
}
private:
NETLIB_RESETI()
{
m_last_CLK = 0;
@ -122,7 +124,6 @@ namespace netlist
m_QQ.push(m_q ^ 1, NLTIME_FROM_NS(20)); // FIXME: timing
}
public:
logic_input_t m_CLK;
logic_input_t m_J;
logic_input_t m_K;
@ -138,7 +139,6 @@ namespace netlist
NETLIB_OBJECT_DERIVED(74113A, 74113)
{
public:
NETLIB_CONSTRUCTOR(74113A) { }
};

2
src/lib/netlist/devices/nld_74153.cpp
View File

@ -67,6 +67,7 @@ namespace devices
{
}
private:
NETLIB_RESETI()
{
m_chan = 0;
@ -92,7 +93,6 @@ namespace devices
}
}
public:
object_array_t<logic_input_t, 4> m_C;
logic_input_t m_G;

4
src/lib/netlist/devices/nld_7450.cpp
View File

@ -31,6 +31,8 @@ namespace netlist
static constexpr const std::array<netlist_time, 2> times = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22) };
// FIXME: timing, see 74107 for example, use template
NETLIB_OBJECT(7450)
{
NETLIB_CONSTRUCTOR(7450)
@ -45,7 +47,7 @@ namespace netlist
//NETLIB_RESETI();
public:
private:
NETLIB_HANDLERI(inputs)
{
m_A.activate();

4
src/lib/netlist/devices/nld_7473.cpp
View File

@ -79,12 +79,12 @@ namespace netlist
{
}
private:
NETLIB_RESETI()
{
m_last_CLK = 0;
}
public:
NETLIB_HANDLERI(inputs)
{
const auto JK = (m_J() << 1) | m_K();
@ -132,9 +132,7 @@ namespace netlist
NETLIB_OBJECT_DERIVED(7473A, 7473)
{
public:
NETLIB_CONSTRUCTOR(7473A) { }
};
NETLIB_DEVICE_IMPL(7473, "TTL_7473", "+CLK,+J,+K,+CLRQ,@VCC,@GND")

3
src/lib/netlist/devices/nld_74ls629.cpp
View File

@ -125,6 +125,7 @@ namespace netlist
register_subalias("Y", m_clock.m_Y);
}
private:
NETLIB_RESETI()
{
m_R_FC.set_R( nlconst::magic(90000.0));
@ -136,7 +137,6 @@ namespace netlist
/* update param may be called from anywhere, update_dev(time) is not a good idea */
}
public:
SN74LS629clk m_clock;
analog::NETLIB_SUB(R_base) m_R_FC;
analog::NETLIB_SUB(R_base) m_R_RNG;
@ -149,7 +149,6 @@ namespace netlist
nld_power_pins m_power_pins;
nld_power_pins m_power_pins_osc;
private:
NETLIB_HANDLERI(inputs)
{
{

2
src/lib/netlist/devices/nld_9321.cpp
View File

@ -40,6 +40,7 @@ namespace netlist
{
}
private:
NETLIB_HANDLERI(in)
{
m_enable = m_E() ? 0 : 1;
@ -56,7 +57,6 @@ namespace netlist
m_D[i].push((i == m_o && m_enable) ? 0 : 1, NLTIME_FROM_NS(18));
}
public:
state_var<bool> m_enable;
state_var<uint32_t> m_o;
object_array_t<logic_input_t, 2> m_A;

10
src/lib/netlist/devices/nlid_system.h
View File

@ -337,7 +337,6 @@ namespace devices
NETLIB_OBJECT(frontier)
{
public:
NETLIB_CONSTRUCTOR(frontier)
, m_RIN(*this, "m_RIN", NETLIB_DELEGATE(input))
, m_ROUT(*this, "m_ROUT", NETLIB_DELEGATE(input))
@ -356,13 +355,13 @@ namespace devices
connect(m_Q, m_ROUT.P());
}
private:
NETLIB_RESETI()
{
m_RIN.set_G_V_I(plib::reciprocal(m_p_RIN()),0,0);
m_ROUT.set_G_V_I(plib::reciprocal(m_p_ROUT()),0,0);
}
private:
NETLIB_HANDLERI(input)
{
m_Q.push(m_I());
@ -442,7 +441,6 @@ namespace devices
NETLIB_OBJECT(sys_dsw1)
{
public:
NETLIB_CONSTRUCTOR(sys_dsw1)
, m_RON(*this, "RON", nlconst::one())
, m_ROFF(*this, "ROFF", nlconst::magic(1.0E20))
@ -499,7 +497,6 @@ namespace devices
NETLIB_OBJECT(sys_dsw2)
{
public:
NETLIB_CONSTRUCTOR(sys_dsw2)
, m_R1(*this, "_R1")
, m_R2(*this, "_R2")
@ -515,6 +512,7 @@ namespace devices
connect(m_R1.N(), m_R2.P());
}
private:
NETLIB_RESETI()
{
m_R1.set_G(m_GOFF());
@ -523,7 +521,6 @@ namespace devices
//NETLIB_UPDATE_PARAMI();
private:
NETLIB_HANDLERI(input)
{
const netlist_sig_t state = m_I();
@ -568,7 +565,6 @@ namespace devices
NETLIB_OBJECT(sys_compd)
{
public:
NETLIB_CONSTRUCTOR(sys_compd)
, m_IP(*this, "IP", NETLIB_DELEGATE(inputs))
, m_IN(*this, "IN", NETLIB_DELEGATE(inputs))
@ -579,6 +575,7 @@ namespace devices
{
}
private:
NETLIB_RESETI()
{
m_last_state = 0;
@ -586,7 +583,6 @@ namespace devices
//NETLIB_UPDATE_PARAMI();
private:
NETLIB_HANDLERI(inputs)
{
const netlist_sig_t state = (m_IP() > m_IN());