diff options
author | 2020-05-21 22:38:18 -0400 | |
---|---|---|
committer | 2020-05-21 22:38:18 -0400 | |
commit | f95267bf5e215e0f140407fecaf7c16c7da90f81 (patch) | |
tree | 4b2da8dca374c2e247ca84a841af34d09648fb65 /src/devices/bus/cgenie | |
parent | 363485b628f370714ea065fcbd2484d7e0510c1e (diff) |
Various buses and associated drivers: Simplify handler signatures (nw)
Diffstat (limited to 'src/devices/bus/cgenie')
-rw-r--r-- | src/devices/bus/cgenie/expansion/floppy.cpp | 14 | ||||
-rw-r--r-- | src/devices/bus/cgenie/expansion/floppy.h | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp index 6238aaa936f..ef1dd23128f 100644 --- a/src/devices/bus/cgenie/expansion/floppy.cpp +++ b/src/devices/bus/cgenie/expansion/floppy.cpp @@ -155,13 +155,15 @@ void cgenie_fdc_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER( cgenie_fdc_device::irq_r ) +uint8_t cgenie_fdc_device::irq_r() { uint8_t data = m_irq_status; - m_irq_status &= ~IRQ_TIMER; - m_slot->int_w(m_irq_status ? ASSERT_LINE : CLEAR_LINE); - + if (!machine().side_effects_disabled()) + { + m_irq_status &= ~IRQ_TIMER; + m_slot->int_w(m_irq_status ? ASSERT_LINE : CLEAR_LINE); + } return data; } @@ -200,7 +202,7 @@ WRITE_LINE_MEMBER( cgenie_fdc_device::intrq_w ) m_slot->int_w(m_irq_status ? ASSERT_LINE : CLEAR_LINE); } -WRITE8_MEMBER( cgenie_fdc_device::select_w ) +void cgenie_fdc_device::select_w(uint8_t data) { if (VERBOSE) logerror("cgenie_fdc_device::motor_w: 0x%02x\n", data); @@ -221,7 +223,7 @@ WRITE8_MEMBER( cgenie_fdc_device::select_w ) } } -WRITE8_MEMBER( cgenie_fdc_device::command_w ) +void cgenie_fdc_device::command_w(uint8_t data) { // density select is encoded into this pseudo-command if ((data & 0xfe) == 0xfe) diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h index 1b6dbf5268b..80f1f47aa65 100644 --- a/src/devices/bus/cgenie/expansion/floppy.h +++ b/src/devices/bus/cgenie/expansion/floppy.h @@ -43,9 +43,9 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(timer_callback); - DECLARE_READ8_MEMBER(irq_r); - DECLARE_WRITE8_MEMBER(select_w); - DECLARE_WRITE8_MEMBER(command_w); + uint8_t irq_r(); + void select_w(uint8_t data); + void command_w(uint8_t data); void mmio(address_map &map); |