summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-12-27 19:32:23 +0100
committer couriersud <couriersud@arcor.de>2016-12-27 19:37:30 +0100
commit419a7da1722b0ea3020991443db3171883300a6a (patch)
treee264558cd798ca262469a1373eb8e5ae58c475ab
parent7754d03130df80ad0c549061eae24eb8bc11dc95 (diff)
Fix 74629 and some internals. (nw)
-rw-r--r--src/lib/netlist/devices/nld_74ls629.cpp2
-rw-r--r--src/lib/netlist/devices/nlid_system.h1
-rw-r--r--src/lib/netlist/nl_config.h4
-rw-r--r--src/mame/includes/mario.h2
4 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp
index 3d35f90eba6..9a34b9c5ca9 100644
--- a/src/lib/netlist/devices/nld_74ls629.cpp
+++ b/src/lib/netlist/devices/nld_74ls629.cpp
@@ -60,7 +60,7 @@ namespace netlist
NETLIB_RESETI()
{
- m_enableq = 1;
+ m_enableq = 0;
m_out = 0;
m_inc = netlist_time::zero();
}
diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
index 05b7925bdb0..2a827f6b20e 100644
--- a/src/lib/netlist/devices/nlid_system.h
+++ b/src/lib/netlist/devices/nlid_system.h
@@ -526,6 +526,7 @@ namespace netlist
register_subalias("Q", m_RV.m_P);
connect_late(m_RV.m_N, m_GNDHack);
+ //printf("%s %s\n", out_proxied->name().cstr(), out_proxied->device().name().cstr());
}
virtual ~nld_d_to_a_proxy() {}
diff --git a/src/lib/netlist/nl_config.h b/src/lib/netlist/nl_config.h
index 4965e7b9746..14598d2dccf 100644
--- a/src/lib/netlist/nl_config.h
+++ b/src/lib/netlist/nl_config.h
@@ -124,8 +124,8 @@
namespace netlist
{
#if NL_KEEP_STATISTICS
-using nperftime_t = plib::timer<plib::exact_ticks, true>;
-using nperfcount_t = plib::counter<true>;
+using nperftime_t = plib::chrono::timer<plib::chrono::exact_ticks, true>;
+using nperfcount_t = plib::chrono::counter<true>;
#else
using nperftime_t = plib::chrono::timer<plib::chrono::exact_ticks, false>;
using nperfcount_t = plib::chrono::counter<false>;
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index 2c9563e335e..40161d4f187 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -83,7 +83,7 @@ public:
#else
optional_device<netlist_mame_logic_input_t> m_audio_snd0;
optional_device<netlist_mame_logic_input_t> m_audio_snd7;
- optional_device<netlist_mame_logic_input_t> m_audio_dac;
+ optional_device<netlist_mame_int_input_t> m_audio_dac;
#endif
/* memory pointers */