diff options
Diffstat (limited to 'src/devices/bus/nubus/nubus_m2hires.cpp')
-rw-r--r-- | src/devices/bus/nubus/nubus_m2hires.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp index 7ba4efe9b30..851537685d2 100644 --- a/src/devices/bus/nubus/nubus_m2hires.cpp +++ b/src/devices/bus/nubus/nubus_m2hires.cpp @@ -93,9 +93,9 @@ void nubus_m2hires_device::device_start() m_vram.resize(VRAM_SIZE); m_vram32 = (uint32_t *)&m_vram[0]; - nubus().install_device(slotspace, slotspace+VRAM_SIZE-1, read32_delegate(*this, FUNC(nubus_m2hires_device::vram_r)), write32_delegate(*this, FUNC(nubus_m2hires_device::vram_w))); - nubus().install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32_delegate(*this, FUNC(nubus_m2hires_device::vram_r)), write32_delegate(*this, FUNC(nubus_m2hires_device::vram_w))); - nubus().install_device(slotspace+0x80000, slotspace+0xeffff, read32_delegate(*this, FUNC(nubus_m2hires_device::m2hires_r)), write32_delegate(*this, FUNC(nubus_m2hires_device::m2hires_w))); + nubus().install_device(slotspace, slotspace+VRAM_SIZE-1, read32s_delegate(*this, FUNC(nubus_m2hires_device::vram_r)), write32s_delegate(*this, FUNC(nubus_m2hires_device::vram_w))); + nubus().install_device(slotspace+0x900000, slotspace+VRAM_SIZE-1+0x900000, read32s_delegate(*this, FUNC(nubus_m2hires_device::vram_r)), write32s_delegate(*this, FUNC(nubus_m2hires_device::vram_w))); + nubus().install_device(slotspace+0x80000, slotspace+0xeffff, read32s_delegate(*this, FUNC(nubus_m2hires_device::m2hires_r)), write32s_delegate(*this, FUNC(nubus_m2hires_device::m2hires_w))); m_timer = timer_alloc(0, nullptr); m_timer->adjust(screen().time_until_pos(479, 0), 0); @@ -215,7 +215,7 @@ uint32_t nubus_m2hires_device::screen_update(screen_device &screen, bitmap_rgb32 return 0; } -WRITE32_MEMBER( nubus_m2hires_device::m2hires_w ) +void nubus_m2hires_device::m2hires_w(offs_t offset, uint32_t data, uint32_t mem_mask) { data ^= 0xffffffff; @@ -278,7 +278,7 @@ WRITE32_MEMBER( nubus_m2hires_device::m2hires_w ) } } -READ32_MEMBER( nubus_m2hires_device::m2hires_r ) +uint32_t nubus_m2hires_device::m2hires_r(offs_t offset, uint32_t mem_mask) { if (offset == 0x10010/4) { @@ -293,13 +293,13 @@ READ32_MEMBER( nubus_m2hires_device::m2hires_r ) return 0; } -WRITE32_MEMBER( nubus_m2hires_device::vram_w ) +void nubus_m2hires_device::vram_w(offs_t offset, uint32_t data, uint32_t mem_mask) { data ^= 0xffffffff; COMBINE_DATA(&m_vram32[offset]); } -READ32_MEMBER( nubus_m2hires_device::vram_r ) +uint32_t nubus_m2hires_device::vram_r(offs_t offset, uint32_t mem_mask) { return m_vram32[offset] ^ 0xffffffff; } |