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/adp.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/adp.cpp')
-rw-r--r-- | src/mame/drivers/adp.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp index 69670dc19a4..757e3969d95 100644 --- a/src/mame/drivers/adp.cpp +++ b/src/mame/drivers/adp.cpp @@ -192,8 +192,8 @@ public: /* devices */ DECLARE_READ16_MEMBER(input_r); DECLARE_WRITE16_MEMBER(input_w); - void machine_start_skattv() ATTR_COLD; - void machine_reset_skattv(); + DECLARE_MACHINE_START(skattv); + DECLARE_MACHINE_RESET(skattv); DECLARE_PALETTE_INIT(adp); DECLARE_PALETTE_INIT(fstation); IRQ_CALLBACK_MEMBER(duart_iack_handler); @@ -245,12 +245,12 @@ IRQ_CALLBACK_MEMBER(adp_state::duart_iack_handler) return m_duart->get_irq_vector(); } -void adp_state::machine_start_skattv() +MACHINE_START_MEMBER(adp_state,skattv) { save_item(NAME(m_mux_data)); } -void adp_state::machine_reset_skattv() +MACHINE_RESET_MEMBER(adp_state,skattv) { m_mux_data = 0; } @@ -554,8 +554,8 @@ MACHINE_CONFIG_START(adp_state::quickjac) MCFG_DEVICE_PROGRAM_MAP(quickjac_mem) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(adp_state, duart_iack_handler) - set_machine_start_cb(config, driver_callback_delegate(&machine_start_skattv, this)); - set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_skattv, this)); + MCFG_MACHINE_START_OVERRIDE(adp_state,skattv) + MCFG_MACHINE_RESET_OVERRIDE(adp_state,skattv) MCFG_DEVICE_ADD( "duart", MC68681, XTAL(8'664'000) / 2 ) MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4)) |