diff options
Diffstat (limited to 'src/mame/drivers/bionicc.c')
-rw-r--r-- | src/mame/drivers/bionicc.c | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index e055dca4469..cfcb5ac9db3 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -70,50 +70,45 @@ * *************************************/ -static WRITE16_HANDLER( hacked_controls_w ) +WRITE16_MEMBER(bionicc_state::hacked_controls_w) { - bionicc_state *state = space->machine().driver_data<bionicc_state>(); - logerror("%06x: hacked_controls_w %04x %02x\n", cpu_get_pc(&space->device()), offset, data); - COMBINE_DATA(&state->m_inp[offset]); + logerror("%06x: hacked_controls_w %04x %02x\n", cpu_get_pc(&space.device()), offset, data); + COMBINE_DATA(&m_inp[offset]); } -static READ16_HANDLER( hacked_controls_r ) +READ16_MEMBER(bionicc_state::hacked_controls_r) { - bionicc_state *state = space->machine().driver_data<bionicc_state>(); - logerror("%06x: hacked_controls_r %04x %04x\n", cpu_get_pc(&space->device()), offset, state->m_inp[offset]); - return state->m_inp[offset]; + logerror("%06x: hacked_controls_r %04x %04x\n", cpu_get_pc(&space.device()), offset, m_inp[offset]); + return m_inp[offset]; } -static WRITE16_HANDLER( bionicc_mpu_trigger_w ) +WRITE16_MEMBER(bionicc_state::bionicc_mpu_trigger_w) { - bionicc_state *state = space->machine().driver_data<bionicc_state>(); - data = input_port_read(space->machine(), "SYSTEM") >> 12; - state->m_inp[0] = data ^ 0x0f; + data = input_port_read(machine(), "SYSTEM") >> 12; + m_inp[0] = data ^ 0x0f; - data = input_port_read(space->machine(), "P2"); - state->m_inp[1] = data ^ 0xff; + data = input_port_read(machine(), "P2"); + m_inp[1] = data ^ 0xff; - data = input_port_read(space->machine(), "P1"); - state->m_inp[2] = data ^ 0xff; + data = input_port_read(machine(), "P1"); + m_inp[2] = data ^ 0xff; } -static WRITE16_HANDLER( hacked_soundcommand_w ) +WRITE16_MEMBER(bionicc_state::hacked_soundcommand_w) { - bionicc_state *state = space->machine().driver_data<bionicc_state>(); - COMBINE_DATA(&state->m_soundcommand); - soundlatch_w(space, 0, state->m_soundcommand & 0xff); + COMBINE_DATA(&m_soundcommand); + soundlatch_w(space, 0, m_soundcommand & 0xff); } -static READ16_HANDLER( hacked_soundcommand_r ) +READ16_MEMBER(bionicc_state::hacked_soundcommand_r) { - bionicc_state *state = space->machine().driver_data<bionicc_state>(); - return state->m_soundcommand; + return m_soundcommand; } @@ -155,14 +150,14 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, bionicc_state ) AM_RANGE(0xfe4000, 0xfe4001) AM_READ_PORT("SYSTEM") AM_RANGE(0xfe4002, 0xfe4003) AM_READ_PORT("DSW") AM_RANGE(0xfe8010, 0xfe8017) AM_WRITE_LEGACY(bionicc_scroll_w) - AM_RANGE(0xfe801a, 0xfe801b) AM_WRITE_LEGACY(bionicc_mpu_trigger_w) /* ??? not sure, but looks like it */ + AM_RANGE(0xfe801a, 0xfe801b) AM_WRITE(bionicc_mpu_trigger_w) /* ??? not sure, but looks like it */ AM_RANGE(0xfec000, 0xfecfff) AM_RAM_WRITE_LEGACY(bionicc_txvideoram_w) AM_BASE(m_txvideoram) AM_RANGE(0xff0000, 0xff3fff) AM_RAM_WRITE_LEGACY(bionicc_fgvideoram_w) AM_BASE(m_fgvideoram) AM_RANGE(0xff4000, 0xff7fff) AM_RAM_WRITE_LEGACY(bionicc_bgvideoram_w) AM_BASE(m_bgvideoram) AM_RANGE(0xff8000, 0xff87ff) AM_RAM_WRITE_LEGACY(bionicc_paletteram_w) AM_BASE(m_paletteram) AM_RANGE(0xffc000, 0xfffff7) AM_RAM /* working RAM */ - AM_RANGE(0xfffff8, 0xfffff9) AM_READWRITE_LEGACY(hacked_soundcommand_r, hacked_soundcommand_w) /* hack */ - AM_RANGE(0xfffffa, 0xffffff) AM_READWRITE_LEGACY(hacked_controls_r, hacked_controls_w) /* hack */ + AM_RANGE(0xfffff8, 0xfffff9) AM_READWRITE(hacked_soundcommand_r, hacked_soundcommand_w) /* hack */ + AM_RANGE(0xfffffa, 0xffffff) AM_READWRITE(hacked_controls_r, hacked_controls_w) /* hack */ ADDRESS_MAP_END |