diff options
author | Vas Crabb <vas@vastheman.com> | 2018-06-08 01:29:39 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-06-08 01:29:39 +1000 |
commit | 93eaa6a4943ade6513257a740fcde97ca9468559 (patch) | |
tree | 1340f2160a7064a839b7ca649b2257489cdd3d6d /src/mame/drivers/ninjaw.cpp | |
parent | fafafe7050e4d04230656215b840ac53aad081e7 (diff) |
as if millions of this pointers suddenly cried out in terror, and were suddenly silenced
* streamline templates in addrmap.h
* get rid of overloads on read/write member names - this will become even more important in the near future
Diffstat (limited to 'src/mame/drivers/ninjaw.cpp')
-rw-r--r-- | src/mame/drivers/ninjaw.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp index 1930770d1ab..ae1853c5685 100644 --- a/src/mame/drivers/ninjaw.cpp +++ b/src/mame/drivers/ninjaw.cpp @@ -425,11 +425,11 @@ void ninjaw_state::ninjaw_master_map(address_map &map) map(0x000000, 0x0bffff).rom(); map(0x0c0000, 0x0cffff).ram(); /* main ram */ map(0x200000, 0x200003).rw("tc0040ioc", FUNC(tc0040ioc_device::read), FUNC(tc0040ioc_device::write)).umask16(0x00ff); - map(0x210000, 0x210001).w(this, FUNC(ninjaw_state::cpua_ctrl_w)); - map(0x220000, 0x220003).rw(this, FUNC(ninjaw_state::sound_r), FUNC(ninjaw_state::sound_w)); + map(0x210000, 0x210001).w(FUNC(ninjaw_state::cpua_ctrl_w)); + map(0x220000, 0x220003).rw(FUNC(ninjaw_state::sound_r), FUNC(ninjaw_state::sound_w)); map(0x240000, 0x24ffff).ram().share("share1"); map(0x260000, 0x263fff).ram().share("spriteram"); - map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(this, FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ + map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ map(0x2a0000, 0x2a000f).rw("tc0100scn_1", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0x2c0000, 0x2d3fff).rw("tc0100scn_2", FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps (2nd screen) */ map(0x2e0000, 0x2e000f).rw("tc0100scn_2", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); @@ -450,7 +450,7 @@ void ninjaw_state::ninjaw_slave_map(address_map &map) map(0x200000, 0x200003).rw("tc0040ioc", FUNC(tc0040ioc_device::read), FUNC(tc0040ioc_device::write)).umask16(0x00ff); map(0x240000, 0x24ffff).ram().share("share1"); map(0x260000, 0x263fff).ram().share("spriteram"); - map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(this, FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ + map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ map(0x340000, 0x340007).rw("tc0110pcr_1", FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); /* palette (1st screen) */ map(0x350000, 0x350007).rw("tc0110pcr_2", FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); /* palette (2nd screen) */ map(0x360000, 0x360007).rw("tc0110pcr_3", FUNC(tc0110pcr_device::word_r), FUNC(tc0110pcr_device::step1_word_w)); /* palette (3rd screen) */ @@ -461,11 +461,11 @@ void ninjaw_state::darius2_master_map(address_map &map) map(0x000000, 0x0bffff).rom(); map(0x0c0000, 0x0cffff).ram(); /* main ram */ map(0x200000, 0x200003).rw("tc0040ioc", FUNC(tc0040ioc_device::read), FUNC(tc0040ioc_device::write)).umask16(0x00ff); - map(0x210000, 0x210001).w(this, FUNC(ninjaw_state::cpua_ctrl_w)); - map(0x220000, 0x220003).rw(this, FUNC(ninjaw_state::sound_r), FUNC(ninjaw_state::sound_w)); + map(0x210000, 0x210001).w(FUNC(ninjaw_state::cpua_ctrl_w)); + map(0x220000, 0x220003).rw(FUNC(ninjaw_state::sound_r), FUNC(ninjaw_state::sound_w)); map(0x240000, 0x24ffff).ram().share("share1"); map(0x260000, 0x263fff).ram().share("spriteram"); - map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(this, FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ + map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ map(0x2a0000, 0x2a000f).rw("tc0100scn_1", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); map(0x2c0000, 0x2d3fff).rw("tc0100scn_2", FUNC(tc0100scn_device::word_r), FUNC(tc0100scn_device::word_w)); /* tilemaps (2nd screen) */ map(0x2e0000, 0x2e000f).rw("tc0100scn_2", FUNC(tc0100scn_device::ctrl_word_r), FUNC(tc0100scn_device::ctrl_word_w)); @@ -483,7 +483,7 @@ void ninjaw_state::darius2_slave_map(address_map &map) map(0x200000, 0x200003).rw("tc0040ioc", FUNC(tc0040ioc_device::read), FUNC(tc0040ioc_device::write)).umask16(0x00ff); map(0x240000, 0x24ffff).ram().share("share1"); map(0x260000, 0x263fff).ram().share("spriteram"); - map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(this, FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ + map(0x280000, 0x293fff).r("tc0100scn_1", FUNC(tc0100scn_device::word_r)).w(FUNC(ninjaw_state::tc0100scn_triple_screen_w)); /* tilemaps (1st screen/all screens) */ } @@ -497,11 +497,11 @@ void ninjaw_state::sound_map(address_map &map) map(0xe000, 0xe003).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write)); map(0xe200, 0xe200).nopr().w(m_tc0140syt, FUNC(tc0140syt_device::slave_port_w)); map(0xe201, 0xe201).rw(m_tc0140syt, FUNC(tc0140syt_device::slave_comm_r), FUNC(tc0140syt_device::slave_comm_w)); - map(0xe400, 0xe403).w(this, FUNC(ninjaw_state::pancontrol_w)); /* pan */ + map(0xe400, 0xe403).w(FUNC(ninjaw_state::pancontrol_w)); /* pan */ map(0xea00, 0xea00).nopr(); map(0xee00, 0xee00).nopw(); /* ? */ map(0xf000, 0xf000).nopw(); /* ? */ - map(0xf200, 0xf200).w(this, FUNC(ninjaw_state::sound_bankswitch_w)); + map(0xf200, 0xf200).w(FUNC(ninjaw_state::sound_bankswitch_w)); } |