summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-06-01 12:07:45 +1000
committer Vas Crabb <vas@vastheman.com>2018-06-01 12:07:45 +1000
commitaebae021bf038e4eb6bf8249e4c42d650efb2891 (patch)
tree0044b3aa15e26e81e3cafe146724357060583366
parent062027276e610f71efaff37a3b669bd986b45abd (diff)
remove a few literal tags from address maps (nw)
-rw-r--r--src/mame/drivers/dooyong.cpp40
-rw-r--r--src/mame/drivers/leland.cpp18
2 files changed, 29 insertions, 29 deletions
diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp
index 1ea9272763a..58443893343 100644
--- a/src/mame/drivers/dooyong.cpp
+++ b/src/mame/drivers/dooyong.cpp
@@ -777,7 +777,7 @@ uint32_t popbingo_state::screen_update_popbingo(screen_device &screen, bitmap_in
void dooyong_z80_ym2203_state::lastday_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
- map(0x8000, 0xbfff).bankr("mainbank");
+ map(0x8000, 0xbfff).bankr(m_mainbank);
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");
@@ -797,7 +797,7 @@ void dooyong_z80_ym2203_state::lastday_map(address_map &map)
void dooyong_z80_ym2203_state::pollux_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
- map(0x8000, 0xbfff).bankr("mainbank");
+ 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));
@@ -816,7 +816,7 @@ void dooyong_z80_ym2203_state::pollux_map(address_map &map)
void dooyong_z80_ym2203_state::gulfstrm_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
- map(0x8000, 0xbfff).bankr("mainbank");
+ 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));
@@ -836,7 +836,7 @@ void dooyong_z80_ym2203_state::gulfstrm_map(address_map &map)
void dooyong_z80_state::bluehawk_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
- map(0x8000, 0xbfff).bankr("mainbank");
+ map(0x8000, 0xbfff).bankr(m_mainbank);
map(0xc000, 0xc000).portr("DSWA");
map(0xc000, 0xc000).w(this, FUNC(dooyong_z80_state::flip_screen_w));
map(0xc001, 0xc001).portr("DSWB");
@@ -857,7 +857,7 @@ void dooyong_z80_state::bluehawk_map(address_map &map)
void dooyong_z80_state::flytiger_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
- map(0x8000, 0xbfff).bankr("mainbank");
+ map(0x8000, 0xbfff).bankr(m_mainbank);
map(0xc000, 0xcfff).ram().share("spriteram");
map(0xd000, 0xdfff).ram();
map(0xe000, 0xe000).portr("P1");
@@ -877,7 +877,7 @@ void dooyong_z80_state::flytiger_map(address_map &map)
void dooyong_z80_state::primella_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
- map(0x8000, 0xbfff).bankr("mainbank");
+ 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));
@@ -1487,7 +1487,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80)
/* video hardware */
- MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
+ MCFG_DEVICE_ADD(m_spriteram, BUFFERED_SPRITERAM8)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1495,7 +1495,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_lastday)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m_spriteram, buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastday)
@@ -1540,7 +1540,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80)
/* video hardware */
- MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
+ MCFG_DEVICE_ADD(m_spriteram, BUFFERED_SPRITERAM8)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1548,7 +1548,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_gulfstrm)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m_spriteram, buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastday)
@@ -1578,7 +1578,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80)
/* video hardware */
- MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
+ MCFG_DEVICE_ADD(m_spriteram, BUFFERED_SPRITERAM8)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1586,7 +1586,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_pollux)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m_spriteram, buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lastday)
@@ -1616,7 +1616,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::bluehawk)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
/* video hardware */
- MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
+ MCFG_DEVICE_ADD(m_spriteram, BUFFERED_SPRITERAM8)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1624,7 +1624,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::bluehawk)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_state, screen_update_bluehawk)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m_spriteram, buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_bluehawk)
@@ -1656,7 +1656,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::flytiger)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
/* video hardware */
- MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM8)
+ MCFG_DEVICE_ADD(m_spriteram, BUFFERED_SPRITERAM8)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1664,7 +1664,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::flytiger)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_state, screen_update_flytiger)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m_spriteram, buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_flytiger)
@@ -1742,7 +1742,7 @@ MACHINE_CONFIG_START(rshark_state::dooyong_68k)
MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map)
// video hardware
- MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16)
+ MCFG_DEVICE_ADD(m_spriteram, BUFFERED_SPRITERAM16)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1750,7 +1750,7 @@ MACHINE_CONFIG_START(rshark_state::dooyong_68k)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(rshark_state, screen_update_rshark)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m_spriteram, buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rshark)
@@ -1794,7 +1794,7 @@ MACHINE_CONFIG_START(popbingo_state::popbingo)
MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map)
// video hardware
- MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16)
+ MCFG_DEVICE_ADD(m_spriteram, BUFFERED_SPRITERAM16)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1802,7 +1802,7 @@ MACHINE_CONFIG_START(popbingo_state::popbingo)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(popbingo_state, screen_update_popbingo)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m_spriteram, buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_popbingo)
diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp
index 4ae226f5dae..1c549156e15 100644
--- a/src/mame/drivers/leland.cpp
+++ b/src/mame/drivers/leland.cpp
@@ -83,9 +83,9 @@
void leland_state::master_map_program(address_map &map)
{
map(0x0000, 0x1fff).rom();
- map(0x2000, 0x9fff).bankr("masterbank_0");
- map(0xa000, 0xdfff).bankr("masterbank_1").w(this, FUNC(leland_state::leland_battery_ram_w)).share("battery");
- map(0xe000, 0xefff).ram().share("mainram");
+ map(0x2000, 0x9fff).bankr(m_master_bankslot[0]);
+ map(0xa000, 0xdfff).bankr(m_master_bankslot[1]).w(this, FUNC(leland_state::leland_battery_ram_w)).share("battery");
+ map(0xe000, 0xefff).ram().share(m_mainram);
map(0xf000, 0xf3ff).rw(this, FUNC(leland_state::leland_gated_paletteram_r), FUNC(leland_state::leland_gated_paletteram_w)).share("palette");
map(0xf800, 0xf801).w(this, FUNC(leland_state::leland_master_video_addr_w));
}
@@ -110,9 +110,9 @@ void leland_state::master_redline_map_io(address_map &map)
void ataxx_state::master_map_program_2(address_map &map)
{
map(0x0000, 0x1fff).rom();
- map(0x2000, 0x9fff).bankr("masterbank_0");
- map(0xa000, 0xdfff).bankr("masterbank_1").w(this, FUNC(ataxx_state::ataxx_battery_ram_w)).share("battery");
- map(0xe000, 0xf7ff).ram().share("mainram");
+ map(0x2000, 0x9fff).bankr(m_master_bankslot[0]);
+ map(0xa000, 0xdfff).bankr(m_master_bankslot[1]).w(this, FUNC(ataxx_state::ataxx_battery_ram_w)).share("battery");
+ map(0xe000, 0xf7ff).ram().share(m_mainram);
map(0xf800, 0xffff).rw(this, FUNC(ataxx_state::ataxx_paletteram_and_misc_r), FUNC(ataxx_state::ataxx_paletteram_and_misc_w)).share("palette");
}
@@ -140,7 +140,7 @@ void ataxx_state::master_map_io_2(address_map &map)
void leland_state::slave_small_map_program(address_map &map)
{
map(0x0000, 0x1fff).rom();
- map(0x2000, 0xdfff).bankr("slavebank");
+ map(0x2000, 0xdfff).bankr(m_slave_bankslot);
map(0xe000, 0xefff).ram();
map(0xf800, 0xf801).w(this, FUNC(leland_state::leland_slave_video_addr_w));
map(0xf802, 0xf802).r(this, FUNC(leland_state::leland_raster_r));
@@ -151,7 +151,7 @@ void leland_state::slave_small_map_program(address_map &map)
void leland_state::slave_large_map_program(address_map &map)
{
map(0x0000, 0x1fff).rom();
- map(0x4000, 0xbfff).bankr("slavebank");
+ map(0x4000, 0xbfff).bankr(m_slave_bankslot);
map(0xc000, 0xc000).w(this, FUNC(leland_state::leland_slave_large_banksw_w));
map(0xe000, 0xefff).ram();
map(0xf800, 0xf801).w(this, FUNC(leland_state::leland_slave_video_addr_w));
@@ -170,7 +170,7 @@ void leland_state::slave_map_io(address_map &map)
void leland_state::slave_map_program(address_map &map)
{
map(0x0000, 0x1fff).rom();
- map(0x2000, 0x9fff).bankr("slavebank");
+ map(0x2000, 0x9fff).bankr(m_slave_bankslot);
map(0xa000, 0xdfff).rom();
map(0xe000, 0xefff).ram();
map(0xfffc, 0xfffd).w(this, FUNC(leland_state::leland_slave_video_addr_w));