summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2022-10-25 17:44:39 +0200
committer hap <happppp@users.noreply.github.com>2022-10-25 17:44:53 +0200
commit957cfaa53d8c44904b62372ed120ccb684afd08c (patch)
treee21c56b3f74dc093eb75810e96b38cb0e226d40e
parentf727c63b169e6c5d23154447150e5548dcb1516a (diff)
emu_timer: undo prev commit, add running() getter and change some enabled() calls to that
-rw-r--r--src/devices/bus/a2bus/a2pic.cpp8
-rw-r--r--src/devices/bus/a2bus/grappler.cpp2
-rw-r--r--src/devices/bus/a2bus/uniprint.cpp2
-rw-r--r--src/devices/cpu/i86/i186.cpp4
-rw-r--r--src/devices/machine/chessmachine.cpp2
-rw-r--r--src/devices/machine/cxd1185.cpp4
-rw-r--r--src/devices/machine/er1400.cpp6
-rw-r--r--src/devices/machine/i8155.cpp10
-rw-r--r--src/devices/machine/ncr5380.cpp8
-rw-r--r--src/devices/machine/timer.h1
-rw-r--r--src/devices/sound/c140.cpp4
-rw-r--r--src/devices/video/crtc_ega.cpp4
-rw-r--r--src/devices/video/mc6845.cpp4
-rw-r--r--src/emu/schedule.cpp2
-rw-r--r--src/emu/schedule.h1
-rw-r--r--src/mame/apple/apple2e.cpp2
-rw-r--r--src/mame/atari/atarist.cpp6
-rw-r--r--src/mame/atari/atarivad.cpp2
-rw-r--r--src/mame/chess/tasc.cpp2
-rw-r--r--src/mame/entex/advision.cpp4
-rw-r--r--src/mame/fidelity/cc1.cpp4
-rw-r--r--src/mame/fidelity/cc10.cpp2
-rw-r--r--src/mame/handheld/hh_cop400.cpp2
-rw-r--r--src/mame/handheld/hh_tms1k.cpp4
-rw-r--r--src/mame/hegenerglaser/modular.cpp2
-rw-r--r--src/mame/konami/asterix.cpp2
-rw-r--r--src/mame/konami/parodius.cpp2
-rw-r--r--src/mame/konami/rollerg.cpp2
-rw-r--r--src/mame/konami/simpsons.cpp2
-rw-r--r--src/mame/konami/vendetta.cpp2
-rw-r--r--src/mame/mess.flt1
-rw-r--r--src/mame/miltonbradley/microvsn.cpp4
-rw-r--r--src/mame/saitek/risc2500.cpp2
-rw-r--r--src/mame/sgi/hpc3.cpp2
-rw-r--r--src/mame/shared/efo_zsu.cpp2
-rw-r--r--src/mame/televideo/tv955kb.cpp6
-rw-r--r--src/mame/tiger/k28.cpp2
37 files changed, 62 insertions, 59 deletions
diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp
index 321155f2cf8..537abe313ad 100644
--- a/src/devices/bus/a2bus/a2pic.cpp
+++ b/src/devices/bus/a2bus/a2pic.cpp
@@ -155,7 +155,7 @@ a2bus_pic_device::a2bus_pic_device(machine_config const &mconfig, char const *ta
INPUT_CHANGED_MEMBER(a2bus_pic_device::sw1_strobe)
{
- m_printer_conn->write_strobe(BIT(m_input_sw1->read(), 3) ^ (m_strobe_timer->enabled() ? 0U : 1U));
+ m_printer_conn->write_strobe(BIT(m_input_sw1->read(), 3) ^ (m_strobe_timer->running() ? 0U : 1U));
}
@@ -373,7 +373,7 @@ void a2bus_pic_device::device_reset()
m_printer_out->write(0x00U);
}
- m_printer_conn->write_strobe(BIT(sw1, 3) ^ (m_strobe_timer->enabled() ? 0U : 1U));
+ m_printer_conn->write_strobe(BIT(sw1, 3) ^ (m_strobe_timer->running() ? 0U : 1U));
reset_mode();
}
@@ -486,7 +486,7 @@ void a2bus_pic_device::data_write(s32 param)
ioport_value const sw1(m_input_sw1->read());
unsigned const cycles(15U - ((sw1 & 0x07U) << 1));
int const state(BIT(sw1, 3));
- if (!m_strobe_timer->enabled())
+ if (!m_strobe_timer->running())
{
LOG("Output /STROBE=%d for %u cycles\n", state, cycles);
clear_ack_latch();
@@ -520,7 +520,7 @@ void a2bus_pic_device::reset_mode()
void a2bus_pic_device::set_ack_latch()
{
- if (m_strobe_timer->enabled())
+ if (m_strobe_timer->running())
{
LOG("Active strobe prevents acknowledge latch from being set\n");
}
diff --git a/src/devices/bus/a2bus/grappler.cpp b/src/devices/bus/a2bus/grappler.cpp
index c09ff95e8fc..933b9b3357f 100644
--- a/src/devices/bus/a2bus/grappler.cpp
+++ b/src/devices/bus/a2bus/grappler.cpp
@@ -785,7 +785,7 @@ void a2bus_grapplerplus_device::data_latched(u8 data)
// generate strobe pulse after one clock cycle
m_next_strobe = 0U;
- if (!m_strobe_timer->enabled())
+ if (!m_strobe_timer->running())
{
LOG("Start strobe timer\n");
m_strobe_timer->adjust(attotime::from_ticks(7, clock()));
diff --git a/src/devices/bus/a2bus/uniprint.cpp b/src/devices/bus/a2bus/uniprint.cpp
index d451a45fe89..9bc72a4f2bd 100644
--- a/src/devices/bus/a2bus/uniprint.cpp
+++ b/src/devices/bus/a2bus/uniprint.cpp
@@ -139,7 +139,7 @@ void a2bus_uniprint_device::write_c0nx(u8 offset, u8 data)
// generate strobe pulse after one clock cycle
m_next_strobe = 0U;
- if (!m_strobe_timer->enabled())
+ if (!m_strobe_timer->running())
{
LOG("Start strobe timer\n");
m_strobe_timer->adjust(attotime::from_ticks(1, clock()));
diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp
index 1bfd4820c5e..2847607a278 100644
--- a/src/devices/cpu/i86/i186.cpp
+++ b/src/devices/cpu/i86/i186.cpp
@@ -1330,7 +1330,7 @@ void i80186_cpu_device::internal_timer_sync(int which)
timer_state *t = &m_timer[which];
/* if we have a timing timer running, adjust the count */
- if ((t->control & 0x8000) && !(t->control & 0x0c) && t->int_timer->enabled())
+ if ((t->control & 0x8000) && !(t->control & 0x0c) && t->int_timer->running())
t->count = ((t->control & 0x1000) ? t->maxB : t->maxA) - t->int_timer->remaining().as_ticks(clock() / 8);
}
@@ -1450,7 +1450,7 @@ void i80186_cpu_device::internal_timer_update(int which, int new_count, int new_
/* update the interrupt timer */
if (update_int_timer)
{
- if ((t->control & 0x8004) == 0x8000 && (!(t->control & 0x10) || t->int_timer->enabled()))
+ if ((t->control & 0x8004) == 0x8000 && (!(t->control & 0x10) || t->int_timer->running()))
{
int diff = ((t->control & 0x1000) ? t->maxB : t->maxA) - t->count;
if (diff <= 0)
diff --git a/src/devices/machine/chessmachine.cpp b/src/devices/machine/chessmachine.cpp
index fa201f9b11e..1016cec2ec4 100644
--- a/src/devices/machine/chessmachine.cpp
+++ b/src/devices/machine/chessmachine.cpp
@@ -126,7 +126,7 @@ void chessmachine_device::install_bootrom(bool enable)
u32 chessmachine_device::disable_bootrom_r()
{
// disconnect bootrom from the bus after next opcode
- if (m_bootrom_enabled && !m_disable_bootrom->enabled() && !machine().side_effects_disabled())
+ if (m_bootrom_enabled && !m_disable_bootrom->running() && !machine().side_effects_disabled())
m_disable_bootrom->adjust(m_maincpu->cycles_to_attotime(5));
return 0;
diff --git a/src/devices/machine/cxd1185.cpp b/src/devices/machine/cxd1185.cpp
index 9417def1ff8..b854884d29a 100644
--- a/src/devices/machine/cxd1185.cpp
+++ b/src/devices/machine/cxd1185.cpp
@@ -172,7 +172,7 @@ u8 cxd1185_device::scsi_data_r()
{
data = m_fifo.dequeue();
- if (m_state != IDLE && !m_state_timer->enabled())
+ if (m_state != IDLE && !m_state_timer->running())
m_state_timer->adjust(attotime::zero);
}
else
@@ -375,7 +375,7 @@ void cxd1185_device::scsi_data_w(u8 data)
{
m_fifo.enqueue(data);
- if (m_state != IDLE && !m_state_timer->enabled())
+ if (m_state != IDLE && !m_state_timer->running())
m_state_timer->adjust(attotime::zero);
}
else
diff --git a/src/devices/machine/er1400.cpp b/src/devices/machine/er1400.cpp
index 7a49272fe5c..c2375294ba5 100644
--- a/src/devices/machine/er1400.cpp
+++ b/src/devices/machine/er1400.cpp
@@ -261,7 +261,7 @@ WRITE_LINE_MEMBER(er1400_device::c1_w)
return;
m_code_input = (m_code_input & 3) | (bool(state) << 2);
- if (!m_data_propagation_timer->enabled())
+ if (!m_data_propagation_timer->running())
m_data_propagation_timer->adjust(attotime::from_usec(20));
}
@@ -276,7 +276,7 @@ WRITE_LINE_MEMBER(er1400_device::c2_w)
return;
m_code_input = (m_code_input & 5) | (bool(state) << 1);
- if (!m_data_propagation_timer->enabled())
+ if (!m_data_propagation_timer->running())
m_data_propagation_timer->adjust(attotime::from_usec(20));
}
@@ -291,7 +291,7 @@ WRITE_LINE_MEMBER(er1400_device::c3_w)
return;
m_code_input = (m_code_input & 6) | bool(state);
- if (!m_data_propagation_timer->enabled())
+ if (!m_data_propagation_timer->running())
m_data_propagation_timer->adjust(attotime::from_usec(20));
}
diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp
index fee07c4a919..810bb001e67 100644
--- a/src/devices/machine/i8155.cpp
+++ b/src/devices/machine/i8155.cpp
@@ -116,7 +116,7 @@ inline uint8_t i8155_device::get_timer_mode() const
inline uint16_t i8155_device::get_timer_count() const
{
- if (m_timer->enabled())
+ if (m_timer->running())
{
// timer counts down by twos
return std::min((uint16_t(attotime_to_clocks(m_timer->remaining())) + 1) << 1, m_count_loaded & 0x3ffe) | (m_count_even_phase ? 0 : 1);
@@ -139,12 +139,12 @@ inline void i8155_device::timer_output(int to)
inline void i8155_device::timer_stop_count()
{
// stop counting
- if (m_timer->enabled())
+ if (m_timer->running())
{
m_count_loaded = (m_count_loaded & (TIMER_MODE_MASK << 8)) | get_timer_count();
- m_timer->enable(false);
+ m_timer->adjust(attotime::never);
}
- m_timer_tc->enable(false);
+ m_timer_tc->adjust(attotime::never);
// clear timer output
timer_output(1);
@@ -519,7 +519,7 @@ void i8155_device::write_command(uint8_t data)
case COMMAND_TM_START:
LOGMASKED(LOG_PORT, "Timer Command: Start\n");
- if (m_timer->enabled())
+ if (m_timer->running())
{
// if timer is running, start the new mode and CNT length immediately after present TC is reached
}
diff --git a/src/devices/machine/ncr5380.cpp b/src/devices/machine/ncr5380.cpp
index ec7e2c412b3..56fefc4f97f 100644
--- a/src/devices/machine/ncr5380.cpp
+++ b/src/devices/machine/ncr5380.cpp
@@ -168,7 +168,7 @@ void ncr5380_device::scsi_ctrl_changed()
}
m_state = IDLE;
- m_state_timer->enable(false);
+ m_state_timer->adjust(attotime::never);
// clear scsi bus
scsi_bus->data_w(scsi_refid, 0);
@@ -182,7 +182,7 @@ void ncr5380_device::scsi_ctrl_changed()
if ((ctrl & S_PHASE_MASK) == (m_tcmd & TC_PHASE))
{
// transfer cycle
- if (m_state != IDLE && !m_state_timer->enabled())
+ if (m_state != IDLE && !m_state_timer->running())
m_state_timer->adjust(attotime::zero);
}
else
@@ -190,7 +190,7 @@ void ncr5380_device::scsi_ctrl_changed()
LOG("phase mismatch %d != %d\n", (ctrl & S_PHASE_MASK), (m_tcmd & TC_PHASE));
m_state = IDLE;
- m_state_timer->enable(false);
+ m_state_timer->adjust(attotime::never);
set_drq(true);
set_irq(true);
@@ -286,7 +286,7 @@ void ncr5380_device::mode_w(u8 data)
if ((m_mode & MODE_DMA) && !(data & MODE_DMA))
{
m_state = IDLE;
- m_state_timer->enable(false);
+ m_state_timer->adjust(attotime::never);
m_bas &= ~BAS_ENDOFDMA;
diff --git a/src/devices/machine/timer.h b/src/devices/machine/timer.h
index dbd7e0763f6..2c138a1565c 100644
--- a/src/devices/machine/timer.h
+++ b/src/devices/machine/timer.h
@@ -97,6 +97,7 @@ public:
}
// timing information
+ bool running() const { return m_timer->running(); }
attotime elapsed() const { return m_timer->elapsed(); }
attotime remaining() const { return m_timer->remaining(); }
attotime start() const { return m_timer->start(); }
diff --git a/src/devices/sound/c140.cpp b/src/devices/sound/c140.cpp
index 1010e36aa8b..d723e124e35 100644
--- a/src/devices/sound/c140.cpp
+++ b/src/devices/sound/c140.cpp
@@ -540,13 +540,13 @@ void c140_device::c140_w(offs_t offset, u8 data)
if (BIT(data, 0))
{
// kyukaidk and marvlandj want the first interrupt to happen immediately
- if (!m_int1_timer->enabled())
+ if (!m_int1_timer->running())
m_int1_callback(ASSERT_LINE);
}
else
{
m_int1_callback(CLEAR_LINE);
- m_int1_timer->enable(false);
+ m_int1_timer->adjust(attotime::never);
}
}
}
diff --git a/src/devices/video/crtc_ega.cpp b/src/devices/video/crtc_ega.cpp
index 781b435f48e..4c9a738c110 100644
--- a/src/devices/video/crtc_ega.cpp
+++ b/src/devices/video/crtc_ega.cpp
@@ -228,7 +228,7 @@ void crtc_ega_device::update_counters()
{
m_character_counter = m_line_timer->elapsed().as_ticks( m_clock );
- if ( m_hsync_off_timer->enabled() )
+ if ( m_hsync_off_timer->running() )
{
m_hsync_width_counter = m_hsync_off_timer->elapsed().as_ticks( m_clock );
}
@@ -718,7 +718,7 @@ void crtc_ega_device::device_reset()
if(!m_res_out_irq_cb.isnull())
m_res_out_irq_cb(false);
- if (!m_line_timer->enabled())
+ if (!m_line_timer->running())
{
m_line_timer->adjust( attotime::from_ticks( m_horiz_char_total + 2, m_clock ) );
}
diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp
index a197869b4e8..8c8c6e81f88 100644
--- a/src/devices/video/mc6845.cpp
+++ b/src/devices/video/mc6845.cpp
@@ -689,7 +689,7 @@ void mc6845_device::update_counters()
{
m_character_counter = attotime_to_cclks(m_line_timer->elapsed());
- if (m_hsync_off_timer->enabled())
+ if (m_hsync_off_timer->running())
{
m_hsync_width_counter = attotime_to_cclks(m_hsync_off_timer->elapsed());
}
@@ -1560,7 +1560,7 @@ void mc6845_device::device_reset()
m_out_vsync_cb(false);
- if (!m_line_timer->enabled())
+ if (!m_line_timer->running())
m_line_timer->adjust(cclks_to_attotime(m_horiz_char_total + 1));
m_light_pen_latched = false;
diff --git a/src/emu/schedule.cpp b/src/emu/schedule.cpp
index bdba5a71d3d..fac8b80ae90 100644
--- a/src/emu/schedule.cpp
+++ b/src/emu/schedule.cpp
@@ -152,7 +152,7 @@ void emu_timer::adjust(attotime start_delay, s32 param, const attotime &period)
// set the start and expire times
m_start = m_scheduler->time();
m_expire = m_start + start_delay;
- m_enabled = !m_expire.is_never();
+ m_enabled = true;
m_period = period;
// remove and re-insert the timer in its new order
diff --git a/src/emu/schedule.h b/src/emu/schedule.h
index 338560594d9..df758f23994 100644
--- a/src/emu/schedule.h
+++ b/src/emu/schedule.h
@@ -50,6 +50,7 @@ public:
void adjust(attotime start_delay, s32 param = 0, const attotime &periodicity = attotime::never) noexcept;
// timing queries
+ bool running() const noexcept { return !m_expire.is_never(); }
attotime elapsed() const noexcept;
attotime remaining() const noexcept;
attotime start() const noexcept { return m_start; }
diff --git a/src/mame/apple/apple2e.cpp b/src/mame/apple/apple2e.cpp
index 56cd5c3888f..935014e17d2 100644
--- a/src/mame/apple/apple2e.cpp
+++ b/src/mame/apple/apple2e.cpp
@@ -2177,7 +2177,7 @@ void apple2e_state::laserprn_w(u8 data)
// generate strobe pulse after one clock cycle
m_next_strobe = 0U;
- if (!m_strobe_timer->enabled())
+ if (!m_strobe_timer->running())
{
m_strobe_timer->adjust(attotime::from_hz(1021800));
}
diff --git a/src/mame/atari/atarist.cpp b/src/mame/atari/atarist.cpp
index 88d6f2cd7b3..28fdefafdbf 100644
--- a/src/mame/atari/atarist.cpp
+++ b/src/mame/atari/atarist.cpp
@@ -1350,7 +1350,7 @@ TIMER_CALLBACK_MEMBER(ste_state::microwire_tick)
microwire_shift();
m_lmc1992->enable_w(1);
m_mw_shift = 0;
- m_microwire_timer->enable(0);
+ m_microwire_timer->adjust(attotime::never);
break;
}
}
@@ -1372,7 +1372,7 @@ uint16_t ste_state::microwire_data_r()
void ste_state::microwire_data_w(uint16_t data)
{
- if (!m_microwire_timer->enabled())
+ if (!m_microwire_timer->running())
{
m_mw_data = data;
m_microwire_timer->adjust(attotime::zero, 0, attotime::from_usec(2));
@@ -1396,7 +1396,7 @@ uint16_t ste_state::microwire_mask_r()
void ste_state::microwire_mask_w(uint16_t data)
{
- if (!m_microwire_timer->enabled())
+ if (!m_microwire_timer->running())
{
m_mw_mask = data;
}
diff --git a/src/mame/atari/atarivad.cpp b/src/mame/atari/atarivad.cpp
index 0182f814944..258324c40df 100644
--- a/src/mame/atari/atarivad.cpp
+++ b/src/mame/atari/atarivad.cpp
@@ -308,7 +308,7 @@ void atari_vad_device::internal_control_write(offs_t offset, uint16_t newword)
// set the scanline interrupt here
case 0x03:
- if (oldword != newword || !m_scanline_int_timer->enabled())
+ if (oldword != newword || !m_scanline_int_timer->running())
m_scanline_int_timer->adjust(screen().time_until_pos(newword & 0x1ff));
break;
diff --git a/src/mame/chess/tasc.cpp b/src/mame/chess/tasc.cpp
index 2501ac53a51..72ddff1c5f7 100644
--- a/src/mame/chess/tasc.cpp
+++ b/src/mame/chess/tasc.cpp
@@ -180,7 +180,7 @@ u32 tasc_state::input_r()
if (!machine().side_effects_disabled())
{
// disconnect bootrom from the bus after next opcode
- if (m_bootrom_enabled && !m_disable_bootrom->enabled())
+ if (m_bootrom_enabled && !m_disable_bootrom->running())
m_disable_bootrom->adjust(m_maincpu->cycles_to_attotime(10));
m_maincpu->set_input_line(ARM_FIRQ_LINE, CLEAR_LINE);
diff --git a/src/mame/entex/advision.cpp b/src/mame/entex/advision.cpp
index f2b8149522c..321868cbe61 100644
--- a/src/mame/entex/advision.cpp
+++ b/src/mame/entex/advision.cpp
@@ -180,7 +180,7 @@ void advision_state::av_control_w(u8 data)
// disable led outputs (there is some delay before it takes effect)
// see for example codered twister and anime girl, gaps between the 'pixels' should be visible but minimal
- if (m_video_bank == 0 && !m_led_off->enabled())
+ if (m_video_bank == 0 && !m_led_off->running())
m_led_off->adjust(attotime::from_usec(39));
// P24 rising edge: transfer led latches to outputs
@@ -239,7 +239,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(advision_state::led_off)
READ_LINE_MEMBER(advision_state::vsync_r)
{
// T1: mirror sync pulse (half rotation)
- return (m_mirror_sync->enabled()) ? 0 : 1;
+ return (m_mirror_sync->running()) ? 0 : 1;
}
diff --git a/src/mame/fidelity/cc1.cpp b/src/mame/fidelity/cc1.cpp
index c4afe7b5c54..651c4eaf05e 100644
--- a/src/mame/fidelity/cc1.cpp
+++ b/src/mame/fidelity/cc1.cpp
@@ -150,7 +150,7 @@ u8 cc1_state::ppi_porta_r()
data |= ~m_inputs[1]->read() << 5 & 0xe0;
// d4: 555 Q
- return data | ((m_delay->enabled()) ? 0x10 : 0);
+ return data | ((m_delay->running()) ? 0x10 : 0);
}
void cc1_state::ppi_portb_w(u8 data)
@@ -163,7 +163,7 @@ void cc1_state::ppi_portb_w(u8 data)
void cc1_state::ppi_portc_w(u8 data)
{
// d6: trigger monostable 555 (R=15K, C=1uF)
- if (~data & m_led_select & 0x40 && !m_delay->enabled())
+ if (~data & m_led_select & 0x40 && !m_delay->running())
m_delay->adjust(attotime::from_msec(17));
// d0-d3: digit select
diff --git a/src/mame/fidelity/cc10.cpp b/src/mame/fidelity/cc10.cpp
index 88ccabcf1dd..c36f0f1c909 100644
--- a/src/mame/fidelity/cc10.cpp
+++ b/src/mame/fidelity/cc10.cpp
@@ -126,7 +126,7 @@ void ccx_state::update_display()
void ccx_state::ppi_porta_w(u8 data)
{
// d7: enable beeper on falling edge (556 monostable) (unpopulated on ACR)
- if (m_beeper != nullptr && ~data & m_7seg_data & 0x80 && !m_beeper_off->enabled())
+ if (m_beeper != nullptr && ~data & m_7seg_data & 0x80 && !m_beeper_off->running())
{
m_beeper->set_state(1);
m_beeper_off->adjust(attotime::from_msec(80)); // duration is approximate
diff --git a/src/mame/handheld/hh_cop400.cpp b/src/mame/handheld/hh_cop400.cpp
index c9a1c3c2245..2719a748052 100644
--- a/src/mame/handheld/hh_cop400.cpp
+++ b/src/mame/handheld/hh_cop400.cpp
@@ -1263,7 +1263,7 @@ CUSTOM_INPUT_MEMBER(mbaskb2_state::switch_r)
{
// The power switch is off-1-2, and the game relies on power-on starting at 1,
// otherwise msoccer2 boots up to what looks like a factory test mode.
- return (m_inputs[3]->read() & 1) | (m_on_timer->enabled() ? 1 : 0);
+ return (m_inputs[3]->read() & 1) | (m_on_timer->running() ? 1 : 0);
}
static INPUT_PORTS_START( mbaskb2 )
diff --git a/src/mame/handheld/hh_tms1k.cpp b/src/mame/handheld/hh_tms1k.cpp
index 3f1b7371c02..38530da7872 100644
--- a/src/mame/handheld/hh_tms1k.cpp
+++ b/src/mame/handheld/hh_tms1k.cpp
@@ -1560,7 +1560,7 @@ u8 cchime_state::read_k()
inp |= m_inputs[2]->read() << 1 & 4;
// K8: tempo knob state
- if (m_tempo_timer->enabled())
+ if (m_tempo_timer->running())
inp |= 8;
return inp;
@@ -5490,7 +5490,7 @@ u8 mmarvin_state::read_k()
{
// K1-K4: multiplexed inputs
// K8: speed knob state
- return (read_inputs(4) & 7) | (m_speed_timer->enabled() ? 0 : 8);
+ return (read_inputs(4) & 7) | (m_speed_timer->running() ? 0 : 8);
}
// config
diff --git a/src/mame/hegenerglaser/modular.cpp b/src/mame/hegenerglaser/modular.cpp
index 5ed1c911f5d..cdd3a59e3d2 100644
--- a/src/mame/hegenerglaser/modular.cpp
+++ b/src/mame/hegenerglaser/modular.cpp
@@ -245,7 +245,7 @@ u8 mmodular_state::bavaria2_r()
// d7: busy signal
// other: unused?
- return m_bav_busy->enabled() ? 0x80 : 0;
+ return m_bav_busy->running() ? 0x80 : 0;
}
diff --git a/src/mame/konami/asterix.cpp b/src/mame/konami/asterix.cpp
index e552c89f1f8..6b09e82454f 100644
--- a/src/mame/konami/asterix.cpp
+++ b/src/mame/konami/asterix.cpp
@@ -66,7 +66,7 @@ void asterix_state::sound_arm_nmi_w(uint8_t data)
void asterix_state::z80_nmi_w(int state)
{
- if (state && !m_nmi_blocked->enabled())
+ if (state && !m_nmi_blocked->running())
m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
}
diff --git a/src/mame/konami/parodius.cpp b/src/mame/konami/parodius.cpp
index b1bc5be69b1..55917fcf694 100644
--- a/src/mame/konami/parodius.cpp
+++ b/src/mame/konami/parodius.cpp
@@ -209,7 +209,7 @@ void parodius_state::sound_arm_nmi_w(uint8_t data)
void parodius_state::z80_nmi_w(int state)
{
- if (state && !m_nmi_blocked->enabled())
+ if (state && !m_nmi_blocked->running())
m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
}
diff --git a/src/mame/konami/rollerg.cpp b/src/mame/konami/rollerg.cpp
index c083846b297..d968de66a15 100644
--- a/src/mame/konami/rollerg.cpp
+++ b/src/mame/konami/rollerg.cpp
@@ -175,7 +175,7 @@ void rollerg_state::sound_arm_nmi_w(uint8_t data)
void rollerg_state::z80_nmi_w(int state)
{
- if (state && !m_nmi_blocked->enabled())
+ if (state && !m_nmi_blocked->running())
m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
}
diff --git a/src/mame/konami/simpsons.cpp b/src/mame/konami/simpsons.cpp
index 3256a330e02..3526a23c2ae 100644
--- a/src/mame/konami/simpsons.cpp
+++ b/src/mame/konami/simpsons.cpp
@@ -177,7 +177,7 @@ void simpsons_state::z80_arm_nmi_w(uint8_t data)
void simpsons_state::z80_nmi_w(int state)
{
- if (state && !m_nmi_blocked->enabled())
+ if (state && !m_nmi_blocked->running())
m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
}
diff --git a/src/mame/konami/vendetta.cpp b/src/mame/konami/vendetta.cpp
index c3442d8f60d..3da014c22a8 100644
--- a/src/mame/konami/vendetta.cpp
+++ b/src/mame/konami/vendetta.cpp
@@ -344,7 +344,7 @@ void vendetta_state::z80_arm_nmi_w(uint8_t data)
void vendetta_state::z80_nmi_w(int state)
{
- if (state && !m_nmi_blocked->enabled())
+ if (state && !m_nmi_blocked->running())
m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
}
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index afb0c39daa7..db9781e99a1 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -589,6 +589,7 @@ olympiaint/peoplepc.cpp
omnibyte/msbc1.cpp
omnibyte/ob68k1a.cpp
omron/luna_68k.cpp
+omron/luna_88k.cpp
openuni/hektor.cpp
osborne/osbexec.cpp
osborne/osborne1.cpp
diff --git a/src/mame/miltonbradley/microvsn.cpp b/src/mame/miltonbradley/microvsn.cpp
index d562095d656..37228530692 100644
--- a/src/mame/miltonbradley/microvsn.cpp
+++ b/src/mame/miltonbradley/microvsn.cpp
@@ -295,7 +295,7 @@ u8 microvision_state::tms1100_k_r()
// K8: paddle capacitor
if (m_paddle_on)
- data |= (m_paddle_timer->enabled() ? 0 : BIT(m_r, 2)) << 3;
+ data |= (m_paddle_timer->running() ? 0 : BIT(m_r, 2)) << 3;
return data;
}
@@ -390,7 +390,7 @@ READ_LINE_MEMBER(microvision_state::i8021_t1_r)
{
// T1: paddle capacitor (active low)
int active = (m_p2 & 0xc) ? 1 : 0;
- active |= m_paddle_timer->enabled() ? 1 : 0;
+ active |= m_paddle_timer->running() ? 1 : 0;
return (m_paddle_on) ? active : 1;
}
diff --git a/src/mame/saitek/risc2500.cpp b/src/mame/saitek/risc2500.cpp
index 36afd69a4b6..b62047a6055 100644
--- a/src/mame/saitek/risc2500.cpp
+++ b/src/mame/saitek/risc2500.cpp
@@ -229,7 +229,7 @@ void risc2500_state::install_bootrom(bool enable)
u32 risc2500_state::disable_boot_rom_r()
{
// disconnect bootrom from the bus after next opcode
- if (m_bootrom_enabled && !m_disable_bootrom->enabled() && !machine().side_effects_disabled())
+ if (m_bootrom_enabled && !m_disable_bootrom->running() && !machine().side_effects_disabled())
m_disable_bootrom->adjust(m_maincpu->cycles_to_attotime(10));
return 0;
diff --git a/src/mame/sgi/hpc3.cpp b/src/mame/sgi/hpc3.cpp
index ad5b58dd9dd..8067e118183 100644
--- a/src/mame/sgi/hpc3.cpp
+++ b/src/mame/sgi/hpc3.cpp
@@ -524,7 +524,7 @@ void hpc3_device::hd_enet_w(offs_t offset, uint32_t data, uint32_t mem_mask)
else
m_enet_tx_ctrl = (m_enet_tx_ctrl & (TXC_LC | TXC_ST)) | (data & ~((TXC_LC | TXC_ST)));
- if ((m_enet_tx_ctrl & TXC_CA) && !m_enet_tx_timer->enabled())
+ if ((m_enet_tx_ctrl & TXC_CA) && !m_enet_tx_timer->running())
m_enet_tx_timer->adjust(attotime::zero);
break;
case 0x7008/4:
diff --git a/src/mame/shared/efo_zsu.cpp b/src/mame/shared/efo_zsu.cpp
index 11b570e6de6..4bb4e7c1105 100644
--- a/src/mame/shared/efo_zsu.cpp
+++ b/src/mame/shared/efo_zsu.cpp
@@ -203,7 +203,7 @@ WRITE_LINE_MEMBER(efo_zsu_device::ctc0_z2_w)
WRITE_LINE_MEMBER(efo_zsu_device::fifo_dor_w)
{
- if (!m_fifo_shift_timer->enabled())
+ if (!m_fifo_shift_timer->running())
m_ctc[0]->trg3(!state);
}
diff --git a/src/mame/televideo/tv955kb.cpp b/src/mame/televideo/tv955kb.cpp
index 6b9063f1f3f..80d493d6766 100644
--- a/src/mame/televideo/tv955kb.cpp
+++ b/src/mame/televideo/tv955kb.cpp
@@ -65,7 +65,7 @@ void tv955kb_device::bell_reset()
{
m_bell_on = false;
m_bell->level_w(0);
- m_bell_timer->enable(false);
+ m_bell_timer->adjust(attotime::never);
}
WRITE_LINE_MEMBER(tv955kb_device::write_rxd)
@@ -88,9 +88,9 @@ u8 tv955kb_device::keys_r()
WRITE_LINE_MEMBER(tv955kb_device::bell_w)
{
- if (state && m_bell_timer->enabled())
+ if (state && m_bell_timer->running())
bell_reset();
- else if (!state && !m_bell_timer->enabled())
+ else if (!state && !m_bell_timer->running())
{
// Speaker driven through 2N4401 from Q8 output of MC14040 clocked by ALE
attotime period = m_mcu->cycles_to_attotime(128);
diff --git a/src/mame/tiger/k28.cpp b/src/mame/tiger/k28.cpp
index f9be588d9a6..c41e97eb712 100644
--- a/src/mame/tiger/k28.cpp
+++ b/src/mame/tiger/k28.cpp
@@ -184,7 +184,7 @@ u8 k28_state::mcu_p1_r()
data |= m_inputs[i]->read();
// force press on-button at boot
- if (i == 5 && m_onbutton_timer->enabled())
+ if (i == 5 && m_onbutton_timer->running())
data |= 1;
}