From 6f86608136c1cdcb166bf8fe794cb2cc62804e64 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 24 Mar 2014 17:58:24 +0000 Subject: [PATCH] READ/WRITE*_HANDLER to READ/WRITE*_MEMBER where it was wrongly placed (nw) --- src/emu/cpu/psx/psx.c | 16 ++++++++-------- src/emu/machine/mc68681.h | 4 ++-- src/emu/tilemap.c | 12 ++++++------ src/emu/tilemap.h | 12 ++++++------ src/mame/drivers/3x3puzzl.c | 6 +++--- src/mame/drivers/dreambal.c | 2 +- src/mame/drivers/jaguar.c | 2 +- src/mame/drivers/konendev.c | 8 ++++---- src/mame/drivers/seabattl.c | 16 ++++++++-------- src/mame/includes/megadriv.h | 6 +++--- src/mame/includes/segaorun.h | 8 ++++---- src/mame/includes/segas16b.h | 4 ++-- src/mame/includes/segas18.h | 4 ++-- src/mame/machine/snes.c | 2 +- src/mame/video/redclash.c | 14 +++++++------- src/mess/machine/thomflop.c | 2 +- 16 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/emu/cpu/psx/psx.c b/src/emu/cpu/psx/psx.c index 4f0efa68d51..505e1f9a27c 100644 --- a/src/emu/cpu/psx/psx.c +++ b/src/emu/cpu/psx/psx.c @@ -266,13 +266,13 @@ WRITE32_MEMBER( psxcpu_device::rom_config_w ) } } -READ32_HANDLER( psxcpu_device::com_delay_r ) +READ32_MEMBER( psxcpu_device::com_delay_r ) { //verboselog( p_psx, 1, "psx_com_delay_r( %08x )\n", mem_mask ); return m_com_delay; } -WRITE32_HANDLER( psxcpu_device::com_delay_w ) +WRITE32_MEMBER( psxcpu_device::com_delay_w ) { COMBINE_DATA( &m_com_delay ); // TODO: check byte writes //verboselog( p_psx, 1, "psx_com_delay_w( %08x %08x )\n", data, mem_mask ); @@ -3351,32 +3351,32 @@ psxcpu_device *psxcpu_device::getcpu( device_t &device, const char *cputag ) return downcast( device.subdevice( cputag ) ); } -READ32_HANDLER( psxcpu_device::gpu_r ) +READ32_MEMBER( psxcpu_device::gpu_r ) { return m_gpu_read_handler( space, offset, mem_mask ); } -WRITE32_HANDLER( psxcpu_device::gpu_w ) +WRITE32_MEMBER( psxcpu_device::gpu_w ) { m_gpu_write_handler( space, offset, data, mem_mask ); } -READ16_HANDLER( psxcpu_device::spu_r ) +READ16_MEMBER( psxcpu_device::spu_r ) { return m_spu_read_handler( space, offset, mem_mask ); } -WRITE16_HANDLER( psxcpu_device::spu_w ) +WRITE16_MEMBER( psxcpu_device::spu_w ) { m_spu_write_handler( space, offset, data, mem_mask ); } -READ8_HANDLER( psxcpu_device::cd_r ) +READ8_MEMBER( psxcpu_device::cd_r ) { return m_cd_read_handler( space, offset, mem_mask ); } -WRITE8_HANDLER( psxcpu_device::cd_w ) +WRITE8_MEMBER( psxcpu_device::cd_w ) { m_cd_write_handler( space, offset, data, mem_mask ); } diff --git a/src/emu/machine/mc68681.h b/src/emu/machine/mc68681.h index 60c7d3b782d..e56ad90041c 100644 --- a/src/emu/machine/mc68681.h +++ b/src/emu/machine/mc68681.h @@ -104,8 +104,8 @@ public: static void static_set_clocks(device_t &device, int clk3, int clk4, int clk5, int clk6); // API - DECLARE_READ8_HANDLER(read); - DECLARE_WRITE8_HANDLER(write); + DECLARE_READ8_MEMBER(read); + DECLARE_WRITE8_MEMBER(write); UINT8 get_irq_vector() { m_read_vector = true; return IVR; } DECLARE_WRITE_LINE_MEMBER( rx_a_w ) { m_chanA->device_serial_interface::rx_w((UINT8)state); } diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index ae5fd146ed3..2cee5ea96ef 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -1665,14 +1665,14 @@ void tilemap_device::static_set_transparent_pen(device_t &device, pen_t pen) // write: Main memory writes //------------------------------------------------- -WRITE8_HANDLER(tilemap_device::write) +WRITE8_MEMBER(tilemap_device::write) { m_basemem.write8(offset, data); offset /= m_bytes_per_entry; mark_tile_dirty(offset); } -WRITE16_HANDLER(tilemap_device::write) +WRITE16_MEMBER(tilemap_device::write) { m_basemem.write16(offset, data, mem_mask); offset = offset * 2 / m_bytes_per_entry; @@ -1681,7 +1681,7 @@ WRITE16_HANDLER(tilemap_device::write) mark_tile_dirty(offset + 1); } -WRITE32_HANDLER(tilemap_device::write) +WRITE32_MEMBER(tilemap_device::write) { m_basemem.write32(offset, data, mem_mask); offset = offset * 4 / m_bytes_per_entry; @@ -1702,14 +1702,14 @@ WRITE32_HANDLER(tilemap_device::write) // write_entry_ext: Extension memory writes //------------------------------------------------- -WRITE8_HANDLER(tilemap_device::write_ext) +WRITE8_MEMBER(tilemap_device::write_ext) { m_extmem.write8(offset, data); offset /= m_bytes_per_entry; mark_tile_dirty(offset); } -WRITE16_HANDLER(tilemap_device::write_ext) +WRITE16_MEMBER(tilemap_device::write_ext) { m_extmem.write16(offset, data, mem_mask); offset = offset * 2 / m_bytes_per_entry; @@ -1718,7 +1718,7 @@ WRITE16_HANDLER(tilemap_device::write_ext) mark_tile_dirty(offset + 1); } -WRITE32_HANDLER(tilemap_device::write_ext) +WRITE32_MEMBER(tilemap_device::write_ext) { m_extmem.write32(offset, data, mem_mask); offset = offset * 4 / m_bytes_per_entry; diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h index e3414f639b3..de2f9c00a5c 100644 --- a/src/emu/tilemap.h +++ b/src/emu/tilemap.h @@ -728,12 +728,12 @@ public: static void static_set_transparent_pen(device_t &device, pen_t pen); // write handlers - DECLARE_WRITE8_HANDLER(write); - DECLARE_WRITE16_HANDLER(write); - DECLARE_WRITE32_HANDLER(write); - DECLARE_WRITE8_HANDLER(write_ext); - DECLARE_WRITE16_HANDLER(write_ext); - DECLARE_WRITE32_HANDLER(write_ext); + DECLARE_WRITE8_MEMBER(write); + DECLARE_WRITE16_MEMBER(write); + DECLARE_WRITE32_MEMBER(write); + DECLARE_WRITE8_MEMBER(write_ext); + DECLARE_WRITE16_MEMBER(write_ext); + DECLARE_WRITE32_MEMBER(write_ext); // pick one to use to avoid ambiguity errors using device_t::machine; diff --git a/src/mame/drivers/3x3puzzl.c b/src/mame/drivers/3x3puzzl.c index 82e0ece96ec..ab3e0d7aa80 100644 --- a/src/mame/drivers/3x3puzzl.c +++ b/src/mame/drivers/3x3puzzl.c @@ -88,9 +88,9 @@ public: int m_oki_bank; UINT16 m_gfx_control; - DECLARE_WRITE16_HANDLER(gfx_ctrl_w); - DECLARE_WRITE16_HANDLER(tilemap1_scrollx_w); - DECLARE_WRITE16_HANDLER(tilemap1_scrolly_w); + DECLARE_WRITE16_MEMBER(gfx_ctrl_w); + DECLARE_WRITE16_MEMBER(tilemap1_scrollx_w); + DECLARE_WRITE16_MEMBER(tilemap1_scrolly_w); protected: virtual void video_start(); diff --git a/src/mame/drivers/dreambal.c b/src/mame/drivers/dreambal.c index cd8e5377069..230267aa5cc 100644 --- a/src/mame/drivers/dreambal.c +++ b/src/mame/drivers/dreambal.c @@ -54,7 +54,7 @@ public: DECLARE_READ16_MEMBER( dreambal_protection_region_0_104_r ); DECLARE_WRITE16_MEMBER( dreambal_protection_region_0_104_w ); - DECLARE_WRITE16_HANDLER( dreambal_eeprom_w ) + DECLARE_WRITE16_MEMBER( dreambal_eeprom_w ) { if (data&0xfff8) { diff --git a/src/mame/drivers/jaguar.c b/src/mame/drivers/jaguar.c index b5a65652bc0..09217c138f1 100644 --- a/src/mame/drivers/jaguar.c +++ b/src/mame/drivers/jaguar.c @@ -381,7 +381,7 @@ public: { } - virtual WRITE16_HANDLER(write_cs0) + virtual DECLARE_WRITE16_MEMBER(write_cs0) { // the first write is to the device head register if( offset == 6 && (m_status & IDE_STATUS_DRQ)) diff --git a/src/mame/drivers/konendev.c b/src/mame/drivers/konendev.c index 94fcc4024ba..1a7b545345f 100644 --- a/src/mame/drivers/konendev.c +++ b/src/mame/drivers/konendev.c @@ -51,8 +51,8 @@ protected: public: DECLARE_DRIVER_INIT(konendev); - DECLARE_READ32_HANDLER(gcu_r); - DECLARE_WRITE32_HANDLER(gcu_w); + DECLARE_READ32_MEMBER(gcu_r); + DECLARE_WRITE32_MEMBER(gcu_w); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -63,7 +63,7 @@ UINT32 konendev_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap } // VERY similar to the Firebeat GCU, probably the same -READ32_HANDLER(konendev_state::gcu_r) +READ32_MEMBER(konendev_state::gcu_r) { int reg = offset << 2; @@ -77,7 +77,7 @@ READ32_HANDLER(konendev_state::gcu_r) return 0; } -WRITE32_HANDLER(konendev_state::gcu_w) +WRITE32_MEMBER(konendev_state::gcu_w) { int reg = offset << 2; diff --git a/src/mame/drivers/seabattl.c b/src/mame/drivers/seabattl.c index 66d65c88ebe..c24e8b2e9bc 100644 --- a/src/mame/drivers/seabattl.c +++ b/src/mame/drivers/seabattl.c @@ -268,7 +268,7 @@ static ADDRESS_MAP_START( seabattl_io_map, AS_IO, 8, seabattl_state ) AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE") ADDRESS_MAP_END -READ8_HANDLER(seabattl_state::seabattl_collision_r) +READ8_MEMBER(seabattl_state::seabattl_collision_r) { m_screen->update_partial(m_screen->vpos()); return m_collision; @@ -287,20 +287,20 @@ WRITE8_MEMBER(seabattl_state::seabattl_control_w) m_waveenable = BIT(data, 5); } -READ8_HANDLER(seabattl_state::seabattl_collision_clear_r) +READ8_MEMBER(seabattl_state::seabattl_collision_clear_r) { m_screen->update_partial(m_screen->vpos()); m_collision = 0; return 0; } -WRITE8_HANDLER(seabattl_state::seabattl_collision_clear_w ) +WRITE8_MEMBER(seabattl_state::seabattl_collision_clear_w ) { m_screen->update_partial(m_screen->vpos()); m_collision = 0; } -WRITE8_HANDLER(seabattl_state::sound_w ) +WRITE8_MEMBER(seabattl_state::sound_w ) { // sound effects // bits: @@ -314,7 +314,7 @@ WRITE8_HANDLER(seabattl_state::sound_w ) // 7 - unused } -WRITE8_HANDLER(seabattl_state::sound2_w ) +WRITE8_MEMBER(seabattl_state::sound2_w ) { // sound effects // bits: @@ -328,19 +328,19 @@ WRITE8_HANDLER(seabattl_state::sound2_w ) // 7 - unused } -WRITE8_HANDLER(seabattl_state::time_display_w ) +WRITE8_MEMBER(seabattl_state::time_display_w ) { m_digit5->a_w(data & 0x0f); m_digit4->a_w((data >> 4) & 0x0f); } -WRITE8_HANDLER(seabattl_state::score_display_w ) +WRITE8_MEMBER(seabattl_state::score_display_w ) { m_digit3->a_w(data & 0x0f); m_digit2->a_w((data >> 4) & 0x0f); } -WRITE8_HANDLER(seabattl_state::score2_display_w ) +WRITE8_MEMBER(seabattl_state::score2_display_w ) { m_digit1->a_w(data & 0x0f); m_digit0->a_w((data >> 4) & 0x0f); diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index 07d4da6d3ff..2d75b34f277 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -404,9 +404,9 @@ private: READ8_MEMBER( smsgg_backupram_r ); WRITE8_MEMBER( smsgg_backupram_w ); WRITE8_MEMBER( mt_sms_standard_rom_bank_w ); - WRITE8_HANDLER( codemasters_rom_bank_0000_w ); - WRITE8_HANDLER( codemasters_rom_bank_4000_w ); - WRITE8_HANDLER( codemasters_rom_bank_8000_w ); + WRITE8_MEMBER( codemasters_rom_bank_0000_w ); + WRITE8_MEMBER( codemasters_rom_bank_4000_w ); + WRITE8_MEMBER( codemasters_rom_bank_8000_w ); void megatech_set_genz80_as_sms_standard_ports(const char* tag); }; diff --git a/src/mame/includes/segaorun.h b/src/mame/includes/segaorun.h index 970aee585cd..8adbcba72d8 100644 --- a/src/mame/includes/segaorun.h +++ b/src/mame/includes/segaorun.h @@ -78,10 +78,10 @@ public: UINT32 screen_update_outrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_shangon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE16_HANDLER( sega_tileram_0_w ) { m_segaic16vid->segaic16_tileram_0_w(space,offset,data,mem_mask); }; - DECLARE_WRITE16_HANDLER( sega_textram_0_w ) { m_segaic16vid->segaic16_textram_0_w(space,offset,data,mem_mask); }; - DECLARE_READ16_HANDLER( sega_road_control_0_r ) { return m_segaic16road->segaic16_road_control_0_r(space,offset,mem_mask); }; - DECLARE_WRITE16_HANDLER( sega_road_control_0_w ) { m_segaic16road->segaic16_road_control_0_w(space,offset,data,mem_mask); }; + DECLARE_WRITE16_MEMBER( sega_tileram_0_w ) { m_segaic16vid->segaic16_tileram_0_w(space,offset,data,mem_mask); }; + DECLARE_WRITE16_MEMBER( sega_textram_0_w ) { m_segaic16vid->segaic16_textram_0_w(space,offset,data,mem_mask); }; + DECLARE_READ16_MEMBER( sega_road_control_0_r ) { return m_segaic16road->segaic16_road_control_0_r(space,offset,mem_mask); }; + DECLARE_WRITE16_MEMBER( sega_road_control_0_w ) { m_segaic16road->segaic16_road_control_0_w(space,offset,data,mem_mask); }; CUSTOM_INPUT_MEMBER( bankmotor_pos_r ); TIMER_DEVICE_CALLBACK_MEMBER(bankmotor_update); diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h index b039c508c5f..54ae6dcb0fc 100644 --- a/src/mame/includes/segas16b.h +++ b/src/mame/includes/segas16b.h @@ -113,8 +113,8 @@ public: // video updates UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE16_HANDLER( sega_tileram_0_w ) { m_segaic16vid->segaic16_tileram_0_w(space,offset,data,mem_mask); }; - DECLARE_WRITE16_HANDLER( sega_textram_0_w ) { m_segaic16vid->segaic16_textram_0_w(space,offset,data,mem_mask); }; + DECLARE_WRITE16_MEMBER( sega_tileram_0_w ) { m_segaic16vid->segaic16_tileram_0_w(space,offset,data,mem_mask); }; + DECLARE_WRITE16_MEMBER( sega_textram_0_w ) { m_segaic16vid->segaic16_textram_0_w(space,offset,data,mem_mask); }; protected: // internal types diff --git a/src/mame/includes/segas18.h b/src/mame/includes/segas18.h index bff640c36f5..7464a88e740 100644 --- a/src/mame/includes/segas18.h +++ b/src/mame/includes/segas18.h @@ -88,8 +88,8 @@ public: // video rendering UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE16_HANDLER( sega_tileram_0_w ) { m_segaic16vid->segaic16_tileram_0_w(space,offset,data,mem_mask); }; - DECLARE_WRITE16_HANDLER( sega_textram_0_w ) { m_segaic16vid->segaic16_textram_0_w(space,offset,data,mem_mask); }; + DECLARE_WRITE16_MEMBER( sega_tileram_0_w ) { m_segaic16vid->segaic16_tileram_0_w(space,offset,data,mem_mask); }; + DECLARE_WRITE16_MEMBER( sega_textram_0_w ) { m_segaic16vid->segaic16_textram_0_w(space,offset,data,mem_mask); }; protected: // timer IDs diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 47a1bd2c45f..9ff5a63c2f8 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -331,7 +331,7 @@ READ8_MEMBER( snes_state::snes_io_dma_r ) return snes_open_bus_r(space, 0); } -WRITE8_HANDLER( snes_state::snes_io_dma_w ) +WRITE8_MEMBER( snes_state::snes_io_dma_w ) { switch (offset) { diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c index 5b9931b9ddf..c9291639eeb 100644 --- a/src/mame/video/redclash.c +++ b/src/mame/video/redclash.c @@ -97,13 +97,13 @@ PALETTE_INIT_MEMBER(ladybug_state,redclash) palette.set_pen_indirect(i, (i - 0x60) + 0x20); } -WRITE8_HANDLER( ladybug_state::redclash_videoram_w ) +WRITE8_MEMBER( ladybug_state::redclash_videoram_w ) { m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } -WRITE8_HANDLER( ladybug_state::redclash_gfxbank_w ) +WRITE8_MEMBER( ladybug_state::redclash_gfxbank_w ) { if (m_gfxbank != (data & 0x01)) { @@ -112,7 +112,7 @@ WRITE8_HANDLER( ladybug_state::redclash_gfxbank_w ) } } -WRITE8_HANDLER( ladybug_state::redclash_flipscreen_w ) +WRITE8_MEMBER( ladybug_state::redclash_flipscreen_w ) { flip_screen_set(data & 0x01); } @@ -128,25 +128,25 @@ star_speed: 6 = backwards medium 7 = backwards fast */ -WRITE8_HANDLER( ladybug_state::redclash_star0_w ) +WRITE8_MEMBER( ladybug_state::redclash_star0_w ) { m_star_speed = (m_star_speed & ~1) | ((data & 1) << 0); redclash_set_stars_speed(m_star_speed); } -WRITE8_HANDLER( ladybug_state::redclash_star1_w ) +WRITE8_MEMBER( ladybug_state::redclash_star1_w ) { m_star_speed = (m_star_speed & ~2) | ((data & 1) << 1); redclash_set_stars_speed(m_star_speed); } -WRITE8_HANDLER( ladybug_state::redclash_star2_w ) +WRITE8_MEMBER( ladybug_state::redclash_star2_w ) { m_star_speed = (m_star_speed & ~4) | ((data & 1) << 2); redclash_set_stars_speed( m_star_speed); } -WRITE8_HANDLER( ladybug_state::redclash_star_reset_w ) +WRITE8_MEMBER( ladybug_state::redclash_star_reset_w ) { redclash_set_stars_enable(1); } diff --git a/src/mess/machine/thomflop.c b/src/mess/machine/thomflop.c index 659f1bd9992..aa365a488ea 100644 --- a/src/mess/machine/thomflop.c +++ b/src/mess/machine/thomflop.c @@ -286,7 +286,7 @@ READ8_MEMBER( thomson_state::to7_5p14_r ) -WRITE8_HANDLER( thomson_state::to7_5p14_w ) +WRITE8_MEMBER( thomson_state::to7_5p14_w ) { wd2793_device *fdc = machine().device("wd2793"); if ( offset < 4 )