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/n64.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/n64.cpp')
-rw-r--r-- | src/mame/drivers/n64.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp index 0920349268b..3e77ff298db 100644 --- a/src/mame/drivers/n64.cpp +++ b/src/mame/drivers/n64.cpp @@ -30,7 +30,7 @@ public: { } DECLARE_READ32_MEMBER(dd_null_r); - void machine_start_n64dd() ATTR_COLD; + DECLARE_MACHINE_START(n64dd); INTERRUPT_GEN_MEMBER(n64_reset_poll); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(n64_cart); void mempak_format(uint8_t* pak); @@ -378,7 +378,7 @@ DEVICE_IMAGE_LOAD_MEMBER(n64_mess_state,n64_cart) return image_init_result::PASS; } -void n64_mess_state::machine_start_n64dd() +MACHINE_START_MEMBER(n64_mess_state,n64dd) { machine_start(); machine().device<n64_periphs>("rcp")->dd_present = true; @@ -487,7 +487,7 @@ MACHINE_CONFIG_START(n64_mess_state::n64dd) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(n64dd_map) - set_machine_start_cb(config, driver_callback_delegate(&machine_start_n64dd, this)); + MCFG_MACHINE_START_OVERRIDE(n64_mess_state, n64dd) MCFG_DEVICE_REMOVE("cartslot") MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "n64_cart") |