From f77249b044a4d9ab5c044af63b989dd5d649c3bf Mon Sep 17 00:00:00 2001 From: cam900 Date: Sat, 27 Apr 2019 18:47:32 +0900 Subject: k051316.cpp : Simplify handlers --- src/mame/drivers/88games.cpp | 6 +++--- src/mame/drivers/bottom9.cpp | 6 +++--- src/mame/drivers/chqflag.cpp | 4 ++-- src/mame/drivers/rollerg.cpp | 4 ++-- src/mame/video/k051316.cpp | 8 ++++---- src/mame/video/k051316.h | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp index 924a19df8fd..8dcecf9385e 100644 --- a/src/mame/drivers/88games.cpp +++ b/src/mame/drivers/88games.cpp @@ -39,9 +39,9 @@ READ8_MEMBER(_88games_state::bankedram_r) else { if (m_zoomreadroms) - return m_k051316->rom_r(space, offset); + return m_k051316->rom_r(offset); else - return m_k051316->read(space, offset); + return m_k051316->read(offset); } } @@ -50,7 +50,7 @@ WRITE8_MEMBER(_88games_state::bankedram_w) if (m_videobank) m_ram[offset] = data; else - m_k051316->write(space, offset, data); + m_k051316->write(offset, data); } WRITE8_MEMBER(_88games_state::k88games_5f84_w) diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp index 17579e8b007..c5712137bcf 100644 --- a/src/mame/drivers/bottom9.cpp +++ b/src/mame/drivers/bottom9.cpp @@ -63,9 +63,9 @@ READ8_MEMBER(bottom9_state::bottom9_bankedram1_r) else { if (m_zoomreadroms) - return m_k051316->rom_r(space, offset); + return m_k051316->rom_r(offset); else - return m_k051316->read(space, offset); + return m_k051316->read(offset); } } @@ -74,7 +74,7 @@ WRITE8_MEMBER(bottom9_state::bottom9_bankedram1_w) if (m_k052109_selected) k052109_051960_w(space, offset, data); else - m_k051316->write(space, offset, data); + m_k051316->write(offset, data); } READ8_MEMBER(bottom9_state::bottom9_bankedram2_r) diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp index 62517565017..444ebb873fa 100644 --- a/src/mame/drivers/chqflag.cpp +++ b/src/mame/drivers/chqflag.cpp @@ -38,9 +38,9 @@ template READ8_MEMBER(chqflag_state::k051316_ramrom_r) { if (m_k051316_readroms) - return m_k051316[Chip]->rom_r(space, offset); + return m_k051316[Chip]->rom_r(offset); else - return m_k051316[Chip]->read(space, offset); + return m_k051316[Chip]->read(offset); } WRITE8_MEMBER(chqflag_state::chqflag_bankswitch_w) diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp index 0da4cf9287a..528994e61a0 100644 --- a/src/mame/drivers/rollerg.cpp +++ b/src/mame/drivers/rollerg.cpp @@ -44,9 +44,9 @@ WRITE8_MEMBER(rollerg_state::rollerg_0010_w) READ8_MEMBER(rollerg_state::rollerg_k051316_r) { if (m_readzoomroms) - return m_k051316->rom_r(space, offset); + return m_k051316->rom_r(offset); else - return m_k051316->read(space, offset); + return m_k051316->read(offset); } WRITE8_MEMBER(rollerg_state::soundirq_w) diff --git a/src/mame/video/k051316.cpp b/src/mame/video/k051316.cpp index 528a7e6cbb8..3e770b365ff 100644 --- a/src/mame/video/k051316.cpp +++ b/src/mame/video/k051316.cpp @@ -189,19 +189,19 @@ void k051316_device::device_reset() DEVICE HANDLERS *****************************************************************************/ -READ8_MEMBER( k051316_device::read ) +u8 k051316_device::read(offs_t offset) { return m_ram[offset]; } -WRITE8_MEMBER( k051316_device::write ) +void k051316_device::write(offs_t offset, u8 data) { m_ram[offset] = data; m_tmap->mark_tile_dirty(offset & 0x3ff); } -READ8_MEMBER( k051316_device::rom_r ) +u8 k051316_device::rom_r(offs_t offset) { assert (m_zoom_rom.found()); @@ -222,7 +222,7 @@ READ8_MEMBER( k051316_device::rom_r ) } } -WRITE8_MEMBER( k051316_device::ctrl_w ) +void k051316_device::ctrl_w(offs_t offset, u8 data) { m_ctrlram[offset] = data; //if (offset >= 0x0c) logerror("%s: write %02x to 051316 reg %x\n", machine().describe_context(), data, offset); diff --git a/src/mame/video/k051316.h b/src/mame/video/k051316.h index 7fbea2355a4..d6ebe726a81 100644 --- a/src/mame/video/k051316.h +++ b/src/mame/video/k051316.h @@ -46,10 +46,10 @@ public: structure (e.g. TILE_FLIPX) */ - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( rom_r ); - DECLARE_WRITE8_MEMBER( ctrl_w ); + u8 read(offs_t offset); + void write(offs_t offset, u8 data); + u8 rom_r(offs_t offset); + void ctrl_w(offs_t offset, u8 data); void zoom_draw(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect,int flags,uint32_t priority); void wraparound_enable(int status); -- cgit v1.2.3