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/atarisy1.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/atarisy1.cpp')
-rw-r--r-- | src/mame/drivers/atarisy1.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp index 2c721739029..eb622a3fc6f 100644 --- a/src/mame/drivers/atarisy1.cpp +++ b/src/mame/drivers/atarisy1.cpp @@ -218,7 +218,7 @@ void atarisy1_state::update_interrupts() } -void atarisy1_state::machine_start_atarisy1() +MACHINE_START_MEMBER(atarisy1_state,atarisy1) { atarigen_state::machine_start(); @@ -227,7 +227,7 @@ void atarisy1_state::machine_start_atarisy1() } -void atarisy1_state::machine_reset_atarisy1() +MACHINE_RESET_MEMBER(atarisy1_state,atarisy1) { atarigen_state::machine_reset(); @@ -716,8 +716,8 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1) MCFG_DEVICE_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8) MCFG_DEVICE_PROGRAM_MAP(sound_map) - set_machine_start_cb(config, driver_callback_delegate(&machine_start_atarisy1, this)); - set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atarisy1, this)); + MCFG_MACHINE_START_OVERRIDE(atarisy1_state,atarisy1) + MCFG_MACHINE_RESET_OVERRIDE(atarisy1_state,atarisy1) MCFG_DEVICE_ADD("adc", ADC0809, ATARI_CLOCK_14MHz/16) MCFG_ADC0808_EOC_CB(WRITELINE("ajsint", input_merger_device, in_w<1>)) @@ -770,7 +770,7 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarisy1_state, video_int_write_line)) - set_video_start_cb(config, driver_callback_delegate(&video_start_atarisy1, this)); + MCFG_VIDEO_START_OVERRIDE(atarisy1_state,atarisy1) /* sound hardware */ MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", INPUTLINE("maincpu", M68K_IRQ_6)) |