diff options
Diffstat (limited to 'src/mame/drivers/ultraman.c')
-rw-r--r-- | src/mame/drivers/ultraman.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index 4ec5cbeb226..76188444228 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -17,18 +17,17 @@ #include "sound/okim6295.h" #include "includes/ultraman.h" -static WRITE16_HANDLER( sound_cmd_w ) +WRITE16_MEMBER(ultraman_state::sound_cmd_w) { if (ACCESSING_BITS_0_7) soundlatch_w(space, 0, data & 0xff); } -static WRITE16_HANDLER( sound_irq_trigger_w ) +WRITE16_MEMBER(ultraman_state::sound_irq_trigger_w) { - ultraman_state *state = space->machine().driver_data<ultraman_state>(); if (ACCESSING_BITS_0_7) - device_set_input_line(state->m_audiocpu, INPUT_LINE_NMI, PULSE_LINE); + device_set_input_line(m_audiocpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -42,8 +41,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, ultraman_state ) AM_RANGE(0x1c0006, 0x1c0007) AM_READ_PORT("DSW1") AM_RANGE(0x1c0008, 0x1c0009) AM_READ_PORT("DSW2") AM_RANGE(0x1c0018, 0x1c0019) AM_WRITE_LEGACY(ultraman_gfxctrl_w) /* counters + gfx ctrl */ - AM_RANGE(0x1c0020, 0x1c0021) AM_WRITE_LEGACY(sound_cmd_w) - AM_RANGE(0x1c0028, 0x1c0029) AM_WRITE_LEGACY(sound_irq_trigger_w) + AM_RANGE(0x1c0020, 0x1c0021) AM_WRITE(sound_cmd_w) + AM_RANGE(0x1c0028, 0x1c0029) AM_WRITE(sound_irq_trigger_w) AM_RANGE(0x1c0030, 0x1c0031) AM_WRITE_LEGACY(watchdog_reset16_w) AM_RANGE(0x204000, 0x204fff) AM_DEVREADWRITE8_LEGACY("k051316_1", k051316_r, k051316_w, 0x00ff) /* K051316 #0 RAM */ AM_RANGE(0x205000, 0x205fff) AM_DEVREADWRITE8_LEGACY("k051316_2", k051316_r, k051316_w, 0x00ff) /* K051316 #1 RAM */ |