diff options
Diffstat (limited to 'src/mame/drivers/quasar.cpp')
-rw-r--r-- | src/mame/drivers/quasar.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp index 72c6d3aa250..429aaecdf72 100644 --- a/src/mame/drivers/quasar.cpp +++ b/src/mame/drivers/quasar.cpp @@ -113,11 +113,11 @@ READ_LINE_MEMBER(quasar_state::audio_t1_r) void quasar_state::quasar(address_map &map) { map(0x0000, 0x13ff).rom(); - map(0x1400, 0x14ff).mirror(0x6000).r(this, FUNC(quasar_state::cvs_bullet_ram_or_palette_r)).w(this, FUNC(quasar_state::quasar_bullet_w)).share("bullet_ram"); - map(0x1500, 0x15ff).mirror(0x6000).rw(this, FUNC(quasar_state::cvs_s2636_0_or_character_ram_r), FUNC(quasar_state::cvs_s2636_0_or_character_ram_w)); - map(0x1600, 0x16ff).mirror(0x6000).rw(this, FUNC(quasar_state::cvs_s2636_1_or_character_ram_r), FUNC(quasar_state::cvs_s2636_1_or_character_ram_w)); - map(0x1700, 0x17ff).mirror(0x6000).rw(this, FUNC(quasar_state::cvs_s2636_2_or_character_ram_r), FUNC(quasar_state::cvs_s2636_2_or_character_ram_w)); - map(0x1800, 0x1bff).mirror(0x6000).r(this, FUNC(quasar_state::cvs_video_or_color_ram_r)).w(this, FUNC(quasar_state::quasar_video_w)).share("video_ram"); + map(0x1400, 0x14ff).mirror(0x6000).r(FUNC(quasar_state::cvs_bullet_ram_or_palette_r)).w(FUNC(quasar_state::quasar_bullet_w)).share("bullet_ram"); + map(0x1500, 0x15ff).mirror(0x6000).rw(FUNC(quasar_state::cvs_s2636_0_or_character_ram_r), FUNC(quasar_state::cvs_s2636_0_or_character_ram_w)); + map(0x1600, 0x16ff).mirror(0x6000).rw(FUNC(quasar_state::cvs_s2636_1_or_character_ram_r), FUNC(quasar_state::cvs_s2636_1_or_character_ram_w)); + map(0x1700, 0x17ff).mirror(0x6000).rw(FUNC(quasar_state::cvs_s2636_2_or_character_ram_r), FUNC(quasar_state::cvs_s2636_2_or_character_ram_w)); + map(0x1800, 0x1bff).mirror(0x6000).r(FUNC(quasar_state::cvs_video_or_color_ram_r)).w(FUNC(quasar_state::quasar_video_w)).share("video_ram"); map(0x1c00, 0x1fff).mirror(0x6000).ram(); map(0x2000, 0x33ff).rom(); map(0x4000, 0x53ff).rom(); @@ -126,14 +126,14 @@ void quasar_state::quasar(address_map &map) void quasar_state::quasar_io(address_map &map) { - map(0x00, 0x03).rw(this, FUNC(quasar_state::quasar_IO_r), FUNC(quasar_state::video_page_select_w)); - map(0x08, 0x0b).w(this, FUNC(quasar_state::io_page_select_w)); + map(0x00, 0x03).rw(FUNC(quasar_state::quasar_IO_r), FUNC(quasar_state::video_page_select_w)); + map(0x08, 0x0b).w(FUNC(quasar_state::io_page_select_w)); } void quasar_state::quasar_data(address_map &map) { - map(S2650_CTRL_PORT, S2650_CTRL_PORT).r(this, FUNC(quasar_state::cvs_collision_r)).nopw(); - map(S2650_DATA_PORT, S2650_DATA_PORT).rw(this, FUNC(quasar_state::cvs_collision_clear), FUNC(quasar_state::quasar_sh_command_w)); + map(S2650_CTRL_PORT, S2650_CTRL_PORT).r(FUNC(quasar_state::cvs_collision_r)).nopw(); + map(S2650_DATA_PORT, S2650_DATA_PORT).rw(FUNC(quasar_state::cvs_collision_clear), FUNC(quasar_state::quasar_sh_command_w)); } /************************************* @@ -150,7 +150,7 @@ void quasar_state::sound_map(address_map &map) void quasar_state::sound_portmap(address_map &map) { map(0x00, 0x7f).ram(); - map(0x80, 0x80).r(this, FUNC(quasar_state::quasar_sh_command_r)); + map(0x80, 0x80).r(FUNC(quasar_state::quasar_sh_command_r)); } /************************************************************************ @@ -312,7 +312,7 @@ MACHINE_CONFIG_START(quasar_state::quasar) MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_DEVICE_IO_MAP(sound_portmap) MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, quasar_state, audio_t1_r)) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, data_w)) MCFG_MACHINE_START_OVERRIDE(quasar_state,quasar) MCFG_MACHINE_RESET_OVERRIDE(quasar_state,quasar) |