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/cps2.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/cps2.cpp')
-rw-r--r-- | src/mame/drivers/cps2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp index acdf491f9f4..13f3547fa81 100644 --- a/src/mame/drivers/cps2.cpp +++ b/src/mame/drivers/cps2.cpp @@ -1297,7 +1297,7 @@ INPUT_PORTS_END * *************************************/ -void cps_state::machine_start_cps2() +MACHINE_START_MEMBER(cps_state,cps2) { if (m_audiocpu != nullptr) // gigaman2 has an AT89C4051 (8051) MCU as an audio cpu, no qsound. membank("bank1")->configure_entries(0, (QSOUND_SIZE - 0x10000) / 0x4000, memregion("audiocpu")->base() + 0x10000, 0x4000); @@ -1316,7 +1316,7 @@ MACHINE_CONFIG_START(cps_state::cps2) MCFG_DEVICE_PROGRAM_MAP(qsound_sub_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(cps_state, irq0_line_hold, 250) // measured - set_machine_start_cb(config, driver_callback_delegate(&machine_start_cps2, this)); + MCFG_MACHINE_START_OVERRIDE(cps_state, cps2) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -1331,7 +1331,7 @@ MACHINE_CONFIG_START(cps_state::cps2) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1) MCFG_PALETTE_ADD("palette", 0xc00) - set_video_start_cb(config, driver_callback_delegate(&video_start_cps2, this)); + MCFG_VIDEO_START_OVERRIDE(cps_state, cps2) /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); |