diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2012-04-03 07:01:48 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2012-04-03 07:01:48 +0000 |
commit | 3783cf95515491d961776534fb5937b76accd464 (patch) | |
tree | dc81476844b0b7308d5ecac1debbe6f1cc8c7443 /src/mame/drivers/magicfly.c | |
parent | 03c583747e9e7475522d1a2ceb5a454a1bc4a5e4 (diff) |
MAME going modern part 3 (no whatsnew)
Diffstat (limited to 'src/mame/drivers/magicfly.c')
-rw-r--r-- | src/mame/drivers/magicfly.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index 60956c94e8c..3d43c8d68de 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -427,6 +427,10 @@ public: UINT8 *m_colorram; tilemap_t *m_bg_tilemap; int m_input_selector; + DECLARE_WRITE8_MEMBER(magicfly_videoram_w); + DECLARE_WRITE8_MEMBER(magicfly_colorram_w); + DECLARE_READ8_MEMBER(mux_port_r); + DECLARE_WRITE8_MEMBER(mux_port_w); }; @@ -435,18 +439,16 @@ public: *************************/ -static WRITE8_HANDLER( magicfly_videoram_w ) +WRITE8_MEMBER(magicfly_state::magicfly_videoram_w) { - magicfly_state *state = space->machine().driver_data<magicfly_state>(); - state->m_videoram[offset] = data; - state->m_bg_tilemap->mark_tile_dirty(offset); + m_videoram[offset] = data; + m_bg_tilemap->mark_tile_dirty(offset); } -static WRITE8_HANDLER( magicfly_colorram_w ) +WRITE8_MEMBER(magicfly_state::magicfly_colorram_w) { - magicfly_state *state = space->machine().driver_data<magicfly_state>(); - state->m_colorram[offset] = data; - state->m_bg_tilemap->mark_tile_dirty(offset); + m_colorram[offset] = data; + m_bg_tilemap->mark_tile_dirty(offset); } static TILE_GET_INFO( get_magicfly_tile_info ) @@ -553,23 +555,21 @@ static PALETTE_INIT( magicfly ) ******************************/ -static READ8_HANDLER( mux_port_r ) +READ8_MEMBER(magicfly_state::mux_port_r) { - magicfly_state *state = space->machine().driver_data<magicfly_state>(); - switch( state->m_input_selector ) + switch( m_input_selector ) { - case 0x01: return input_port_read(space->machine(), "IN0-0"); - case 0x02: return input_port_read(space->machine(), "IN0-1"); - case 0x04: return input_port_read(space->machine(), "IN0-2"); - case 0x08: return input_port_read(space->machine(), "IN0-3"); - case 0x00: return input_port_read(space->machine(), "DSW0"); + case 0x01: return input_port_read(machine(), "IN0-0"); + case 0x02: return input_port_read(machine(), "IN0-1"); + case 0x04: return input_port_read(machine(), "IN0-2"); + case 0x08: return input_port_read(machine(), "IN0-3"); + case 0x00: return input_port_read(machine(), "DSW0"); } return 0xff; } -static WRITE8_HANDLER( mux_port_w ) +WRITE8_MEMBER(magicfly_state::mux_port_w) { - magicfly_state *state = space->machine().driver_data<magicfly_state>(); /* - bits - 7654 3210 ---- xxxx Input selector. @@ -579,13 +579,13 @@ static WRITE8_HANDLER( mux_port_w ) x--- ---- Sound DAC. */ - state->m_input_selector = data & 0x0f; /* Input Selector */ + m_input_selector = data & 0x0f; /* Input Selector */ - dac_data_w(space->machine().device("dac"), data & 0x80); /* Sound DAC */ + dac_data_w(machine().device("dac"), data & 0x80); /* Sound DAC */ - coin_counter_w(space->machine(), 0, data & 0x40); /* Coin1 */ - coin_counter_w(space->machine(), 1, data & 0x10); /* Coin2 */ - coin_counter_w(space->machine(), 2, data & 0x20); /* Payout */ + coin_counter_w(machine(), 0, data & 0x40); /* Coin1 */ + coin_counter_w(machine(), 1, data & 0x10); /* Coin2 */ + coin_counter_w(machine(), 2, data & 0x20); /* Payout */ } @@ -597,10 +597,10 @@ static ADDRESS_MAP_START( magicfly_map, AS_PROGRAM, 8, magicfly_state ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* MK48Z02B NVRAM */ AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_device, address_w) AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w) - AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE_LEGACY(magicfly_videoram_w) AM_BASE(m_videoram) /* HM6116LP #1 (2K x 8) RAM (only 1st half used) */ - AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE_LEGACY(magicfly_colorram_w) AM_BASE(m_colorram) /* HM6116LP #2 (2K x 8) RAM (only 1st half used) */ - AM_RANGE(0x2800, 0x2800) AM_READ_LEGACY(mux_port_r) /* multiplexed input port */ - AM_RANGE(0x3000, 0x3000) AM_WRITE_LEGACY(mux_port_w) /* output port */ + AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(magicfly_videoram_w) AM_BASE(m_videoram) /* HM6116LP #1 (2K x 8) RAM (only 1st half used) */ + AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(magicfly_colorram_w) AM_BASE(m_colorram) /* HM6116LP #2 (2K x 8) RAM (only 1st half used) */ + AM_RANGE(0x2800, 0x2800) AM_READ(mux_port_r) /* multiplexed input port */ + AM_RANGE(0x3000, 0x3000) AM_WRITE(mux_port_w) /* output port */ AM_RANGE(0xc000, 0xffff) AM_ROM /* ROM space */ ADDRESS_MAP_END |