diff options
Diffstat (limited to 'src/mame/drivers/munchmo.c')
-rw-r--r-- | src/mame/drivers/munchmo.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index 1d841340500..ee762556589 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -35,10 +35,9 @@ Stephh's notes (based on the game Z80 code and some tests) : * *************************************/ -static WRITE8_HANDLER( mnchmobl_nmi_enable_w ) +WRITE8_MEMBER(munchmo_state::mnchmobl_nmi_enable_w) { - munchmo_state *state = space->machine().driver_data<munchmo_state>(); - state->m_nmi_enable = data; + m_nmi_enable = data; } /* trusted thru schematics, NMI and IRQ triggers at vblank, at the same time (!) */ @@ -59,19 +58,17 @@ static INTERRUPT_GEN( mnchmobl_sound_irq ) device_set_input_line(device, INPUT_LINE_NMI, ASSERT_LINE); } -static WRITE8_HANDLER( mnchmobl_soundlatch_w ) +WRITE8_MEMBER(munchmo_state::mnchmobl_soundlatch_w) { - munchmo_state *state = space->machine().driver_data<munchmo_state>(); soundlatch_w(space, 0, data); - device_set_input_line(state->m_audiocpu, 0, HOLD_LINE ); + device_set_input_line(m_audiocpu, 0, HOLD_LINE ); } -static WRITE8_HANDLER( sound_nmi_ack_w ) +WRITE8_MEMBER(munchmo_state::sound_nmi_ack_w) { - munchmo_state *state = space->machine().driver_data<munchmo_state>(); - device_set_input_line(state->m_audiocpu, INPUT_LINE_NMI, CLEAR_LINE); + device_set_input_line(m_audiocpu, INPUT_LINE_NMI, CLEAR_LINE); } static READ8_DEVICE_HANDLER( munchmo_ayreset_r ) @@ -95,7 +92,7 @@ static ADDRESS_MAP_START( mnchmobl_map, AS_PROGRAM, 8, munchmo_state ) AM_RANGE(0xb800, 0xb8ff) AM_MIRROR(0x0100) AM_RAM AM_BASE(m_videoram) AM_RANGE(0xbaba, 0xbaba) AM_WRITENOP /* ? */ AM_RANGE(0xbc00, 0xbc7f) AM_RAM AM_BASE(m_status_vram) - AM_RANGE(0xbe00, 0xbe00) AM_WRITE_LEGACY(mnchmobl_soundlatch_w) + AM_RANGE(0xbe00, 0xbe00) AM_WRITE(mnchmobl_soundlatch_w) AM_RANGE(0xbe01, 0xbe01) AM_WRITE_LEGACY(mnchmobl_palette_bank_w) AM_RANGE(0xbe02, 0xbe02) AM_READ_PORT("DSW1") AM_RANGE(0xbe03, 0xbe03) AM_READ_PORT("DSW2") @@ -103,7 +100,7 @@ static ADDRESS_MAP_START( mnchmobl_map, AS_PROGRAM, 8, munchmo_state ) AM_RANGE(0xbe21, 0xbe21) AM_WRITENOP /* ? */ AM_RANGE(0xbe31, 0xbe31) AM_WRITENOP /* ? */ AM_RANGE(0xbe41, 0xbe41) AM_WRITE_LEGACY(mnchmobl_flipscreen_w) - AM_RANGE(0xbe61, 0xbe61) AM_WRITE_LEGACY(mnchmobl_nmi_enable_w) /* ENI 1-10C */ + AM_RANGE(0xbe61, 0xbe61) AM_WRITE(mnchmobl_nmi_enable_w) /* ENI 1-10C */ AM_RANGE(0xbf00, 0xbf07) AM_WRITEONLY AM_BASE(m_vreg) /* MY0 1-8C */ AM_RANGE(0xbf01, 0xbf01) AM_READ_PORT("SYSTEM") AM_RANGE(0xbf02, 0xbf02) AM_READ_PORT("P1") @@ -120,7 +117,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, munchmo_state ) AM_RANGE(0x7000, 0x7fff) AM_DEVWRITE_LEGACY("ay2", ay8910_address_w) AM_RANGE(0x8000, 0x9fff) AM_DEVREADWRITE_LEGACY("ay1", munchmo_ayreset_r, ay8910_reset_w) AM_RANGE(0xa000, 0xbfff) AM_DEVREADWRITE_LEGACY("ay2", munchmo_ayreset_r, ay8910_reset_w) - AM_RANGE(0xc000, 0xdfff) AM_WRITE_LEGACY(sound_nmi_ack_w) + AM_RANGE(0xc000, 0xdfff) AM_WRITE(sound_nmi_ack_w) AM_RANGE(0xe000, 0xe7ff) AM_MIRROR(0x1800) AM_RAM // is mirror ok? ADDRESS_MAP_END |