diff options
author | 2020-05-28 18:10:20 +0200 | |
---|---|---|
committer | 2020-05-28 18:10:20 +0200 | |
commit | d4c772bcc7263dd2697a7977d196a96ad2d067a3 (patch) | |
tree | 3fa4d24ee8250f44ec9f7a0cc9df94bf8bd3c5cb /src/mame/drivers/joystand.cpp | |
parent | c7d667d41adaa9627a3350e7f984fe7fc431f081 (diff) |
drivers starting with i, j, k, l and m: more macro removal (nw)
Diffstat (limited to 'src/mame/drivers/joystand.cpp')
-rw-r--r-- | src/mame/drivers/joystand.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp index 2f6bc3e2b85..049ffbf1421 100644 --- a/src/mame/drivers/joystand.cpp +++ b/src/mame/drivers/joystand.cpp @@ -174,15 +174,15 @@ private: // tilemaps tilemap_t *m_bg1_tmap; tilemap_t *m_bg2_tmap; - DECLARE_WRITE16_MEMBER(bg1_w); - DECLARE_WRITE16_MEMBER(bg2_w); + void bg1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bg2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); // r5g5b5 layers bitmap_rgb32 m_bg15_bitmap[2]; - DECLARE_WRITE16_MEMBER(bg15_0_w); - DECLARE_WRITE16_MEMBER(bg15_1_w); + void bg15_0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bg15_1_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0); static const rgb_t BG15_TRANSPARENT; void draw_bg15_tile(address_space &space, int x, int y, uint16_t code); void draw_bg15_tilemap(); @@ -193,15 +193,15 @@ private: void eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // cart - DECLARE_READ16_MEMBER(cart_r); - DECLARE_WRITE16_MEMBER(cart_w); + uint16_t cart_r(offs_t offset); + void cart_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // misc - DECLARE_READ16_MEMBER(fpga_r); - DECLARE_WRITE16_MEMBER(oki_bank_w); - DECLARE_READ16_MEMBER(e00000_r); - DECLARE_READ16_MEMBER(e00020_r); - DECLARE_WRITE16_MEMBER(outputs_w); + uint16_t fpga_r(); + void oki_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t e00000_r(); + uint16_t e00020_r(); + void outputs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // screen updates uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -231,13 +231,13 @@ TILE_GET_INFO_MEMBER(joystand_state::get_bg2_tile_info) tileinfo.set(0, code & 0x00ffffff, code >> 24, 0); } -WRITE16_MEMBER(joystand_state::bg1_w) +void joystand_state::bg1_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_bg1_ram[offset]); m_bg1_tmap->mark_tile_dirty(offset/2); } -WRITE16_MEMBER(joystand_state::bg2_w) +void joystand_state::bg2_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_bg2_ram[offset]); m_bg2_tmap->mark_tile_dirty(offset/2); @@ -250,7 +250,7 @@ WRITE16_MEMBER(joystand_state::bg2_w) ***************************************************************************/ // pixel-based -WRITE16_MEMBER(joystand_state::bg15_0_w) +void joystand_state::bg15_0_w(offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t val = COMBINE_DATA(&m_bg15_0_ram[offset]); m_bg15_bitmap[0].pix32(offset >> 9, offset & 0x1ff) = (val & 0x8000) ? BG15_TRANSPARENT : m_bg15_palette->pen_color(val & 0x7fff); @@ -293,7 +293,7 @@ void joystand_state::draw_bg15_tilemap() } } -WRITE16_MEMBER(joystand_state::bg15_1_w) +void joystand_state::bg15_1_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask) { uint16_t code = COMBINE_DATA(&m_bg15_1_ram[offset]); if ((offset & 0x83) == 0x01) @@ -363,12 +363,12 @@ uint32_t joystand_state::screen_update( screen_device &screen, bitmap_rgb32 &bit ***************************************************************************/ -READ16_MEMBER(joystand_state::fpga_r) +uint16_t joystand_state::fpga_r() { return 0xffff; } -WRITE16_MEMBER(joystand_state::oki_bank_w) +void joystand_state::oki_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask) { if (ACCESSING_BITS_0_7) m_oki->set_rom_bank((data >> 6) & 3); @@ -397,7 +397,7 @@ void joystand_state::eeprom_w(offs_t offset, uint16_t data, uint16_t mem_mask) } } -WRITE16_MEMBER(joystand_state::outputs_w) +void joystand_state::outputs_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_outputs[0]); if (ACCESSING_BITS_8_15) @@ -419,24 +419,24 @@ WRITE16_MEMBER(joystand_state::outputs_w) // carts // copy slot -READ16_MEMBER(joystand_state::e00000_r) +uint16_t joystand_state::e00000_r() { return ioport("COPY")->read(); } // master slot -READ16_MEMBER(joystand_state::e00020_r) +uint16_t joystand_state::e00020_r() { return ioport("MASTER")->read(); } -READ16_MEMBER(joystand_state::cart_r) +uint16_t joystand_state::cart_r(offs_t offset) { int which = offset / 0x80000; int addr = offset & 0x7ffff; return (m_cart_flash[which * 2 + 0]->read(addr) << 8) | m_cart_flash[which * 2 + 1]->read(addr); } -WRITE16_MEMBER(joystand_state::cart_w) +void joystand_state::cart_w(offs_t offset, uint16_t data, uint16_t mem_mask) { int which = offset / 0x80000; int addr = offset & 0x7ffff; |