diff options
Diffstat (limited to 'src/mame/drivers/hp_ipc.cpp')
-rw-r--r-- | src/mame/drivers/hp_ipc.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index 283a53421f4..895337778cd 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -400,17 +400,17 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ16_MEMBER(mem_r); - DECLARE_WRITE16_MEMBER(mem_w); - DECLARE_READ16_MEMBER(mmu_r); - DECLARE_WRITE16_MEMBER(mmu_w); - DECLARE_READ16_MEMBER(ram_r); - DECLARE_WRITE16_MEMBER(ram_w); - DECLARE_READ16_MEMBER(trap_r); - DECLARE_WRITE16_MEMBER(trap_w); - - DECLARE_READ8_MEMBER(floppy_id_r); - DECLARE_WRITE8_MEMBER(floppy_id_w); + uint16_t mem_r(offs_t offset, uint16_t mem_mask); + void mem_w(offs_t offset, uint16_t data, uint16_t mem_mask); + uint16_t mmu_r(offs_t offset); + void mmu_w(offs_t offset, uint16_t data); + uint16_t ram_r(offs_t offset, uint16_t mem_mask); + void ram_w(offs_t offset, uint16_t data, uint16_t mem_mask); + uint16_t trap_r(offs_t offset, uint16_t mem_mask); + void trap_w(offs_t offset, uint16_t data, uint16_t mem_mask); + + uint8_t floppy_id_r(); + void floppy_id_w(uint8_t data); DECLARE_FLOPPY_FORMATS(floppy_formats); DECLARE_WRITE_LINE_MEMBER(irq_1); @@ -523,19 +523,19 @@ static INPUT_PORTS_START(hp_ipc) INPUT_PORTS_END -READ16_MEMBER(hp_ipc_state::mmu_r) +uint16_t hp_ipc_state::mmu_r(offs_t offset) { uint16_t data = (m_mmu[offset & 3] >> 10); return data; } -WRITE16_MEMBER(hp_ipc_state::mmu_w) +void hp_ipc_state::mmu_w(offs_t offset, uint16_t data) { m_mmu[offset & 3] = (data & 0xFFF) << 10; } -READ16_MEMBER(hp_ipc_state::mem_r) +uint16_t hp_ipc_state::mem_r(offs_t offset, uint16_t mem_mask) { int fc = m_maincpu->get_fc() & 4; @@ -545,10 +545,10 @@ READ16_MEMBER(hp_ipc_state::mem_r) m_bankdev->set_bank(m_fc ? 0 : 1); } - return m_bankdev->read16(space, offset, mem_mask); + return m_bankdev->read16(offset, mem_mask); } -WRITE16_MEMBER(hp_ipc_state::mem_w) +void hp_ipc_state::mem_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int fc = m_maincpu->get_fc() & 4; @@ -558,23 +558,23 @@ WRITE16_MEMBER(hp_ipc_state::mem_w) m_bankdev->set_bank(m_fc ? 0 : 1); } - m_bankdev->write16(space, offset, data, mem_mask); + m_bankdev->write16(offset, data, mem_mask); } -READ16_MEMBER(hp_ipc_state::trap_r) +uint16_t hp_ipc_state::trap_r(offs_t offset, uint16_t mem_mask) { if (!machine().side_effects_disabled()) set_bus_error((offset << 1) & 0xFFFFFF, true, mem_mask); return 0xffff; } -WRITE16_MEMBER(hp_ipc_state::trap_w) +void hp_ipc_state::trap_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (!machine().side_effects_disabled()) set_bus_error((offset << 1) & 0xFFFFFF, false, mem_mask); } -READ16_MEMBER(hp_ipc_state::ram_r) +uint16_t hp_ipc_state::ram_r(offs_t offset, uint16_t mem_mask) { uint32_t ram_address = get_ram_address(offset); uint16_t data = 0xffff; @@ -592,7 +592,7 @@ READ16_MEMBER(hp_ipc_state::ram_r) return data; } -WRITE16_MEMBER(hp_ipc_state::ram_w) +void hp_ipc_state::ram_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint32_t ram_address = get_ram_address(offset); @@ -613,7 +613,7 @@ WRITE16_MEMBER(hp_ipc_state::ram_w) * bit 1 -- disk changed (from drive) * bit 0 -- write protect (from drive) */ -READ8_MEMBER(hp_ipc_state::floppy_id_r) +uint8_t hp_ipc_state::floppy_id_r() { uint8_t data = 0; @@ -634,7 +634,7 @@ READ8_MEMBER(hp_ipc_state::floppy_id_r) * bit 1 -- 1: drive select (via inverter to drive's /DRIVE SEL 1) * bit 0 -- 1: reset disc_changed (via inverter to drive's /DSKRST) */ -WRITE8_MEMBER(hp_ipc_state::floppy_id_w) +void hp_ipc_state::floppy_id_w(uint8_t data) { floppy_image_device *floppy0 = m_fdc->subdevice<floppy_connector>("0")->get_device(); |