diff options
Diffstat (limited to 'src/mame/drivers/firebeat.cpp')
-rw-r--r-- | src/mame/drivers/firebeat.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp index eb7db475138..90b56c3594e 100644 --- a/src/mame/drivers/firebeat.cpp +++ b/src/mame/drivers/firebeat.cpp @@ -160,6 +160,8 @@ Keyboard Mania 2nd Mix - dongle, program CD, audio CD #include "firebeat.lh" +namespace { + struct IBUTTON_SUBKEY { uint8_t identifier[8]; @@ -200,6 +202,11 @@ public: void init_kbm(); void init_ppp(); +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; + private: required_device<ppc4xx_device> m_maincpu; optional_device<m68000_device> m_audiocpu; @@ -224,9 +231,6 @@ private: int m_ibutton_read_subkey_ptr; uint8_t m_ibutton_subkey_data[0x40]; - DECLARE_MACHINE_START(firebeat); - DECLARE_MACHINE_RESET(firebeat); - DECLARE_VIDEO_START(firebeat); uint32_t screen_update_firebeat_0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_firebeat_1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(firebeat_interrupt); @@ -283,7 +287,7 @@ private: -VIDEO_START_MEMBER(firebeat_state,firebeat) +void firebeat_state::video_start() { } @@ -821,7 +825,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(firebeat_state::spu_timer_callback) /*****************************************************************************/ -MACHINE_START_MEMBER(firebeat_state,firebeat) +void firebeat_state::machine_start() { /* set conservative DRC options */ m_maincpu->ppcdrc_set_options(PPCDRC_COMPATIBLE_OPTIONS); @@ -1053,7 +1057,7 @@ WRITE_LINE_MEMBER(firebeat_state::gcu1_interrupt) m_maincpu->set_input_line(INPUT_LINE_IRQ0, state); } -MACHINE_RESET_MEMBER(firebeat_state,firebeat) +void firebeat_state::machine_reset() { m_layer = 0; } @@ -1082,9 +1086,6 @@ void firebeat_state::firebeat(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &firebeat_state::firebeat_map); m_maincpu->set_vblank_int("screen", FUNC(firebeat_state::firebeat_interrupt)); - MCFG_MACHINE_START_OVERRIDE(firebeat_state,firebeat) - MCFG_MACHINE_RESET_OVERRIDE(firebeat_state,firebeat) - RTC65271(config, "rtc", 0); FUJITSU_29F016A(config, "flash_main"); @@ -1109,8 +1110,6 @@ void firebeat_state::firebeat(machine_config &config) screen.set_screen_update(FUNC(firebeat_state::screen_update_firebeat_0)); screen.set_palette("palette"); - MCFG_VIDEO_START_OVERRIDE(firebeat_state,firebeat) - /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -1138,9 +1137,6 @@ void firebeat_state::firebeat2(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &firebeat_state::firebeat2_map); m_maincpu->set_vblank_int("lscreen", FUNC(firebeat_state::firebeat_interrupt)); - MCFG_MACHINE_START_OVERRIDE(firebeat_state,firebeat) - MCFG_MACHINE_RESET_OVERRIDE(firebeat_state,firebeat) - RTC65271(config, "rtc", 0); FUJITSU_29F016A(config, "flash_main"); @@ -1176,8 +1172,6 @@ void firebeat_state::firebeat2(machine_config &config) rscreen.set_screen_update(FUNC(firebeat_state::screen_update_firebeat_1)); rscreen.set_palette("palette"); - MCFG_VIDEO_START_OVERRIDE(firebeat_state,firebeat) - /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -1725,6 +1719,9 @@ ROM_START( bm3final ) DISK_IMAGE_READONLY( "gcc01jca02", 0, SHA1(823e29bab11cb67069d822f5ffb2b90b9d3368d2) ) ROM_END +} // Anonymous namespace + + /*****************************************************************************/ GAME( 2000, ppp, 0, firebeat, ppp, firebeat_state, init_ppp, ROT0, "Konami", "ParaParaParadise", MACHINE_NOT_WORKING) |