summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/gba
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-06-08 01:29:39 +1000
committer Vas Crabb <vas@vastheman.com>2018-06-08 01:29:39 +1000
commit93eaa6a4943ade6513257a740fcde97ca9468559 (patch)
tree1340f2160a7064a839b7ca649b2257489cdd3d6d /src/devices/bus/gba
parentfafafe7050e4d04230656215b840ac53aad081e7 (diff)
as if millions of this pointers suddenly cried out in terror, and were suddenly silenced
* streamline templates in addrmap.h * get rid of overloads on read/write member names - this will become even more important in the near future
Diffstat (limited to 'src/devices/bus/gba')
-rw-r--r--src/devices/bus/gba/rom.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp
index f31a23de07b..3255d335313 100644
--- a/src/devices/bus/gba/rom.cpp
+++ b/src/devices/bus/gba/rom.cpp
@@ -416,13 +416,13 @@ READ32_MEMBER(gba_rom_flash_device::read_ram)
offset &= m_flash_mask;
if (mem_mask & 0xff)
- rv |= m_flash->read(offset * 4);
+ rv |= m_flash->read(space, offset * 4);
if (mem_mask & 0xff00)
- rv |= m_flash->read((offset * 4) + 1) << 8;
+ rv |= m_flash->read(space, (offset * 4) + 1) << 8;
if (mem_mask & 0xff0000)
- rv |= m_flash->read((offset * 4) + 2) << 16;
+ rv |= m_flash->read(space, (offset * 4) + 2) << 16;
if (mem_mask & 0xff000000)
- rv |= m_flash->read((offset * 4) + 3) << 24;
+ rv |= m_flash->read(space, (offset * 4) + 3) << 24;
return rv;
}
@@ -434,16 +434,16 @@ WRITE32_MEMBER(gba_rom_flash_device::write_ram)
switch (mem_mask)
{
case 0xff:
- m_flash->write(offset * 4, data & 0xff);
+ m_flash->write(space, offset * 4, data & 0xff);
break;
case 0xff00:
- m_flash->write((offset * 4) + 1, (data >> 8) & 0xff);
+ m_flash->write(space, (offset * 4) + 1, (data >> 8) & 0xff);
break;
case 0xff0000:
- m_flash->write((offset * 4) + 2, (data >> 16) & 0xff);
+ m_flash->write(space, (offset * 4) + 2, (data >> 16) & 0xff);
break;
case 0xff000000:
- m_flash->write((offset * 4) + 3, (data >> 24) & 0xff);
+ m_flash->write(space, (offset * 4) + 3, (data >> 24) & 0xff);
break;
default:
fatalerror("Unknown mem_mask for GBA flash write %x\n", mem_mask);
@@ -462,13 +462,13 @@ READ32_MEMBER(gba_rom_flash1m_device::read_ram)
offset &= m_flash_mask;
if (mem_mask & 0xff)
- rv |= m_flash->read(offset * 4);
+ rv |= m_flash->read(space, offset * 4);
if (mem_mask & 0xff00)
- rv |= m_flash->read((offset * 4) + 1) << 8;
+ rv |= m_flash->read(space, (offset * 4) + 1) << 8;
if (mem_mask & 0xff0000)
- rv |= m_flash->read((offset * 4) + 2) << 16;
+ rv |= m_flash->read(space, (offset * 4) + 2) << 16;
if (mem_mask & 0xff000000)
- rv |= m_flash->read((offset * 4) + 3) << 24;
+ rv |= m_flash->read(space, (offset * 4) + 3) << 24;
return rv;
}
@@ -480,16 +480,16 @@ WRITE32_MEMBER(gba_rom_flash1m_device::write_ram)
switch (mem_mask)
{
case 0xff:
- m_flash->write(offset * 4, data & 0xff);
+ m_flash->write(space, offset * 4, data & 0xff);
break;
case 0xff00:
- m_flash->write((offset * 4) + 1, (data >> 8) & 0xff);
+ m_flash->write(space, (offset * 4) + 1, (data >> 8) & 0xff);
break;
case 0xff0000:
- m_flash->write((offset * 4) + 2, (data >> 16) & 0xff);
+ m_flash->write(space, (offset * 4) + 2, (data >> 16) & 0xff);
break;
case 0xff000000:
- m_flash->write((offset * 4) + 3, (data >> 24) & 0xff);
+ m_flash->write(space, (offset * 4) + 3, (data >> 24) & 0xff);
break;
default:
fatalerror("Unknown mem_mask for GBA flash write %x\n", mem_mask);