diff options
Diffstat (limited to 'src/mame/drivers/slapfght.cpp')
-rw-r--r-- | src/mame/drivers/slapfght.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp index feacfbb9e97..272421e9329 100644 --- a/src/mame/drivers/slapfght.cpp +++ b/src/mame/drivers/slapfght.cpp @@ -278,8 +278,8 @@ void slapfght_state::perfrman_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).ram(); map(0x8800, 0x8fff).ram().share("share1"); - map(0x9000, 0x97ff).ram().w(this, FUNC(slapfght_state::videoram_w)).share("videoram"); - map(0x9800, 0x9fff).ram().w(this, FUNC(slapfght_state::colorram_w)).share("colorram"); + map(0x9000, 0x97ff).ram().w(FUNC(slapfght_state::videoram_w)).share("videoram"); + map(0x9800, 0x9fff).ram().w(FUNC(slapfght_state::colorram_w)).share("colorram"); map(0xa000, 0xa7ff).ram().share("spriteram"); } @@ -289,14 +289,14 @@ void slapfght_state::tigerh_map(address_map &map) map(0x0000, 0xbfff).rom(); map(0xc000, 0xc7ff).ram(); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(slapfght_state::videoram_w)).share("videoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(slapfght_state::colorram_w)).share("colorram"); + map(0xd000, 0xd7ff).ram().w(FUNC(slapfght_state::videoram_w)).share("videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(slapfght_state::colorram_w)).share("colorram"); map(0xe000, 0xe7ff).ram().share("spriteram"); - map(0xe800, 0xe800).w(this, FUNC(slapfght_state::scrollx_lo_w)); - map(0xe801, 0xe801).w(this, FUNC(slapfght_state::scrollx_hi_w)); - map(0xe802, 0xe802).w(this, FUNC(slapfght_state::scrolly_w)); - map(0xf000, 0xf7ff).ram().w(this, FUNC(slapfght_state::fixram_w)).share("fixvideoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); + map(0xe800, 0xe800).w(FUNC(slapfght_state::scrollx_lo_w)); + map(0xe801, 0xe801).w(FUNC(slapfght_state::scrollx_hi_w)); + map(0xe802, 0xe802).w(FUNC(slapfght_state::scrolly_w)); + map(0xf000, 0xf7ff).ram().w(FUNC(slapfght_state::fixram_w)).share("fixvideoram"); + map(0xf800, 0xffff).ram().w(FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); } void slapfght_state::tigerh_map_mcu(address_map &map) @@ -308,7 +308,7 @@ void slapfght_state::tigerh_map_mcu(address_map &map) void slapfght_state::tigerhb1_map(address_map &map) { tigerh_map(map); - map(0xe803, 0xe803).rw(this, FUNC(slapfght_state::tigerhb1_prot_r), FUNC(slapfght_state::tigerhb1_prot_w)); + map(0xe803, 0xe803).rw(FUNC(slapfght_state::tigerhb1_prot_r), FUNC(slapfght_state::tigerhb1_prot_w)); } void slapfght_state::tigerhb2_map(address_map &map) @@ -324,14 +324,14 @@ void slapfght_state::slapfigh_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc7ff).ram(); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(slapfght_state::videoram_w)).share("videoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(slapfght_state::colorram_w)).share("colorram"); + map(0xd000, 0xd7ff).ram().w(FUNC(slapfght_state::videoram_w)).share("videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(slapfght_state::colorram_w)).share("colorram"); map(0xe000, 0xe7ff).ram().share("spriteram"); - map(0xe800, 0xe800).w(this, FUNC(slapfght_state::scrollx_lo_w)); - map(0xe801, 0xe801).w(this, FUNC(slapfght_state::scrollx_hi_w)); - map(0xe802, 0xe802).w(this, FUNC(slapfght_state::scrolly_w)); - map(0xf000, 0xf7ff).ram().w(this, FUNC(slapfght_state::fixram_w)).share("fixvideoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); + map(0xe800, 0xe800).w(FUNC(slapfght_state::scrollx_lo_w)); + map(0xe801, 0xe801).w(FUNC(slapfght_state::scrollx_hi_w)); + map(0xe802, 0xe802).w(FUNC(slapfght_state::scrolly_w)); + map(0xf000, 0xf7ff).ram().w(FUNC(slapfght_state::fixram_w)).share("fixvideoram"); + map(0xf800, 0xffff).ram().w(FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); } void slapfght_state::slapfigh_map_mcu(address_map &map) @@ -349,7 +349,7 @@ void slapfght_state::slapfighb1_map(address_map &map) void slapfght_state::getstar_map(address_map &map) { slapfigh_map(map); - map(0xe803, 0xe803).rw(this, FUNC(slapfght_state::getstar_mcusim_r), FUNC(slapfght_state::getstar_mcusim_w)); + map(0xe803, 0xe803).rw(FUNC(slapfght_state::getstar_mcusim_r), FUNC(slapfght_state::getstar_mcusim_w)); } void slapfght_state::slapfighb2_map(address_map &map) @@ -358,15 +358,15 @@ void slapfght_state::slapfighb2_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xc7ff).ram(); map(0xc800, 0xcfff).ram().share("share1"); - map(0xd000, 0xd7ff).ram().w(this, FUNC(slapfght_state::videoram_w)).share("videoram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(slapfght_state::colorram_w)).share("colorram"); + map(0xd000, 0xd7ff).ram().w(FUNC(slapfght_state::videoram_w)).share("videoram"); + map(0xd800, 0xdfff).ram().w(FUNC(slapfght_state::colorram_w)).share("colorram"); map(0xe000, 0xe7ff).ram().share("spriteram"); - map(0xe800, 0xe800).w(this, FUNC(slapfght_state::scrollx_hi_w)); - map(0xe802, 0xe802).w(this, FUNC(slapfght_state::scrolly_w)); - map(0xe803, 0xe803).w(this, FUNC(slapfght_state::scrollx_lo_w)); + map(0xe800, 0xe800).w(FUNC(slapfght_state::scrollx_hi_w)); + map(0xe802, 0xe802).w(FUNC(slapfght_state::scrolly_w)); + map(0xe803, 0xe803).w(FUNC(slapfght_state::scrollx_lo_w)); map(0xec00, 0xefff).rom(); // it reads a copy of the logo from here! - map(0xf000, 0xf7ff).ram().w(this, FUNC(slapfght_state::fixram_w)).share("fixvideoram"); - map(0xf800, 0xffff).ram().w(this, FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); + map(0xf000, 0xf7ff).ram().w(FUNC(slapfght_state::fixram_w)).share("fixvideoram"); + map(0xf800, 0xffff).ram().w(FUNC(slapfght_state::fixcol_w)).share("fixcolorram"); } @@ -402,28 +402,28 @@ READ8_MEMBER(slapfght_state::vblank_r) void slapfght_state::io_map_nomcu(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(slapfght_state::vblank_r)); + map(0x00, 0x00).r(FUNC(slapfght_state::vblank_r)); map(0x00, 0x0f).w("mainlatch", FUNC(ls259_device::write_a0)); } void slapfght_state::io_map_mcu(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(slapfght_state::tigerh_mcu_status_r)); + map(0x00, 0x00).r(FUNC(slapfght_state::tigerh_mcu_status_r)); map(0x00, 0x0f).w("mainlatch", FUNC(ls259_device::write_a0)); } void slapfght_state::getstarb1_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(slapfght_state::getstarb1_prot_r)); + map(0x00, 0x00).r(FUNC(slapfght_state::getstarb1_prot_r)); map(0x00, 0x0f).w("mainlatch", FUNC(ls259_device::write_a0)); } void slapfght_state::getstarb2_io_map(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).r(this, FUNC(slapfght_state::getstar_mcusim_status_r)); + map(0x00, 0x00).r(FUNC(slapfght_state::getstar_mcusim_status_r)); map(0x00, 0x0f).w("mainlatch", FUNC(ls259_device::write_a0)); } @@ -456,7 +456,7 @@ void slapfght_state::perfrman_sound_map(address_map &map) map(0xa090, 0xa090).w("ay2", FUNC(ay8910_device::address_w)); map(0xa091, 0xa091).r("ay2", FUNC(ay8910_device::data_r)); map(0xa092, 0xa092).w("ay2", FUNC(ay8910_device::data_w)); - map(0xa0e0, 0xa0e0).select(0x0010).w(this, FUNC(slapfght_state::sound_nmi_enable_w)); + map(0xa0e0, 0xa0e0).select(0x0010).w(FUNC(slapfght_state::sound_nmi_enable_w)); } void slapfght_state::tigerh_sound_map(address_map &map) @@ -468,7 +468,7 @@ void slapfght_state::tigerh_sound_map(address_map &map) map(0xa090, 0xa090).w("ay2", FUNC(ay8910_device::address_w)); map(0xa091, 0xa091).r("ay2", FUNC(ay8910_device::data_r)); map(0xa092, 0xa092).w("ay2", FUNC(ay8910_device::data_w)); - map(0xa0e0, 0xa0e0).select(0x0010).w(this, FUNC(slapfght_state::sound_nmi_enable_w)); + map(0xa0e0, 0xa0e0).select(0x0010).w(FUNC(slapfght_state::sound_nmi_enable_w)); map(0xc800, 0xcfff).ram().share("share1"); map(0xd000, 0xffff).ram(); } |