summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2021-08-14 01:10:56 -0700
committer Aaron Giles <aaron@aarongiles.com>2021-08-14 01:10:56 -0700
commit01c7762edad80a3628594dc757b7b9cadad5be5e (patch)
treec0255603cb9990fd85196f5b471152e643a67c5d
parentb78251b9ca31b90d5f5afc832717568b4527afd0 (diff)
Remaining fixestime-experiments
-rw-r--r--src/devices/machine/input_merger.h4
-rw-r--r--src/mame/audio/turbo.cpp3
-rw-r--r--src/mame/machine/thomson.cpp2
3 files changed, 3 insertions, 6 deletions
diff --git a/src/devices/machine/input_merger.h b/src/devices/machine/input_merger.h
index 39ad7324575..bd13d4f90de 100644
--- a/src/devices/machine/input_merger.h
+++ b/src/devices/machine/input_merger.h
@@ -25,8 +25,8 @@ public:
// input lines
template <unsigned Bit> DECLARE_WRITE_LINE_MEMBER(in_w) { static_assert(Bit < 32, "invalid bit"); m_update_state.synchronize((Bit << 1) | (state ? 1U : 0U)); }
- template <unsigned Bit> void in_set(u8 data) { in_w<Bit>(1); }
- template <unsigned Bit> void in_clear(u8 data) { in_w<Bit>(0); }
+ template <unsigned Bit> void in_set(u8 data = 0) { in_w<Bit>(1); }
+ template <unsigned Bit> void in_clear(u8 data = 0) { in_w<Bit>(0); }
protected:
// constructor/destructor
diff --git a/src/mame/audio/turbo.cpp b/src/mame/audio/turbo.cpp
index 3094ca44e3b..a96361cf8c6 100644
--- a/src/mame/audio/turbo.cpp
+++ b/src/mame/audio/turbo.cpp
@@ -69,9 +69,6 @@ void turbo_state::sound_a_w(uint8_t data)
// /CRASH.L: channel 3
if ((diff & 0x80) && !(data & 0x80)) m_samples->start(3, 5);
-
- /* update any samples */
- turbo_update_samples();
}
diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp
index 9017111a7a4..c043e2dba95 100644
--- a/src/mame/machine/thomson.cpp
+++ b/src/mame/machine/thomson.cpp
@@ -4303,7 +4303,7 @@ MACHINE_START_MEMBER( mo6_state, mo6 )
to9_palette_init();
to7_modem_init();
to7_midi_init();
- m_mo5_periodic_timer = timer_alloc(*this, FUNC(thomson_state::mo5_periodic_cb));
+ m_mo5_periodic_timer = timer_alloc(*this, FUNC(mo6_state::mo5_periodic_cb));
/* memory */
m_thom_cart_bank = 0;