diff options
Diffstat (limited to 'src/mame/drivers/drmicro.c')
-rw-r--r-- | src/mame/drivers/drmicro.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c index b129d57cd27..287630e9cf8 100644 --- a/src/mame/drivers/drmicro.c +++ b/src/mame/drivers/drmicro.c @@ -31,13 +31,12 @@ static INTERRUPT_GEN( drmicro_interrupt ) device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } -static WRITE8_HANDLER( nmi_enable_w ) +WRITE8_MEMBER(drmicro_state::nmi_enable_w) { - drmicro_state *state = space->machine().driver_data<drmicro_state>(); - state->m_nmi_enable = data & 1; - state->m_flipscreen = (data & 2) ? 1 : 0; - flip_screen_set(space->machine(), data & 2); + m_nmi_enable = data & 1; + m_flipscreen = (data & 2) ? 1 : 0; + flip_screen_set(machine(), data & 2); // bit2,3 unknown } @@ -64,11 +63,10 @@ static void pcm_w(device_t *device) msm5205_reset_w(device, 1); } -static WRITE8_HANDLER( pcm_set_w ) +WRITE8_MEMBER(drmicro_state::pcm_set_w) { - drmicro_state *state = space->machine().driver_data<drmicro_state>(); - state->m_pcm_adr = ((data & 0x3f) << 9); - pcm_w(state->m_msm); + m_pcm_adr = ((data & 0x3f) << 9); + pcm_w(m_msm); } /************************************* @@ -89,8 +87,8 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, drmicro_state ) AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE_LEGACY("sn1", sn76496_w) AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE_LEGACY("sn2", sn76496_w) AM_RANGE(0x02, 0x02) AM_DEVWRITE_LEGACY("sn3", sn76496_w) - AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") AM_WRITE_LEGACY(pcm_set_w) - AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2") AM_WRITE_LEGACY(nmi_enable_w) + AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") AM_WRITE(pcm_set_w) + AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2") AM_WRITE(nmi_enable_w) AM_RANGE(0x05, 0x05) AM_NOP // unused? / watchdog? ADDRESS_MAP_END |