diff options
Diffstat (limited to 'src/mame/drivers/system1.cpp')
-rw-r--r-- | src/mame/drivers/system1.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index 7c14f8f0a1c..3d9f0d72549 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -760,12 +760,12 @@ void system1_state::system1_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xcfff).ram().share("ram"); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(system1_state::system1_paletteram_w)).share("palette"); - map(0xe000, 0xefff).rw(this, FUNC(system1_state::system1_videoram_r), FUNC(system1_state::system1_videoram_w)); - map(0xf000, 0xf3ff).rw(this, FUNC(system1_state::system1_mixer_collision_r), FUNC(system1_state::system1_mixer_collision_w)); - map(0xf400, 0xf7ff).w(this, FUNC(system1_state::system1_mixer_collision_reset_w)); - map(0xf800, 0xfbff).rw(this, FUNC(system1_state::system1_sprite_collision_r), FUNC(system1_state::system1_sprite_collision_w)); - map(0xfc00, 0xffff).w(this, FUNC(system1_state::system1_sprite_collision_reset_w)); + map(0xd800, 0xdfff).ram().w(FUNC(system1_state::system1_paletteram_w)).share("palette"); + map(0xe000, 0xefff).rw(FUNC(system1_state::system1_videoram_r), FUNC(system1_state::system1_videoram_w)); + map(0xf000, 0xf3ff).rw(FUNC(system1_state::system1_mixer_collision_r), FUNC(system1_state::system1_mixer_collision_w)); + map(0xf400, 0xf7ff).w(FUNC(system1_state::system1_mixer_collision_reset_w)); + map(0xf800, 0xfbff).rw(FUNC(system1_state::system1_sprite_collision_r), FUNC(system1_state::system1_sprite_collision_w)); + map(0xfc00, 0xffff).w(FUNC(system1_state::system1_sprite_collision_reset_w)); } void system1_state::decrypted_opcodes_map(address_map &map) @@ -774,7 +774,7 @@ void system1_state::decrypted_opcodes_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1"); map(0xc000, 0xcfff).ram().share("ram"); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(system1_state::system1_paletteram_w)).share("palette"); + map(0xd800, 0xdfff).ram().w(FUNC(system1_state::system1_paletteram_w)).share("palette"); } void system1_state::banked_decrypted_opcodes_map(address_map &map) @@ -783,7 +783,7 @@ void system1_state::banked_decrypted_opcodes_map(address_map &map) map(0x8000, 0xbfff).bankr("bank1d"); map(0xc000, 0xcfff).ram().share("ram"); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(system1_state::system1_paletteram_w)).share("palette"); + map(0xd800, 0xdfff).ram().w(FUNC(system1_state::system1_paletteram_w)).share("palette"); } /* same as normal System 1 except address map is shuffled (RAM/collision are swapped) */ @@ -791,13 +791,13 @@ void system1_state::nobo_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xc000, 0xc3ff).rw(this, FUNC(system1_state::system1_mixer_collision_r), FUNC(system1_state::system1_mixer_collision_w)); - map(0xc400, 0xc7ff).w(this, FUNC(system1_state::system1_mixer_collision_reset_w)); - map(0xc800, 0xcbff).rw(this, FUNC(system1_state::system1_sprite_collision_r), FUNC(system1_state::system1_sprite_collision_w)); - map(0xcc00, 0xcfff).w(this, FUNC(system1_state::system1_sprite_collision_reset_w)); + map(0xc000, 0xc3ff).rw(FUNC(system1_state::system1_mixer_collision_r), FUNC(system1_state::system1_mixer_collision_w)); + map(0xc400, 0xc7ff).w(FUNC(system1_state::system1_mixer_collision_reset_w)); + map(0xc800, 0xcbff).rw(FUNC(system1_state::system1_sprite_collision_r), FUNC(system1_state::system1_sprite_collision_w)); + map(0xcc00, 0xcfff).w(FUNC(system1_state::system1_sprite_collision_reset_w)); map(0xd000, 0xd7ff).ram().share("spriteram"); - map(0xd800, 0xdfff).ram().w(this, FUNC(system1_state::system1_paletteram_w)).share("palette"); - map(0xe000, 0xefff).rw(this, FUNC(system1_state::system1_videoram_r), FUNC(system1_state::system1_videoram_w)); + map(0xd800, 0xdfff).ram().w(FUNC(system1_state::system1_paletteram_w)).share("palette"); + map(0xe000, 0xefff).rw(FUNC(system1_state::system1_videoram_r), FUNC(system1_state::system1_videoram_w)); map(0xf000, 0xffff).ram().share("ram"); } @@ -839,9 +839,9 @@ void system1_state::sound_map(address_map &map) { map(0x0000, 0x7fff).rom(); map(0x8000, 0x87ff).mirror(0x1800).ram(); - map(0xa000, 0xa000).mirror(0x1fff).w("sn1", FUNC(sn76489a_device::write)); - map(0xc000, 0xc000).mirror(0x1fff).w("sn2", FUNC(sn76489a_device::write)); - map(0xe000, 0xe000).mirror(0x1fff).r(this, FUNC(system1_state::sound_data_r)); + map(0xa000, 0xa000).mirror(0x1fff).w("sn1", FUNC(sn76489a_device::command_w)); + map(0xc000, 0xc000).mirror(0x1fff).w("sn2", FUNC(sn76489a_device::command_w)); + map(0xe000, 0xe000).mirror(0x1fff).r(FUNC(system1_state::sound_data_r)); } @@ -854,7 +854,7 @@ void system1_state::sound_map(address_map &map) void system1_state::mcu_io_map(address_map &map) { - map(0x0000, 0xffff).rw(this, FUNC(system1_state::mcu_io_r), FUNC(system1_state::mcu_io_w)); + map(0x0000, 0xffff).rw(FUNC(system1_state::mcu_io_r), FUNC(system1_state::mcu_io_w)); } |