summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mayumi.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mayumi.c')
-rw-r--r--src/mame/drivers/mayumi.c31
1 files changed, 14 insertions, 17 deletions
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index f936f53daea..ce8c936df02 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -42,6 +42,9 @@ public:
DECLARE_READ8_MEMBER(key_matrix_1p_r);
DECLARE_READ8_MEMBER(key_matrix_2p_r);
TILE_GET_INFO_MEMBER(get_tile_info);
+ virtual void machine_start();
+ virtual void machine_reset();
+ virtual void video_start();
};
@@ -59,10 +62,9 @@ TILE_GET_INFO_MEMBER(mayumi_state::get_tile_info)
SET_TILE_INFO_MEMBER(0, code, col, 0);
}
-static VIDEO_START( mayumi )
+void mayumi_state::video_start()
{
- mayumi_state *state = machine.driver_data<mayumi_state>();
- state->m_tilemap = &machine.tilemap().create(tilemap_get_info_delegate(FUNC(mayumi_state::get_tile_info),state), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
+ m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mayumi_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
}
WRITE8_MEMBER(mayumi_state::mayumi_videoram_w)
@@ -373,24 +375,22 @@ static const ym2203_interface ym2203_config =
*
*************************************/
-static MACHINE_START( mayumi )
+void mayumi_state::machine_start()
{
- mayumi_state *state = machine.driver_data<mayumi_state>();
- UINT8 *ROM = state->memregion("maincpu")->base();
+ UINT8 *ROM = memregion("maincpu")->base();
- state->membank("bank1")->configure_entries(0, 4, &ROM[0x8000], 0x4000);
- state->membank("bank1")->set_entry(0);
+ membank("bank1")->configure_entries(0, 4, &ROM[0x8000], 0x4000);
+ membank("bank1")->set_entry(0);
- state->save_item(NAME(state->m_int_enable));
- state->save_item(NAME(state->m_input_sel));
+ save_item(NAME(m_int_enable));
+ save_item(NAME(m_input_sel));
}
-static MACHINE_RESET( mayumi )
+void mayumi_state::machine_reset()
{
- mayumi_state *state = machine.driver_data<mayumi_state>();
- state->m_int_enable = 0;
- state->m_input_sel = 0;
+ m_int_enable = 0;
+ m_input_sel = 0;
}
static MACHINE_CONFIG_START( mayumi, mayumi_state )
@@ -401,8 +401,6 @@ static MACHINE_CONFIG_START( mayumi, mayumi_state )
MCFG_CPU_IO_MAP(mayumi_io_map)
MCFG_CPU_VBLANK_INT("screen", mayumi_interrupt)
- MCFG_MACHINE_START( mayumi )
- MCFG_MACHINE_RESET( mayumi )
MCFG_I8255_ADD( "i8255", mayumi_i8255_intf )
@@ -418,7 +416,6 @@ static MACHINE_CONFIG_START( mayumi, mayumi_state )
MCFG_PALETTE_LENGTH(256)
MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
- MCFG_VIDEO_START(mayumi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")