summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cninja.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/cninja.cpp')
-rw-r--r--src/mame/drivers/cninja.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp
index 9705aa3d1ee..cd8101cac17 100644
--- a/src/mame/drivers/cninja.cpp
+++ b/src/mame/drivers/cninja.cpp
@@ -91,13 +91,13 @@ void cninja_state::cninja_map(address_map &map)
{
map(0x000000, 0x0bffff).rom();
- map(0x140000, 0x14000f).w(this, FUNC(cninja_state::cninja_pf_control_w<0>));
+ map(0x140000, 0x14000f).w(FUNC(cninja_state::cninja_pf_control_w<0>));
map(0x144000, 0x144fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x146000, 0x146fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w));
map(0x14c000, 0x14c7ff).writeonly().share("pf1_rowscroll");
map(0x14e000, 0x14e7ff).ram().share("pf2_rowscroll");
- map(0x150000, 0x15000f).w(this, FUNC(cninja_state::cninja_pf_control_w<1>));
+ map(0x150000, 0x15000f).w(FUNC(cninja_state::cninja_pf_control_w<1>));
map(0x154000, 0x154fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x156000, 0x156fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w));
map(0x15c000, 0x15c7ff).ram().share("pf3_rowscroll");
@@ -109,7 +109,7 @@ void cninja_state::cninja_map(address_map &map)
map(0x1a4000, 0x1a47ff).ram().share("spriteram1"); /* Sprites */
map(0x1b4000, 0x1b4001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)); /* DMA flag */
- map(0x1bc000, 0x1bffff).rw(this, FUNC(cninja_state::cninja_protection_region_0_104_r), FUNC(cninja_state::cninja_protection_region_0_104_w)).share("prot16ram"); /* Protection device */
+ map(0x1bc000, 0x1bffff).rw(FUNC(cninja_state::cninja_protection_region_0_104_r), FUNC(cninja_state::cninja_protection_region_0_104_w)).share("prot16ram"); /* Protection device */
map(0x308000, 0x308fff).nopw(); /* Bootleg only */
}
@@ -120,13 +120,13 @@ void cninja_state::cninjabl_map(address_map &map)
map(0x138000, 0x1387ff).ram().share("spriteram1"); /* bootleg sprite-ram (sprites rewritten here in new format) */
- map(0x140000, 0x14000f).w(this, FUNC(cninja_state::cninja_pf_control_w<0>));
+ map(0x140000, 0x14000f).w(FUNC(cninja_state::cninja_pf_control_w<0>));
map(0x144000, 0x144fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x146000, 0x146fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w));
map(0x14c000, 0x14c7ff).writeonly().share("pf1_rowscroll");
map(0x14e000, 0x14e7ff).ram().share("pf2_rowscroll");
- map(0x150000, 0x15000f).w(this, FUNC(cninja_state::cninja_pf_control_w<1>)); // not used / incorrect on this
+ map(0x150000, 0x15000f).w(FUNC(cninja_state::cninja_pf_control_w<1>)); // not used / incorrect on this
map(0x154000, 0x154fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x156000, 0x156fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w));
map(0x15c000, 0x15c7ff).ram().share("pf3_rowscroll");
@@ -193,13 +193,13 @@ void cninja_state::edrandy_map(address_map &map)
{
map(0x000000, 0x0fffff).rom();
- map(0x140000, 0x14000f).w(this, FUNC(cninja_state::cninja_pf_control_w<0>));
+ map(0x140000, 0x14000f).w(FUNC(cninja_state::cninja_pf_control_w<0>));
map(0x144000, 0x144fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x146000, 0x146fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w));
map(0x14c000, 0x14c7ff).ram().share("pf1_rowscroll");
map(0x14e000, 0x14e7ff).ram().share("pf2_rowscroll");
- map(0x150000, 0x15000f).w(this, FUNC(cninja_state::cninja_pf_control_w<1>));
+ map(0x150000, 0x15000f).w(FUNC(cninja_state::cninja_pf_control_w<1>));
map(0x154000, 0x154fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x156000, 0x156fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w));
map(0x15c000, 0x15c7ff).ram().share("pf3_rowscroll");
@@ -207,10 +207,10 @@ void cninja_state::edrandy_map(address_map &map)
map(0x188000, 0x189fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x194000, 0x197fff).ram(); /* Main ram */
- map(0x198000, 0x19bfff).rw(this, FUNC(cninja_state::edrandy_protection_region_6_146_r), FUNC(cninja_state::edrandy_protection_region_6_146_w)).share("prot16ram"); /* Protection device */
-// map(0x198000, 0x1987ff).rw(this, FUNC(cninja_state::edrandy_protection_region_6_146_r), FUNC(cninja_state::edrandy_protection_region_6_146_w)).share("prot16ram"); /* Protection device */
+ map(0x198000, 0x19bfff).rw(FUNC(cninja_state::edrandy_protection_region_6_146_r), FUNC(cninja_state::edrandy_protection_region_6_146_w)).share("prot16ram"); /* Protection device */
+// map(0x198000, 0x1987ff).rw(FUNC(cninja_state::edrandy_protection_region_6_146_r), FUNC(cninja_state::edrandy_protection_region_6_146_w)).share("prot16ram"); /* Protection device */
- map(0x1a0000, 0x1a3fff).rw(this, FUNC(cninja_state::edrandy_protection_region_8_146_r), FUNC(cninja_state::edrandy_protection_region_8_146_w));
+ map(0x1a0000, 0x1a3fff).rw(FUNC(cninja_state::edrandy_protection_region_8_146_r), FUNC(cninja_state::edrandy_protection_region_8_146_w));
map(0x1a4000, 0x1a4007).m("irq", FUNC(deco_irq_device::map)).umask16(0x00ff);
map(0x1ac000, 0x1ac001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)); /* DMA flag */
@@ -227,29 +227,29 @@ void cninja_state::robocop2_map(address_map &map)
{
map(0x000000, 0x0fffff).rom();
- map(0x140000, 0x14000f).w(this, FUNC(cninja_state::cninja_pf_control_w<0>));
+ map(0x140000, 0x14000f).w(FUNC(cninja_state::cninja_pf_control_w<0>));
map(0x144000, 0x144fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x146000, 0x146fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w));
map(0x14c000, 0x14c7ff).ram().share("pf1_rowscroll");
map(0x14e000, 0x14e7ff).ram().share("pf2_rowscroll");
- map(0x150000, 0x15000f).w(this, FUNC(cninja_state::cninja_pf_control_w<1>));
+ map(0x150000, 0x15000f).w(FUNC(cninja_state::cninja_pf_control_w<1>));
map(0x154000, 0x154fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x156000, 0x156fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w));
map(0x15c000, 0x15c7ff).ram().share("pf3_rowscroll");
map(0x15e000, 0x15e7ff).ram().share("pf4_rowscroll");
map(0x180000, 0x1807ff).ram().share("spriteram1");
-// map(0x18c000, 0x18c0ff).w(this, FUNC(cninja_state::cninja_loopback_w)) /* Protection writes */
+// map(0x18c000, 0x18c0ff).w(FUNC(cninja_state::cninja_loopback_w)) /* Protection writes */
// map(0x18c000, 0x18c7ff).r(m_ioprot, FUNC(deco146_device,robocop2_prot_r)) /* Protection device */
// map(0x18c064, 0x18c065).w(m_soundlatch, FUNC(generic_latch_8_device::write));
- map(0x18c000, 0x18ffff).rw(this, FUNC(cninja_state::mutantf_protection_region_0_146_r), FUNC(cninja_state::mutantf_protection_region_0_146_w)).share("prot16ram"); /* Protection device */
+ map(0x18c000, 0x18ffff).rw(FUNC(cninja_state::mutantf_protection_region_0_146_r), FUNC(cninja_state::mutantf_protection_region_0_146_w)).share("prot16ram"); /* Protection device */
map(0x198000, 0x198001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)); /* DMA flag */
map(0x1a8000, 0x1a9fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x1b0000, 0x1b0007).m("irq", FUNC(deco_irq_device::map)).umask16(0x00ff);
map(0x1b8000, 0x1bbfff).ram(); /* Main ram */
- map(0x1f0000, 0x1f0001).w(this, FUNC(cninja_state::robocop2_priority_w));
+ map(0x1f0000, 0x1f0001).w(FUNC(cninja_state::robocop2_priority_w));
map(0x1f8000, 0x1f8001).portr("DSW3"); /* Dipswitch #3 */
}
@@ -283,19 +283,19 @@ void cninja_state::mutantf_map(address_map &map)
map(0x120000, 0x1207ff).ram().share("spriteram1");
map(0x140000, 0x1407ff).ram().share("spriteram2");
map(0x160000, 0x161fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
- map(0x180000, 0x180001).w(this, FUNC(cninja_state::robocop2_priority_w));
+ map(0x180000, 0x180001).w(FUNC(cninja_state::robocop2_priority_w));
map(0x180002, 0x180003).nopw(); /* VBL irq ack */
- map(0x1a0000, 0x1a3fff).rw(this, FUNC(cninja_state::mutantf_protection_region_0_146_r), FUNC(cninja_state::mutantf_protection_region_0_146_w)).share("prot16ram"); /* Protection device */
- map(0x1c0000, 0x1c0001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)).r(this, FUNC(cninja_state::mutantf_71_r));
+ map(0x1a0000, 0x1a3fff).rw(FUNC(cninja_state::mutantf_protection_region_0_146_r), FUNC(cninja_state::mutantf_protection_region_0_146_w)).share("prot16ram"); /* Protection device */
+ map(0x1c0000, 0x1c0001).w(m_spriteram[0], FUNC(buffered_spriteram16_device::write)).r(FUNC(cninja_state::mutantf_71_r));
map(0x1e0000, 0x1e0001).w(m_spriteram[1], FUNC(buffered_spriteram16_device::write));
- map(0x300000, 0x30000f).w(this, FUNC(cninja_state::cninja_pf_control_w<0>));
+ map(0x300000, 0x30000f).w(FUNC(cninja_state::cninja_pf_control_w<0>));
map(0x304000, 0x305fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x306000, 0x307fff).rw(m_deco_tilegen[0], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w));
map(0x308000, 0x3087ff).ram().share("pf1_rowscroll");
map(0x30a000, 0x30a7ff).ram().share("pf2_rowscroll");
- map(0x310000, 0x31000f).w(this, FUNC(cninja_state::cninja_pf_control_w<1>));
+ map(0x310000, 0x31000f).w(FUNC(cninja_state::cninja_pf_control_w<1>));
map(0x314000, 0x315fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf1_data_r), FUNC(deco16ic_device::pf1_data_w));
map(0x316000, 0x317fff).rw(m_deco_tilegen[1], FUNC(deco16ic_device::pf2_data_r), FUNC(deco16ic_device::pf2_data_w));
map(0x318000, 0x3187ff).ram().share("pf3_rowscroll");
@@ -354,7 +354,7 @@ void cninja_state::cninjabl2_s_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0x8000, 0x87ff).ram();
- map(0x9000, 0x9000).w(this, FUNC(cninja_state::cninjabl2_oki_bank_w));
+ map(0x9000, 0x9000).w(FUNC(cninja_state::cninjabl2_oki_bank_w));
map(0x9800, 0x9800).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
map(0xa000, 0xa000).r(m_ioprot, FUNC(deco_146_base_device::soundlatch_r));
}