diff options
Diffstat (limited to 'src/mame/machine/midwayic.cpp')
-rw-r--r-- | src/mame/machine/midwayic.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp index c7aedfa33c2..44d252131c0 100644 --- a/src/mame/machine/midwayic.cpp +++ b/src/mame/machine/midwayic.cpp @@ -758,7 +758,7 @@ void midway_ioasic_device::device_start() { m_dcs->set_fifo_callbacks( read16smo_delegate(*this, FUNC(midway_ioasic_device::fifo_r)), - read16_delegate(*this, FUNC(midway_ioasic_device::fifo_status_r)), + read16mo_delegate(*this, FUNC(midway_ioasic_device::fifo_status_r)), write_line_delegate(*this, FUNC(midway_ioasic_device::fifo_reset_w))); m_dcs->set_io_callbacks( write_line_delegate(*this, FUNC(midway_ioasic_device::ioasic_output_full)), @@ -788,7 +788,7 @@ void midway_ioasic_device::ioasic_reset() void midway_ioasic_device::update_ioasic_irq() { - uint16_t fifo_state = fifo_status_r(machine().dummy_space(), 0); + uint16_t fifo_state = fifo_status_r(machine().dummy_space()); uint16_t irqbits = 0x2000; uint8_t new_state; @@ -889,7 +889,7 @@ uint16_t midway_ioasic_device::fifo_r() } -READ16_MEMBER(midway_ioasic_device::fifo_status_r) +uint16_t midway_ioasic_device::fifo_status_r(address_space &space) { uint16_t result = 0; @@ -972,18 +972,18 @@ void midway_ioasic_device::fifo_full_w(uint16_t data) * *************************************/ -READ32_MEMBER( midway_ioasic_device::packed_r ) +uint32_t midway_ioasic_device::packed_r(address_space &space, offs_t offset, uint32_t mem_mask) { uint32_t result = 0; if (ACCESSING_BITS_0_15) - result |= read(space, offset*2, 0x0000ffff) & 0xffff; + result |= read(space, offset*2) & 0xffff; if (ACCESSING_BITS_16_31) - result |= (read(space, offset*2+1, 0x0000ffff) & 0xffff) << 16; + result |= (read(space, offset*2+1) & 0xffff) << 16; return result; } -READ32_MEMBER( midway_ioasic_device::read ) +uint32_t midway_ioasic_device::read(address_space &space, offs_t offset) { uint32_t result; @@ -1033,7 +1033,7 @@ READ32_MEMBER( midway_ioasic_device::read ) if (m_has_dcs) { result |= ((m_dcs->control_r() >> 4) ^ 0x40) & 0x00c0; - result |= fifo_status_r(space,0) & 0x0038; + result |= fifo_status_r(space) & 0x0038; result |= m_dcs->data2_r() & 0xff00; } else if (m_has_cage) @@ -1076,12 +1076,12 @@ READ32_MEMBER( midway_ioasic_device::read ) } -WRITE32_MEMBER( midway_ioasic_device::packed_w ) +void midway_ioasic_device::packed_w(offs_t offset, uint32_t data, uint32_t mem_mask) { if (ACCESSING_BITS_0_15) - write(space, offset*2, data & 0xffff, 0x0000ffff); + write(offset*2, data & 0xffff, 0x0000ffff); if (ACCESSING_BITS_16_31) - write(space, offset*2+1, data >> 16, 0x0000ffff); + write(offset*2+1, data >> 16, 0x0000ffff); } void midway_ioasic_device::serial_rx_w(u8 data) @@ -1101,7 +1101,7 @@ void midway_ioasic_device::serial_rx_w(u8 data) } -WRITE32_MEMBER( midway_ioasic_device::write ) +void midway_ioasic_device::write(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t oldreg, newreg; |