diff options
Diffstat (limited to 'src/mame/drivers/mainsnk.c')
-rw-r--r-- | src/mame/drivers/mainsnk.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c index 0f1f946aaef..949931a1500 100644 --- a/src/mame/drivers/mainsnk.c +++ b/src/mame/drivers/mainsnk.c @@ -112,25 +112,23 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k #include "sound/ay8910.h" #include "includes/mainsnk.h" -static WRITE8_HANDLER( sound_command_w ) +WRITE8_MEMBER(mainsnk_state::sound_command_w) { - mainsnk_state *state = space->machine().driver_data<mainsnk_state>(); - state->m_sound_cpu_busy = 1; + m_sound_cpu_busy = 1; soundlatch_w(space, 0, data); - cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE); + cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE); } -static READ8_HANDLER( sound_command_r ) +READ8_MEMBER(mainsnk_state::sound_command_r) { return soundlatch_r(space, 0); } -static READ8_HANDLER( sound_ack_r ) +READ8_MEMBER(mainsnk_state::sound_ack_r) { - mainsnk_state *state = space->machine().driver_data<mainsnk_state>(); - state->m_sound_cpu_busy = 0; + m_sound_cpu_busy = 0; return 0xff; } @@ -152,7 +150,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, mainsnk_state ) AM_RANGE(0xc400, 0xc400) AM_READ_PORT("DSW1") AM_RANGE(0xc500, 0xc500) AM_READ_PORT("DSW2") AM_RANGE(0xc600, 0xc600) AM_WRITE_LEGACY(mainsnk_c600_w) - AM_RANGE(0xc700, 0xc700) AM_WRITE_LEGACY(sound_command_w) + AM_RANGE(0xc700, 0xc700) AM_WRITE(sound_command_w) AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE_LEGACY(mainsnk_bgram_w) AM_BASE(m_bgram) AM_RANGE(0xdc00, 0xe7ff) AM_RAM AM_RANGE(0xe800, 0xefff) AM_RAM AM_BASE(m_spriteram) @@ -162,8 +160,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, mainsnk_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0xa000, 0xa000) AM_READ_LEGACY(sound_command_r) - AM_RANGE(0xc000, 0xc000) AM_READ_LEGACY(sound_ack_r) + AM_RANGE(0xa000, 0xa000) AM_READ(sound_command_r) + AM_RANGE(0xc000, 0xc000) AM_READ(sound_ack_r) AM_RANGE(0xe000, 0xe001) AM_DEVWRITE_LEGACY("ay1", ay8910_address_data_w) AM_RANGE(0xe002, 0xe003) AM_WRITENOP // ? always FFFF, snkwave leftover? AM_RANGE(0xe008, 0xe009) AM_DEVWRITE_LEGACY("ay2", ay8910_address_data_w) |