diff options
Diffstat (limited to 'src/mame/machine/archimds.cpp')
-rw-r--r-- | src/mame/machine/archimds.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/machine/archimds.cpp b/src/mame/machine/archimds.cpp index 86f8cc67ac3..d940cb4a11c 100644 --- a/src/mame/machine/archimds.cpp +++ b/src/mame/machine/archimds.cpp @@ -260,7 +260,7 @@ void archimedes_state::archimedes_init() m_timer[3]->adjust(attotime::never); } -READ32_MEMBER(archimedes_state::archimedes_memc_logical_r) +uint32_t archimedes_state::archimedes_memc_logical_r(offs_t offset) { uint32_t page, poffs; @@ -298,7 +298,7 @@ READ32_MEMBER(archimedes_state::archimedes_memc_logical_r) -WRITE32_MEMBER(archimedes_state::archimedes_memc_logical_w) +void archimedes_state::archimedes_memc_logical_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t page, poffs; @@ -327,7 +327,7 @@ WRITE32_MEMBER(archimedes_state::archimedes_memc_logical_w) } /* Aristocrat Mark 5 - same as normal AA except with Dram emulator */ -READ32_MEMBER(archimedes_state::aristmk5_drame_memc_logical_r) +uint32_t archimedes_state::aristmk5_drame_memc_logical_r(offs_t offset) { uint32_t page, poffs; @@ -448,7 +448,7 @@ bool archimedes_state::check_floppy_ready() } /* TODO: should be a 8-bit handler */ -READ32_MEMBER( archimedes_state::ioc_ctrl_r ) +uint32_t archimedes_state::ioc_ctrl_r(offs_t offset) { if(IOC_LOG) logerror("IOC: R %s = %02x (PC=%x) %02x\n", ioc_regnames[offset&0x1f], m_ioc_regs[offset&0x1f], m_maincpu->pc(),offset & 0x1f); @@ -521,7 +521,7 @@ READ32_MEMBER( archimedes_state::ioc_ctrl_r ) } /* TODO: should be a 8-bit handler */ -WRITE32_MEMBER( archimedes_state::ioc_ctrl_w ) +void archimedes_state::ioc_ctrl_w(offs_t offset, uint32_t data) { if(IOC_LOG) logerror("IOC: W %02x @ reg %s (PC=%x)\n", data&0xff, ioc_regnames[offset&0x1f], m_maincpu->pc()); @@ -651,7 +651,7 @@ WRITE32_MEMBER( archimedes_state::ioc_ctrl_w ) } } -READ32_MEMBER(archimedes_state::archimedes_ioc_r) +uint32_t archimedes_state::archimedes_ioc_r(offs_t offset, uint32_t mem_mask) { uint32_t ioc_addr; @@ -668,7 +668,7 @@ READ32_MEMBER(archimedes_state::archimedes_ioc_r) { switch((ioc_addr & 0x70000) >> 16) { - case 0: return ioc_ctrl_r(space,offset,mem_mask); + case 0: return ioc_ctrl_r(offset); case 1: if (m_fdc) { @@ -732,7 +732,7 @@ READ32_MEMBER(archimedes_state::archimedes_ioc_r) return 0; } -WRITE32_MEMBER(archimedes_state::archimedes_ioc_w) +void archimedes_state::archimedes_ioc_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint32_t ioc_addr; @@ -749,7 +749,7 @@ WRITE32_MEMBER(archimedes_state::archimedes_ioc_w) { switch((ioc_addr & 0x70000) >> 16) { - case 0: ioc_ctrl_w(space,offset,data,mem_mask); return; + case 0: ioc_ctrl_w(offset,data); return; case 1: if (m_fdc) { @@ -852,7 +852,7 @@ WRITE32_MEMBER(archimedes_state::archimedes_ioc_w) logerror("(PC=%08x) I/O: W %x @ %x (mask %08x)\n", m_maincpu->pc(), data, (offset*4)+0x3000000, mem_mask); } -WRITE32_MEMBER(archimedes_state::archimedes_memc_w) +void archimedes_state::archimedes_memc_w(offs_t offset, uint32_t data, uint32_t mem_mask) { // is it a register? if ((data & 0x0fe00000) == 0x03600000) @@ -970,7 +970,7 @@ The physical page is encoded differently depending on the page size : 1 being bit 6 */ -WRITE32_MEMBER(archimedes_state::archimedes_memc_page_w) +void archimedes_state::archimedes_memc_page_w(uint32_t data) { uint32_t log, phys, memc; |