summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/dooyong.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/dooyong.cpp')
-rw-r--r--src/mame/drivers/dooyong.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp
index 58443893343..220dc6bd57c 100644
--- a/src/mame/drivers/dooyong.cpp
+++ b/src/mame/drivers/dooyong.cpp
@@ -781,15 +781,15 @@ void dooyong_z80_ym2203_state::lastday_map(address_map &map)
map(0xc000, 0xc007).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w));
map(0xc008, 0xc00f).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w));
map(0xc010, 0xc010).portr("SYSTEM");
- map(0xc010, 0xc010).w(this, FUNC(dooyong_z80_ym2203_state::lastday_ctrl_w)); /* coin counter, flip screen */
+ map(0xc010, 0xc010).w(FUNC(dooyong_z80_ym2203_state::lastday_ctrl_w)); /* coin counter, flip screen */
map(0xc011, 0xc011).portr("P1");
- map(0xc011, 0xc011).w(this, FUNC(dooyong_z80_ym2203_state::bankswitch_w));
+ map(0xc011, 0xc011).w(FUNC(dooyong_z80_ym2203_state::bankswitch_w));
map(0xc012, 0xc012).portr("P2");
map(0xc012, 0xc012).w("soundlatch", FUNC(generic_latch_8_device::write));
map(0xc013, 0xc013).portr("DSWA");
map(0xc014, 0xc014).portr("DSWB");
map(0xc800, 0xcfff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
- map(0xd000, 0xdfff).rw(this, FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w));
+ map(0xd000, 0xdfff).rw(FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w));
map(0xe000, 0xefff).ram();
map(0xf000, 0xffff).ram().share("spriteram");
}
@@ -800,17 +800,17 @@ void dooyong_z80_ym2203_state::pollux_map(address_map &map)
map(0x8000, 0xbfff).bankr(m_mainbank);
map(0xc000, 0xcfff).ram();
map(0xd000, 0xdfff).ram().share("spriteram");
- map(0xe000, 0xefff).rw(this, FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w));
- map(0xf000, 0xf000).portr("DSWA").w(this, FUNC(dooyong_z80_ym2203_state::bankswitch_w));
+ map(0xe000, 0xefff).rw(FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w));
+ map(0xf000, 0xf000).portr("DSWA").w(FUNC(dooyong_z80_ym2203_state::bankswitch_w));
map(0xf001, 0xf001).portr("DSWB");
map(0xf002, 0xf002).portr("P1");
map(0xf003, 0xf003).portr("P2");
map(0xf004, 0xf004).portr("SYSTEM");
- map(0xf008, 0xf008).w(this, FUNC(dooyong_z80_ym2203_state::pollux_ctrl_w)); /* coin counter, flip screen */
+ map(0xf008, 0xf008).w(FUNC(dooyong_z80_ym2203_state::pollux_ctrl_w)); /* coin counter, flip screen */
map(0xf010, 0xf010).w("soundlatch", FUNC(generic_latch_8_device::write));
map(0xf018, 0xf01f).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w));
map(0xf020, 0xf027).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w));
- map(0xf800, 0xffff).rw(this, FUNC(dooyong_z80_ym2203_state::paletteram_flytiger_r), FUNC(dooyong_z80_ym2203_state::paletteram_flytiger_w));
+ map(0xf800, 0xffff).rw(FUNC(dooyong_z80_ym2203_state::paletteram_flytiger_r), FUNC(dooyong_z80_ym2203_state::paletteram_flytiger_w));
}
void dooyong_z80_ym2203_state::gulfstrm_map(address_map &map)
@@ -819,14 +819,14 @@ void dooyong_z80_ym2203_state::gulfstrm_map(address_map &map)
map(0x8000, 0xbfff).bankr(m_mainbank);
map(0xc000, 0xcfff).ram();
map(0xd000, 0xdfff).ram().share("spriteram");
- map(0xe000, 0xefff).rw(this, FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w));
+ map(0xe000, 0xefff).rw(FUNC(dooyong_z80_ym2203_state::lastday_tx_r), FUNC(dooyong_z80_ym2203_state::lastday_tx_w));
map(0xf000, 0xf000).portr("DSWA");
- map(0xf000, 0xf000).w(this, FUNC(dooyong_z80_ym2203_state::bankswitch_w));
+ map(0xf000, 0xf000).w(FUNC(dooyong_z80_ym2203_state::bankswitch_w));
map(0xf001, 0xf001).portr("DSWB");
map(0xf002, 0xf002).portr("P2");
map(0xf003, 0xf003).portr("P1");
map(0xf004, 0xf004).portr("SYSTEM");
- map(0xf008, 0xf008).w(this, FUNC(dooyong_z80_ym2203_state::pollux_ctrl_w)); /* coin counter, flip screen */
+ map(0xf008, 0xf008).w(FUNC(dooyong_z80_ym2203_state::pollux_ctrl_w)); /* coin counter, flip screen */
map(0xf010, 0xf010).w("soundlatch", FUNC(generic_latch_8_device::write));
map(0xf018, 0xf01f).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w));
map(0xf020, 0xf027).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w));
@@ -838,18 +838,18 @@ void dooyong_z80_state::bluehawk_map(address_map &map)
map(0x0000, 0x7fff).rom();
map(0x8000, 0xbfff).bankr(m_mainbank);
map(0xc000, 0xc000).portr("DSWA");
- map(0xc000, 0xc000).w(this, FUNC(dooyong_z80_state::flip_screen_w));
+ map(0xc000, 0xc000).w(FUNC(dooyong_z80_state::flip_screen_w));
map(0xc001, 0xc001).portr("DSWB");
map(0xc002, 0xc002).portr("P1");
map(0xc003, 0xc003).portr("P2");
map(0xc004, 0xc004).portr("SYSTEM");
- map(0xc008, 0xc008).w(this, FUNC(dooyong_z80_state::bankswitch_w));
+ map(0xc008, 0xc008).w(FUNC(dooyong_z80_state::bankswitch_w));
map(0xc010, 0xc010).w("soundlatch", FUNC(generic_latch_8_device::write));
map(0xc018, 0xc01f).w(m_fg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w));
map(0xc040, 0xc047).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w));
map(0xc048, 0xc04f).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w));
map(0xc800, 0xcfff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
- map(0xd000, 0xdfff).rw(this, FUNC(dooyong_z80_state::bluehawk_tx_r), FUNC(dooyong_z80_state::bluehawk_tx_w));
+ map(0xd000, 0xdfff).rw(FUNC(dooyong_z80_state::bluehawk_tx_r), FUNC(dooyong_z80_state::bluehawk_tx_w));
map(0xe000, 0xefff).ram().share("spriteram");
map(0xf000, 0xffff).ram();
}
@@ -861,17 +861,17 @@ void dooyong_z80_state::flytiger_map(address_map &map)
map(0xc000, 0xcfff).ram().share("spriteram");
map(0xd000, 0xdfff).ram();
map(0xe000, 0xe000).portr("P1");
- map(0xe000, 0xe000).w(this, FUNC(dooyong_z80_state::bankswitch_w));
+ map(0xe000, 0xe000).w(FUNC(dooyong_z80_state::bankswitch_w));
map(0xe002, 0xe002).portr("P2");
map(0xe004, 0xe004).portr("SYSTEM");
map(0xe006, 0xe006).portr("DSWA");
map(0xe008, 0xe008).portr("DSWB");
- map(0xe010, 0xe010).w(this, FUNC(dooyong_z80_state::flytiger_ctrl_w)); /* coin counter, flip screen */
+ map(0xe010, 0xe010).w(FUNC(dooyong_z80_state::flytiger_ctrl_w)); /* coin counter, flip screen */
map(0xe020, 0xe020).w("soundlatch", FUNC(generic_latch_8_device::write));
map(0xe030, 0xe037).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w));
map(0xe040, 0xe047).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w));
- map(0xe800, 0xefff).rw(this, FUNC(dooyong_z80_state::paletteram_flytiger_r), FUNC(dooyong_z80_state::paletteram_flytiger_w));
- map(0xf000, 0xffff).rw(this, FUNC(dooyong_z80_state::lastday_tx_r), FUNC(dooyong_z80_state::lastday_tx_w));
+ map(0xe800, 0xefff).rw(FUNC(dooyong_z80_state::paletteram_flytiger_r), FUNC(dooyong_z80_state::paletteram_flytiger_w));
+ map(0xf000, 0xffff).rw(FUNC(dooyong_z80_state::lastday_tx_r), FUNC(dooyong_z80_state::lastday_tx_w));
}
void dooyong_z80_state::primella_map(address_map &map)
@@ -880,10 +880,10 @@ void dooyong_z80_state::primella_map(address_map &map)
map(0x8000, 0xbfff).bankr(m_mainbank);
map(0xc000, 0xcfff).ram();
map(0xd000, 0xd3ff).ram(); /* what is this? looks like a palette? scratchpad RAM maybe? */
- map(0xe000, 0xefff).rw(this, FUNC(dooyong_z80_state::bluehawk_tx_r), FUNC(dooyong_z80_state::bluehawk_tx_w));
+ map(0xe000, 0xefff).rw(FUNC(dooyong_z80_state::bluehawk_tx_r), FUNC(dooyong_z80_state::bluehawk_tx_w));
map(0xf000, 0xf7ff).w(m_palette, FUNC(palette_device::write8)).share("palette");
map(0xf800, 0xf800).portr("DSWA");
- map(0xf800, 0xf800).w(this, FUNC(dooyong_z80_state::primella_ctrl_w)); /* bank switch, flip screen etc */
+ map(0xf800, 0xf800).w(FUNC(dooyong_z80_state::primella_ctrl_w)); /* bank switch, flip screen etc */
map(0xf810, 0xf810).portr("DSWB");
map(0xf810, 0xf810).w("soundlatch", FUNC(generic_latch_8_device::write));
map(0xf820, 0xf820).portr("P1");
@@ -907,7 +907,7 @@ void rshark_state::rshark_map(address_map &map)
map(0x0c4010, 0x0c401f).w(m_bg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff);
map(0x0c8000, 0x0c8fff).w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x0c0013, 0x0c0013).w("soundlatch", FUNC(generic_latch_8_device::write));
- map(0x0c0014, 0x0c0015).w(this, FUNC(rshark_state::ctrl_w)); /* flip screen + unknown stuff */
+ map(0x0c0014, 0x0c0015).w(FUNC(rshark_state::ctrl_w)); /* flip screen + unknown stuff */
map(0x0cc000, 0x0cc00f).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff);
map(0x0cc010, 0x0cc01f).w(m_fg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff);
}
@@ -926,7 +926,7 @@ void rshark_state::superx_map(address_map &map)
map(0x084010, 0x08401f).w(m_bg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff);
map(0x088000, 0x088fff).w(m_palette, FUNC(palette_device::write16)).share("palette");
map(0x080013, 0x080013).w("soundlatch", FUNC(generic_latch_8_device::write));
- map(0x080014, 0x080015).w(this, FUNC(rshark_state::ctrl_w)); /* flip screen + unknown stuff */
+ map(0x080014, 0x080015).w(FUNC(rshark_state::ctrl_w)); /* flip screen + unknown stuff */
map(0x08c000, 0x08c00f).w(m_fg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff);
map(0x08c010, 0x08c01f).w(m_fg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff);
}
@@ -942,7 +942,7 @@ void popbingo_state::popbingo_map(address_map &map)
map(0x0c0004, 0x0c0005).portr("P1_P2");
map(0x0c0006, 0x0c0007).portr("SYSTEM");
map(0x0c0013, 0x0c0013).w("soundlatch", FUNC(generic_latch_8_device::write));
- map(0x0c0014, 0x0c0015).w(this, FUNC(popbingo_state::ctrl_w));
+ map(0x0c0014, 0x0c0015).w(FUNC(popbingo_state::ctrl_w));
map(0x0c0018, 0x0c001b).nopw(); // ?
map(0x0c4000, 0x0c400f).w(m_bg[0], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff);
map(0x0c4010, 0x0c401f).w(m_bg[1], FUNC(dooyong_rom_tilemap_device::ctrl_w)).umask16(0x00ff);