summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/seta.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/seta.cpp')
-rw-r--r--src/mame/drivers/seta.cpp368
1 files changed, 184 insertions, 184 deletions
diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp
index bee40948f5e..41ba1384311 100644
--- a/src/mame/drivers/seta.cpp
+++ b/src/mame/drivers/seta.cpp
@@ -1703,7 +1703,7 @@ WRITE16_MEMBER(seta_state::ipl2_ack_w)
void seta_state::tndrcade_map(address_map &map)
{
map(0x000000, 0x07ffff).rom(); // ROM
- map(0x200000, 0x200001).w(this, FUNC(seta_state::ipl1_ack_w));
+ map(0x200000, 0x200001).w(FUNC(seta_state::ipl1_ack_w));
map(0x280000, 0x280001).nopw(); // ? 0 / 1 (sub cpu related?)
map(0x300000, 0x300001).nopw(); // ? 0 / 1
map(0x380000, 0x3803ff).ram().share("paletteram1"); // Palette
@@ -1711,8 +1711,8 @@ void seta_state::tndrcade_map(address_map &map)
map(0x600000, 0x6005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
map(0x600600, 0x600607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16));
- map(0x800000, 0x800007).w(this, FUNC(seta_state::sub_ctrl_w)); // Sub CPU Control?
- map(0xa00000, 0xa00fff).rw(this, FUNC(seta_state::sharedram_68000_r), FUNC(seta_state::sharedram_68000_w)); // Shared RAM
+ map(0x800000, 0x800007).w(FUNC(seta_state::sub_ctrl_w)); // Sub CPU Control?
+ map(0xa00000, 0xa00fff).rw(FUNC(seta_state::sharedram_68000_r), FUNC(seta_state::sharedram_68000_w)); // Shared RAM
map(0xc00000, 0xc03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr
map(0xe00000, 0xe03fff).ram().share("share1"); // RAM (Mirrored?)
map(0xffc000, 0xffffff).ram().share("share1"); // RAM (Mirrored?)
@@ -1738,15 +1738,15 @@ void seta_state::downtown_map(address_map &map)
map(0x000000, 0x09ffff).rom(); // ROM
map(0x100000, 0x103fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
map(0x200000, 0x200001).noprw(); // watchdog? (twineagl)
- map(0x300000, 0x300001).w(this, FUNC(seta_state::ipl1_ack_w));
- map(0x400000, 0x400007).w(this, FUNC(seta_state::twineagl_tilebank_w)); // special tile banking to animate water in twineagl
- map(0x500001, 0x500001).w(this, FUNC(seta_state::twineagl_ctrl_w));
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x300000, 0x300001).w(FUNC(seta_state::ipl1_ack_w));
+ map(0x400000, 0x400007).w(FUNC(seta_state::twineagl_tilebank_w)); // special tile banking to animate water in twineagl
+ map(0x500001, 0x500001).w(FUNC(seta_state::twineagl_ctrl_w));
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette
map(0x800000, 0x800005).writeonly().share("vctrl_0");// VRAM Ctrl
- map(0x900000, 0x903fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM
- map(0xa00000, 0xa00007).w(this, FUNC(seta_state::sub_ctrl_w)); // Sub CPU Control?
- map(0xb00000, 0xb00fff).rw(this, FUNC(seta_state::sharedram_68000_r), FUNC(seta_state::sharedram_68000_w)); // Shared RAM
+ map(0x900000, 0x903fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM
+ map(0xa00000, 0xa00007).w(FUNC(seta_state::sub_ctrl_w)); // Sub CPU Control?
+ map(0xb00000, 0xb00fff).rw(FUNC(seta_state::sharedram_68000_r), FUNC(seta_state::sharedram_68000_w)); // Shared RAM
map(0xc00000, 0xc00001).nopw(); // ? $4000
map(0xd00000, 0xd005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
map(0xd00600, 0xd00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16));
@@ -1762,22 +1762,22 @@ void seta_state::downtown_map(address_map &map)
void seta_state::calibr50_map(address_map &map)
{
map(0x000000, 0x09ffff).rom(); // ROM
- map(0x100000, 0x100001).r(this, FUNC(seta_state::ipl2_ack_r));
+ map(0x100000, 0x100001).r(FUNC(seta_state::ipl2_ack_r));
map(0x200000, 0x200fff).ram(); // NVRAM
- map(0x300000, 0x300001).rw(this, FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w));
+ map(0x300000, 0x300001).rw(FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w));
map(0x400000, 0x400001).r("watchdog", FUNC(watchdog_timer_device::reset16_r));
map(0x500000, 0x500001).nopw(); // ?
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette
map(0x800000, 0x800005).writeonly().share("vctrl_0");// VRAM Ctrl
- map(0x900000, 0x903fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM
+ map(0x900000, 0x903fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM
map(0x904000, 0x904fff).ram(); //
map(0xa00000, 0xa00001).portr("P1"); // X1-004
map(0xa00002, 0xa00003).portr("P2"); // X1-004
map(0xa00008, 0xa00009).portr("COINS"); // X1-004
map(0xa00010, 0xa00017).r(m_upd4701, FUNC(upd4701_device::read_xy)).umask16(0x00ff);
- map(0xa00019, 0xa00019).r(m_upd4701, FUNC(upd4701_device::reset_xy));
+ map(0xa00019, 0xa00019).r(m_upd4701, FUNC(upd4701_device::reset_xy_r));
map(0xd00000, 0xd005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
map(0xd00600, 0xd00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16));
@@ -1845,15 +1845,15 @@ void seta_state::usclssic_map(address_map &map)
map(0xa00000, 0xa00005).ram().share("vctrl_0"); // VRAM Ctrl
map(0xb00000, 0xb003ff).ram().share("paletteram1"); // Palette
map(0xb40000, 0xb40007).r(m_upd4701, FUNC(upd4701_device::read_xy)).umask16(0x00ff);
- map(0xb40001, 0xb40001).w(this, FUNC(seta_state::usclssic_lockout_w)); // Coin Lockout + Tiles Banking
- map(0xb4000a, 0xb4000b).w(this, FUNC(seta_state::ipl1_ack_w));
+ map(0xb40001, 0xb40001).w(FUNC(seta_state::usclssic_lockout_w)); // Coin Lockout + Tiles Banking
+ map(0xb4000a, 0xb4000b).w(FUNC(seta_state::ipl1_ack_w));
map(0xb40010, 0xb40011).portr("COINS"); // Coins
map(0xb40011, 0xb40011).w("soundlatch1", FUNC(generic_latch_8_device::write)); // To Sub CPU
- map(0xb40018, 0xb4001f).r(this, FUNC(seta_state::usclssic_dsw_r)); // 2 DSWs
+ map(0xb40018, 0xb4001f).r(FUNC(seta_state::usclssic_dsw_r)); // 2 DSWs
map(0xb40018, 0xb40019).w("watchdog", FUNC(watchdog_timer_device::reset16_w));
- map(0xb80000, 0xb80001).r(this, FUNC(seta_state::ipl2_ack_r));
+ map(0xb80000, 0xb80001).r(FUNC(seta_state::ipl2_ack_r));
map(0xc00000, 0xc03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr
- map(0xd00000, 0xd03fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM
+ map(0xd00000, 0xd03fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM
map(0xd04000, 0xd04fff).ram(); //
map(0xe00000, 0xe00fff).ram(); // NVRAM? (odd bytes)
}
@@ -1871,7 +1871,7 @@ void seta_state::atehate_map(address_map &map)
map(0x200000, 0x200001).nopw(); // ? watchdog ?
map(0x300000, 0x300001).nopw(); // ? 0 (irq ack lev 2?)
map(0x500000, 0x500001).nopw(); // ? (end of lev 1: bit 4 goes 1,0,1)
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette
map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
map(0xa00600, 0xa00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16));
@@ -1896,10 +1896,10 @@ void seta_state::blandia_map(address_map &map)
map(0x400000, 0x400001).portr("P1"); // P1
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
map(0x500004, 0x500005).nopw();
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram(); // (rezon,jjsquawk)
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
map(0x703c00, 0x7047ff).ram().share("paletteram2"); // 2nd Palette for the palette offset effect
@@ -1909,9 +1909,9 @@ void seta_state::blandia_map(address_map &map)
map(0x900000, 0x903fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr
map(0xa00000, 0xa00005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0xa80000, 0xa80005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
- map(0xb00000, 0xb03fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0xb00000, 0xb03fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0xb04000, 0xb0ffff).ram(); // (jjsquawk)
- map(0xb80000, 0xb83fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0xb80000, 0xb83fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0xb84000, 0xb8ffff).ram(); // (jjsquawk)
map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
map(0xd00000, 0xd00007).nopw(); // ?
@@ -1934,16 +1934,16 @@ void seta_state::blandiap_map(address_map &map)
map(0x400000, 0x400001).portr("P1"); // P1
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
map(0x500004, 0x500005).nopw();
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram(); // (rezon,jjsquawk)
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
map(0x703c00, 0x7047ff).ram().share("paletteram2"); // 2nd Palette for the palette offset effect
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0x804000, 0x80ffff).ram(); // (jjsquawk)
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x884000, 0x88ffff).ram(); // (jjsquawk)
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
@@ -2006,18 +2006,18 @@ void seta_state::wrofaero_map(address_map &map)
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
map(0x500004, 0x500005).nopw();
- map(0x500006, 0x500007).r(this, FUNC(seta_state::extra_r)); // Buttons 4,5,6 (Daioh only)
+ map(0x500006, 0x500007).r(FUNC(seta_state::extra_r)); // Buttons 4,5,6 (Daioh only)
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram(); // (rezon,jjsquawk)
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
map(0x701000, 0x70ffff).ram(); //
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0x804000, 0x80ffff).ram(); // (jjsquawk)
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x884000, 0x88ffff).ram(); // (jjsquawk)
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
@@ -2027,7 +2027,7 @@ void seta_state::wrofaero_map(address_map &map)
map(0xb00000, 0xb03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr
map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
#if __uPD71054_TIMER
- map(0xd00000, 0xd00007).w(this, FUNC(seta_state::timer_regs_w)); // ?
+ map(0xd00000, 0xd00007).w(FUNC(seta_state::timer_regs_w)); // ?
#else
map(0xd00000, 0xd00007).nopw(); // ?
#endif
@@ -2039,8 +2039,8 @@ void seta_state::zombraid_map(address_map &map)
{
wrofaero_map(map);
map(0x300000, 0x30ffff).ram().share("nvram"); // actually 8K x8 SRAM
- map(0xf00000, 0xf00001).w(this, FUNC(seta_state::zombraid_gun_w));
- map(0xf00002, 0xf00003).r(this, FUNC(seta_state::zombraid_gun_r));
+ map(0xf00000, 0xf00001).w(FUNC(seta_state::zombraid_gun_w));
+ map(0xf00002, 0xf00003).r(FUNC(seta_state::zombraid_gun_r));
}
READ16_MEMBER(seta_state::zingzipbl_unknown_r)
@@ -2056,22 +2056,22 @@ void seta_state::zingzipbl_map(address_map &map)
map(0x300000, 0x30ffff).ram(); // RAM (wrofaero only?)
// AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1
// AM_RANGE(0x400002, 0x400003) AM_READ_PORT("P2") // P2
- map(0x400002, 0x400003).r(this, FUNC(seta_state::zingzipbl_unknown_r)); // P2
+ map(0x400002, 0x400003).r(FUNC(seta_state::zingzipbl_unknown_r)); // P2
// AM_RANGE(0x400004, 0x400005) AM_READ_PORT("COINS") // Coins
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
map(0x500004, 0x500005).nopw();
//AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r) // DSW
map(0x700000, 0x7003ff).ram(); // (rezon,jjsquawk)
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
map(0x701000, 0x70ffff).ram(); //
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0x804000, 0x80ffff).ram(); // (jjsquawk)
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x884000, 0x88ffff).ram(); // (jjsquawk)
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
- map(0x902010, 0x902013).r(this, FUNC(seta_state::zingzipbl_unknown_r));
+ map(0x902010, 0x902013).r(FUNC(seta_state::zingzipbl_unknown_r));
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
@@ -2080,7 +2080,7 @@ void seta_state::zingzipbl_map(address_map &map)
map(0xb00000, 0xb03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr
map(0xc00000, 0xc03fff).ram(); // soundram on original
#if __uPD71054_TIMER
- map(0xd00000, 0xd00007).w(this, FUNC(seta_state::timer_regs_w)); // ?
+ map(0xd00000, 0xd00007).w(FUNC(seta_state::timer_regs_w)); // ?
#else
map(0xd00000, 0xd00007).nopw(); // ?
#endif
@@ -2097,15 +2097,15 @@ void seta_state::jjsquawb_map(address_map &map)
map(0x400000, 0x400001).portr("P1"); // P1
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
map(0x500004, 0x500005).nopw();
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x70b3ff).ram(); // RZ: (rezon,jjsquawk)
map(0x70b400, 0x70bfff).ram().share("paletteram1"); // Palette
map(0x70c000, 0x70ffff).ram(); //
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0
- map(0x804000, 0x807fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0
+ map(0x804000, 0x807fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2
map(0x884000, 0x88ffff).ram(); // (jjsquawk)
map(0x908000, 0x908005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x909000, 0x909005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
@@ -2115,7 +2115,7 @@ void seta_state::jjsquawb_map(address_map &map)
map(0xb0c000, 0xb0ffff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // RZ: Sprites Code + X + Attr
map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
#if __uPD71054_TIMER
- map(0xd00000, 0xd00007).w(this, FUNC(seta_state::timer_regs_w)); // ?
+ map(0xd00000, 0xd00007).w(FUNC(seta_state::timer_regs_w)); // ?
#else
map(0xd00000, 0xd00007).nopw(); // ?
#endif
@@ -2133,7 +2133,7 @@ void seta_state::orbs_map(address_map &map)
map(0xf00000, 0xf0ffff).ram(); // RAM
map(0x100000, 0x100001).nopr(); // ?
map(0x200000, 0x200001).nopr(); // ?
- map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x400000, 0x400001).nopw(); // ?
map(0x500000, 0x500001).portr("P1"); // P1
map(0x500002, 0x500003).portr("P2"); // P2
@@ -2212,17 +2212,17 @@ void seta_state::keroppi_map(address_map &map)
{
map(0x000000, 0x07ffff).rom(); // ROM
map(0xf00000, 0xf0ffff).ram(); // RAM
- map(0x100000, 0x100001).r(this, FUNC(seta_state::keroppi_protection_r)); //
- map(0x200000, 0x200001).r(this, FUNC(seta_state::keroppi_protection_init_r)); //
- map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x100000, 0x100001).r(FUNC(seta_state::keroppi_protection_r)); //
+ map(0x200000, 0x200001).r(FUNC(seta_state::keroppi_protection_init_r)); //
+ map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x400000, 0x400001).nopw(); // ?
map(0x500000, 0x500001).portr("P1"); // P1
map(0x500002, 0x500003).portr("P2"); // P2
- map(0x500004, 0x500005).r(this, FUNC(seta_state::keroppi_coin_r)); // Coins
+ map(0x500004, 0x500005).r(FUNC(seta_state::keroppi_coin_r)); // Coins
map(0x8000f0, 0x8000f1).ram(); // NVRAM
map(0x800100, 0x8001ff).ram(); // NVRAM
map(0x900000, 0x900001).nopw(); // ?
- map(0x900002, 0x900003).w(this, FUNC(seta_state::keroppi_prize_w)); //
+ map(0x900002, 0x900003).w(FUNC(seta_state::keroppi_prize_w)); //
map(0xa00000, 0xa03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
map(0xb00000, 0xb003ff).ram().share("paletteram1"); // Palette
map(0xc00000, 0xc03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr
@@ -2250,8 +2250,8 @@ void seta_state::blockcar_map(address_map &map)
map(0xf05000, 0xf050ff).ram(); // Backup RAM?
map(0x100000, 0x100001).nopw(); // ? 1 (start of interrupts, main loop: watchdog?)
map(0x200000, 0x200001).nopw(); // ? 0/1 (IRQ acknowledge?)
- map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
- map(0x400001, 0x400001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?)
+ map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x400001, 0x400001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?)
map(0x500000, 0x500001).portr("P1"); // P1
map(0x500002, 0x500003).portr("P2"); // P2
map(0x500004, 0x500005).portr("COINS"); // Coins
@@ -2271,8 +2271,8 @@ void seta_state::blockcarb_map(address_map &map)
map(0xf05000, 0xf050ff).ram(); // Backup RAM?
map(0x100000, 0x100001).nopw(); // ? 1 (start of interrupts, main loop: watchdog?)
map(0x200000, 0x200001).nopw(); // ? 0/1 (IRQ acknowledge?)
- map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
- map(0x400001, 0x400001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?)
+ map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x400001, 0x400001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?)
map(0x500000, 0x500001).portr("P1"); // P1
map(0x500002, 0x500003).portr("P2"); // P2
map(0x500004, 0x500005).portr("COINS"); // Coins
@@ -2297,17 +2297,17 @@ void seta_state::daioh_map(address_map &map)
map(0x400000, 0x400001).portr("P1"); // P1
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
map(0x500004, 0x500005).nopw();
map(0x500006, 0x500007).portr("EXTRA"); // Buttons 4,5,6
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram();
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
map(0x701000, 0x70ffff).ram(); //
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0x804000, 0x80ffff).ram(); //
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x884000, 0x88ffff).ram(); //
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
@@ -2334,17 +2334,17 @@ void seta_state::daiohp_map(address_map &map)
map(0x400000, 0x400001).portr("P1"); // P1
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
map(0x500004, 0x500005).nopw();
map(0x500006, 0x500007).portr("EXTRA"); // Buttons 4,5,6
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram();
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
map(0x701000, 0x70ffff).ram(); //
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0x804000, 0x80ffff).ram(); //
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x884000, 0x88ffff).ram(); //
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
@@ -2373,12 +2373,12 @@ void seta_state::drgnunit_map(address_map &map)
map(0x100000, 0x103fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
map(0x200000, 0x200001).nopw(); // Watchdog
map(0x300000, 0x300001).nopw(); // ? IRQ Ack
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette
map(0x800000, 0x800005).ram().share("vctrl_0"); // VRAM Ctrl
- map(0x900000, 0x903fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM
+ map(0x900000, 0x903fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM
map(0x904000, 0x90ffff).nopw(); // unused (qzkklogy)
map(0xb00000, 0xb00001).portr("P1"); // P1
map(0xb00002, 0xb00003).portr("P2"); // P2
@@ -2537,32 +2537,32 @@ void setaroul_state::setaroul_map(address_map &map)
map(0xc40000, 0xc40001).noprw(); // lev. 2/5 irq ack
map(0xc80000, 0xc80001).noprw(); // lev. 4 irq ack
- map(0xcc0000, 0xcc001f).rw(this, FUNC(setaroul_state::rtc_r), FUNC(setaroul_state::rtc_w));
+ map(0xcc0000, 0xcc001f).rw(FUNC(setaroul_state::rtc_r), FUNC(setaroul_state::rtc_w));
map(0xd00000, 0xd00001).w("watchdog", FUNC(watchdog_timer_device::reset16_w));
map(0xd40000, 0xd40001).portr("DSW1-A");
- map(0xd40001, 0xd40001).w(this, FUNC(setaroul_state::pay_w));
+ map(0xd40001, 0xd40001).w(FUNC(setaroul_state::pay_w));
map(0xd40002, 0xd40003).portr("DSW1-B");
map(0xd40004, 0xd40005).portr("DSW2-A");
map(0xd40006, 0xd40007).portr("DSW2-B");
map(0xd40008, 0xd40009).portr("COIN");
- map(0xd40009, 0xd40009).w(this, FUNC(setaroul_state::led_w));
+ map(0xd40009, 0xd40009).w(FUNC(setaroul_state::led_w));
map(0xd4000a, 0xd4000b).portr("DOOR");
- map(0xd40010, 0xd40011).rw(this, FUNC(setaroul_state::inputs_r), FUNC(setaroul_state::mux_w));
+ map(0xd40010, 0xd40011).rw(FUNC(setaroul_state::inputs_r), FUNC(setaroul_state::mux_w));
map(0xd40018, 0xd40019).portr("DSW3");
map(0xdc0000, 0xdc3fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
- map(0xe00000, 0xe03fff).ram().w(this, FUNC(setaroul_state::vram_w<0>)).share("vram_0");
+ map(0xe00000, 0xe03fff).ram().w(FUNC(setaroul_state::vram_w<0>)).share("vram_0");
map(0xe40000, 0xe40005).ram().share("vctrl_0"); // VRAM Ctrl
- map(0xf00000, 0xf03fff).rw(this, FUNC(setaroul_state::spritecode_r), FUNC(setaroul_state::spritecode_w));
- map(0xf40000, 0xf40bff).w(this, FUNC(setaroul_state::spriteylow_w));
- map(0xf40c00, 0xf40c11).w(this, FUNC(setaroul_state::spritectrl_w));
+ map(0xf00000, 0xf03fff).rw(FUNC(setaroul_state::spritecode_r), FUNC(setaroul_state::spritecode_w));
+ map(0xf40000, 0xf40bff).w(FUNC(setaroul_state::spriteylow_w));
+ map(0xf40c00, 0xf40c11).w(FUNC(setaroul_state::spritectrl_w));
// AM_RANGE(0xf80000, 0xf80001) AM_WRITE // $40 at boot
}
@@ -2581,16 +2581,16 @@ void seta_state::extdwnhl_map(address_map &map)
map(0x400000, 0x400001).portr("P1"); // P1
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
- map(0x400008, 0x40000b).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x400008, 0x40000b).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x40000c, 0x40000d).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); // Watchdog (extdwnhl (R) & sokonuke (W) MUST RETURN $FFFF)
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
map(0x500004, 0x500007).noprw(); // IRQ Ack (extdwnhl (R) & sokonuke (W))
map(0x600400, 0x600fff).ram().share("paletteram1"); // Palette
map(0x601000, 0x610bff).ram(); //
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0x804000, 0x80ffff).ram(); //
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x884000, 0x88ffff).ram(); //
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
@@ -2613,19 +2613,19 @@ void seta_state::kamenrid_map(address_map &map)
map(0x200000, 0x20ffff).ram(); // RAM
map(0x500000, 0x500001).portr("P1"); // P1
map(0x500002, 0x500003).portr("P2"); // P2
- map(0x500004, 0x500007).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x500004, 0x500007).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x500008, 0x500009).portr("COINS"); // Coins
map(0x50000c, 0x50000d).rw("watchdog", FUNC(watchdog_timer_device::reset16_r), FUNC(watchdog_timer_device::reset16_w)); // xx Watchdog? (sokonuke)
- map(0x600001, 0x600001).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
- map(0x600003, 0x600003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
- map(0x600004, 0x600005).w(this, FUNC(seta_state::ipl1_ack_w));
- map(0x600006, 0x600007).w(this, FUNC(seta_state::ipl2_ack_w));
+ map(0x600001, 0x600001).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
+ map(0x600003, 0x600003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x600004, 0x600005).w(FUNC(seta_state::ipl1_ack_w));
+ map(0x600006, 0x600007).w(FUNC(seta_state::ipl2_ack_w));
map(0x700000, 0x7003ff).ram(); // Palette RAM (tested)
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
map(0x701000, 0x703fff).ram(); // Palette
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0x804000, 0x807fff).ram(); // tested
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x884000, 0x887fff).ram(); // tested
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
@@ -2646,15 +2646,15 @@ void seta_state::madshark_map(address_map &map)
map(0x500000, 0x500001).portr("P1"); // P1
map(0x500002, 0x500003).portr("P2"); // P2
map(0x500004, 0x500005).portr("COINS"); // Coins
- map(0x500008, 0x50000b).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x500008, 0x50000b).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x50000c, 0x50000d).w("watchdog", FUNC(watchdog_timer_device::reset16_w));
- map(0x600001, 0x600001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x600003, 0x600003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
- map(0x600004, 0x600005).w(this, FUNC(seta_state::ipl1_ack_w));
- map(0x600006, 0x600007).w(this, FUNC(seta_state::ipl2_ack_w));
+ map(0x600001, 0x600001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x600003, 0x600003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x600004, 0x600005).w(FUNC(seta_state::ipl1_ack_w));
+ map(0x600006, 0x600007).w(FUNC(seta_state::ipl2_ack_w));
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
@@ -2686,20 +2686,20 @@ void seta_state::magspeed_map(address_map &map)
map(0x500000, 0x500001).portr("P1"); // P1
map(0x500002, 0x500003).portr("P2"); // P2
map(0x500004, 0x500005).portr("COINS"); // Coins
- map(0x500008, 0x50000b).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x500008, 0x50000b).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x50000c, 0x50000d).w("watchdog", FUNC(watchdog_timer_device::reset16_w));
- map(0x500011, 0x500011).w(this, FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
- map(0x500015, 0x500015).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
- map(0x500018, 0x500019).w(this, FUNC(seta_state::ipl1_ack_w)); // lev 2 irq ack?
- map(0x50001c, 0x50001d).w(this, FUNC(seta_state::ipl2_ack_w)); // lev 4 irq ack?
- map(0x600000, 0x600005).w(this, FUNC(seta_state::magspeed_lights_w)); // Lights
+ map(0x500011, 0x500011).w(FUNC(seta_state::seta_coin_counter_w)); // Coin Counter (no lockout)
+ map(0x500015, 0x500015).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500018, 0x500019).w(FUNC(seta_state::ipl1_ack_w)); // lev 2 irq ack?
+ map(0x50001c, 0x50001d).w(FUNC(seta_state::ipl2_ack_w)); // lev 4 irq ack?
+ map(0x600000, 0x600005).w(FUNC(seta_state::magspeed_lights_w)); // Lights
map(0x600006, 0x600007).nopw(); // ?
map(0x700000, 0x7003ff).ram(); // Palette RAM (tested)
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
map(0x701000, 0x703fff).ram(); // Palette RAM (tested)
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0x804000, 0x807fff).ram(); // tested
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x884000, 0x887fff).ram(); // tested
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
@@ -2723,7 +2723,7 @@ void seta_state::krzybowl_map(address_map &map)
map(0xf00000, 0xf0ffff).ram(); // RAM
map(0x100000, 0x100001).nopr(); // ?
map(0x200000, 0x200001).nopr(); // ?
- map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x400000, 0x400001).nopw(); // ?
map(0x500000, 0x500001).portr("P1"); // P1
map(0x500002, 0x500003).portr("P2"); // P2
@@ -2755,19 +2755,19 @@ void seta_state::msgundam_map(address_map &map)
map(0x400000, 0x400001).portr("P1"); // P1
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
- map(0x400000, 0x400001).w(this, FUNC(seta_state::ipl1_ack_w)); // Lev 2 IRQ Ack
- map(0x400004, 0x400005).w(this, FUNC(seta_state::ipl2_ack_w)); // Lev 4 IRQ Ack
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x400000, 0x400001).w(FUNC(seta_state::ipl1_ack_w)); // Lev 2 IRQ Ack
+ map(0x400004, 0x400005).w(FUNC(seta_state::ipl2_ack_w)); // Lev 4 IRQ Ack
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
map(0x500002, 0x500003).nopw(); // ?
- map(0x500005, 0x500005).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x500005, 0x500005).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
map(0x800000, 0x8005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
map(0x800600, 0x800607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16));
map(0x880000, 0x880001).ram(); // ? 0x4000
map(0x900000, 0x903fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr
- map(0xa00000, 0xa03fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
- map(0xa80000, 0xa83fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0xa00000, 0xa03fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0xa80000, 0xa83fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0xb00000, 0xb00005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0xb80000, 0xb80005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
@@ -2785,17 +2785,17 @@ void seta_state::oisipuzl_map(address_map &map)
map(0x000000, 0x07ffff).rom(); // ROM
map(0x100000, 0x17ffff).rom(); // ROM
map(0x200000, 0x20ffff).ram(); // RAM
- map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x400000, 0x400001).portr("P1"); // P1
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
map(0x400000, 0x400001).nopw(); // ? IRQ Ack
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
map(0x500004, 0x500005).nopw(); // ? IRQ Ack
map(0x700000, 0x703fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
@@ -2817,18 +2817,18 @@ void seta_state::triplfun_map(address_map &map)
map(0x000000, 0x07ffff).rom(); // ROM
map(0x100000, 0x17ffff).rom(); // ROM
map(0x200000, 0x20ffff).ram(); // RAM
- map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x400000, 0x400001).portr("P1"); // P1
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
map(0x400000, 0x400001).nopw(); // ? IRQ Ack
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
map(0x500004, 0x500005).nopw(); // ? IRQ Ack
map(0x500007, 0x500007).rw("oki", FUNC(okim6295_device::read), FUNC(okim6295_device::write)); // tfun sound
map(0x700000, 0x703fff).noprw();
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x900000, 0x900005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
@@ -2881,8 +2881,8 @@ void seta_state::kiwame_map(address_map &map)
map(0xa00600, 0xa00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16));
map(0xb00000, 0xb003ff).ram().share("paletteram1"); // Palette
map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
- map(0xd00000, 0xd00009).r(this, FUNC(seta_state::kiwame_input_r)); // mahjong panel
- map(0xe00000, 0xe00003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0xd00000, 0xd00009).r(FUNC(seta_state::kiwame_input_r)); // mahjong panel
+ map(0xe00000, 0xe00003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0xfffc00, 0xffffff).rw("tmp68301", FUNC(tmp68301_device::regs_r), FUNC(tmp68301_device::regs_w));
}
@@ -2908,16 +2908,16 @@ void seta_state::thunderl_map(address_map &map)
map(0x000000, 0x00ffff).rom(); // ROM
map(0xffc000, 0xffffff).ram(); // RAM
map(0x100000, 0x103fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
- map(0x200000, 0x200001).rw(this, FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w));
+ map(0x200000, 0x200001).rw(FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w));
map(0x300000, 0x300001).nopw(); // ?
- map(0x400000, 0x40ffff).w(this, FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits)
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x400000, 0x40ffff).w(FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits)
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette
map(0xb00000, 0xb00001).portr("P1"); // P1
map(0xb00002, 0xb00003).portr("P2"); // P2
map(0xb00004, 0xb00005).portr("COINS"); // Coins
- map(0xb0000c, 0xb0000d).r(this, FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits)
+ map(0xb0000c, 0xb0000d).r(FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits)
map(0xb00008, 0xb00009).portr("P3"); // P3 (wits)
map(0xb0000a, 0xb0000b).portr("P4"); // P4 (wits)
map(0xc00000, 0xc00001).ram(); // ? 0x4000
@@ -2933,16 +2933,16 @@ void seta_state::thunderlbl_map(address_map &map)
map(0x000000, 0x00ffff).rom(); // ROM
map(0xffc000, 0xffffff).ram(); // RAM
// map(0x100000, 0x103fff).rw("x1snd", FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
- map(0x200000, 0x200001).rw(this, FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w));
+ map(0x200000, 0x200001).rw(FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w));
map(0x300000, 0x300001).nopw(); // ?
-// map(0x400000, 0x40ffff).w(this, FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits)
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+// map(0x400000, 0x40ffff).w(FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits)
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette
map(0xb00000, 0xb00001).portr("P1"); // P1
map(0xb00002, 0xb00003).portr("P2"); // P2
map(0xb00004, 0xb00005).portr("COINS"); // Coins
-// map(0xb0000c, 0xb0000d).r(this, FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits)
+// map(0xb0000c, 0xb0000d).r(FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits)
map(0xb00008, 0xb00009).portr("P3"); // P3 (wits)
map(0xb00008, 0xb00008).w("soundlatch1", FUNC(generic_latch_8_device::write));
map(0xb0000a, 0xb0000b).portr("P4"); // P4 (wits)
@@ -2962,16 +2962,16 @@ void seta_state::wiggie_map(address_map &map)
map(0x000000, 0x01ffff).rom(); // ROM
map(0xffc000, 0xffffff).ram(); // RAM
map(0x100000, 0x103fff).noprw(); // X1_010 is not used
- map(0x200000, 0x200001).rw(this, FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w));
+ map(0x200000, 0x200001).rw(FUNC(seta_state::ipl1_ack_r), FUNC(seta_state::ipl1_ack_w));
map(0x300000, 0x300001).nopw(); // ?
- map(0x400000, 0x40ffff).w(this, FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits)
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x400000, 0x40ffff).w(FUNC(seta_state::thunderl_protection_w)); // Protection (not in wits)
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700000, 0x7003ff).ram().share("paletteram1"); // Palette
map(0xb00000, 0xb00001).portr("P1"); // P1
map(0xb00002, 0xb00003).portr("P2"); // P2
map(0xb00004, 0xb00005).portr("COINS"); // Coins
- map(0xb0000c, 0xb0000d).r(this, FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits)
+ map(0xb0000c, 0xb0000d).r(FUNC(seta_state::thunderl_protection_r)); // Protection (not in wits)
map(0xb00008, 0xb00009).portr("P3"); // P3 (wits)
map(0xb00008, 0xb00008).w("soundlatch1", FUNC(generic_latch_8_device::write));
map(0xb0000a, 0xb0000b).portr("P4"); // P4 (wits)
@@ -3006,8 +3006,8 @@ void seta_state::umanclub_map(address_map &map)
map(0x400004, 0x400005).portr("COINS"); // Coins
map(0x400000, 0x400001).nopw(); // ? (end of lev 2)
map(0x400004, 0x400005).nopw(); // ? (end of lev 2)
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
map(0xa00600, 0xa00607).ram().rw(m_seta001, FUNC(seta001_device::spritectrl_r16), FUNC(seta001_device::spritectrl_w16));
map(0xa80000, 0xa80001).ram(); // ? 0x4000
@@ -3035,12 +3035,12 @@ void seta_state::utoukond_map(address_map &map)
map(0x400000, 0x400001).portr("P1"); // P1
map(0x400002, 0x400003).portr("P2"); // P2
map(0x400004, 0x400005).portr("COINS"); // Coins
- map(0x500001, 0x500001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
- map(0x500003, 0x500003).w(this, FUNC(seta_state::seta_vregs_w)); // Video Registers
- map(0x600000, 0x600003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x500001, 0x500001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout
+ map(0x500003, 0x500003).w(FUNC(seta_state::seta_vregs_w)); // Video Registers
+ map(0x600000, 0x600003).r(FUNC(seta_state::seta_dsw_r)); // DSW
map(0x700400, 0x700fff).ram().share("paletteram1"); // Palette
- map(0x800000, 0x803fff).ram().w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
- map(0x880000, 0x883fff).ram().w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
+ map(0x800000, 0x803fff).ram().w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0x880000, 0x883fff).ram().w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2&3
map(0x900000, 0x900005).writeonly().share("vctrl_0");// VRAM 0&1 Ctrl
map(0x980000, 0x980005).writeonly().share("vctrl_1");// VRAM 2&3 Ctrl
map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
@@ -3076,12 +3076,12 @@ void seta_state::pairlove_map(address_map &map)
map(0x000000, 0x03ffff).rom(); // ROM
map(0x100000, 0x100001).nopw(); // ? 1 (start of interrupts, main loop: watchdog?)
map(0x200000, 0x200001).nopw(); // ? 0/1 (IRQ acknowledge?)
- map(0x300000, 0x300003).r(this, FUNC(seta_state::seta_dsw_r)); // DSW
- map(0x400001, 0x400001).w(this, FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?)
+ map(0x300000, 0x300003).r(FUNC(seta_state::seta_dsw_r)); // DSW
+ map(0x400001, 0x400001).w(FUNC(seta_state::seta_coin_lockout_w)); // Coin Lockout + Sound Enable (bit 4?)
map(0x500000, 0x500001).portr("P1"); // P1
map(0x500002, 0x500003).portr("P2"); // P2
map(0x500004, 0x500005).portr("COINS"); // Coins
- map(0x900000, 0x9001ff).rw(this, FUNC(seta_state::pairlove_prot_r), FUNC(seta_state::pairlove_prot_w));
+ map(0x900000, 0x9001ff).rw(FUNC(seta_state::pairlove_prot_r), FUNC(seta_state::pairlove_prot_w));
map(0xa00000, 0xa03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
map(0xb00000, 0xb00fff).ram().share("paletteram1"); // Palette
map(0xc00000, 0xc03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr
@@ -3105,13 +3105,13 @@ void seta_state::crazyfgt_map(address_map &map)
map(0x610004, 0x610005).portr("INPUT");
map(0x610006, 0x610007).nopw();
map(0x620000, 0x620003).nopw(); // protection
- map(0x630000, 0x630003).r(this, FUNC(seta_state::seta_dsw_r));
+ map(0x630000, 0x630003).r(FUNC(seta_state::seta_dsw_r));
map(0x640400, 0x640fff).writeonly().share("paletteram1"); // Palette
map(0x650000, 0x650003).w("ymsnd", FUNC(ym3812_device::write)).umask16(0x00ff);
map(0x658001, 0x658001).w("oki", FUNC(okim6295_device::write));
map(0x670000, 0x670001).nopr(); // watchdog?
- map(0x800000, 0x803fff).w(this, FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2
- map(0x880000, 0x883fff).w(this, FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0
+ map(0x800000, 0x803fff).w(FUNC(seta_state::vram_w<1>)).share("vram_1"); // VRAM 2
+ map(0x880000, 0x883fff).w(FUNC(seta_state::vram_w<0>)).share("vram_0"); // VRAM 0
map(0x900000, 0x900005).ram().share("vctrl_1"); // VRAM 2&3 Ctrl
map(0x980000, 0x980005).ram().share("vctrl_0"); // VRAM 0&1 Ctrl
map(0xa00000, 0xa005ff).ram().rw(m_seta001, FUNC(seta001_device::spriteylow_r16), FUNC(seta001_device::spriteylow_w16)); // Sprites Y
@@ -3275,9 +3275,9 @@ void jockeyc_state::jockeyc_map(address_map &map)
{
map(0x000000, 0x1fffff).rom(); // ROM (up to 2MB)
- map(0x200000, 0x200001).rw(this, FUNC(jockeyc_state::mux_r), FUNC(jockeyc_state::jockeyc_mux_w));
+ map(0x200000, 0x200001).rw(FUNC(jockeyc_state::mux_r), FUNC(jockeyc_state::jockeyc_mux_w));
map(0x200002, 0x200003).portr("COIN");
- map(0x200010, 0x200011).portr("SERVICE").w(this, FUNC(jockeyc_state::jockeyc_out_w));
+ map(0x200010, 0x200011).portr("SERVICE").w(FUNC(jockeyc_state::jockeyc_out_w));
map(0x300000, 0x300001).w("watchdog", FUNC(watchdog_timer_device::reset16_w));
map(0x300002, 0x300003).noprw(); // clr.l $300000 (watchdog)
@@ -3288,19 +3288,19 @@ void jockeyc_state::jockeyc_map(address_map &map)
map(0x300060, 0x300061).nopw(); // lev6 ack
#if JOCKEYC_HIDDEN_EDITOR
- map(0x400000, 0x400007).r(this, FUNC(jockeyc_state::trackball_r));
+ map(0x400000, 0x400007).r(FUNC(jockeyc_state::trackball_r));
#endif
- map(0x500000, 0x500003).r(this, FUNC(jockeyc_state::dsw_r)); // DSW x 3
- map(0x600000, 0x600001).r(this, FUNC(jockeyc_state::comm_r)); // comm data
- map(0x600002, 0x600003).r(this, FUNC(jockeyc_state::comm_r)); // comm status (bits 0,4,5,6)
+ map(0x500000, 0x500003).r(FUNC(jockeyc_state::dsw_r)); // DSW x 3
+ map(0x600000, 0x600001).r(FUNC(jockeyc_state::comm_r)); // comm data
+ map(0x600002, 0x600003).r(FUNC(jockeyc_state::comm_r)); // comm status (bits 0,4,5,6)
- map(0x800000, 0x80001f).rw(this, FUNC(jockeyc_state::rtc_r), FUNC(jockeyc_state::rtc_w));
+ map(0x800000, 0x80001f).rw(FUNC(jockeyc_state::rtc_r), FUNC(jockeyc_state::rtc_w));
map(0x900000, 0x903fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
map(0xa00000, 0xa00005).writeonly().share("vctrl_0"); // VRAM 0&1 Ctrl
- map(0xb00000, 0xb03fff).ram().w(this, FUNC(jockeyc_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0xb00000, 0xb03fff).ram().w(FUNC(jockeyc_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0xb04000, 0xb0ffff).nopw(); // likely left-over
map(0xc00000, 0xc00001).ram(); // ? 0x4000
@@ -3363,9 +3363,9 @@ void jockeyc_state::inttoote_map(address_map &map)
{
map(0x000000, 0x1fffff).rom(); // ROM (up to 2MB)
- map(0x200000, 0x200001).rw(this, FUNC(jockeyc_state::mux_r), FUNC(jockeyc_state::inttoote_mux_w));
+ map(0x200000, 0x200001).rw(FUNC(jockeyc_state::mux_r), FUNC(jockeyc_state::inttoote_mux_w));
map(0x200002, 0x200003).portr("COIN");
- map(0x200010, 0x200011).portr("SERVICE").w(this, FUNC(jockeyc_state::inttoote_out_w));
+ map(0x200010, 0x200011).portr("SERVICE").w(FUNC(jockeyc_state::inttoote_out_w));
map(0x300000, 0x300001).w("watchdog", FUNC(watchdog_timer_device::reset16_w));
@@ -3374,16 +3374,16 @@ void jockeyc_state::inttoote_map(address_map &map)
map(0x300040, 0x300041).nopw(); // lev4 ack
map(0x300060, 0x300061).nopw(); // lev6 ack
- map(0x500000, 0x500003).r(this, FUNC(jockeyc_state::dsw_r)); // DSW x 3
+ map(0x500000, 0x500003).r(FUNC(jockeyc_state::dsw_r)); // DSW x 3
- map(0x700000, 0x700101).ram().r(this, FUNC(jockeyc_state::inttoote_700000_r)).share("inttoote_700000");
+ map(0x700000, 0x700101).ram().r(FUNC(jockeyc_state::inttoote_700000_r)).share("inttoote_700000");
- map(0x800000, 0x80001f).rw(this, FUNC(jockeyc_state::rtc_r), FUNC(jockeyc_state::rtc_w));
+ map(0x800000, 0x80001f).rw(FUNC(jockeyc_state::rtc_r), FUNC(jockeyc_state::rtc_w));
map(0x900000, 0x903fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound
map(0xa00000, 0xa00005).writeonly().share("vctrl_0"); // VRAM 0&1 Ctrl
- map(0xb00000, 0xb03fff).ram().w(this, FUNC(jockeyc_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
+ map(0xb00000, 0xb03fff).ram().w(FUNC(jockeyc_state::vram_w<0>)).share("vram_0"); // VRAM 0&1
map(0xc00000, 0xc00001).ram(); // ? 0x4000
@@ -3425,11 +3425,11 @@ READ8_MEMBER(seta_state::ff_r){return 0xff;}
void seta_state::tndrcade_sub_map(address_map &map)
{
map(0x0000, 0x01ff).ram(); // RAM
- map(0x0800, 0x0800).r(this, FUNC(seta_state::ff_r)); // ? (bits 0/1/2/3: 1 -> do test 0-ff/100-1e0/5001-57ff/banked rom)
+ map(0x0800, 0x0800).r(FUNC(seta_state::ff_r)); // ? (bits 0/1/2/3: 1 -> do test 0-ff/100-1e0/5001-57ff/banked rom)
//AM_RANGE(0x0800, 0x0800) AM_DEVREAD("soundlatch1", generic_latch_8_device, read) //
//AM_RANGE(0x0801, 0x0801) AM_DEVREAD("soundlatch2", generic_latch_8_device, read) //
map(0x1000, 0x1000).portr("P1"); // P1
- map(0x1000, 0x1000).w(this, FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout
+ map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout
map(0x1001, 0x1001).portr("P2"); // P2
map(0x1002, 0x1002).portr("COINS"); // Coins
map(0x2000, 0x2001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
@@ -3451,7 +3451,7 @@ void seta_state::twineagl_sub_map(address_map &map)
map(0x0800, 0x0800).r("soundlatch1", FUNC(generic_latch_8_device::read)); //
map(0x0801, 0x0801).r("soundlatch2", FUNC(generic_latch_8_device::read)); //
map(0x1000, 0x1000).portr("P1"); // P1
- map(0x1000, 0x1000).w(this, FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout
+ map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout
map(0x1001, 0x1001).portr("P2"); // P2
map(0x1002, 0x1002).portr("COINS"); // Coins
map(0x5000, 0x57ff).ram().share("sharedram"); // Shared RAM
@@ -3493,8 +3493,8 @@ void seta_state::downtown_sub_map(address_map &map)
map(0x0000, 0x01ff).ram(); // RAM
map(0x0800, 0x0800).r("soundlatch1", FUNC(generic_latch_8_device::read)); //
map(0x0801, 0x0801).r("soundlatch2", FUNC(generic_latch_8_device::read)); //
- map(0x1000, 0x1007).r(this, FUNC(seta_state::downtown_ip_r)); // Input Ports
- map(0x1000, 0x1000).w(this, FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout
+ map(0x1000, 0x1007).r(FUNC(seta_state::downtown_ip_r)); // Input Ports
+ map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout
map(0x5000, 0x57ff).ram().share("sharedram"); // Shared RAM
map(0x7000, 0x7fff).rom(); // ROM
map(0x8000, 0xbfff).bankr("subbank"); // Banked ROM
@@ -3538,10 +3538,10 @@ void seta_state::calibr50_sub_map(address_map &map)
{
map(0x0000, 0x1fff).rw(m_x1, FUNC(x1_010_device::read), FUNC(x1_010_device::write)); // Sound
map(0x4000, 0x4000).r("soundlatch1", FUNC(generic_latch_8_device::read)); // From Main CPU
- map(0x4000, 0x4000).w(this, FUNC(seta_state::calibr50_sub_bankswitch_w)); // Bankswitching
+ map(0x4000, 0x4000).w(FUNC(seta_state::calibr50_sub_bankswitch_w)); // Bankswitching
map(0x8000, 0xbfff).bankr("subbank"); // Banked ROM
map(0xc000, 0xffff).rom(); // ROM
- map(0xc000, 0xc000).w(this, FUNC(seta_state::calibr50_soundlatch2_w)); // To Main CPU
+ map(0xc000, 0xc000).w(FUNC(seta_state::calibr50_soundlatch2_w)); // To Main CPU
}
@@ -3555,7 +3555,7 @@ void seta_state::metafox_sub_map(address_map &map)
map(0x0800, 0x0800).r("soundlatch1", FUNC(generic_latch_8_device::read)); //
map(0x0801, 0x0801).r("soundlatch2", FUNC(generic_latch_8_device::read)); //
map(0x1000, 0x1000).portr("COINS"); // Coins
- map(0x1000, 0x1000).w(this, FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout
+ map(0x1000, 0x1000).w(FUNC(seta_state::sub_bankswitch_lockout_w)); // ROM Bank + Coin Lockout
map(0x1002, 0x1002).portr("P1"); // P1
//AM_RANGE(0x1004, 0x1004) AM_READNOP // ?
map(0x1006, 0x1006).portr("P2"); // P2
@@ -3581,7 +3581,7 @@ void seta_state::utoukond_sound_io_map(address_map &map)
{
map.global_mask(0xff);
map(0x00, 0x03).rw("ymsnd", FUNC(ym3438_device::read), FUNC(ym3438_device::write));
- map(0x80, 0x80).w(this, FUNC(seta_state::utoukond_sound_control_w));
+ map(0x80, 0x80).w(FUNC(seta_state::utoukond_sound_control_w));
map(0xc0, 0xc0).r("soundlatch1", FUNC(generic_latch_8_device::read));
}
@@ -8007,7 +8007,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::calibr50_interrupt)
MACHINE_START_MEMBER(seta_state, usclssic)
{
- m_buttonmux->ab_w(0xff);
+ m_buttonmux->write_ab(0xff);
}