summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/netlist
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/netlist')
-rw-r--r--src/emu/netlist/devices/net_lib.c7
-rw-r--r--src/emu/netlist/devices/net_lib.h16
-rw-r--r--src/emu/netlist/devices/nld_7400.c2
-rw-r--r--src/emu/netlist/devices/nld_7400.h6
-rw-r--r--src/emu/netlist/devices/nld_signal.h438
-rw-r--r--src/emu/netlist/devices/nld_system.h10
-rw-r--r--src/emu/netlist/netlist.mak2
-rw-r--r--src/emu/netlist/nl_base.c23
-rw-r--r--src/emu/netlist/nl_base.h54
-rw-r--r--src/emu/netlist/nl_config.h24
-rw-r--r--src/emu/netlist/nl_lists.h4
-rw-r--r--src/emu/netlist/nl_setup.c3
-rw-r--r--src/emu/netlist/nl_setup.h1
13 files changed, 291 insertions, 299 deletions
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c
index 2c255469569..ac8754fb36b 100644
--- a/src/emu/netlist/devices/net_lib.c
+++ b/src/emu/netlist/devices/net_lib.c
@@ -340,7 +340,6 @@ NETLIB_START(nic7448)
NETLIB_UPDATE(nic7448)
{
-
if (INPLOGIC(m_BIQ) && !INPLOGIC(m_LTQ))
{
sub.update_outputs(8);
@@ -502,7 +501,6 @@ NETLIB_UPDATE(nic7474)
NETLIB_START(nic7474)
{
-
register_sub(sub, "sub");
register_input(sub, "CLK", sub.m_clk, net_input_t::INP_STATE_LH);
register_input("D", m_D);
@@ -817,7 +815,7 @@ NETLIB_UPDATE(nic74107A)
else if (!sub.m_Q2)
sub.m_clk.activate_hl();
//if (!sub.m_Q2 & INPLOGIC(m_clrQ))
- // sub.m_clk.activate_hl();
+ // sub.m_clk.activate_hl();
}
NETLIB_START(nic74153)
@@ -977,7 +975,7 @@ static const net_device_t_base_factory *netregistry[] =
ENTRY(netdev_analog_const, NETDEV_ANALOG_CONST)
ENTRY(netdev_logic_input, NETDEV_LOGIC_INPUT)
ENTRY(netdev_analog_input, NETDEV_ANALOG_INPUT)
- ENTRY(netdev_log, NETDEV_LOG)
+ ENTRY(netdev_log, NETDEV_LOG)
ENTRY(netdev_clock, NETDEV_CLOCK)
ENTRY(netdev_mainclock, NETDEV_MAINCLOCK)
ENTRY(netdev_analog_callback,NETDEV_CALLBACK)
@@ -1040,4 +1038,3 @@ net_device_t *net_create_device_by_name(const astring &name, netlist_setup_t &se
fatalerror("Class %s required for IC %s not found!\n", name.cstr(), icname.cstr());
return NULL; // appease code analysis
}
-
diff --git a/src/emu/netlist/devices/net_lib.h b/src/emu/netlist/devices/net_lib.h
index 2eb66ad2324..177a387b347 100644
--- a/src/emu/netlist/devices/net_lib.h
+++ b/src/emu/netlist/devices/net_lib.h
@@ -57,7 +57,7 @@
#include "nld_7400.h"
// this is a bad hack
-#define USE_OLD7493 (0)
+#define USE_OLD7493 (0)
// ----------------------------------------------------------------------------------------
// Special chips
@@ -87,8 +87,8 @@
NET_CONNECT(_name, S, _S) \
NET_CONNECT(_name, R, _R)
-#define NETDEV_LOG(_name, _I) \
- NET_REGISTER_DEV(netdev_log, _name) \
+#define NETDEV_LOG(_name, _I) \
+ NET_REGISTER_DEV(netdev_log, _name) \
NET_CONNECT(_name, I, _I)
@@ -356,7 +356,7 @@ NETLIB_SUBDEVICE(nic7474sub,
);
NETLIB_DEVICE(nic7474,
- NETLIB_NAME(nic7474sub) sub;
+ NETLIB_NAME(nic7474sub) sub;
ttl_input_t m_D;
ttl_input_t m_clrQ;
@@ -389,7 +389,7 @@ NETLIB_SUBDEVICE(nic74107Asub,
);
NETLIB_DEVICE(nic74107A,
- NETLIB_NAME(nic74107Asub) sub;
+ NETLIB_NAME(nic74107Asub) sub;
ttl_input_t m_J;
ttl_input_t m_K;
@@ -400,7 +400,7 @@ NETLIB_DEVICE(nic74107A,
class NETLIB_NAME(nic74107) : public NETLIB_NAME(nic74107A)
{
public:
- NETLIB_NAME(nic74107) ()
+ NETLIB_NAME(nic74107) ()
: NETLIB_NAME(nic74107A) () {}
};
@@ -480,7 +480,7 @@ NETLIB_SUBDEVICE(nic9316_sub,
);
NETLIB_DEVICE(nic9316,
- NETLIB_NAME(nic9316_sub) sub;
+ NETLIB_NAME(nic9316_sub) sub;
ttl_input_t m_ENP;
ttl_input_t m_ENT;
ttl_input_t m_CLRQ;
@@ -543,7 +543,7 @@ NETLIB_SUBDEVICE(nic7448_sub,
NETLIB_DEVICE(nic7448,
- NETLIB_NAME(nic7448_sub) sub;
+ NETLIB_NAME(nic7448_sub) sub;
ttl_input_t m_LTQ;
ttl_input_t m_BIQ;
diff --git a/src/emu/netlist/devices/nld_7400.c b/src/emu/netlist/devices/nld_7400.c
index 977bd991dbc..baad498c641 100644
--- a/src/emu/netlist/devices/nld_7400.c
+++ b/src/emu/netlist/devices/nld_7400.c
@@ -2,5 +2,3 @@
* nld_7400.c
*
*/
-
-
diff --git a/src/emu/netlist/devices/nld_7400.h b/src/emu/netlist/devices/nld_7400.h
index 078ceafd54b..82f121597ed 100644
--- a/src/emu/netlist/devices/nld_7400.h
+++ b/src/emu/netlist/devices/nld_7400.h
@@ -35,9 +35,9 @@
#define NLD_7400_H_
#define TTL_7400_NAND(_name, _A, _B) \
- NET_REGISTER_DEV(7400, _name) \
- NET_CONNECT(_name, A, _A) \
- NET_CONNECT(_name, B, _B)
+ NET_REGISTER_DEV(7400, _name) \
+ NET_CONNECT(_name, A, _A) \
+ NET_CONNECT(_name, B, _B)
NETLIB_SIGNAL(7400, 2, 0, 0);
diff --git a/src/emu/netlist/devices/nld_signal.h b/src/emu/netlist/devices/nld_signal.h
index 9119c0253a7..4265343f624 100644
--- a/src/emu/netlist/devices/nld_signal.h
+++ b/src/emu/netlist/devices/nld_signal.h
@@ -15,12 +15,12 @@
// ----------------------------------------------------------------------------------------
#define NETLIB_SIGNAL(_name, _num_input, _check, _invert) \
- class NETLIB_NAME(_name) : public net_signal_t<_num_input, _check, _invert> \
- { \
- public: \
- ATTR_COLD NETLIB_NAME(_name) () \
- : net_signal_t<_num_input, _check, _invert>() { } \
- }
+ class NETLIB_NAME(_name) : public net_signal_t<_num_input, _check, _invert> \
+ { \
+ public: \
+ ATTR_COLD NETLIB_NAME(_name) () \
+ : net_signal_t<_num_input, _check, _invert>() { } \
+ }
// ----------------------------------------------------------------------------------------
// net_signal_t
@@ -30,46 +30,46 @@ template <int _numdev>
class net_signal_base_t : public net_device_t
{
public:
- net_signal_base_t()
- : net_device_t(), m_active(1) { }
+ net_signal_base_t()
+ : net_device_t(), m_active(1) { }
- ATTR_COLD void start()
- {
- const char *sIN[8] = { "I1", "I2", "I3", "I4", "I5", "I6", "I7", "I8" };
+ ATTR_COLD void start()
+ {
+ const char *sIN[8] = { "I1", "I2", "I3", "I4", "I5", "I6", "I7", "I8" };
- register_output("Q", m_Q);
- for (int i=0; i < _numdev; i++)
- {
- register_input(sIN[i], m_i[i], net_input_t::INP_STATE_ACTIVE);
- }
- m_Q.initial(1);
- }
+ register_output("Q", m_Q);
+ for (int i=0; i < _numdev; i++)
+ {
+ register_input(sIN[i], m_i[i], net_input_t::INP_STATE_ACTIVE);
+ }
+ m_Q.initial(1);
+ }
#if (USE_DEACTIVE_DEVICE)
- ATTR_HOT void inc_active()
- {
- if (m_active == 0)
- {
- update();
- }
- m_active++;
- }
-
- ATTR_HOT void dec_active()
- {
- m_active--;
- if (m_active == 0)
- {
- for (int i = 0; i< _numdev; i++)
- m_i[i].inactivate();
- }
- }
+ ATTR_HOT void inc_active()
+ {
+ if (m_active == 0)
+ {
+ update();
+ }
+ m_active++;
+ }
+
+ ATTR_HOT void dec_active()
+ {
+ m_active--;
+ if (m_active == 0)
+ {
+ for (int i = 0; i< _numdev; i++)
+ m_i[i].inactivate();
+ }
+ }
#endif
public:
- ttl_input_t m_i[_numdev];
- ttl_output_t m_Q;
- INT8 m_active;
+ ttl_input_t m_i[_numdev];
+ ttl_output_t m_Q;
+ INT8 m_active;
};
@@ -77,72 +77,72 @@ template <int _numdev, int _check, int _invert>
class net_signal_t : public net_device_t
{
public:
- net_signal_t()
- : net_device_t(), m_active(1)
- {
- m_Q.initial(1);
- }
-
- ATTR_COLD void start()
- {
- const char *sIN[8] = { "A", "B", "C", "D", "E", "F", "G", "H" };
-
- register_output("Q", m_Q);
- for (int i=0; i < _numdev; i++)
- {
- register_input(sIN[i], m_i[i], net_input_t::INP_STATE_ACTIVE);
- }
- }
-
- #if (USE_DEACTIVE_DEVICE)
- ATTR_HOT void inc_active()
- {
- if (m_active == 0)
- {
- update();
- }
- m_active++;
- }
-
- ATTR_HOT void dec_active()
- {
- m_active--;
- if (m_active == 0)
- {
- for (int i = 0; i< _numdev; i++)
- m_i[i].inactivate();
- }
- }
- #endif
-
- virtual void update()
- {
- static const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
- int pos = -1;
-
- for (int i = 0; i< _numdev; i++)
- {
- this->m_i[i].activate();
- if (INPLOGIC(this->m_i[i]) == _check)
- {
- OUTLOGIC(this->m_Q, _check ^ (1 ^ _invert), times[_check]);// ? 15000 : 22000);
- pos = i;
- break;
- }
- }
- if (pos >= 0)
- {
- for (int i = 0; i < _numdev; i++)
- if (i != pos)
- this->m_i[i].inactivate();
- } else
- OUTLOGIC(this->m_Q,_check ^ (_invert), times[1-_check]);// ? 22000 : 15000);
- }
+ net_signal_t()
+ : net_device_t(), m_active(1)
+ {
+ m_Q.initial(1);
+ }
+
+ ATTR_COLD void start()
+ {
+ const char *sIN[8] = { "A", "B", "C", "D", "E", "F", "G", "H" };
+
+ register_output("Q", m_Q);
+ for (int i=0; i < _numdev; i++)
+ {
+ register_input(sIN[i], m_i[i], net_input_t::INP_STATE_ACTIVE);
+ }
+ }
+
+ #if (USE_DEACTIVE_DEVICE)
+ ATTR_HOT void inc_active()
+ {
+ if (m_active == 0)
+ {
+ update();
+ }
+ m_active++;
+ }
+
+ ATTR_HOT void dec_active()
+ {
+ m_active--;
+ if (m_active == 0)
+ {
+ for (int i = 0; i< _numdev; i++)
+ m_i[i].inactivate();
+ }
+ }
+ #endif
+
+ virtual void update()
+ {
+ static const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
+ int pos = -1;
+
+ for (int i = 0; i< _numdev; i++)
+ {
+ this->m_i[i].activate();
+ if (INPLOGIC(this->m_i[i]) == _check)
+ {
+ OUTLOGIC(this->m_Q, _check ^ (1 ^ _invert), times[_check]);// ? 15000 : 22000);
+ pos = i;
+ break;
+ }
+ }
+ if (pos >= 0)
+ {
+ for (int i = 0; i < _numdev; i++)
+ if (i != pos)
+ this->m_i[i].inactivate();
+ } else
+ OUTLOGIC(this->m_Q,_check ^ (_invert), times[1-_check]);// ? 22000 : 15000);
+ }
public:
- ttl_input_t m_i[_numdev];
- ttl_output_t m_Q;
- INT8 m_active;
+ ttl_input_t m_i[_numdev];
+ ttl_output_t m_Q;
+ INT8 m_active;
};
#if 1
@@ -150,71 +150,71 @@ template <int _check, int _invert>
class xx_net_signal_t: public net_device_t
{
public:
- xx_net_signal_t()
- : net_device_t(), m_active(1)
- {
- m_Q.initial(1);
- }
-
- ATTR_COLD void start()
- {
- const char *sIN[2] = { "A", "B" };
-
- register_output("Q", m_Q);
- for (int i=0; i < 2; i++)
- {
- register_input(sIN[i], m_i[i], net_input_t::INP_STATE_ACTIVE);
- }
- }
-
- #if (USE_DEACTIVE_DEVICE)
- ATTR_HOT void inc_active()
- {
- if (m_active == 0)
- {
- update();
- }
- m_active++;
- }
-
- ATTR_HOT void dec_active()
- {
- m_active--;
- if (m_active == 0)
- {
- m_i[0].inactivate();
- m_i[1].inactivate();
- }
- }
- #endif
-
-
- ATTR_HOT ATTR_ALIGN void update()
- {
- const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
-
- int res = _invert ^ 1 ^_check;
- m_i[0].activate();
- m_i[1].activate();
- if (INPLOGIC(m_i[0]) ^ _check)
- {
- if (INPLOGIC(m_i[1]) ^ _check)
- {
- res = _invert ^ _check;
- }
- else
- m_i[0].inactivate();
- } else {
- if (INPLOGIC(m_i[1]) ^ _check)
- m_i[1].inactivate();
- }
- OUTLOGIC(m_Q, res, times[(res & 1) ^ 1]);// ? 22000 : 15000);
- }
+ xx_net_signal_t()
+ : net_device_t(), m_active(1)
+ {
+ m_Q.initial(1);
+ }
+
+ ATTR_COLD void start()
+ {
+ const char *sIN[2] = { "A", "B" };
+
+ register_output("Q", m_Q);
+ for (int i=0; i < 2; i++)
+ {
+ register_input(sIN[i], m_i[i], net_input_t::INP_STATE_ACTIVE);
+ }
+ }
+
+ #if (USE_DEACTIVE_DEVICE)
+ ATTR_HOT void inc_active()
+ {
+ if (m_active == 0)
+ {
+ update();
+ }
+ m_active++;
+ }
+
+ ATTR_HOT void dec_active()
+ {
+ m_active--;
+ if (m_active == 0)
+ {
+ m_i[0].inactivate();
+ m_i[1].inactivate();
+ }
+ }
+ #endif
+
+
+ ATTR_HOT ATTR_ALIGN void update()
+ {
+ const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
+
+ int res = _invert ^ 1 ^_check;
+ m_i[0].activate();
+ m_i[1].activate();
+ if (INPLOGIC(m_i[0]) ^ _check)
+ {
+ if (INPLOGIC(m_i[1]) ^ _check)
+ {
+ res = _invert ^ _check;
+ }
+ else
+ m_i[0].inactivate();
+ } else {
+ if (INPLOGIC(m_i[1]) ^ _check)
+ m_i[1].inactivate();
+ }
+ OUTLOGIC(m_Q, res, times[(res & 1) ^ 1]);// ? 22000 : 15000);
+ }
public:
- ttl_input_t m_i[2];
- ttl_output_t m_Q;
- INT8 m_active;
+ ttl_input_t m_i[2];
+ ttl_output_t m_Q;
+ INT8 m_active;
};
#endif
@@ -226,58 +226,58 @@ template <UINT8 _check, UINT8 _invert>
class net_signal_t<3, _check, _invert> : public net_device_t
{
public:
- net_signal_t() : net_device_t(), m_active(1) { }
-
- ATTR_COLD void start()
- {
- const char *sIN[3] = { "I1", "I2", "I3" };
-
- register_output("Q", m_Q);
- for (int i=0; i < 3; i++)
- {
- register_input(sIN[i], m_i[i], net_input_t::INP_STATE_ACTIVE);
- }
- m_Q.initial(1);
- }
-
- ATTR_HOT ATTR_ALIGN void update()
- {
- const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
- //const UINT8 res_tab[4] = {1, 1, 1, 0 };
- //const UINT8 ai1[4] = {0, 1, 0, 0 };
- //const UINT8 ai2[4] = {1, 0, 1, 0 };
-
- UINT8 res = _invert ^ 1 ^_check;
- m_i[0].activate();
- if (INPLOGIC(m_i[0]) ^ _check)
- {
- m_i[1].activate();
- if (INPLOGIC(m_i[1]) ^ _check)
- {
- m_i[2].activate();
- if (INPLOGIC(m_i[2]) ^ _check)
- {
- res = _invert ^ _check;
- }
- else
- m_i[1].inactivate();
- }
- else
- {
- if (INPLOGIC(m_i[2]) ^ _check)
- m_i[2].inactivate();
- m_i[0].inactivate();
- }
- } else {
- if (INPLOGIC(m_i[1]) ^ _check)
- m_i[1].inactivate();
- }
- OUTLOGIC(m_Q, res, times[1 - res]);// ? 22000 : 15000);
- }
+ net_signal_t() : net_device_t(), m_active(1) { }
+
+ ATTR_COLD void start()
+ {
+ const char *sIN[3] = { "I1", "I2", "I3" };
+
+ register_output("Q", m_Q);
+ for (int i=0; i < 3; i++)
+ {
+ register_input(sIN[i], m_i[i], net_input_t::INP_STATE_ACTIVE);
+ }
+ m_Q.initial(1);
+ }
+
+ ATTR_HOT ATTR_ALIGN void update()
+ {
+ const netlist_time times[2] = { NLTIME_FROM_NS(22), NLTIME_FROM_NS(15) };
+ //const UINT8 res_tab[4] = {1, 1, 1, 0 };
+ //const UINT8 ai1[4] = {0, 1, 0, 0 };
+ //const UINT8 ai2[4] = {1, 0, 1, 0 };
+
+ UINT8 res = _invert ^ 1 ^_check;
+ m_i[0].activate();
+ if (INPLOGIC(m_i[0]) ^ _check)
+ {
+ m_i[1].activate();
+ if (INPLOGIC(m_i[1]) ^ _check)
+ {
+ m_i[2].activate();
+ if (INPLOGIC(m_i[2]) ^ _check)
+ {
+ res = _invert ^ _check;
+ }
+ else
+ m_i[1].inactivate();
+ }
+ else
+ {
+ if (INPLOGIC(m_i[2]) ^ _check)
+ m_i[2].inactivate();
+ m_i[0].inactivate();
+ }
+ } else {
+ if (INPLOGIC(m_i[1]) ^ _check)
+ m_i[1].inactivate();
+ }
+ OUTLOGIC(m_Q, res, times[1 - res]);// ? 22000 : 15000);
+ }
public:
- ttl_input_t m_i[3];
- ttl_output_t m_Q;
- INT8 m_active;
+ ttl_input_t m_i[3];
+ ttl_output_t m_Q;
+ INT8 m_active;
};
@@ -288,8 +288,8 @@ template <int _check, int _invert>
class net_signal_t<2, _check, _invert> : public xx_net_signal_t<_check, _invert>
{
public:
- net_signal_t()
- : xx_net_signal_t<_check, _invert>() { }
+ net_signal_t()
+ : xx_net_signal_t<_check, _invert>() { }
};
diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h
index 34cc4d99bc4..7f32ff748c3 100644
--- a/src/emu/netlist/devices/nld_system.h
+++ b/src/emu/netlist/devices/nld_system.h
@@ -17,12 +17,12 @@
// ----------------------------------------------------------------------------------------
#define NETDEV_TTL_CONST(_name, _v) \
- NET_REGISTER_DEV(netdev_ttl_const, _name) \
- NETDEV_PARAM(_name.CONST, _v)
+ NET_REGISTER_DEV(netdev_ttl_const, _name) \
+ NETDEV_PARAM(_name.CONST, _v)
#define NETDEV_ANALOG_CONST(_name, _v) \
- NET_REGISTER_DEV(netdev_analog_const, _name) \
- NETDEV_PARAM(_name.CONST, _v)
+ NET_REGISTER_DEV(netdev_analog_const, _name) \
+ NETDEV_PARAM(_name.CONST, _v)
// ----------------------------------------------------------------------------------------
// netdev_*_const
@@ -58,7 +58,7 @@ NETLIB_DEVICE_WITH_PARAMS(netdev_mainclock,
class NETLIB_NAME(netdev_analog_callback) : public net_device_t
{
public:
- NETLIB_NAME(netdev_analog_callback)()
+ NETLIB_NAME(netdev_analog_callback)()
: net_device_t() { }
ATTR_COLD void start()
diff --git a/src/emu/netlist/netlist.mak b/src/emu/netlist/netlist.mak
index 76aa56236d4..7f235075919 100644
--- a/src/emu/netlist/netlist.mak
+++ b/src/emu/netlist/netlist.mak
@@ -22,4 +22,4 @@ NETLISTOBJS+= \
$(NETLISTOBJ)/nl_base.o \
$(NETLISTOBJ)/nl_parser.o \
$(NETLISTOBJ)/devices/net_lib.o \
-
+
diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c
index a784c64e3b7..3908960b0a9 100644
--- a/src/emu/netlist/nl_base.c
+++ b/src/emu/netlist/nl_base.c
@@ -13,9 +13,9 @@
netlist_base_t::netlist_base_t()
: m_mainclock(NULL),
- m_time_ps(netlist_time::zero),
- m_rem(0),
- m_div(NETLIST_DIV)
+ m_time_ps(netlist_time::zero),
+ m_rem(0),
+ m_div(NETLIST_DIV)
{
}
@@ -30,11 +30,11 @@ ATTR_COLD void netlist_base_t::set_mainclock_dev(NETLIB_NAME(netdev_mainclock) *
ATTR_COLD void netlist_base_t::reset()
{
- m_time_ps = netlist_time::zero;
- m_rem = 0;
- m_queue.clear();
- if (m_mainclock != NULL)
- m_mainclock->m_Q.set_time(netlist_time::zero);
+ m_time_ps = netlist_time::zero;
+ m_rem = 0;
+ m_queue.clear();
+ if (m_mainclock != NULL)
+ m_mainclock->m_Q.set_time(netlist_time::zero);
}
@@ -195,9 +195,9 @@ ATTR_HOT ATTR_ALIGN const netlist_sig_t netlist_core_device_t::INPLOGIC_PASSIVE(
net_device_t::net_device_t()
: netlist_core_device_t(),
- m_inputs(20),
- m_setup(NULL),
- m_variable_input_count(false)
+ m_inputs(20),
+ m_setup(NULL),
+ m_variable_input_count(false)
{
}
@@ -311,7 +311,6 @@ ATTR_HOT inline void net_output_t::update_dev(const net_input_t *inp, const UINT
ATTR_HOT inline void net_output_t::update_devs()
{
-
assert(m_num_cons != 0);
const UINT32 masks[4] = { 1, 5, 3, 1 };
diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h
index 713e94572e2..5904f043e4f 100644
--- a/src/emu/netlist/nl_base.h
+++ b/src/emu/netlist/nl_base.h
@@ -38,7 +38,7 @@ typedef delegate<void ()> net_update_delegate;
#define NETLIB_UPDATE(_chip) ATTR_HOT ATTR_ALIGN void NETLIB_NAME(_chip) :: update(void)
#define NETLIB_START(_chip) ATTR_COLD void NETLIB_NAME(_chip) :: start(void)
//#define NETLIB_CONSTRUCTOR(_chip) ATTR_COLD _chip :: _chip (netlist_setup_t &setup, const char *name)
-// : net_device_t(setup, name)
+// : net_device_t(setup, name)
#define NETLIB_UPDATE_PARAM(_chip) ATTR_HOT ATTR_ALIGN void NETLIB_NAME(_chip) :: update_param(void)
#define NETLIB_FUNC_VOID(_chip, _name, _params) ATTR_HOT ATTR_ALIGN inline void NETLIB_NAME(_chip) :: _name _params
@@ -47,8 +47,8 @@ typedef delegate<void ()> net_update_delegate;
class NETLIB_NAME(_name) : public net_device_t \
{ \
public: \
- NETLIB_NAME(_name) () \
- : net_device_t() { } \
+ NETLIB_NAME(_name) () \
+ : net_device_t() { } \
protected: \
ATTR_HOT void update(); \
ATTR_HOT void start(); \
@@ -59,9 +59,9 @@ typedef delegate<void ()> net_update_delegate;
class NETLIB_NAME(_name) : public netlist_core_device_t \
{ \
public: \
- NETLIB_NAME(_name) () \
- : netlist_core_device_t() \
- { } \
+ NETLIB_NAME(_name) () \
+ : netlist_core_device_t() \
+ { } \
/*protected:*/ \
ATTR_HOT void update(); \
_priv \
@@ -71,8 +71,8 @@ typedef delegate<void ()> net_update_delegate;
class NETLIB_NAME(_name) : public net_device_t \
{ \
public: \
- NETLIB_NAME(_name) () \
- : net_device_t() { } \
+ NETLIB_NAME(_name) () \
+ : net_device_t() { } \
ATTR_HOT void update_param(); \
ATTR_HOT void update(); \
ATTR_HOT void start(); \
@@ -319,7 +319,7 @@ public:
: net_output_t(OUTPUT | SIGNAL_DIGITAL)
{
// Default to TTL
- m_low_V = 0.1; // these depend on sinked/sourced current. Values should be suitable for typical applications.
+ m_low_V = 0.1; // these depend on sinked/sourced current. Values should be suitable for typical applications.
m_high_V = 4.8;
}
@@ -774,34 +774,34 @@ ATTR_HOT inline const bool analog_input_t::is_highz() const
class net_device_t_base_factory
{
public:
- net_device_t_base_factory(const astring &name, const astring &classname)
- : m_name(name), m_classname(classname)
- {}
+ net_device_t_base_factory(const astring &name, const astring &classname)
+ : m_name(name), m_classname(classname)
+ {}
- virtual ~net_device_t_base_factory() {}
+ virtual ~net_device_t_base_factory() {}
- virtual net_device_t *Create() const = 0;
+ virtual net_device_t *Create() const = 0;
- const astring &name() const { return m_name; }
- const astring &classname() const { return m_classname; }
+ const astring &name() const { return m_name; }
+ const astring &classname() const { return m_classname; }
protected:
- astring m_name; /* device name */
- astring m_classname; /* device class name */
+ astring m_name; /* device name */
+ astring m_classname; /* device class name */
};
template <class C>
class net_device_t_factory : public net_device_t_base_factory
{
public:
- net_device_t_factory(const astring &name, const astring &classname)
- : net_device_t_base_factory(name, classname) { }
-
- net_device_t *Create() const
- {
- net_device_t *r = new C();
- //r->init(setup, name);
- return r;
- }
+ net_device_t_factory(const astring &name, const astring &classname)
+ : net_device_t_base_factory(name, classname) { }
+
+ net_device_t *Create() const
+ {
+ net_device_t *r = new C();
+ //r->init(setup, name);
+ return r;
+ }
};
net_device_t *net_create_device_by_classname(const astring &classname, netlist_setup_t &setup, const astring &icname);
diff --git a/src/emu/netlist/nl_config.h b/src/emu/netlist/nl_config.h
index 91bc758193c..fd729d5c217 100644
--- a/src/emu/netlist/nl_config.h
+++ b/src/emu/netlist/nl_config.h
@@ -16,27 +16,27 @@
// SETUP
//============================================================
-#define USE_DELEGATES (0)
+#define USE_DELEGATES (0)
/*
* The next options needs -Wno-pmf-conversions to compile and gcc
* This is intended for non-mame usage.
*
*/
-#define USE_PMFDELEGATES (0)
+#define USE_PMFDELEGATES (0)
// Next if enabled adds 20% performance ... but is not guaranteed to be absolutely timing correct.
-#define USE_DEACTIVE_DEVICE (0)
+#define USE_DEACTIVE_DEVICE (0)
-#define OUTPUT_MAX_CONNECTIONS (48)
+#define OUTPUT_MAX_CONNECTIONS (48)
// Use nano-second resolution - Sufficient for now
-#define NETLIST_INTERNAL_RES (U64(1000000000))
-#define NETLIST_DIV_BITS (0)
-//#define NETLIST_INTERNAL_RES (U64(1000000000000))
-//#define NETLIST_DIV_BITS (10)
-#define NETLIST_DIV (U64(1) << NETLIST_DIV_BITS)
-#define NETLIST_MASK (NETLIST_DIV-1)
-#define NETLIST_CLOCK (NETLIST_INTERNAL_RES / NETLIST_DIV)
+#define NETLIST_INTERNAL_RES (U64(1000000000))
+#define NETLIST_DIV_BITS (0)
+//#define NETLIST_INTERNAL_RES (U64(1000000000000))
+//#define NETLIST_DIV_BITS (10)
+#define NETLIST_DIV (U64(1) << NETLIST_DIV_BITS)
+#define NETLIST_MASK (NETLIST_DIV-1)
+#define NETLIST_CLOCK (NETLIST_INTERNAL_RES / NETLIST_DIV)
#define NETLIST_HIGHIMP_V (1.23456e20) /* some voltage we should never see */
@@ -54,7 +54,7 @@ typedef delegate<void (const double)> netlist_output_delegate;
#define NL_VERBOSE (0)
#define NL_KEEP_STATISTICS (0)
-#define FATAL_ERROR_AFTER_NS (0) //(1000)
+#define FATAL_ERROR_AFTER_NS (0) //(1000)
#if (NL_VERBOSE)
#define NL_VERBOSE_OUT(x) printf x
diff --git a/src/emu/netlist/nl_lists.h b/src/emu/netlist/nl_lists.h
index cb437df14c2..970b5c1c39f 100644
--- a/src/emu/netlist/nl_lists.h
+++ b/src/emu/netlist/nl_lists.h
@@ -118,8 +118,8 @@ public:
}
// profiling
- INT32 m_prof_start;
- INT32 m_prof_end;
+ INT32 m_prof_start;
+ INT32 m_prof_end;
INT32 m_prof_sortmove;
INT32 m_prof_sort;
private:
diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c
index 3cf1795c488..ac9d05ce63c 100644
--- a/src/emu/netlist/nl_setup.c
+++ b/src/emu/netlist/nl_setup.c
@@ -87,7 +87,7 @@ void netlist_setup_t::remove_dev(const astring &name)
void netlist_setup_t::register_callback(const astring &devname, netlist_output_delegate delegate)
{
- NETLIB_NAME(netdev_analog_callback) *dev = (NETLIB_NAME(netdev_analog_callback) *) m_devices.find(devname);
+ NETLIB_NAME(netdev_analog_callback) *dev = (NETLIB_NAME(netdev_analog_callback) *) m_devices.find(devname);
if (dev == NULL)
fatalerror("did not find device %s\n", devname.cstr());
dev->register_callback(delegate);
@@ -315,4 +315,3 @@ void netlist_setup_t::print_stats()
printf("Queue Move %15d\n", m_netlist.m_queue.m_prof_sortmove);
}
}
-
diff --git a/src/emu/netlist/nl_setup.h b/src/emu/netlist/nl_setup.h
index ffc07c9b17d..735a27e6176 100644
--- a/src/emu/netlist/nl_setup.h
+++ b/src/emu/netlist/nl_setup.h
@@ -36,7 +36,6 @@
#define NETLIST_START(_name) \
ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &netlist) \
{
-
#define NETLIST_END }
#define NETLIST_INCLUDE(_name) \