summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/twin16.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/twin16.cpp')
-rw-r--r--src/mame/drivers/twin16.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp
index 0d6da76e01c..d12c2001495 100644
--- a/src/mame/drivers/twin16.cpp
+++ b/src/mame/drivers/twin16.cpp
@@ -164,13 +164,13 @@ void twin16_state::sound_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
map(0x8000, 0x87ff).ram();
- map(0x9000, 0x9000).w(this, FUNC(twin16_state::upd_reset_w));
+ map(0x9000, 0x9000).w(FUNC(twin16_state::upd_reset_w));
map(0xa000, 0xa000).r("soundlatch", FUNC(generic_latch_8_device::read));
map(0xb000, 0xb00d).rw(m_k007232, FUNC(k007232_device::read), FUNC(k007232_device::write));
map(0xc000, 0xc001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0xd000, 0xd000).w(m_upd7759, FUNC(upd7759_device::port_w));
- map(0xe000, 0xe000).w(this, FUNC(twin16_state::upd_start_w));
- map(0xf000, 0xf000).r(this, FUNC(twin16_state::upd_busy_r)); // miaj writes 0 to it
+ map(0xe000, 0xe000).w(FUNC(twin16_state::upd_start_w));
+ map(0xf000, 0xf000).r(FUNC(twin16_state::upd_busy_r)); // miaj writes 0 to it
}
void twin16_state::main_map(address_map &map)
@@ -181,7 +181,7 @@ void twin16_state::main_map(address_map &map)
map(0x060000, 0x063fff).ram();
map(0x080000, 0x080fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette");
map(0x081000, 0x081fff).nopw();
- map(0x0a0000, 0x0a0001).portr("SYSTEM").w(this, FUNC(twin16_state::CPUA_register_w));
+ map(0x0a0000, 0x0a0001).portr("SYSTEM").w(FUNC(twin16_state::CPUA_register_w));
map(0x0a0002, 0x0a0003).portr("P1");
map(0x0a0004, 0x0a0005).portr("P2");
map(0x0a0006, 0x0a0007).portr("P3");
@@ -189,12 +189,12 @@ void twin16_state::main_map(address_map &map)
map(0x0a0010, 0x0a0011).portr("DSW2").w("watchdog", FUNC(watchdog_timer_device::reset16_w));
map(0x0a0012, 0x0a0013).portr("DSW1");
map(0x0a0018, 0x0a0019).portr("DSW3");
- map(0x0c0000, 0x0c000f).w(this, FUNC(twin16_state::video_register_w));
- map(0x0c000e, 0x0c000f).r(this, FUNC(twin16_state::sprite_status_r));
- map(0x100000, 0x103fff).ram().w(this, FUNC(twin16_state::fixram_w)).share("fixram");
+ map(0x0c0000, 0x0c000f).w(FUNC(twin16_state::video_register_w));
+ map(0x0c000e, 0x0c000f).r(FUNC(twin16_state::sprite_status_r));
+ map(0x100000, 0x103fff).ram().w(FUNC(twin16_state::fixram_w)).share("fixram");
// AM_RANGE(0x104000, 0x105fff) AM_NOP // miaj
- map(0x120000, 0x121fff).ram().w(this, FUNC(twin16_state::videoram0_w)).share("videoram.0");
- map(0x122000, 0x123fff).ram().w(this, FUNC(twin16_state::videoram1_w)).share("videoram.1");
+ map(0x120000, 0x121fff).ram().w(FUNC(twin16_state::videoram0_w)).share("videoram.0");
+ map(0x122000, 0x123fff).ram().w(FUNC(twin16_state::videoram1_w)).share("videoram.1");
map(0x140000, 0x143fff).ram().share("spriteram");
}
@@ -205,11 +205,11 @@ void twin16_state::sub_map(address_map &map)
// AM_RANGE(0x044000, 0x04ffff) AM_NOP // miaj
map(0x060000, 0x063fff).ram();
map(0x080000, 0x09ffff).rom().region("data", 0);
- map(0x0a0000, 0x0a0001).w(this, FUNC(twin16_state::CPUB_register_w));
+ map(0x0a0000, 0x0a0001).w(FUNC(twin16_state::CPUB_register_w));
map(0x400000, 0x403fff).ram().share("spriteram");
- map(0x480000, 0x481fff).ram().w(this, FUNC(twin16_state::videoram0_w)).share("videoram.0");
- map(0x482000, 0x483fff).ram().w(this, FUNC(twin16_state::videoram1_w)).share("videoram.1");
- map(0x500000, 0x53ffff).ram().w(this, FUNC(twin16_state::zipram_w)).share("zipram");
+ map(0x480000, 0x481fff).ram().w(FUNC(twin16_state::videoram0_w)).share("videoram.0");
+ map(0x482000, 0x483fff).ram().w(FUNC(twin16_state::videoram1_w)).share("videoram.1");
+ map(0x500000, 0x53ffff).ram().w(FUNC(twin16_state::zipram_w)).share("zipram");
map(0x600000, 0x6fffff).rom().region("gfxrom", 0);
map(0x700000, 0x77ffff).bankr("gfxrombank");
map(0x780000, 0x79ffff).ram().share("sprite_gfx_ram");
@@ -221,19 +221,19 @@ void fround_state::fround_map(address_map &map)
map(0x040000, 0x043fff).ram().share("comram");
map(0x060000, 0x063fff).ram();
map(0x080000, 0x080fff).rw(m_palette, FUNC(palette_device::read8), FUNC(palette_device::write8)).umask16(0x00ff).share("palette");
- map(0x0a0000, 0x0a0001).portr("SYSTEM").w(this, FUNC(fround_state::fround_CPU_register_w));
+ map(0x0a0000, 0x0a0001).portr("SYSTEM").w(FUNC(fround_state::fround_CPU_register_w));
map(0x0a0002, 0x0a0003).portr("P1");
map(0x0a0004, 0x0a0005).portr("P2");
map(0x0a0009, 0x0a0009).w("soundlatch", FUNC(generic_latch_8_device::write));
map(0x0a0010, 0x0a0011).portr("DSW2").w("watchdog", FUNC(watchdog_timer_device::reset16_w));
map(0x0a0012, 0x0a0013).portr("DSW1");
map(0x0a0018, 0x0a0019).portr("DSW3");
- map(0x0c0000, 0x0c000f).w(this, FUNC(fround_state::video_register_w));
- map(0x0c000e, 0x0c000f).r(this, FUNC(fround_state::sprite_status_r));
- map(0x0e0000, 0x0e0001).w(this, FUNC(fround_state::gfx_bank_w));
- map(0x100000, 0x103fff).ram().w(this, FUNC(fround_state::fixram_w)).share("fixram");
- map(0x120000, 0x121fff).ram().w(this, FUNC(fround_state::videoram0_w)).share("videoram.0");
- map(0x122000, 0x123fff).ram().w(this, FUNC(fround_state::videoram1_w)).share("videoram.1");
+ map(0x0c0000, 0x0c000f).w(FUNC(fround_state::video_register_w));
+ map(0x0c000e, 0x0c000f).r(FUNC(fround_state::sprite_status_r));
+ map(0x0e0000, 0x0e0001).w(FUNC(fround_state::gfx_bank_w));
+ map(0x100000, 0x103fff).ram().w(FUNC(fround_state::fixram_w)).share("fixram");
+ map(0x120000, 0x121fff).ram().w(FUNC(fround_state::videoram0_w)).share("videoram.0");
+ map(0x122000, 0x123fff).ram().w(FUNC(fround_state::videoram1_w)).share("videoram.1");
map(0x140000, 0x143fff).ram().share("spriteram");
map(0x500000, 0x5fffff).rom().region("tiles", 0);
map(0x600000, 0x6fffff).rom().region("gfxrom", 0);