diff options
author | Vas Crabb <vas@vastheman.com> | 2018-05-16 21:56:39 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-05-16 21:56:39 +1000 |
commit | 166638ce8093e04884166296469bda82882890fd (patch) | |
tree | 6dedcf3bde5d05843695efaf4949ab285d3193f1 /src/mame/drivers/homedata.cpp | |
parent | 8e796a2075415427491a541b75884aea6e21f6a9 (diff) |
Revert "- Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much"
This reverts commit c83e2a853d4e1643fcc85b68ada3c6f7f33adea4.
Revert "fix compile. (nw)"
This reverts commit a259ba3e366f442a22a9341755ff58163869860c.
GCC is being bad and allowing invalid C++ that other compilers reject.
Diffstat (limited to 'src/mame/drivers/homedata.cpp')
-rw-r--r-- | src/mame/drivers/homedata.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index 0fdb0651caf..efc1c99a5c2 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -1125,7 +1125,7 @@ static GFXDECODE_START( gfx_lemnangl ) GFXDECODE_END -void homedata_state::machine_start_homedata() +MACHINE_START_MEMBER(homedata_state,homedata) { save_item(NAME(m_visible_page)); save_item(NAME(m_flipscreen)); @@ -1138,14 +1138,14 @@ void homedata_state::machine_start_homedata() save_item(NAME(m_snd_command)); } -void homedata_state::machine_start_reikaids() +MACHINE_START_MEMBER(homedata_state,reikaids) { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 8, &ROM[0xc000], 0x4000); membank("bank2")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x10000); - machine_start_homedata(); + MACHINE_START_CALL_MEMBER(homedata); save_item(NAME(m_upd7807_porta)); save_item(NAME(m_upd7807_portc)); @@ -1154,14 +1154,14 @@ void homedata_state::machine_start_reikaids() save_item(NAME(m_gfx_bank)); } -void homedata_state::machine_start_pteacher() +MACHINE_START_MEMBER(homedata_state,pteacher) { uint8_t *ROM = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 4, &ROM[0xc000], 0x4000); membank("bank2")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x10000); - machine_start_homedata(); + MACHINE_START_CALL_MEMBER(homedata); save_item(NAME(m_upd7807_porta)); save_item(NAME(m_upd7807_portc)); @@ -1171,7 +1171,7 @@ void homedata_state::machine_start_pteacher() save_item(NAME(m_from_cpu)); } -void homedata_state::machine_reset_homedata() +MACHINE_RESET_MEMBER(homedata_state,homedata) { m_visible_page = 0; m_flipscreen = 0; @@ -1187,14 +1187,14 @@ void homedata_state::machine_reset_homedata() m_snd_command = 0; } -void homedata_state::machine_reset_pteacher() +MACHINE_RESET_MEMBER(homedata_state,pteacher) { address_space &space = m_maincpu->space(AS_PROGRAM); /* on reset, ports are set as input (high impedance), therefore 0xff output */ pteacher_upd7807_portc_w(space, 0, 0xff); - machine_reset_homedata(); + MACHINE_RESET_CALL_MEMBER(homedata); m_upd7807_porta = 0; m_gfx_bank[0] = 0; @@ -1203,14 +1203,14 @@ void homedata_state::machine_reset_pteacher() m_from_cpu = 0; } -void homedata_state::machine_reset_reikaids() +MACHINE_RESET_MEMBER(homedata_state,reikaids) { address_space &space = m_maincpu->space(AS_PROGRAM); /* on reset, ports are set as input (high impedance), therefore 0xff output */ reikaids_upd7807_portc_w(space, 0, 0xff); - machine_reset_homedata(); + MACHINE_RESET_CALL_MEMBER(homedata); m_reikaids_which = m_priority; // m_priority is set in DRIVER_INIT m_upd7807_porta = 0; @@ -1229,8 +1229,8 @@ MACHINE_CONFIG_START(homedata_state::mrokumei) MCFG_DEVICE_PROGRAM_MAP(mrokumei_sound_map) MCFG_DEVICE_IO_MAP(mrokumei_sound_io_map) - set_machine_start_cb(config, driver_callback_delegate(&machine_start_homedata, this)); - set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_homedata, this)); + MCFG_MACHINE_START_OVERRIDE(homedata_state,homedata) + MCFG_MACHINE_RESET_OVERRIDE(homedata_state,homedata) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1247,7 +1247,7 @@ MACHINE_CONFIG_START(homedata_state::mrokumei) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,mrokumei) - set_video_start_cb(config, driver_callback_delegate(&video_start_mrokumei, this)); + MCFG_VIDEO_START_OVERRIDE(homedata_state,mrokumei) /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1283,8 +1283,8 @@ MACHINE_CONFIG_START(homedata_state::reikaids) MCFG_QUANTUM_TIME(attotime::from_hz(30000)) // very high interleave required to sync for startup tests - set_machine_start_cb(config, driver_callback_delegate(&machine_start_reikaids, this)); - set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_reikaids, this)); + MCFG_MACHINE_START_OVERRIDE(homedata_state,reikaids) + MCFG_MACHINE_RESET_OVERRIDE(homedata_state,reikaids) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1300,7 +1300,7 @@ MACHINE_CONFIG_START(homedata_state::reikaids) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,reikaids) - set_video_start_cb(config, driver_callback_delegate(&video_start_reikaids, this)); + MCFG_VIDEO_START_OVERRIDE(homedata_state,reikaids) /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1340,8 +1340,8 @@ MACHINE_CONFIG_START(homedata_state::pteacher) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // should be enough - set_machine_start_cb(config, driver_callback_delegate(&machine_start_pteacher, this)); - set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_pteacher, this)); + MCFG_MACHINE_START_OVERRIDE(homedata_state,pteacher) + MCFG_MACHINE_RESET_OVERRIDE(homedata_state,pteacher) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1358,7 +1358,7 @@ MACHINE_CONFIG_START(homedata_state::pteacher) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,pteacher) - set_video_start_cb(config, driver_callback_delegate(&video_start_pteacher, this)); + MCFG_VIDEO_START_OVERRIDE(homedata_state,pteacher) /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1384,7 +1384,7 @@ MACHINE_CONFIG_START(homedata_state::lemnangl) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_lemnangl) - set_video_start_cb(config, driver_callback_delegate(&video_start_lemnangl, this)); + MCFG_VIDEO_START_OVERRIDE(homedata_state,lemnangl) MACHINE_CONFIG_END static INPUT_PORTS_START( mirderby ) @@ -1527,7 +1527,7 @@ MACHINE_CONFIG_START(homedata_state::mirderby) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(homedata_state,mirderby) - set_video_start_cb(config, driver_callback_delegate(&video_start_mirderby, this)); + MCFG_VIDEO_START_OVERRIDE(homedata_state,mirderby) /* sound hardware */ SPEAKER(config, "speaker").front_center(); |