- Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much

uglier, but this is intended to discourage ongoing use, and will be gradually eliminated.
2025-10-08 09:30:17 +03:00 · 2018-05-16 09:37:54 +02:00 · 2018-05-16 09:37:54 +02:00 · c83e2a853d
commit c83e2a853d
parent 2242ff0089
1014 changed files with 6119 additions and 6227 deletions
--- a/src/devices/video/stvvdp2.cpp
+++ b/src/devices/video/stvvdp2.cpp
@ -6359,7 +6359,7 @@ int saturn_state::stv_vdp2_start ( void )
 }
 /* maybe we should move this to video/stv.c */
-VIDEO_START_MEMBER(saturn_state,stv_vdp2)
+void saturn_state::video_start_stv_vdp2()
 {
 	int i;
 	m_screen->register_screen_bitmap(m_tmpbitmap);
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@ -22,67 +22,11 @@
 //  CONFIGURATION MACROS
 //**************************************************************************
 // core machine callbacks
 #define MCFG_MACHINE_START_OVERRIDE(_class, _func) \
 	driver_device::static_set_callback(config.root_device(), driver_device::CB_MACHINE_START, driver_callback_delegate(&_class::MACHINE_START_NAME(_func), this));
 #define MCFG_MACHINE_RESET_OVERRIDE(_class, _func) \
 	driver_device::static_set_callback(config.root_device(), driver_device::CB_MACHINE_RESET, driver_callback_delegate(&_class::MACHINE_RESET_NAME(_func), this));
 #define MCFG_MACHINE_RESET_REMOVE() \
 	driver_device::static_set_callback(config.root_device(), driver_device::CB_MACHINE_RESET, driver_callback_delegate());
 // core sound callbacks
 #define MCFG_SOUND_START_OVERRIDE(_class, _func) \
 	driver_device::static_set_callback(config.root_device(), driver_device::CB_SOUND_START, driver_callback_delegate(&_class::SOUND_START_NAME(_func), this));
 #define MCFG_SOUND_RESET_OVERRIDE(_class, _func) \
 	driver_device::static_set_callback(config.root_device(), driver_device::CB_SOUND_RESET, driver_callback_delegate(&_class::SOUND_RESET_NAME(_func), this));
 // core video callbacks
 #define MCFG_VIDEO_START_OVERRIDE(_class, _func) \
 	driver_device::static_set_callback(config.root_device(), driver_device::CB_VIDEO_START, driver_callback_delegate(&_class::VIDEO_START_NAME(_func), this));
 #define MCFG_VIDEO_RESET_OVERRIDE(_class, _func) \
 	driver_device::static_set_callback(config.root_device(), driver_device::CB_VIDEO_RESET, driver_callback_delegate(&_class::VIDEO_RESET_NAME(_func), this));
 //**************************************************************************
 //  OTHER MACROS
 //**************************************************************************
 #define MACHINE_START_NAME(name)    machine_start_##name
 #define MACHINE_START_CALL_MEMBER(name) MACHINE_START_NAME(name)()
 #define DECLARE_MACHINE_START(name) void MACHINE_START_NAME(name)() ATTR_COLD
 #define MACHINE_START_MEMBER(cls,name) void cls::MACHINE_START_NAME(name)()
 #define MACHINE_RESET_NAME(name)    machine_reset_##name
 #define MACHINE_RESET_CALL_MEMBER(name) MACHINE_RESET_NAME(name)()
 #define DECLARE_MACHINE_RESET(name) void MACHINE_RESET_NAME(name)()
 #define MACHINE_RESET_MEMBER(cls,name) void cls::MACHINE_RESET_NAME(name)()
 #define SOUND_START_NAME(name)      sound_start_##name
 #define DECLARE_SOUND_START(name)   void SOUND_START_NAME(name)() ATTR_COLD
 #define SOUND_START_MEMBER(cls,name) void cls::SOUND_START_NAME(name)()
 #define SOUND_RESET_NAME(name)      sound_reset_##name
 #define SOUND_RESET_CALL_MEMBER(name) SOUND_RESET_NAME(name)()
 #define DECLARE_SOUND_RESET(name)   void SOUND_RESET_NAME(name)()
 #define SOUND_RESET_MEMBER(cls,name) void cls::SOUND_RESET_NAME(name)()
 #define VIDEO_START_NAME(name)      video_start_##name
 #define VIDEO_START_CALL_MEMBER(name)       VIDEO_START_NAME(name)()
 #define DECLARE_VIDEO_START(name)   void VIDEO_START_NAME(name)() ATTR_COLD
 #define VIDEO_START_MEMBER(cls,name) void cls::VIDEO_START_NAME(name)()
 #define VIDEO_RESET_NAME(name)      video_reset_##name
 #define VIDEO_RESET_CALL_MEMBER(name)       VIDEO_RESET_NAME(name)()
 #define DECLARE_VIDEO_RESET(name)   void VIDEO_RESET_NAME(name)()
 #define VIDEO_RESET_MEMBER(cls,name) void cls::VIDEO_RESET_NAME(name)()
 //**************************************************************************
 //  TYPE DEFINITIONS
@ -120,6 +64,13 @@ public:
 	// inline configuration helpers
 	void set_game_driver(const game_driver &game);
 	static void static_set_callback(device_t &device, callback_type type, driver_callback_delegate callback);
 	static void set_machine_start_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_MACHINE_START, callback); }
 	static void set_machine_reset_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_MACHINE_RESET, callback); }
 	static void set_sound_start_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_SOUND_START, callback); }
 	static void set_sound_reset_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_SOUND_RESET, callback); }
 	static void set_video_start_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_VIDEO_START, callback); }
 	static void set_video_reset_cb(machine_config &config, driver_callback_delegate callback) { static_set_callback(config.root_device(), CB_VIDEO_RESET, callback); }
 	static void remove_machine_reset_cb(machine_config &config) { static_set_callback(config.root_device(), CB_MACHINE_RESET, driver_callback_delegate()); }
 	// dummy driver_init callback
 	void empty_init();
--- a/src/mame/audio/8080bw.cpp
+++ b/src/mame/audio/8080bw.cpp
@ -15,7 +15,7 @@
 /*                                                     */
 /*******************************************************/
-MACHINE_START_MEMBER(_8080bw_state,extra_8080bw_sh)
+void _8080bw_state::machine_start_extra_8080bw_sh()
 {
 	save_item(NAME(m_port_1_last_extra));
 	save_item(NAME(m_port_2_last_extra));
@ -970,7 +970,7 @@ void _8080bw_state::schaser_reinit_555_time_remain()
 }
-MACHINE_START_MEMBER(_8080bw_state,schaser_sh)
+void _8080bw_state::machine_start_schaser_sh()
 {
 	save_item(NAME(m_schaser_explosion));
 	save_item(NAME(m_schaser_effect_555_is_low));
@ -980,7 +980,7 @@ MACHINE_START_MEMBER(_8080bw_state,schaser_sh)
 }
-MACHINE_RESET_MEMBER(_8080bw_state,schaser_sh)
+void _8080bw_state::machine_reset_schaser_sh()
 {
 	address_space &space = m_maincpu->space(AS_PROGRAM);
--- a/src/mame/audio/cinemat.cpp
+++ b/src/mame/audio/cinemat.cpp
@ -1354,7 +1354,7 @@ WRITE8_MEMBER(cinemat_state::sound_output_w)
 	logerror("sound_output = %02X\n", data);
 }
-SOUND_RESET_MEMBER( cinemat_state, demon )
+void cinemat_state::sound_reset_demon()
 {
 	/* generic init */
 	sound_reset();
@ -1408,7 +1408,7 @@ MACHINE_CONFIG_START(cinemat_state::demon_sound)
 	MCFG_DEVICE_ADD("ctc", Z80CTC, 3579545 /* same as "audiocpu" */)
 	MCFG_Z80CTC_INTR_CB(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
-	MCFG_SOUND_RESET_OVERRIDE(cinemat_state, demon)
+	set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_demon, this));
 	MCFG_DEVICE_MODIFY("outlatch")
 	MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, demon_sound4_w))
@ -1447,9 +1447,9 @@ WRITE8_MEMBER(cinemat_state::qb3_sound_fifo_w)
 }
-SOUND_RESET_MEMBER( cinemat_state, qb3 )
+void cinemat_state::sound_reset_qb3()
 {
-	SOUND_RESET_CALL_MEMBER(demon);
+	sound_reset_demon();
 	/* this patch prevents the sound ROM from eating itself when command $0A is sent */
 	/* on a cube rotate */
@ -1459,7 +1459,7 @@ SOUND_RESET_MEMBER( cinemat_state, qb3 )
 MACHINE_CONFIG_START(cinemat_state::qb3_sound)
 	demon_sound(config);
-	MCFG_SOUND_RESET_OVERRIDE(cinemat_state, qb3)
+	set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_qb3, this));
 	MCFG_DEVICE_MODIFY("outlatch")
 	MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // not mapped through LS259
--- a/src/mame/audio/mw8080bw.cpp
+++ b/src/mame/audio/mw8080bw.cpp
@ -18,7 +18,7 @@
 *
 *************************************/
-SOUND_START_MEMBER( mw8080bw_state, samples )
+void mw8080bw_state::sound_start_samples()
 {
 	/* setup for save states */
 	save_item(NAME(m_port_1_last));
@ -145,7 +145,7 @@ static const char *const seawolf_sample_names[] =
 };
 MACHINE_CONFIG_START(mw8080bw_state::seawolf_audio)
-	MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
 	SPEAKER(config, "mono").front_center();
 	MCFG_DEVICE_ADD("samples", SAMPLES)
@ -199,7 +199,7 @@ static const char *const gunfight_sample_names[] =
 MACHINE_CONFIG_START(mw8080bw_state::gunfight_audio)
-	MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
@ -1544,7 +1544,7 @@ static const char *const gmissile_sample_names[] =
 };
 MACHINE_CONFIG_START(mw8080bw_state::gmissile_audio)
-	MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
@ -1638,7 +1638,7 @@ static const char *const m4_sample_names[] =
 MACHINE_CONFIG_START(mw8080bw_state::m4_audio)
-	MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
@ -1894,7 +1894,7 @@ static const char *const clowns_sample_names[] =
 };
 MACHINE_CONFIG_START(mw8080bw_state::clowns_audio)
-	MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
 	SPEAKER(config, "mono").front_center();
@ -3263,7 +3263,7 @@ static const char *const phantom2_sample_names[] =
 };
 MACHINE_CONFIG_START(mw8080bw_state::phantom2_audio)
-	MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
 	SPEAKER(config, "mono").front_center();
 	MCFG_DEVICE_ADD("samples", SAMPLES)
@ -3507,7 +3507,7 @@ static const char *const invaders_sample_names[] =
 /* left in for all games that hack into invaders samples for audio */
 MACHINE_CONFIG_START(mw8080bw_state::invaders_samples_audio)
-	MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_samples, this));
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/audio/n8080.cpp
+++ b/src/mame/audio/n8080.cpp
@ -377,7 +377,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(n8080_state::helifire_dac_volume_timer)
 }
-SOUND_START_MEMBER(n8080_state,spacefev)
+void n8080_state::sound_start_spacefev()
 {
 	m_sound_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this));
 	m_sound_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this));
@ -390,7 +390,7 @@ SOUND_START_MEMBER(n8080_state,spacefev)
 	save_item(NAME(m_mono_flop));
 }
-SOUND_RESET_MEMBER(n8080_state,spacefev)
+void n8080_state::sound_reset_spacefev()
 {
 	m_n8080_hardware = 1;
@ -406,7 +406,7 @@ SOUND_RESET_MEMBER(n8080_state,spacefev)
 }
-SOUND_START_MEMBER(n8080_state,sheriff)
+void n8080_state::sound_start_sheriff()
 {
 	m_sound_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this));
 	m_sound_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::stop_mono_flop_callback), this));
@ -418,7 +418,7 @@ SOUND_START_MEMBER(n8080_state,sheriff)
 	save_item(NAME(m_mono_flop));
 }
-SOUND_RESET_MEMBER(n8080_state,sheriff)
+void n8080_state::sound_reset_sheriff()
 {
 	m_n8080_hardware = 2;
@ -433,7 +433,7 @@ SOUND_RESET_MEMBER(n8080_state,sheriff)
 }
-SOUND_START_MEMBER(n8080_state,helifire)
+void n8080_state::sound_start_helifire()
 {
 	save_item(NAME(m_prev_snd_data));
 	save_item(NAME(m_prev_sound_pins));
@ -444,7 +444,7 @@ SOUND_START_MEMBER(n8080_state,helifire)
 	save_item(NAME(m_helifire_dac_phase));
 }
-SOUND_RESET_MEMBER(n8080_state,helifire)
+void n8080_state::sound_reset_helifire()
 {
 	m_n8080_hardware = 3;
@ -475,8 +475,8 @@ void n8080_state::helifire_sound_io_map(address_map &map)
 MACHINE_CONFIG_START(n8080_state::spacefev_sound)
-	MCFG_SOUND_START_OVERRIDE(n8080_state,spacefev)
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_spacefev, this));
-	MCFG_SOUND_RESET_OVERRIDE(n8080_state,spacefev)
+	set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_spacefev, this));
 	/* basic machine hardware */
 	MCFG_DEVICE_ADD("audiocpu", I8035, 6000000)
@ -515,8 +515,8 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(n8080_state::sheriff_sound)
-	MCFG_SOUND_START_OVERRIDE(n8080_state,sheriff)
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_sheriff, this));
-	MCFG_SOUND_RESET_OVERRIDE(n8080_state,sheriff)
+	set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_sheriff, this));
 	/* basic machine hardware */
 	MCFG_DEVICE_ADD("audiocpu", I8035, 6000000)
@ -553,8 +553,8 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(n8080_state::helifire_sound)
-	MCFG_SOUND_START_OVERRIDE(n8080_state,helifire)
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_helifire, this));
-	MCFG_SOUND_RESET_OVERRIDE(n8080_state,helifire)
+	set_sound_reset_cb(config, driver_callback_delegate(&sound_reset_helifire, this));
 	/* basic machine hardware */
 	MCFG_DEVICE_ADD("audiocpu", I8035, 6000000)
--- a/src/mame/audio/redalert.cpp
+++ b/src/mame/audio/redalert.cpp
@ -130,7 +130,7 @@ void redalert_state::redalert_audio_map(address_map &map)
 *
 *************************************/
-SOUND_START_MEMBER(redalert_state,redalert)
+void redalert_state::sound_start_redalert()
 {
 	save_item(NAME(m_ay8910_latch_1));
 	save_item(NAME(m_ay8910_latch_2));
@ -227,7 +227,7 @@ MACHINE_CONFIG_START(redalert_state::redalert_audio)
 	redalert_audio_m37b(config);
 	redalert_audio_voice(config);
-	MCFG_SOUND_START_OVERRIDE( redalert_state, redalert )
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_redalert, this));
 MACHINE_CONFIG_END
@ -243,7 +243,7 @@ MACHINE_CONFIG_START(redalert_state::ww3_audio)
 	redalert_audio_m37b(config);
-	MCFG_SOUND_START_OVERRIDE( redalert_state, redalert )
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_redalert, this));
 MACHINE_CONFIG_END
@ -330,7 +330,7 @@ void redalert_state::demoneye_audio_map(address_map &map)
 *
 *************************************/
-SOUND_START_MEMBER( redalert_state, demoneye )
+void redalert_state::sound_start_demoneye()
 {
 	save_item(NAME(m_ay8910_latch_1));
 	save_item(NAME(m_ay8910_latch_2));
@ -355,7 +355,7 @@ MACHINE_CONFIG_START(redalert_state::demoneye_audio)
 	MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, redalert_state, demoneye_ay8910_data_w))
 	MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, redalert_state, demoneye_ay8910_latch_1_w))
-	MCFG_SOUND_START_OVERRIDE( redalert_state, demoneye )
+	set_sound_start_cb(config, driver_callback_delegate(&sound_start_demoneye, this));
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/audio/vicdual.cpp
+++ b/src/mame/audio/vicdual.cpp
@ -128,7 +128,7 @@ TIMER_CALLBACK_MEMBER( vicdual_state::frogs_croak_callback )
 }
-MACHINE_START_MEMBER(vicdual_state,frogs_audio)
+void vicdual_state::machine_start_frogs_audio()
 {
 	m_frogs_croak_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(vicdual_state::frogs_croak_callback), this));
--- a/src/mame/drivers/1942.cpp
+++ b/src/mame/drivers/1942.cpp
@ -646,7 +646,7 @@ MACHINE_CONFIG_START(_1942_state::_1942p)
 	MCFG_PALETTE_INDIRECT_ENTRIES(0x400)
 	MCFG_PALETTE_INIT_OWNER(_1942_state, 1942p)
-	MCFG_VIDEO_START_OVERRIDE(_1942_state,c1942p)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_c1942p, this));
 	MCFG_SCREEN_ADD("screen", RASTER)
 	MCFG_SCREEN_REFRESH_RATE(60)
--- a/src/mame/drivers/2mindril.cpp
+++ b/src/mame/drivers/2mindril.cpp
@ -64,8 +64,8 @@ public:
 	DECLARE_READ16_MEMBER(drill_irq_r);
 	DECLARE_WRITE16_MEMBER(drill_irq_w);
 	void init_drill();
-	DECLARE_MACHINE_START(drill);
+	void machine_start_drill() ATTR_COLD;
-	DECLARE_MACHINE_RESET(drill);
+	void machine_reset_drill();
 	INTERRUPT_GEN_MEMBER(drill_vblank_irq);
 	//INTERRUPT_GEN_MEMBER(drill_device_irq);
 	void tile_decode();
@ -339,14 +339,14 @@ WRITE_LINE_MEMBER(_2mindril_state::irqhandler)
 }
-MACHINE_START_MEMBER(_2mindril_state,drill)
+void _2mindril_state::machine_start_drill()
 {
 	save_item(NAME(m_defender_sensor));
 	save_item(NAME(m_shutter_sensor));
 	save_item(NAME(m_irq_reg));
 }
-MACHINE_RESET_MEMBER(_2mindril_state,drill)
+void _2mindril_state::machine_reset_drill()
 {
 	m_defender_sensor = 0;
 	m_shutter_sensor = 0;
@ -368,8 +368,8 @@ MACHINE_CONFIG_START(_2mindril_state::drill)
 	MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, _2mindril_state, coins_w))
 	MCFG_TC0510NIO_READ_7_CB(IOPORT("COINS"))
-	MCFG_MACHINE_START_OVERRIDE(_2mindril_state,drill)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_drill, this));
-	MCFG_MACHINE_RESET_OVERRIDE(_2mindril_state,drill)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_drill, this));
 	MCFG_SCREEN_ADD("screen", RASTER)
 	MCFG_SCREEN_REFRESH_RATE(60)
@ -382,7 +382,7 @@ MACHINE_CONFIG_START(_2mindril_state::drill)
 	MCFG_PALETTE_ADD("palette", 0x2000)
 	MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
-	MCFG_VIDEO_START_OVERRIDE(_2mindril_state,f3)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_f3, this));
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
--- a/src/mame/drivers/39in1.cpp
+++ b/src/mame/drivers/39in1.cpp
@ -85,7 +85,7 @@ private:
 	DECLARE_READ32_MEMBER(cpld_r);
 	DECLARE_WRITE32_MEMBER(cpld_w);
 	DECLARE_READ32_MEMBER(prot_cheater_r);
-	DECLARE_MACHINE_START(60in1);
+	void machine_start_60in1() ATTR_COLD;
 	virtual void machine_start() override;
 	uint32_t screen_update_39in1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	INTERRUPT_GEN_MEMBER(pxa255_vblank_start);
@ -1567,7 +1567,7 @@ void _39in1_state::machine_start()
 	pxa255_start();
 }
-MACHINE_START_MEMBER(_39in1_state,60in1)
+void _39in1_state::machine_start_60in1()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
 	int i;
@ -1611,7 +1611,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(_39in1_state::_60in1)
 	_39in1(config);
-	MCFG_MACHINE_START_OVERRIDE(_39in1_state,60in1)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_60in1, this));
 MACHINE_CONFIG_END
 ROM_START( 39in1 )
--- a/src/mame/drivers/3do.cpp
+++ b/src/mame/drivers/3do.cpp
@ -165,7 +165,7 @@ MACHINE_CONFIG_START(_3do_state::_3do)
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_x16", _3do_state, timer_x16_cb, attotime::from_hz(12000)) // TODO: timing
-	MCFG_VIDEO_START_OVERRIDE(_3do_state, _3do )
+	set_video_start_cb(config, driver_callback_delegate(&video_start__3do, this));
 	MCFG_SCREEN_ADD("screen", RASTER)
 	MCFG_SCREEN_RAW_PARAMS( X2_CLOCK_NTSC / 2, 1592, 254, 1534, 263, 22, 262 )
--- a/src/mame/drivers/40love.cpp
+++ b/src/mame/drivers/40love.cpp
@ -664,7 +664,7 @@ GFXDECODE_END
 /*******************************************************************************/
-MACHINE_START_MEMBER(fortyl_state,40love)
+void fortyl_state::machine_start_40love()
 {
 	/* video */
 	save_item(NAME(m_pix1));
@ -680,9 +680,9 @@ MACHINE_START_MEMBER(fortyl_state,40love)
 }
-MACHINE_RESET_MEMBER(fortyl_state,common)
+void fortyl_state::machine_reset_common()
 {
-	//MACHINE_RESET_CALL_MEMBER(ta7630);
+	//machine_reset_ta7630();
 	/* video */
 	m_pix1 = 0;
@ -697,9 +697,9 @@ MACHINE_RESET_MEMBER(fortyl_state,common)
 	m_snd_ctrl3 = 0;
 }
-MACHINE_RESET_MEMBER(fortyl_state,40love)
+void fortyl_state::machine_reset_40love()
 {
-	MACHINE_RESET_CALL_MEMBER(common);
+	machine_reset_common();
 }
 MACHINE_CONFIG_START(fortyl_state::_40love)
@ -724,8 +724,8 @@ MACHINE_CONFIG_START(fortyl_state::_40love)
 	MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, 18432000/6) /* OK */
 	MCFG_QUANTUM_TIME(attotime::from_hz(6000))  /* high interleave to ensure proper synchronization of CPUs */
-	MCFG_MACHINE_START_OVERRIDE(fortyl_state,40love)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_40love, this));
-	MCFG_MACHINE_RESET_OVERRIDE(fortyl_state,40love)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_40love, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -790,8 +790,8 @@ MACHINE_CONFIG_START(fortyl_state::undoukai)
 	MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, 18432000/6)
 	MCFG_QUANTUM_TIME(attotime::from_hz(6000))
-	MCFG_MACHINE_START_OVERRIDE(fortyl_state,40love)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_40love, this));
-	MCFG_MACHINE_RESET_OVERRIDE(fortyl_state,40love)  /* init machine */
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_40love, this));  /* init machine */
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
--- a/src/mame/drivers/4roses.cpp
+++ b/src/mame/drivers/4roses.cpp
@ -462,7 +462,7 @@ MACHINE_CONFIG_START(_4roses_state::_4roses)
 	MCFG_PALETTE_ADD("palette", 0x1000)
 	MCFG_PALETTE_INIT_OWNER(_4roses_state,funworld)
-	MCFG_VIDEO_START_OVERRIDE(_4roses_state,funworld)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_funworld, this));
 	MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK/8) /* 2MHz, guess */
 	MCFG_MC6845_SHOW_BORDER_AREA(false)
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@ -215,11 +215,11 @@
 /*                                                     */
 /*******************************************************/
-MACHINE_START_MEMBER(_8080bw_state,extra_8080bw)
+void _8080bw_state::machine_start_extra_8080bw()
 {
-	MACHINE_START_CALL_MEMBER(extra_8080bw_sh);
+	machine_start_extra_8080bw_sh();
-	MACHINE_START_CALL_MEMBER(extra_8080bw_vh);
+	machine_start_extra_8080bw_vh();
-	MACHINE_START_CALL_MEMBER(mw8080bw);
+	machine_start_mw8080bw();
 }
 /*******************************************************/
@ -412,7 +412,7 @@ MACHINE_CONFIG_START(_8080bw_state::invadpt2)
 	/* basic machine hardware */
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_IO_MAP(invadpt2_io_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* 60 Hz signal clocks two LS161. Ripple carry will */
 	/* reset circuit, if LS161 not cleared before.      */
@ -500,7 +500,7 @@ MACHINE_CONFIG_START(_8080bw_state::spcewars)
 	/* basic machine hardware */
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_IO_MAP(spcewars_io_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -668,7 +668,7 @@ MACHINE_CONFIG_START(_8080bw_state::cosmo)
 	MCFG_DEVICE_PROGRAM_MAP(cosmo_map)
 	MCFG_DEVICE_IO_MAP(cosmo_io_map)
 	MCFG_WATCHDOG_ADD("watchdog")
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* video hardware */
 	MCFG_SCREEN_MODIFY("screen")
@ -828,8 +828,8 @@ MACHINE_CONFIG_START(_8080bw_state::spacecom)
 	MCFG_DEVICE_PROGRAM_MAP(spacecom_map)
 	MCFG_DEVICE_IO_MAP(spacecom_io_map)
-	MCFG_MACHINE_START_OVERRIDE(mw8080bw_state, mw8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mw8080bw, this));
-	MCFG_MACHINE_RESET_OVERRIDE(mw8080bw_state, mw8080bw)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mw8080bw, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -949,7 +949,7 @@ MACHINE_CONFIG_START(_8080bw_state::invrvnge)
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* video hardware */
 	MCFG_SCREEN_MODIFY("screen")
@ -1122,7 +1122,7 @@ MACHINE_CONFIG_START(_8080bw_state::lrescue)
 	/* basic machine hardware */
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_IO_MAP(lrescue_io_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -1153,8 +1153,8 @@ MACHINE_CONFIG_START(_8080bw_state::escmars)
 	MCFG_DEVICE_PROGRAM_MAP(escmars_map)
 	MCFG_DEVICE_IO_MAP(lrescue_io_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state, extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
-	MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state, mw8080bw)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mw8080bw, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -1253,7 +1253,7 @@ MACHINE_CONFIG_START(_8080bw_state::cosmicmo)
 	MCFG_DEVICE_IO_MAP(cosmicmo_io_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state,  irq0_line_hold)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
@ -1388,14 +1388,14 @@ static INPUT_PORTS_START( rollingc )
 	PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x00, "SW1:4" )
 INPUT_PORTS_END
-MACHINE_START_MEMBER(_8080bw_state,rollingc)
+void _8080bw_state::machine_start_rollingc()
 {
 	m_scattered_colorram = std::make_unique<uint8_t []>(0x400);
 	m_scattered_colorram2 = std::make_unique<uint8_t []>(0x400);
 	save_pointer(&m_scattered_colorram[0], "m_scattered_colorram", 0x400);
 	save_pointer(&m_scattered_colorram2[0], "m_scattered_colorram2", 0x400);
-	MACHINE_START_CALL_MEMBER(mw8080bw);
+	machine_start_mw8080bw();
 }
 MACHINE_CONFIG_START(_8080bw_state::rollingc)
@ -1419,7 +1419,7 @@ MACHINE_CONFIG_START(_8080bw_state::rollingc)
 	/* sound hardware */
 	invaders_samples_audio(config);
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,rollingc)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_rollingc, this));
 MACHINE_CONFIG_END
@ -1526,19 +1526,19 @@ static INPUT_PORTS_START( schaserm )
 	PORT_DIPSETTING(    0x03, "4" )
 INPUT_PORTS_END
-MACHINE_START_MEMBER(_8080bw_state,schaser)
+void _8080bw_state::machine_start_schaser()
 {
 	m_scattered_colorram = std::make_unique<uint8_t []>(0x800);
 	save_pointer(&m_scattered_colorram[0], "m_scattered_colorram", 0x800);
-	MACHINE_START_CALL_MEMBER(schaser_sh);
+	machine_start_schaser_sh();
-	MACHINE_START_CALL_MEMBER(extra_8080bw_vh);
+	machine_start_extra_8080bw_vh();
-	MACHINE_START_CALL_MEMBER(mw8080bw);
+	machine_start_mw8080bw();
 }
-MACHINE_RESET_MEMBER(_8080bw_state,schaser)
+void _8080bw_state::machine_reset_schaser()
 {
-	MACHINE_RESET_CALL_MEMBER(schaser_sh);
+	machine_reset_schaser_sh();
-	MACHINE_RESET_CALL_MEMBER(mw8080bw);
+	machine_reset_mw8080bw();
 }
 MACHINE_CONFIG_START(_8080bw_state::schaser)
@ -1551,8 +1551,8 @@ MACHINE_CONFIG_START(_8080bw_state::schaser)
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,schaser)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_schaser, this));
-	MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state,schaser)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_schaser, this));
 	MCFG_TIMER_DRIVER_ADD("schaser_sh_555", _8080bw_state, schaser_effect_555_cb)
@ -1667,14 +1667,14 @@ static INPUT_PORTS_START( schasercv )
 	INVADERS_CAB_TYPE_PORT
 INPUT_PORTS_END
-MACHINE_START_MEMBER(_8080bw_state,schasercv)
+void _8080bw_state::machine_start_schasercv()
 {
 	m_scattered_colorram = std::make_unique<uint8_t []>(0x800);
 	save_pointer(&m_scattered_colorram[0], "m_scattered_colorram", 0x800);
-	MACHINE_START_CALL_MEMBER(extra_8080bw_sh);
+	machine_start_extra_8080bw_sh();
-	MACHINE_START_CALL_MEMBER(extra_8080bw_vh);
+	machine_start_extra_8080bw_vh();
-	MACHINE_START_CALL_MEMBER(mw8080bw);
+	machine_start_mw8080bw();
 }
 MACHINE_CONFIG_START(_8080bw_state::schasercv)
@ -1684,7 +1684,7 @@ MACHINE_CONFIG_START(_8080bw_state::schasercv)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(schaser_map)
 	MCFG_DEVICE_IO_MAP(schasercv_io_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state, schasercv)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_schasercv, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -1768,12 +1768,12 @@ static INPUT_PORTS_START( sflush )
 INPUT_PORTS_END
-MACHINE_START_MEMBER(_8080bw_state,sflush)
+void _8080bw_state::machine_start_sflush()
 {
 	m_scattered_colorram = std::make_unique<uint8_t []>(0x800);
 	save_pointer(&m_scattered_colorram[0], "m_scattered_colorram", 0x800);
-	MACHINE_START_CALL_MEMBER(mw8080bw);
+	machine_start_mw8080bw();
 }
 MACHINE_CONFIG_START(_8080bw_state::sflush)
@ -1783,7 +1783,7 @@ MACHINE_CONFIG_START(_8080bw_state::sflush)
 	MCFG_DEVICE_REPLACE("maincpu",M6800,1500000) // ?
 	MCFG_DEVICE_PROGRAM_MAP(sflush_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state, irq0_line_hold)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,sflush)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_sflush, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -1888,7 +1888,7 @@ MACHINE_CONFIG_START(_8080bw_state::lupin3)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_IO_MAP(lupin3_io_map)
 	MCFG_WATCHDOG_ADD("watchdog")
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -1931,7 +1931,7 @@ MACHINE_CONFIG_START(_8080bw_state::lupin3a)
 	lupin3(config);
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(schaser_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,sflush)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_sflush, this));
 	/* video hardware */
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(_8080bw_state, screen_update_lupin3)
@ -1958,14 +1958,14 @@ INTERRUPT_GEN_MEMBER(_8080bw_state::polaris_interrupt)
 	}
 }
-MACHINE_START_MEMBER(_8080bw_state,polaris)
+void _8080bw_state::machine_start_polaris()
 {
 	m_scattered_colorram = std::make_unique<uint8_t []>(0x800);
 	save_pointer(&m_scattered_colorram[0], "m_scattered_colorram", 0x800);
 	save_item(NAME(m_polaris_cloud_speed));
 	save_item(NAME(m_polaris_cloud_pos));
-	MACHINE_START_CALL_MEMBER(mw8080bw);
+	machine_start_mw8080bw();
 }
 READ8_MEMBER(_8080bw_state::polaris_port00_r)
@ -2059,7 +2059,7 @@ MACHINE_CONFIG_START(_8080bw_state::polaris)
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,polaris)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_polaris, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -2186,7 +2186,7 @@ MACHINE_CONFIG_START(_8080bw_state::ballbomb)
 	/* basic machine hardware */
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_IO_MAP(ballbomb_io_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -2269,7 +2269,7 @@ MACHINE_CONFIG_START(_8080bw_state::yosakdon)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(yosakdon_map)
 	MCFG_DEVICE_IO_MAP(yosakdon_io_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* sound hardware */
 	invaders_samples_audio(config);
@ -2435,7 +2435,7 @@ MACHINE_CONFIG_START(_8080bw_state::indianbt)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_IO_MAP(indianbt_io_map)
 	MCFG_WATCHDOG_ADD("watchdog")
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -2461,7 +2461,7 @@ MACHINE_CONFIG_START(_8080bw_state::indianbtbr)
 	MCFG_DEVICE_PROGRAM_MAP(schaser_map)
 	MCFG_DEVICE_IO_MAP(indianbtbr_io_map)
 	MCFG_WATCHDOG_ADD("watchdog")
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -2536,7 +2536,7 @@ MACHINE_CONFIG_START(_8080bw_state::steelwkr)
 	/* basic machine hardware */
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_IO_MAP(steelwkr_io_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	/* add shifter */
 	MCFG_MB14241_ADD("mb14241")
@ -2758,8 +2758,8 @@ MACHINE_CONFIG_START(_8080bw_state::shuttlei)
 	MCFG_DEVICE_PROGRAM_MAP(shuttlei_map)
 	MCFG_DEVICE_IO_MAP(shuttlei_io_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state, extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
-	MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state, mw8080bw)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mw8080bw, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -2800,14 +2800,14 @@ Another (same checksums) dump came from board labeled SI-7811M-2
 */
-MACHINE_START_MEMBER(_8080bw_state,darthvdr)
+void _8080bw_state::machine_start_darthvdr()
 {
 	/* do nothing for now - different interrupt system */
 	m_fleet_step = 3;
 }
-MACHINE_RESET_MEMBER(_8080bw_state,darthvdr)
+void _8080bw_state::machine_reset_darthvdr()
 {
 	/* do nothing for now - different interrupt system */
 }
@ -2885,8 +2885,8 @@ MACHINE_CONFIG_START(_8080bw_state::darthvdr)
 	MCFG_DEVICE_IO_MAP(darthvdr_io_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state,  irq0_line_hold)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,darthvdr)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_darthvdr, this));
-	MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state,darthvdr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_darthvdr, this));
 	/* sound hardware */
 	invaders_samples_audio(config);
@ -2957,7 +2957,7 @@ MACHINE_CONFIG_START(_8080bw_state::vortex)
 	/* basic machine hardware */
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_IO_MAP(vortex_io_map)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_extra_8080bw, this));
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_TIME_INIT(attotime::from_usec(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
@ -3252,12 +3252,12 @@ static INPUT_PORTS_START( gunchamp )
 INPUT_PORTS_END
-MACHINE_START_MEMBER(_8080bw_state, claybust)
+void _8080bw_state::machine_start_claybust()
 {
 	m_claybust_gun_pos = 0;
 	save_item(NAME(m_claybust_gun_pos));
-	MACHINE_START_CALL_MEMBER(mw8080bw);
+	machine_start_mw8080bw();
 }
 MACHINE_CONFIG_START(_8080bw_state::claybust)
@ -3269,7 +3269,7 @@ MACHINE_CONFIG_START(_8080bw_state::claybust)
 	MCFG_TIMER_DRIVER_ADD("claybust_gun", _8080bw_state, claybust_gun_callback)
-	MCFG_MACHINE_START_OVERRIDE(_8080bw_state, claybust)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_claybust, this));
 	/* sound hardware */
 	// TODO: discrete sound
@ -3526,7 +3526,7 @@ MACHINE_CONFIG_START(_8080bw_state::invmulti)
 	MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom")
-	MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state, mw8080bw)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mw8080bw, this));
 MACHINE_CONFIG_END
 void _8080bw_state::init_invmulti()
--- a/src/mame/drivers/a51xx.cpp
+++ b/src/mame/drivers/a51xx.cpp
@ -26,8 +26,8 @@ public:
 	virtual void machine_reset() override;
 	virtual void video_start() override;
-	DECLARE_MACHINE_RESET(a5130);
+	void machine_reset_a5130();
-	DECLARE_VIDEO_START(a5130);
+	void video_start_a5130() ATTR_COLD;
 	uint32_t screen_update_a5120(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_a5130(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	required_device<cpu_device> m_maincpu;
@ -91,11 +91,11 @@ static INPUT_PORTS_START( a5130 )
 INPUT_PORTS_END
-MACHINE_RESET_MEMBER(a51xx_state,a5130)
+void a51xx_state::machine_reset_a5130()
 {
 }
-VIDEO_START_MEMBER(a51xx_state,a5130)
+void a51xx_state::video_start_a5130()
 {
 }
@ -151,13 +151,13 @@ MACHINE_CONFIG_START(a51xx_state::a5130)
 	MCFG_DEVICE_PROGRAM_MAP(a5130_mem)
 	MCFG_DEVICE_IO_MAP(a5130_io)
-	MCFG_MACHINE_RESET_OVERRIDE(a51xx_state,a5130)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_a5130, this));
 	/* video hardware */
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(a51xx_state, screen_update_a5130)
-	MCFG_VIDEO_START_OVERRIDE(a51xx_state,a5130)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_a5130, this));
 MACHINE_CONFIG_END
 /* ROM definition */
--- a/src/mame/drivers/a6809.cpp
+++ b/src/mame/drivers/a6809.cpp
@ -82,7 +82,7 @@ protected:
 	DECLARE_WRITE8_MEMBER(a6809_address_w);
 	DECLARE_WRITE8_MEMBER(a6809_register_w);
 	DECLARE_WRITE_LINE_MEMBER(cass_w);
-	DECLARE_MACHINE_RESET(a6809);
+	void machine_reset_a6809();
 	TIMER_DEVICE_CALLBACK_MEMBER(a6809_c);
 	TIMER_DEVICE_CALLBACK_MEMBER(a6809_p);
@ -120,7 +120,7 @@ static INPUT_PORTS_START( a6809 )
 INPUT_PORTS_END
-MACHINE_RESET_MEMBER( a6809_state, a6809)
+void a6809_state::machine_reset_a6809()
 {
 	m_via->write_pb0(0);
 	m_via->write_pb1(0);
@ -227,7 +227,7 @@ MACHINE_CONFIG_START(a6809_state::a6809)
 	/* basic machine hardware */
 	MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000))
 	MCFG_DEVICE_PROGRAM_MAP(a6809_mem)
-	MCFG_MACHINE_RESET_OVERRIDE(a6809_state, a6809)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_a6809, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
--- a/src/mame/drivers/actfancr.cpp
+++ b/src/mame/drivers/actfancr.cpp
@ -274,12 +274,12 @@ GFXDECODE_END
 /******************************************************************************/
-MACHINE_START_MEMBER(actfancr_state,triothep)
+void actfancr_state::machine_start_triothep()
 {
 	save_item(NAME(m_trio_control_select));
 }
-MACHINE_RESET_MEMBER(actfancr_state,triothep)
+void actfancr_state::machine_reset_triothep()
 {
 	m_trio_control_select = 0;
 }
@ -351,8 +351,8 @@ MACHINE_CONFIG_START(actfancr_state::triothep)
 	MCFG_DEVICE_ADD("audiocpu",M6502, XTAL(12'000'000)/8) /* verified on pcb */
 	MCFG_DEVICE_PROGRAM_MAP(dec0_s_map)
-	MCFG_MACHINE_START_OVERRIDE(actfancr_state,triothep)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_triothep, this));
-	MCFG_MACHINE_RESET_OVERRIDE(actfancr_state,triothep)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_triothep, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
--- 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);
-	DECLARE_MACHINE_START(skattv);
+	void machine_start_skattv() ATTR_COLD;
-	DECLARE_MACHINE_RESET(skattv);
+	void 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();
 }
-MACHINE_START_MEMBER(adp_state,skattv)
+void adp_state::machine_start_skattv()
 {
 	save_item(NAME(m_mux_data));
 }
-MACHINE_RESET_MEMBER(adp_state,skattv)
+void adp_state::machine_reset_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)
-	MCFG_MACHINE_START_OVERRIDE(adp_state,skattv)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_skattv, this));
-	MCFG_MACHINE_RESET_OVERRIDE(adp_state,skattv)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_skattv, this));
 	MCFG_DEVICE_ADD( "duart", MC68681, XTAL(8'664'000) / 2 )
 	MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
--- a/src/mame/drivers/aerofgt.cpp
+++ b/src/mame/drivers/aerofgt.cpp
@ -1432,31 +1432,31 @@ static GFXDECODE_START( gfx_wbbc97 )
 GFXDECODE_END
-MACHINE_START_MEMBER(aerofgt_state,common)
+void aerofgt_state::machine_start_common()
 {
 }
-MACHINE_START_MEMBER(aerofgt_state,aerofgt)
+void aerofgt_state::machine_start_aerofgt()
 {
 	m_soundbank->configure_entries(0, 4, memregion("audiocpu")->base(), 0x8000);
-	MACHINE_START_CALL_MEMBER(common);
+	machine_start_common();
 }
-MACHINE_START_MEMBER(aerofgt_state,spinlbrk)
+void aerofgt_state::machine_start_spinlbrk()
 {
 	m_soundbank->configure_entries(0, 2, memregion("audiocpu")->base()+0x8000, 0x8000);
-	MACHINE_START_CALL_MEMBER(common);
+	machine_start_common();
 }
-MACHINE_RESET_MEMBER(aerofgt_state,common)
+void aerofgt_state::machine_reset_common()
 {
 }
-MACHINE_RESET_MEMBER(aerofgt_state,aerofgt)
+void aerofgt_state::machine_reset_aerofgt()
 {
-	MACHINE_RESET_CALL_MEMBER(common);
+	machine_reset_common();
 	m_soundbank->set_entry(0); /* needed by spinlbrk */
 }
@ -1473,8 +1473,8 @@ MACHINE_CONFIG_START(aerofgt_state::pspikes)
 	MCFG_DEVICE_IO_MAP(turbofrc_sound_portmap)
 								/* IRQs are triggered by the YM2610 */
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_aerofgt, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1496,7 +1496,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikes)
 	MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_pspikes, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -1523,8 +1523,8 @@ MACHINE_CONFIG_START(aerofgt_state::spikes91)
 	/* + Z80 for sound */
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1541,7 +1541,7 @@ MACHINE_CONFIG_START(aerofgt_state::spikes91)
 	//MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0)
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_pspikes, this));
 	/* sound hardware */
 	/* the sound hardware is completely different on this:
@ -1559,8 +1559,8 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesb)
 	MCFG_DEVICE_PROGRAM_MAP(pspikesb_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state,  irq1_line_hold)/* all irq vectors are the same */
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1577,7 +1577,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesb)
 	//MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0)
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_pspikes, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -1604,8 +1604,8 @@ MACHINE_CONFIG_START(aerofgt_state::kickball)
 	MCFG_DEVICE_PROGRAM_MAP(kickball_sound_map)
 	MCFG_DEVICE_IO_MAP(kickball_sound_portmap)
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1627,7 +1627,7 @@ MACHINE_CONFIG_START(aerofgt_state::kickball)
 	//MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0) // still accessed as if it exists, in clone hardware?
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_pspikes, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -1651,8 +1651,8 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesc)
 	MCFG_DEVICE_PROGRAM_MAP(pspikesc_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state,  irq1_line_hold)/* all irq vectors are the same */
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1674,7 +1674,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesc)
 	MCFG_VSYSTEM_SPR2_SET_GFXREGION(1)
 	MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode")
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,pspikes)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_pspikes, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -1695,8 +1695,8 @@ MACHINE_CONFIG_START(aerofgt_state::karatblz)
 	MCFG_DEVICE_IO_MAP(turbofrc_sound_portmap)
 								/* IRQs are triggered by the YM2610 */
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_aerofgt, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1723,7 +1723,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblz)
 	MCFG_VSYSTEM_SPR2_SET_GFXREGION(3)
 	MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode")
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,karatblz)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_karatblz, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -1752,8 +1752,8 @@ MACHINE_CONFIG_START(aerofgt_state::karatblzbl)
 	MCFG_DEVICE_PROGRAM_MAP(karatblzbl_sound_map)
 	MCFG_DEVICE_IO_MAP(karatblzbl_sound_portmap)
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1780,7 +1780,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblzbl)
 	//MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0)
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,karatblz)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_karatblz, this));
 	MCFG_GENERIC_LATCH_8_ADD("soundlatch")
 	MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
@ -1809,8 +1809,8 @@ MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
 	MCFG_DEVICE_IO_MAP(spinlbrk_sound_portmap)
 								/* IRQs are triggered by the YM2610 */
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,spinlbrk)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_spinlbrk, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1838,7 +1838,7 @@ MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
 	MCFG_VSYSTEM_SPR2_SET_GFXREGION(3)
 	MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode")
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,spinlbrk)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_spinlbrk, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -1868,8 +1868,8 @@ MACHINE_CONFIG_START(aerofgt_state::turbofrc)
 	MCFG_DEVICE_IO_MAP(turbofrc_sound_portmap)
 								/* IRQs are triggered by the YM2610 */
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_aerofgt, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1896,7 +1896,7 @@ MACHINE_CONFIG_START(aerofgt_state::turbofrc)
 	MCFG_VSYSTEM_SPR2_SET_GFXREGION(3)
 	MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode")
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_turbofrc, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -1926,8 +1926,8 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgtb)
 	MCFG_DEVICE_IO_MAP(aerofgt_sound_portmap)
 								/* IRQs are triggered by the YM2610 */
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_aerofgt, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1955,7 +1955,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgtb)
 	MCFG_VSYSTEM_SPR2_SET_GFXREGION(3)
 	MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode")
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_turbofrc, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -1985,8 +1985,8 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgt)
 	MCFG_DEVICE_IO_MAP(aerofgt_sound_portmap)
 								/* IRQs are triggered by the YM2610 */
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_aerofgt, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,aerofgt)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aerofgt, this));
 	MCFG_DEVICE_ADD("io", VS9209, 0)
 	MCFG_VS9209_IN_PORTA_CB(IOPORT("P1"))
@ -2019,7 +2019,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgt)
 	MCFG_VSYSTEM_SPR_SET_GFXREGION(2)
 	MCFG_VSYSTEM_SPR_GFXDECODE("gfxdecode")
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_turbofrc, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -2047,8 +2047,8 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboot)
 	MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
 	MCFG_DEVICE_PROGRAM_MAP(aerfboot_sound_map)
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -2066,7 +2066,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboot)
 	//MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0)
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_turbofrc, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2087,8 +2087,8 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboo2)
 	MCFG_DEVICE_PROGRAM_MAP(aerfboo2_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state,  irq2_line_hold)
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -2106,7 +2106,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboo2)
 	//MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 0)
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,turbofrc)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_turbofrc, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2125,8 +2125,8 @@ MACHINE_CONFIG_START(aerofgt_state::wbbc97)
 	MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
 	MCFG_DEVICE_PROGRAM_MAP(wbbc97_sound_map)
 								/* IRQs are triggered by the YM3812 */
-	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -2147,7 +2147,7 @@ MACHINE_CONFIG_START(aerofgt_state::wbbc97)
 	MCFG_VSYSTEM_SPR2_SET_GFXREGION(1)
 	MCFG_VSYSTEM_SPR2_GFXDECODE("gfxdecode")
-	MCFG_VIDEO_START_OVERRIDE(aerofgt_state,wbbc97)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_wbbc97, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/airraid.cpp
+++ b/src/mame/drivers/airraid.cpp
@ -186,7 +186,7 @@ public:
 	DECLARE_WRITE8_MEMBER(bank_w);
 	void init_cshootere();
 	void init_cshooter();
-	DECLARE_MACHINE_RESET(cshooter);
+	void machine_reset_cshooter();
 	TIMER_DEVICE_CALLBACK_MEMBER(cshooter_scanline);
 	void airraid(machine_config &config);
 	void airraid_crypt(machine_config &config);
@ -212,7 +212,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(airraid_state::cshooter_scanline)
 }
-MACHINE_RESET_MEMBER(airraid_state,cshooter)
+void airraid_state::machine_reset_cshooter()
 {
 }
--- a/src/mame/drivers/alg.cpp
+++ b/src/mame/drivers/alg.cpp
@ -56,7 +56,7 @@ public:
 	void init_ntsc();
 	void init_pal();
-	DECLARE_VIDEO_START(alg);
+	void video_start_alg() ATTR_COLD;
 	void alg_r2(machine_config &config);
 	void picmatic(machine_config &config);
@ -116,10 +116,10 @@ int alg_state::get_lightgun_pos(int player, int *x, int *y)
 *
 *************************************/
-VIDEO_START_MEMBER(alg_state,alg)
+void alg_state::video_start_alg()
 {
 	/* standard video start */
-	VIDEO_START_CALL_MEMBER(amiga);
+	video_start_amiga();
 	/* configure pen 4096 as transparent in the renderer and use it for the genlock color */
 	m_palette->set_pen_color(4096, rgb_t(0,0,0,0));
@ -329,7 +329,7 @@ MACHINE_CONFIG_START(alg_state::alg_r1)
 	MCFG_PALETTE_ADD("palette", 4097)
 	MCFG_PALETTE_INIT_OWNER(alg_state,amiga)
-	MCFG_VIDEO_START_OVERRIDE(alg_state,alg)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_alg, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
--- a/src/mame/drivers/alpha68k.cpp
+++ b/src/mame/drivers/alpha68k.cpp
@ -1821,7 +1821,7 @@ WRITE8_MEMBER(alpha68k_state::porta_w)
 /******************************************************************************/
-MACHINE_START_MEMBER(alpha68k_state,common)
+void alpha68k_state::machine_start_common()
 {
 	save_item(NAME(m_trigstate));
 	save_item(NAME(m_deposits1));
@ -1833,7 +1833,7 @@ MACHINE_START_MEMBER(alpha68k_state,common)
 	save_item(NAME(m_flipscreen));
 }
-MACHINE_RESET_MEMBER(alpha68k_state,common)
+void alpha68k_state::machine_reset_common()
 {
 	m_trigstate = 0;
 	m_deposits1 = 0;
@ -1845,13 +1845,13 @@ MACHINE_RESET_MEMBER(alpha68k_state,common)
 	m_flipscreen = 0;
 }
-MACHINE_START_MEMBER(alpha68k_state,alpha68k_V)
+void alpha68k_state::machine_start_alpha68k_V()
 {
 	uint8_t *ROM = memregion("audiocpu")->base();
 	membank("bank7")->configure_entries(0, 32, &ROM[0x10000], 0x4000);
-	MACHINE_START_CALL_MEMBER(common);
+	machine_start_common();
 	save_item(NAME(m_bank_base));
 	save_item(NAME(m_last_bank));
@ -1859,17 +1859,17 @@ MACHINE_START_MEMBER(alpha68k_state,alpha68k_V)
 	save_item(NAME(m_sound_pa_latch));
 }
-MACHINE_RESET_MEMBER(alpha68k_state,alpha68k_V)
+void alpha68k_state::machine_reset_alpha68k_V()
 {
-	MACHINE_RESET_CALL_MEMBER(common);
+	machine_reset_common();
 	m_bank_base = 0;
 	m_last_bank = 0;
 }
-MACHINE_RESET_MEMBER(alpha68k_state,alpha68k_II)
+void alpha68k_state::machine_reset_alpha68k_II()
 {
-	MACHINE_RESET_CALL_MEMBER(common);
+	machine_reset_common();
 	m_bank_base = 0;
 	m_last_bank = 0;
@ -1878,13 +1878,13 @@ MACHINE_RESET_MEMBER(alpha68k_state,alpha68k_II)
 	m_buffer_68 = 0;
 }
-MACHINE_START_MEMBER(alpha68k_state,alpha68k_II)
+void alpha68k_state::machine_start_alpha68k_II()
 {
 	uint8_t *ROM = memregion("audiocpu")->base();
 	membank("bank7")->configure_entries(0, 28, &ROM[0x10000], 0x4000);
-	MACHINE_START_CALL_MEMBER(common);
+	machine_start_common();
 	save_item(NAME(m_bank_base));
 	save_item(NAME(m_last_bank));
@ -1928,8 +1928,8 @@ MACHINE_CONFIG_START(alpha68k_state::sstingry)
 //  MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, alpha68k_state, saiyugoub1_adpcm_control_w))
 	MCFG_DEVICE_DISABLE()
-	MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1980,8 +1980,8 @@ MACHINE_CONFIG_START(alpha68k_state::kyros)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, nmi_line_pulse,  4000)
-	MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -2031,8 +2031,8 @@ MACHINE_CONFIG_START(alpha68k_state::jongbou)
 	MCFG_DEVICE_IO_MAP(jongbou_sound_portmap)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq0_line_hold,  160*60)
-	MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -2070,8 +2070,8 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_I)
 	MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // 4Mhz seems to yield the correct tone
 	MCFG_DEVICE_PROGRAM_MAP(alpha68k_I_s_map)
-	MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -2117,8 +2117,8 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_II)
 	MCFG_DEVICE_IO_MAP(sound_portmap)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 7614)
-	MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_II)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_alpha68k_II, this));
-	MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_II)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_alpha68k_II, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -2134,7 +2134,7 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_II)
 	MCFG_PALETTE_ADD("palette", 2048)
 	MCFG_PALETTE_FORMAT(xRGBRRRRGGGGBBBB_bit0)
-	MCFG_VIDEO_START_OVERRIDE(alpha68k_state,alpha68k)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_alpha68k, this));
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
@ -2179,8 +2179,8 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_V)
 	MCFG_DEVICE_IO_MAP(sound_portmap)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, ALPHA68K_PIXEL_CLOCK / ALPHA68K_HTOTAL / 2)
-	MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_V)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_alpha68k_V, this));
-	MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_V)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_alpha68k_V, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -2196,7 +2196,7 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_V)
 	MCFG_PALETTE_ADD("palette", 4096)
 	MCFG_PALETTE_FORMAT(xRGBRRRRGGGGBBBB_bit0)
-	MCFG_VIDEO_START_OVERRIDE(alpha68k_state,alpha68k)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_alpha68k, this));
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
@ -2234,8 +2234,8 @@ MACHINE_CONFIG_START(alpha68k_state::tnextspc)
 	MCFG_DEVICE_PROGRAM_MAP(tnextspc_sound_map)
 	MCFG_DEVICE_IO_MAP(tnextspc_sound_portmap)
-	MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_common, this));
-	MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_common, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
--- a/src/mame/drivers/alto2.cpp
+++ b/src/mame/drivers/alto2.cpp
@ -31,7 +31,7 @@ public:
 	{ }
 	void init_alto2();
-	DECLARE_MACHINE_RESET(alto2);
+	void machine_reset_alto2();
 	void alto2(machine_config &config);
 	void alto2_const_map(address_map &map);
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@ -87,9 +87,9 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(color_bank_1_w);
 	DECLARE_WRITE_LINE_MEMBER(color_bank_2_w);
-	DECLARE_MACHINE_START(ambush);
+	void machine_start_ambush() ATTR_COLD;
-	DECLARE_MACHINE_START(mariobl);
+	void machine_start_mariobl() ATTR_COLD;
-	DECLARE_MACHINE_START(dkong3abl);
+	void machine_start_dkong3abl() ATTR_COLD;
 	DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
 	DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
@ -637,7 +637,7 @@ void ambush_state::register_save_states()
 	save_item(NAME(m_color_bank));
 }
-MACHINE_START_MEMBER( ambush_state, ambush )
+void ambush_state::machine_start_ambush()
 {
 	register_save_states();
@ -647,7 +647,7 @@ MACHINE_START_MEMBER( ambush_state, ambush )
 	m_char_tilemap->set_scroll_cols(32);
 }
-MACHINE_START_MEMBER( ambush_state, mariobl )
+void ambush_state::machine_start_mariobl()
 {
 	register_save_states();
@ -657,7 +657,7 @@ MACHINE_START_MEMBER( ambush_state, mariobl )
 	m_gfxdecode->gfx(0)->set_granularity(8);
 }
-MACHINE_START_MEMBER( ambush_state, dkong3abl )
+void ambush_state::machine_start_dkong3abl()
 {
 	register_save_states();
@ -704,7 +704,7 @@ MACHINE_CONFIG_START(ambush_state::ambush)
 	MCFG_WATCHDOG_ADD("watchdog")
-	MCFG_MACHINE_START_OVERRIDE(ambush_state, ambush)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_ambush, this));
 	// video hardware
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -740,7 +740,7 @@ MACHINE_CONFIG_START(ambush_state::mariobl)
 	MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ambush_state, coin_counter_1_w))
 	MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, ambush_state, color_bank_1_w))
-	MCFG_MACHINE_START_OVERRIDE(ambush_state, mariobl)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mariobl, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(ambush_state, screen_update_bootleg)
@ -761,7 +761,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(ambush_state::dkong3abl)
 	mariobl(config);
-	MCFG_MACHINE_START_OVERRIDE(ambush_state, dkong3abl)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_dkong3abl, this));
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_dkong3abl)
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@ -1378,7 +1378,7 @@ MACHINE_CONFIG_START(amiga_state::amiga_base)
 	MCFG_PALETTE_ADD("palette", 4096)
 	MCFG_PALETTE_INIT_OWNER(amiga_state, amiga)
-	MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_amiga, this));
 	// cia
 	MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_PAL)
@ -1788,7 +1788,7 @@ MACHINE_CONFIG_START(a1200_state::a1200)
 	MCFG_DEVICE_REMOVE("palette")
-	MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_amiga_aga, this));
 	MCFG_GAYLE_ADD("gayle", amiga_state::CLK_28M_PAL / 2, a1200_state::GAYLE_ID)
 	MCFG_GAYLE_INT2_HANDLER(WRITELINE(*this, a1200_state, gayle_int2_w))
@ -1853,7 +1853,7 @@ MACHINE_CONFIG_START(a4000_state::a4000)
 	MCFG_DEVICE_REMOVE("palette")
-	MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_amiga_aga, this));
 	// real-time clock
 	MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
@ -1944,7 +1944,7 @@ MACHINE_CONFIG_START(cd32_state::cd32)
 	MCFG_DEVICE_REMOVE("palette")
-	MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_amiga_aga, this));
 	MCFG_DEVICE_ADD("cdda", CDDA)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@ -1185,8 +1185,7 @@ MACHINE_CONFIG_START(ampoker2_state::sigma2k)
 	/* video hardware */
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_sigma2k)
-	MCFG_VIDEO_START_OVERRIDE(ampoker2_state, sigma2k)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_sigma2k, this));
 MACHINE_CONFIG_END
 /*************************
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@ -45,7 +45,7 @@ public:
 	{ }
 	void init_ampro();
-	DECLARE_MACHINE_RESET(ampro);
+	void machine_reset_ampro();
 	TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
 	DECLARE_WRITE8_MEMBER(port00_w);
 	DECLARE_READ8_MEMBER(io_r);
@ -134,7 +134,7 @@ static void ampro_floppies(device_slot_interface &device)
 static INPUT_PORTS_START( ampro )
 INPUT_PORTS_END
-MACHINE_RESET_MEMBER( ampro_state, ampro )
+void ampro_state::machine_reset_ampro()
 {
 	membank("bankr0")->set_entry(0); // point at rom
 	membank("bankw0")->set_entry(0); // always write to ram
@ -155,7 +155,7 @@ MACHINE_CONFIG_START(ampro_state::ampro)
 	MCFG_DEVICE_PROGRAM_MAP(ampro_mem)
 	MCFG_DEVICE_IO_MAP(ampro_io)
 	MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
-	MCFG_MACHINE_RESET_OVERRIDE(ampro_state, ampro)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ampro, this));
 	MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(16'000'000) / 8) // 2MHz
 	MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
--- a/src/mame/drivers/amstrad.cpp
+++ b/src/mame/drivers/amstrad.cpp
@ -916,8 +916,8 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
 	MCFG_QUANTUM_TIME(attotime::from_hz(60))
-	MCFG_MACHINE_START_OVERRIDE(amstrad_state, amstrad )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_amstrad, this));
-	MCFG_MACHINE_RESET_OVERRIDE(amstrad_state, amstrad )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_amstrad, this));
 	MCFG_DEVICE_ADD("ppi8255", I8255, 0)
 	MCFG_I8255_IN_PORTA_CB(READ8(*this, amstrad_state, amstrad_ppi_porta_r))
@ -944,7 +944,7 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
 	MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_vsync_changed))
 	MCFG_MC6845_OUT_CUR_CB(WRITELINE("exp", cpc_expansion_slot_device, cursor_w))
-	MCFG_VIDEO_START_OVERRIDE(amstrad_state,amstrad)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_amstrad, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -1027,8 +1027,8 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(amstrad_state::kccomp)
 	cpc6128(config);
-	MCFG_MACHINE_START_OVERRIDE(amstrad_state,kccomp)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_kccomp, this));
-	MCFG_MACHINE_RESET_OVERRIDE(amstrad_state,kccomp)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_kccomp, this));
 	MCFG_PALETTE_MODIFY("palette")
 	MCFG_PALETTE_INIT_OWNER(amstrad_state,kccomp)
@ -1044,8 +1044,8 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
 	MCFG_QUANTUM_TIME(attotime::from_hz(60))
-	MCFG_MACHINE_START_OVERRIDE(amstrad_state, plus )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_plus, this));
-	MCFG_MACHINE_RESET_OVERRIDE(amstrad_state, plus )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_plus, this));
 	MCFG_DEVICE_ADD("ppi8255", I8255, 0)
 	MCFG_I8255_IN_PORTA_CB(READ8(*this, amstrad_state, amstrad_ppi_porta_r))
@ -1071,7 +1071,7 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
 	MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_hsync_changed))
 	MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_vsync_changed))
-	MCFG_VIDEO_START_OVERRIDE(amstrad_state,amstrad)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_amstrad, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -1122,8 +1122,8 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
 	MCFG_QUANTUM_TIME(attotime::from_hz(60))
-	MCFG_MACHINE_START_OVERRIDE(amstrad_state, gx4000 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_gx4000, this));
-	MCFG_MACHINE_RESET_OVERRIDE(amstrad_state, gx4000 )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gx4000, this));
 	MCFG_DEVICE_ADD("ppi8255", I8255, 0)
 	MCFG_I8255_IN_PORTA_CB(READ8(*this, amstrad_state, amstrad_ppi_porta_r))
@ -1149,7 +1149,7 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
 	MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_hsync_changed))
 	MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_vsync_changed))
-	MCFG_VIDEO_START_OVERRIDE(amstrad_state,amstrad)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_amstrad, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -1167,8 +1167,8 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(amstrad_state::aleste)
 	cpc6128(config);
-	MCFG_MACHINE_START_OVERRIDE(amstrad_state,aleste)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_aleste, this));
-	MCFG_MACHINE_RESET_OVERRIDE(amstrad_state,aleste)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_aleste, this));
 	MCFG_DEVICE_REPLACE("ay", AY8912, XTAL(16'000'000) / 16)
 	MCFG_AY8910_PORT_A_READ_CB(READ8(*this, amstrad_state, amstrad_psg_porta_read)) /* portA read */
--- a/src/mame/drivers/amust.cpp
+++ b/src/mame/drivers/amust.cpp
@ -115,7 +115,7 @@ public:
 	{ }
 	void init_amust();
-	DECLARE_MACHINE_RESET(amust);
+	void machine_reset_amust();
 	DECLARE_READ8_MEMBER(port04_r);
 	DECLARE_WRITE8_MEMBER(port04_w);
 	DECLARE_READ8_MEMBER(port05_r);
@ -353,7 +353,7 @@ MC6845_UPDATE_ROW( amust_state::crtc_update_row )
 	}
 }
-MACHINE_RESET_MEMBER( amust_state, amust )
+void amust_state::machine_reset_amust()
 {
 	membank("bankr0")->set_entry(0); // point at rom
 	membank("bankw0")->set_entry(0); // always write to ram
@ -382,7 +382,7 @@ MACHINE_CONFIG_START(amust_state::amust)
 	MCFG_DEVICE_PROGRAM_MAP(mem_map)
 	MCFG_DEVICE_IO_MAP(io_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", amust_state, irq_vs)
-	MCFG_MACHINE_RESET_OVERRIDE(amust_state, amust)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_amust, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
--- a/src/mame/drivers/apogee.cpp
+++ b/src/mame/drivers/apogee.cpp
@ -219,7 +219,7 @@ MACHINE_CONFIG_START(apogee_state::apogee)
 	/* basic machine hardware */
 	MCFG_DEVICE_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
 	MCFG_DEVICE_PROGRAM_MAP(apogee_mem)
-	MCFG_MACHINE_RESET_OVERRIDE(apogee_state, radio86 )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_radio86, this));
 	MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
 	MCFG_PIT8253_CLK0(XTAL(16'000'000)/9)
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@ -910,7 +910,7 @@ void apollo_state::machine_reset()
 {
 	MLOG1(("machine_reset"));
-	MACHINE_RESET_CALL_MEMBER(apollo);
+	machine_reset_apollo();
 #ifdef APOLLO_XXL
 	// set configuration
@ -934,7 +934,7 @@ WRITE_LINE_MEMBER(apollo_state::apollo_reset_instr_callback)
 	MLOG1(("apollo_reset_instr_callback"));
 	// reset the CPU board devices
-	MACHINE_RESET_CALL_MEMBER(apollo);
+	machine_reset_apollo();
 	// reset the ISA bus devices
 	m_isa->reset();
@ -960,7 +960,7 @@ void apollo_state::machine_start(){
 	// clear ram
 	memset(messram->ptr(), 0x55, messram->bytes());
-	MACHINE_START_CALL_MEMBER(apollo);
+	machine_start_apollo();
 	// install nop handlers for unmapped ISA bus addresses
 	m_isa->install16_device((ATBUS_IO_BASE - 0x40000) >> 7, (ATBUS_IO_END - 0x40000) >> 7, read16_delegate(FUNC(apollo_state::apollo_atbus_unmap_io_r), this), write16_delegate(FUNC(apollo_state::apollo_atbus_unmap_io_w), this));
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@ -1486,7 +1486,7 @@ MACHINE_CONFIG_END
 #if 0
 static MACHINE_CONFIG_START( laba2p )
 	apple2p(config);
-	MCFG_MACHINE_START_OVERRIDE(napple2_state,laba2p)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_laba2p, this));
 	MCFG_DEVICE_REMOVE("sl0")
 	MCFG_DEVICE_REMOVE("sl3")
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@ -342,10 +342,10 @@ MACHINE_CONFIG_START(apple2gs_state::apple2gs)
 	MCFG_PALETTE_INIT_OWNER(apple2gs_state, apple2gs)
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_apple2gs )
-	MCFG_MACHINE_START_OVERRIDE(apple2gs_state, apple2gs )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_apple2gs, this));
-	MCFG_MACHINE_RESET_OVERRIDE(apple2gs_state, apple2gs )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_apple2gs, this));
-	MCFG_VIDEO_START_OVERRIDE(apple2gs_state, apple2gs )
+	set_video_start_cb(config, driver_callback_delegate(&video_start_apple2gs, this));
 	/* keyboard controller */
 	MCFG_DEVICE_ADD("ay3600", AY3600, 0)
@ -425,7 +425,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(apple2gs_state::apple2gsr1)
 	apple2gs(config);
-	MCFG_MACHINE_START_OVERRIDE(apple2gs_state, apple2gsr1 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_apple2gsr1, this));
 	#if RUN_ADB_MICRO
 	MCFG_DEVICE_REPLACE(ADBMICRO_TAG, M50740, XTAL(3'579'545))
--- a/src/mame/drivers/apple3.cpp
+++ b/src/mame/drivers/apple3.cpp
@ -60,7 +60,7 @@ MACHINE_CONFIG_START(apple3_state::apple3)
 	MCFG_DEVICE_PROGRAM_MAP(apple3_map)
 	MCFG_QUANTUM_TIME(attotime::from_hz(60))
-	MCFG_MACHINE_RESET_OVERRIDE(apple3_state, apple3 )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_apple3, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -74,7 +74,7 @@ MACHINE_CONFIG_START(apple3_state::apple3)
 	MCFG_PALETTE_ADD("palette", 32)
 	MCFG_PALETTE_INIT_OWNER(apple3_state, apple3 )
-	MCFG_VIDEO_START_OVERRIDE(apple3_state, apple3 )
+	set_video_start_cb(config, driver_callback_delegate(&video_start_apple3, this));
 	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", apple3_state, apple3_interrupt, "screen", 0, 1)
--- a/src/mame/drivers/argus.cpp
+++ b/src/mame/drivers/argus.cpp
@ -508,8 +508,8 @@ MACHINE_CONFIG_START(argus_state::argus)
 	MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0)
-	MCFG_VIDEO_START_OVERRIDE(argus_state,argus)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_argus, this));
-	MCFG_VIDEO_RESET_OVERRIDE(argus_state,argus)
+	set_video_reset_cb(config, driver_callback_delegate(&video_reset_argus, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -550,8 +550,8 @@ MACHINE_CONFIG_START(argus_state::valtric)
 	MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0)
-	MCFG_VIDEO_START_OVERRIDE(argus_state,valtric)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_valtric, this));
-	MCFG_VIDEO_RESET_OVERRIDE(argus_state,valtric)
+	set_video_reset_cb(config, driver_callback_delegate(&video_reset_valtric, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -598,8 +598,8 @@ MACHINE_CONFIG_START(argus_state::butasan)
 	MCFG_DEVICE_ADD("blend", JALECO_BLEND, 0)
-	MCFG_VIDEO_START_OVERRIDE(argus_state,butasan)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_butasan, this));
-	MCFG_VIDEO_RESET_OVERRIDE(argus_state,butasan)
+	set_video_reset_cb(config, driver_callback_delegate(&video_reset_butasan, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/armedf.cpp
+++ b/src/mame/drivers/armedf.cpp
@ -1225,7 +1225,7 @@ GFXDECODE_END
 *
 *************************************/
-MACHINE_START_MEMBER(armedf_state,armedf)
+void armedf_state::machine_start_armedf()
 {
 	save_item(NAME(m_old_mcu_mode));
 	save_item(NAME(m_scroll_msb));
@ -1237,7 +1237,7 @@ MACHINE_START_MEMBER(armedf_state,armedf)
 	save_item(NAME(m_bg_scrolly));
 }
-MACHINE_RESET_MEMBER(armedf_state,armedf)
+void armedf_state::machine_reset_armedf()
 {
 	m_old_mcu_mode = 0;
 	m_scroll_msb = 0;
@ -1277,8 +1277,8 @@ MACHINE_CONFIG_START(armedf_state::terraf)
 	MCFG_DEVICE_PROGRAM_MAP(terraf_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state,  irq1_line_assert)
-	MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this));
-	MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this));
 	MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0)
@ -1290,7 +1290,7 @@ MACHINE_CONFIG_START(armedf_state::terraf)
 	MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this));
 	MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
@ -1321,8 +1321,8 @@ MACHINE_CONFIG_START(armedf_state::terrafjb)
 	MCFG_DEVICE_PROGRAM_MAP(terrafjb_extraz80_map)
 	MCFG_DEVICE_IO_MAP(terrafjb_extraz80_portmap)
-	MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this));
-	MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1332,7 +1332,7 @@ MACHINE_CONFIG_START(armedf_state::terrafjb)
 	MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this));
 	MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
@ -1369,8 +1369,8 @@ MACHINE_CONFIG_START(armedf_state::kozure)
 	MCFG_DEVICE_PROGRAM_MAP(kozure_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state,  irq1_line_assert)
-	MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this));
-	MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this));
 	MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0)
@ -1382,7 +1382,7 @@ MACHINE_CONFIG_START(armedf_state::kozure)
 	MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 ) // 320 x 240, trusted
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this));
 	MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
@ -1408,8 +1408,8 @@ MACHINE_CONFIG_START(armedf_state::armedf)
 	MCFG_DEVICE_IO_MAP(sound_portmap)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold,  XTAL(8'000'000)/2/512)    // ?
-	MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this));
-	MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1419,7 +1419,7 @@ MACHINE_CONFIG_START(armedf_state::armedf)
 	MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 1*8, 31*8-1 )
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(armedf_state,armedf)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_armedf, this));
 	MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
@ -1456,8 +1456,8 @@ MACHINE_CONFIG_START(armedf_state::cclimbr2)
 	MCFG_DEVICE_IO_MAP(sound_portmap)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold,  XTAL(8'000'000)/2/512)    // ?
-	MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this));
-	MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this));
 	MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0)
@ -1469,7 +1469,7 @@ MACHINE_CONFIG_START(armedf_state::cclimbr2)
 	MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this));
 	MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
@ -1506,8 +1506,8 @@ MACHINE_CONFIG_START(armedf_state::legion)
 	MCFG_DEVICE_IO_MAP(sound_3526_portmap)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold,  XTAL(8'000'000)/2/512)    // ?
-	MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this));
-	MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this));
 	MCFG_DEVICE_ADD("nb1414m4", NB1414M4, 0)
@ -1519,7 +1519,7 @@ MACHINE_CONFIG_START(armedf_state::legion)
 	MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this));
 	MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
@ -1556,8 +1556,8 @@ MACHINE_CONFIG_START(armedf_state::legionjb)
 	MCFG_DEVICE_IO_MAP(sound_portmap)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold,  XTAL(8'000'000)/2/512)    // ?
-	MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this));
-	MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1567,7 +1567,7 @@ MACHINE_CONFIG_START(armedf_state::legionjb)
 	MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_terraf, this));
 	MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
@ -1603,15 +1603,15 @@ MACHINE_CONFIG_START(bigfghtr_state::bigfghtr)
 	MCFG_DEVICE_IO_MAP(bigfghtr_mcu_io_map)
 	MCFG_MCS51_PORT_P1_IN_CB(CONSTANT(0xdf)) // bit 5: bus contention related?
-	MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_armedf, this));
-	MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_armedf, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
 	MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000)/2,531,12*8,(64-12)*8, 254, 1*8, 31*8) // guess, matches 59.3 Hz from reference - measured at 59.1358Hz
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(armedf_state,armedf)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_armedf, this));
 	MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
--- a/src/mame/drivers/arsystems.cpp
+++ b/src/mame/drivers/arsystems.cpp
@ -319,7 +319,7 @@ MACHINE_CONFIG_START(arcadia_amiga_state::arcadia)
 	MCFG_PALETTE_ADD("palette", 4096)
 	MCFG_PALETTE_INIT_OWNER(arcadia_amiga_state,amiga)
-	MCFG_VIDEO_START_OVERRIDE(arcadia_amiga_state,amiga)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_amiga, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
--- a/src/mame/drivers/astinvad.cpp
+++ b/src/mame/drivers/astinvad.cpp
@ -81,11 +81,11 @@ public:
 	DECLARE_WRITE8_MEMBER(spcking2_sound3_w);
 	void init_kamikaze();
 	void init_spcking2();
-	DECLARE_MACHINE_START(kamikaze);
+	void machine_start_kamikaze() ATTR_COLD;
-	DECLARE_MACHINE_RESET(kamikaze);
+	void machine_reset_kamikaze();
-	DECLARE_MACHINE_START(spaceint);
+	void machine_start_spaceint() ATTR_COLD;
-	DECLARE_MACHINE_RESET(spaceint);
+	void machine_reset_spaceint();
-	DECLARE_VIDEO_START(spaceint);
+	void video_start_spaceint()   ATTR_COLD;
 	uint32_t screen_update_astinvad(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_spcking2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_spaceint(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@ -130,7 +130,7 @@ private:
 *
 *************************************/
-VIDEO_START_MEMBER(astinvad_state,spaceint)
+void astinvad_state::video_start_spaceint()
 {
 	m_colorram = std::make_unique<uint8_t[]>(m_videoram.bytes());
@ -280,7 +280,7 @@ TIMER_CALLBACK_MEMBER(astinvad_state::kamizake_int_gen)
 }
-MACHINE_START_MEMBER(astinvad_state,kamikaze)
+void astinvad_state::machine_start_kamikaze()
 {
 	m_int_timer = timer_alloc(TIMER_INT_GEN);
 	m_int_timer->adjust(m_screen->time_until_pos(128), 128);
@ -291,7 +291,7 @@ MACHINE_START_MEMBER(astinvad_state,kamikaze)
 	save_item(NAME(m_sound_state));
 }
-MACHINE_RESET_MEMBER(astinvad_state,kamikaze)
+void astinvad_state::machine_reset_kamikaze()
 {
 	m_screen_flip = 0;
 	m_screen_red = 0;
@ -300,13 +300,13 @@ MACHINE_RESET_MEMBER(astinvad_state,kamikaze)
 }
-MACHINE_START_MEMBER(astinvad_state,spaceint)
+void astinvad_state::machine_start_spaceint()
 {
 	save_item(NAME(m_screen_flip));
 	save_item(NAME(m_sound_state));
 }
-MACHINE_RESET_MEMBER(astinvad_state,spaceint)
+void astinvad_state::machine_reset_spaceint()
 {
 	m_screen_flip = 0;
 	m_sound_state[0] = 0;
@ -670,8 +670,8 @@ MACHINE_CONFIG_START(astinvad_state::kamikaze)
 	MCFG_DEVICE_PROGRAM_MAP(kamikaze_map)
 	MCFG_DEVICE_IO_MAP(kamikaze_portmap)
-	MCFG_MACHINE_START_OVERRIDE(astinvad_state, kamikaze)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_kamikaze, this));
-	MCFG_MACHINE_RESET_OVERRIDE(astinvad_state, kamikaze)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_kamikaze, this));
 	MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
 	MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@ -723,11 +723,11 @@ MACHINE_CONFIG_START(astinvad_state::spaceint)
 	MCFG_DEVICE_IO_MAP(spaceint_portmap)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", astinvad_state, irq0_line_hold)
-	MCFG_MACHINE_START_OVERRIDE(astinvad_state, spaceint)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_spaceint, this));
-	MCFG_MACHINE_RESET_OVERRIDE(astinvad_state, spaceint)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_spaceint, this));
 	/* video hardware */
-	MCFG_VIDEO_START_OVERRIDE(astinvad_state, spaceint)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_spaceint, this));
 	MCFG_SCREEN_ADD("screen", RASTER)
 	MCFG_SCREEN_SIZE(32*8, 32*8)
--- a/src/mame/drivers/astrafr.cpp
+++ b/src/mame/drivers/astrafr.cpp
@ -114,10 +114,10 @@ public:
 	void init_astradec();
 	void init_astradec_dual();
 	void init_astradec_sml_dual();
-	DECLARE_MACHINE_START(astra_common);
+	void machine_start_astra_common() ATTR_COLD;
-	DECLARE_MACHINE_START(astra_2e);
+	void machine_start_astra_2e() ATTR_COLD;
-	DECLARE_MACHINE_START(astra_37);
+	void machine_start_astra_37() ATTR_COLD;
-	DECLARE_MACHINE_START(astra_57);
+	void machine_start_astra_57() ATTR_COLD;
 	void astra_single(machine_config &config);
 	void astra_single_alt(machine_config &config);
 	void astrafr_dual(machine_config &config);
@ -273,7 +273,7 @@ void astrafr_state::astrafr_slave_map(address_map &map)
 static INPUT_PORTS_START( astrafr )
 INPUT_PORTS_END
-MACHINE_START_MEMBER(astrafr_state,astra_common)
+void astrafr_state::machine_start_astra_common()
 {
 	m_cpuregion = (uint32_t*)memregion( "maincpu" )->base();
 	m_cpuregion_size = memregion( "maincpu" )->bytes()/4;
@ -290,20 +290,20 @@ MACHINE_START_MEMBER(astrafr_state,astra_common)
 }
 /* the FPGA area read/write addresses move around ... */
-MACHINE_START_MEMBER(astrafr_state,astra_37)
+void astrafr_state::machine_start_astra_37()
 {
 	fgpa_after_rom_write_addr = 0x30;
 	fgpa_first_read_addr = 0x33;
 	fgpa_rom_write_addr = 0x37;
-	MACHINE_START_CALL_MEMBER(astra_common);
+	machine_start_astra_common();
 }
-MACHINE_START_MEMBER(astrafr_state,astra_2e)
+void astrafr_state::machine_start_astra_2e()
 {
 	fgpa_after_rom_write_addr = 0x20;
 	fgpa_first_read_addr = 0x23;
 	fgpa_rom_write_addr = 0x2e;
-	MACHINE_START_CALL_MEMBER(astra_common);
+	machine_start_astra_common();
 }
@ -314,17 +314,17 @@ MACHINE_CONFIG_START(astrafr_state::astrafr_dual)
 	MCFG_DEVICE_ADD("slavecpu", M68340, 16000000)
 	MCFG_DEVICE_PROGRAM_MAP(astrafr_slave_map)
-	MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_common, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(astrafr_state::astrafr_dual_2e)
 	astrafr_dual(config);
-	MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_2e )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_2e, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(astrafr_state::astrafr_dual_37)
 	astrafr_dual(config);
-	MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_37, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(astrafr_state::astrafr_dual_alt)
@ -337,7 +337,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(astrafr_state::astrafr_dual_alt_37)
 	astrafr_dual_alt(config);
-	MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_37, this));
 MACHINE_CONFIG_END
@ -345,42 +345,42 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(astrafr_state::astra_single)
 	MCFG_DEVICE_ADD("maincpu", M68340, 16000000)
 	MCFG_DEVICE_PROGRAM_MAP(astra_map)
-	MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_common, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(astrafr_state::astra_single_37)
 	astra_single(config);
-	MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_37, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(astrafr_state::astra_single_2e)
 	astra_single(config);
-	MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_2e )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_2e, this));
 MACHINE_CONFIG_END
-MACHINE_START_MEMBER(astrafr_state,astra_57)
+void astrafr_state::machine_start_astra_57()
 {
 //  fgpa_after_rom_write_addr = 0x20;
 //  fgpa_first_read_addr = 0x23;
 	fgpa_rom_write_addr = 0x57;
-	MACHINE_START_CALL_MEMBER(astra_common);
+	machine_start_astra_common();
 }
 MACHINE_CONFIG_START(astrafr_state::astra_single_alt)
 	MCFG_DEVICE_ADD("maincpu", M68340, 16000000)
 	MCFG_DEVICE_PROGRAM_MAP(astra_map)
-	MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_common, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(astrafr_state::astra_single_alt_57)
 	astra_single_alt(config);
-	MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_57 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_57, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(astrafr_state::astra_single_alt_37)
 	astra_single_alt(config);
-	MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astra_37, this));
 MACHINE_CONFIG_END
 /* are the ptM roms Master and ptS roms Slave?
--- a/src/mame/drivers/astrcorp.cpp
+++ b/src/mame/drivers/astrcorp.cpp
@ -89,7 +89,7 @@ public:
 	void init_astoneag();
 	void init_showhanc();
 	void init_showhand();
-	DECLARE_VIDEO_START(astrocorp);
+	void video_start_astrocorp() ATTR_COLD;
 	uint32_t screen_update_astrocorp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	TIMER_DEVICE_CALLBACK_MEMBER(skilldrp_scanline);
 	void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -107,7 +107,7 @@ public:
                                Video
 ***************************************************************************/
-VIDEO_START_MEMBER(astrocorp_state,astrocorp)
+void astrocorp_state::video_start_astrocorp()
 {
 	m_screen->register_screen_bitmap(m_bitmap);
@ -532,7 +532,7 @@ MACHINE_CONFIG_START(astrocorp_state::showhand)
 	MCFG_PALETTE_ADD("palette", 0x100)
 	MCFG_PALETTE_FORMAT(BBBBBGGGGGGRRRRR)
-	MCFG_VIDEO_START_OVERRIDE(astrocorp_state,astrocorp)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_astrocorp, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -587,7 +587,7 @@ MACHINE_CONFIG_START(astrocorp_state::skilldrp)
 	MCFG_PALETTE_ADD("palette", 0x100)
 	MCFG_PALETTE_FORMAT(BBBBBGGGGGGRRRRR)
-	MCFG_VIDEO_START_OVERRIDE(astrocorp_state,astrocorp)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_astrocorp, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/astrocde.cpp
+++ b/src/mame/drivers/astrocde.cpp
@ -1214,7 +1214,7 @@ MACHINE_CONFIG_START(astrocde_state::astrocade_16color_base)
 	MCFG_PALETTE_ENTRIES(4096)
 	MCFG_PALETTE_INIT_OWNER(astrocde_state,profpac)
-	MCFG_VIDEO_START_OVERRIDE(astrocde_state,profpac)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_profpac, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(astrocde_state, screen_update_profpac)
--- a/src/mame/drivers/astrof.cpp
+++ b/src/mame/drivers/astrof.cpp
@ -464,7 +464,7 @@ READ8_MEMBER(astrof_state::tomahawk_protection_r)
 *
 *************************************/
-MACHINE_START_MEMBER(astrof_state,astrof)
+void astrof_state::machine_start_astrof()
 {
 	/* the 74175 outputs all HI's if not otherwise set */
 	astrof_set_video_control_2(0xff);
@ -482,16 +482,16 @@ MACHINE_START_MEMBER(astrof_state,astrof)
 }
-MACHINE_START_MEMBER(astrof_state,abattle)
+void astrof_state::machine_start_abattle()
 {
 	/* register for state saving */
 	save_item(NAME(m_abattle_count));
-	MACHINE_START_CALL_MEMBER(astrof);
+	machine_start_astrof();
 }
-MACHINE_START_MEMBER(astrof_state,spfghmk2)
+void astrof_state::machine_start_spfghmk2()
 {
 	/* the 74175 outputs all HI's if not otherwise set */
 	spfghmk2_set_video_control_2(0xff);
@ -507,7 +507,7 @@ MACHINE_START_MEMBER(astrof_state,spfghmk2)
 }
-MACHINE_START_MEMBER(astrof_state,tomahawk)
+void astrof_state::machine_start_tomahawk()
 {
 	/* the 74175 outputs all HI's if not otherwise set */
 	tomahawk_set_video_control_2(0xff);
@ -526,7 +526,7 @@ MACHINE_START_MEMBER(astrof_state,tomahawk)
 *
 *************************************/
-MACHINE_RESET_MEMBER(astrof_state,abattle)
+void astrof_state::machine_reset_abattle()
 {
 	m_abattle_count = 0;
 }
@ -933,7 +933,7 @@ MACHINE_CONFIG_START(astrof_state::astrof)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(astrof_map)
-	MCFG_MACHINE_START_OVERRIDE(astrof_state,astrof)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astrof, this));
 	/* video hardware */
 	MCFG_SCREEN_MODIFY("screen")
@ -949,8 +949,8 @@ MACHINE_CONFIG_START(astrof_state::abattle)
 	/* basic machine hardware */
-	MCFG_MACHINE_START_OVERRIDE(astrof_state,abattle)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_abattle, this));
-	MCFG_MACHINE_RESET_OVERRIDE(astrof_state,abattle)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_abattle, this));
 MACHINE_CONFIG_END
@ -961,7 +961,7 @@ MACHINE_CONFIG_START(astrof_state::spfghmk2)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(spfghmk2_map)
-	MCFG_MACHINE_START_OVERRIDE(astrof_state,spfghmk2)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_spfghmk2, this));
 	/* video hardware */
 	MCFG_SCREEN_MODIFY("screen")
@ -979,7 +979,7 @@ MACHINE_CONFIG_START(astrof_state::tomahawk)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(tomahawk_map)
-	MCFG_MACHINE_START_OVERRIDE(astrof_state,tomahawk)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_tomahawk, this));
 	/* video hardware */
 	MCFG_SCREEN_MODIFY("screen")
--- a/src/mame/drivers/astrohome.cpp
+++ b/src/mame/drivers/astrohome.cpp
@ -35,7 +35,7 @@ public:
 	void astrocde(machine_config &config);
 private:
 	DECLARE_READ8_MEMBER(inputs_r);
-	DECLARE_MACHINE_START(astrocde);
+	void machine_start_astrocde() ATTR_COLD;
 	void astrocade_io(address_map &map);
 	void astrocade_mem(address_map &map);
@ -220,7 +220,7 @@ MACHINE_CONFIG_START(astrocde_mess_state::astrocde)
 	MCFG_DEVICE_PROGRAM_MAP(astrocade_mem)
 	MCFG_DEVICE_IO_MAP(astrocade_io)
-	MCFG_MACHINE_START_OVERRIDE(astrocde_mess_state, astrocde)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_astrocde, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -284,7 +284,7 @@ void astrocde_state::init_astrocde()
 	m_video_config = AC_SOUND_PRESENT | AC_LIGHTPEN_INTS;
 }
-MACHINE_START_MEMBER(astrocde_mess_state, astrocde)
+void astrocde_mess_state::machine_start_astrocde()
 {
 	if (m_cart->exists())
 		m_maincpu->space(AS_PROGRAM).install_read_handler(0x2000, 0x3fff, read8_delegate(FUNC(astrocade_cart_slot_device::read_rom),(astrocade_cart_slot_device*)m_cart));
--- a/src/mame/drivers/at.cpp
+++ b/src/mame/drivers/at.cpp
@ -117,7 +117,7 @@ public:
 	DECLARE_READ16_MEMBER(ps1_unk_r);
 	DECLARE_WRITE16_MEMBER(ps1_unk_w);
 	DECLARE_READ8_MEMBER(ps1_portb_r);
-	DECLARE_MACHINE_START(vrom_fix);
+	void machine_start_vrom_fix() ATTR_COLD;
 	void init_at_common(int xmsbase);
 	uint16_t m_ps1_reg[2];
@ -397,7 +397,7 @@ void at_state::init_atpci()
 	init_at_common(0x100000);
 }
-MACHINE_START_MEMBER(at_state,vrom_fix)
+void at_state::machine_start_vrom_fix()
 {
 	address_space& space = m_maincpu->space(AS_PROGRAM);
 	space.install_read_bank(0xc0000, 0xcffff, "vrom_bank");
@ -482,7 +482,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(at_state::ibmps1)
 	ibm5170(config);
-	MCFG_MACHINE_START_OVERRIDE(at_state, vrom_fix)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_vrom_fix, this));
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_CLOCK(XTAL(10'000'000))
 	MCFG_DEVICE_PROGRAM_MAP(at16l_map)
@ -704,7 +704,7 @@ MACHINE_CONFIG_START(at_state::megapcpla)
 	MCFG_DEVICE_PROGRAM_MAP(at32l_map)
 	MCFG_DEVICE_IO_MAP(at32_io)
 	MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
-	MCFG_MACHINE_START_OVERRIDE(at_state, vrom_fix)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_vrom_fix, this));
 	MCFG_DEVICE_ADD("mb", AT_MB, 0)
 	MCFG_QUANTUM_TIME(attotime::from_hz(60))
--- a/src/mame/drivers/atari400.cpp
+++ b/src/mame/drivers/atari400.cpp
@ -261,13 +261,13 @@ public:
 		m_cart(*this, "cartleft"),
 		m_cart2(*this, "cartright") { }
-	DECLARE_MACHINE_START(a400);
+	void machine_start_a400() ATTR_COLD;
-	DECLARE_MACHINE_START(a800);
+	void machine_start_a800() ATTR_COLD;
-	DECLARE_MACHINE_START(a800xl);
+	void machine_start_a800xl() ATTR_COLD;
-	DECLARE_MACHINE_START(a5200);
+	void machine_start_a5200() ATTR_COLD;
 	DECLARE_PALETTE_INIT(a400);
-	DECLARE_MACHINE_RESET(a400);
+	void machine_reset_a400();
 	DECLARE_WRITE8_MEMBER(gtia_cb);
@ -2010,14 +2010,14 @@ TIMER_DEVICE_CALLBACK_MEMBER( a400_state::a5200_interrupt )
 	m_antic->generic_interrupt(4);
 }
-MACHINE_RESET_MEMBER( a400_state, a400 )
+void a400_state::machine_reset_a400()
 {
 	pokey_device *pokey = machine().device<pokey_device>("pokey");
 	pokey->write(15,0);
 }
-MACHINE_START_MEMBER( a400_state, a400 )
+void a400_state::machine_start_a400()
 {
 	setup_ram(0, m_ram->size());
 	setup_ram(1, m_ram->size());
@ -2030,7 +2030,7 @@ MACHINE_START_MEMBER( a400_state, a400 )
 }
-MACHINE_START_MEMBER( a400_state, a800 )
+void a400_state::machine_start_a800()
 {
 	setup_ram(0, m_ram->size());
 	setup_ram(1, m_ram->size());
@ -2043,7 +2043,7 @@ MACHINE_START_MEMBER( a400_state, a800 )
 	save_item(NAME(m_last_offs));
 }
-MACHINE_START_MEMBER( a400_state, a800xl )
+void a400_state::machine_start_a800xl()
 {
 	m_mmu = 0xfd;
 	m_ext_bank = 0x03;  // only used by a130xe
@ -2057,7 +2057,7 @@ MACHINE_START_MEMBER( a400_state, a800xl )
 }
-MACHINE_START_MEMBER( a400_state, a5200 )
+void a400_state::machine_start_a5200()
 {
 	setup_cart(m_cart);
@ -2109,7 +2109,7 @@ MACHINE_CONFIG_START(a400_state::atari_common_nodac)
 	/* basic machine hardware */
 	MCFG_DEVICE_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT)
-	MCFG_MACHINE_RESET_OVERRIDE( a400_state, a400 )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_a400, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -2187,7 +2187,7 @@ MACHINE_CONFIG_START(a400_state::a400)
 	MCFG_DEVICE_PROGRAM_MAP(a400_mem)
 	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1)
-	MCFG_MACHINE_START_OVERRIDE( a400_state, a400 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_a400, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
@ -2206,7 +2206,7 @@ MACHINE_CONFIG_START(a400_state::a400pal)
 	MCFG_DEVICE_PROGRAM_MAP(a400_mem)
 	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1)
-	MCFG_MACHINE_START_OVERRIDE( a400_state, a400 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_a400, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_REFRESH_RATE_ANTIC_50HZ()
@ -2225,7 +2225,7 @@ MACHINE_CONFIG_START(a400_state::a800)
 	MCFG_DEVICE_PROGRAM_MAP(a400_mem)
 	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1)
-	MCFG_MACHINE_START_OVERRIDE( a400_state, a800 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_a800, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
@ -2246,7 +2246,7 @@ MACHINE_CONFIG_START(a400_state::a800pal)
 	MCFG_DEVICE_PROGRAM_MAP(a400_mem)
 	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1)
-	MCFG_MACHINE_START_OVERRIDE( a400_state, a800 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_a800, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_REFRESH_RATE_ANTIC_50HZ()
@ -2270,7 +2270,7 @@ MACHINE_CONFIG_START(a400_state::a600xl)
 	MCFG_DEVICE_MODIFY("pia")
 	MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, a400_state, a600xl_pia_pb_w))
-	MCFG_MACHINE_START_OVERRIDE( a400_state, a800xl )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_a800xl, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
@ -2295,7 +2295,7 @@ MACHINE_CONFIG_START(a400_state::a800xl)
 	MCFG_DEVICE_MODIFY("pia")
 	MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, a400_state, a800xl_pia_pb_w))
-	MCFG_MACHINE_START_OVERRIDE( a400_state, a800xl )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_a800xl, this));
 	MCFG_RAM_MODIFY(RAM_TAG)
 	MCFG_RAM_DEFAULT_SIZE("64K")
@ -2394,7 +2394,7 @@ MACHINE_CONFIG_START(a400_state::a5200)
 	MCFG_PIA_READPB_HANDLER(NOOP) // FIXME: is there anything connected here
 	MCFG_PIA_CB2_HANDLER(NOOP) // FIXME: is there anything connected here
-	MCFG_MACHINE_START_OVERRIDE( a400_state, a5200 )
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_a5200, this));
 	MCFG_SCREEN_MODIFY( "screen" )
 	MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
--- a/src/mame/drivers/atarig1.cpp
+++ b/src/mame/drivers/atarig1.cpp
@ -40,13 +40,13 @@ void atarig1_state::update_interrupts()
 }
-MACHINE_START_MEMBER(atarig1_state,atarig1)
+void atarig1_state::machine_start_atarig1()
 {
 	atarigen_state::machine_start();
 }
-MACHINE_RESET_MEMBER(atarig1_state,atarig1)
+void atarig1_state::machine_reset_atarig1()
 {
 	atarigen_state::machine_reset();
 	scanline_timer_reset(*m_screen, 8);
@ -401,8 +401,8 @@ MACHINE_CONFIG_START(atarig1_state::atarig1)
 	MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
 	MCFG_DEVICE_PROGRAM_MAP(main_map)
-	MCFG_MACHINE_START_OVERRIDE(atarig1_state,atarig1)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_atarig1, this));
-	MCFG_MACHINE_RESET_OVERRIDE(atarig1_state,atarig1)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atarig1, this));
 	MCFG_DEVICE_ADD("adc", ADC0809, ATARI_CLOCK_14MHz/16)
 	MCFG_ADC0808_IN0_CB(IOPORT("ADC0"))
@ -431,7 +431,7 @@ MACHINE_CONFIG_START(atarig1_state::atarig1)
 	MCFG_SCREEN_PALETTE("palette")
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarig1_state, video_int_write_line))
-	MCFG_VIDEO_START_OVERRIDE(atarig1_state,atarig1)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_atarig1, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/atarig42.cpp
+++ b/src/mame/drivers/atarig42.cpp
@ -545,7 +545,7 @@ MACHINE_CONFIG_START(atarig42_state::atarig42)
 	MCFG_SCREEN_PALETTE("palette")
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarig42_state, video_int_write_line))
-	MCFG_VIDEO_START_OVERRIDE(atarig42_state,atarig42)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_atarig42, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/atarigt.cpp
+++ b/src/mame/drivers/atarigt.cpp
@ -76,7 +76,7 @@ void atarigt_state::update_interrupts()
 }
-MACHINE_RESET_MEMBER(atarigt_state,atarigt)
+void atarigt_state::machine_reset_atarigt()
 {
 	atarigen_state::machine_reset();
 	scanline_timer_reset(*m_screen, 8);
@ -798,7 +798,7 @@ MACHINE_CONFIG_START(atarigt_state::atarigt)
 	MCFG_DEVICE_PROGRAM_MAP(main_map)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(atarigt_state, scanline_int_gen, 250)
-	MCFG_MACHINE_RESET_OVERRIDE(atarigt_state,atarigt)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atarigt, this));
 	MCFG_DEVICE_ADD("adc", ADC0809, ATARI_CLOCK_14MHz/16) // should be 447 kHz according to schematics, but that fails the self-test
 	MCFG_ADC0808_IN2_CB(IOPORT("AN4"))
@ -824,7 +824,7 @@ MACHINE_CONFIG_START(atarigt_state::atarigt)
 	MCFG_SCREEN_UPDATE_DRIVER(atarigt_state, screen_update_atarigt)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarigt_state, video_int_write_line))
-	MCFG_VIDEO_START_OVERRIDE(atarigt_state,atarigt)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_atarigt, this));
 	MCFG_ATARIRLE_ADD("rle", modesc)
--- a/src/mame/drivers/atarisy1.cpp
+++ b/src/mame/drivers/atarisy1.cpp
@ -218,7 +218,7 @@ void atarisy1_state::update_interrupts()
 }
-MACHINE_START_MEMBER(atarisy1_state,atarisy1)
+void atarisy1_state::machine_start_atarisy1()
 {
 	atarigen_state::machine_start();
@ -227,7 +227,7 @@ MACHINE_START_MEMBER(atarisy1_state,atarisy1)
 }
-MACHINE_RESET_MEMBER(atarisy1_state,atarisy1)
+void atarisy1_state::machine_reset_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)
-	MCFG_MACHINE_START_OVERRIDE(atarisy1_state,atarisy1)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_atarisy1, this));
-	MCFG_MACHINE_RESET_OVERRIDE(atarisy1_state,atarisy1)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atarisy1, this));
 	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))
-	MCFG_VIDEO_START_OVERRIDE(atarisy1_state,atarisy1)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_atarisy1, this));
 	/* sound hardware */
 	MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", INPUTLINE("maincpu", M68K_IRQ_6))
--- a/src/mame/drivers/atarisy2.cpp
+++ b/src/mame/drivers/atarisy2.cpp
@ -195,7 +195,7 @@ void atarisy2_state::scanline_update(screen_device &screen, int scanline)
 *
 *************************************/
-MACHINE_START_MEMBER(atarisy2_state,atarisy2)
+void atarisy2_state::machine_start_atarisy2()
 {
 	atarigen_state::machine_start();
@ -209,7 +209,7 @@ MACHINE_START_MEMBER(atarisy2_state,atarisy2)
 }
-MACHINE_RESET_MEMBER(atarisy2_state,atarisy2)
+void atarisy2_state::machine_reset_atarisy2()
 {
 	atarigen_state::machine_reset();
 	m_slapstic->slapstic_reset();
@ -1191,8 +1191,8 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2)
 	MCFG_DEVICE_PROGRAM_MAP(sound_map)
 	MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, MASTER_CLOCK/2/16/16/16/10)
-	MCFG_MACHINE_START_OVERRIDE(atarisy2_state,atarisy2)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_atarisy2, this));
-	MCFG_MACHINE_RESET_OVERRIDE(atarisy2_state,atarisy2)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atarisy2, this));
 	MCFG_DEVICE_ADD("adc", ADC0809, MASTER_CLOCK/32) // 625 kHz
 	MCFG_ADC0808_IN0_CB(IOPORT("ADC0")) // J102 pin 5 (POT1)
@ -1233,7 +1233,7 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2)
 	MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE)
 	MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000)
-	MCFG_VIDEO_START_OVERRIDE(atarisy2_state,atarisy2)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_atarisy2, this));
 	/* sound hardware */
 	MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", NOOP)
--- a/src/mame/drivers/atarisy4.cpp
+++ b/src/mame/drivers/atarisy4.cpp
@ -99,7 +99,7 @@ public:
 	virtual void machine_reset() override;
 	virtual void video_start() override;
 	virtual void video_reset() override;
-	DECLARE_MACHINE_RESET(airrace);
+	void machine_reset_airrace();
 	uint32_t screen_update_atarisy4(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	INTERRUPT_GEN_MEMBER(vblank_int);
 	void image_mem_to_screen( bool clip);
@ -796,7 +796,7 @@ MACHINE_CONFIG_START(atarisy4_state::airrace)
 	MCFG_DEVICE_IO_MAP(dsp1_io_map)
 	MCFG_TMS32010_BIO_IN_CB(READLINE(*this, atarisy4_state, dsp1_bio_r))
-	MCFG_MACHINE_RESET_OVERRIDE(atarisy4_state,airrace)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_airrace, this));
 MACHINE_CONFIG_END
@ -1053,7 +1053,7 @@ void atarisy4_state::machine_reset()
 	m_dsp0->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
 }
-MACHINE_RESET_MEMBER(atarisy4_state,airrace)
+void atarisy4_state::machine_reset_airrace()
 {
 	m_dsp0->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
 	m_dsp1->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
--- a/src/mame/drivers/atm.cpp
+++ b/src/mame/drivers/atm.cpp
@ -33,7 +33,7 @@ public:
 	DECLARE_READ8_MEMBER(beta_neutral_r);
 	DECLARE_READ8_MEMBER(beta_enable_r);
 	DECLARE_READ8_MEMBER(beta_disable_r);
-	DECLARE_MACHINE_RESET(atm);
+	void machine_reset_atm();
 	void atm(machine_config &config);
 	void atmtb2(machine_config &config);
@ -140,7 +140,7 @@ void atm_state::atm_switch(address_map &map)
 	map(0x4000, 0xffff).r(this, FUNC(atm_state::beta_disable_r));
 }
-MACHINE_RESET_MEMBER(atm_state,atm)
+void atm_state::machine_reset_atm()
 {
 	uint8_t *messram = m_ram->pointer();
 	m_program = &m_maincpu->space(AS_PROGRAM);
@ -192,7 +192,7 @@ MACHINE_CONFIG_START(atm_state::atm)
 	MCFG_DEVICE_PROGRAM_MAP(atm_mem)
 	MCFG_DEVICE_IO_MAP(atm_io)
 	MCFG_DEVICE_OPCODES_MAP(atm_switch)
-	MCFG_MACHINE_RESET_OVERRIDE(atm_state, atm )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_atm, this));
 	MCFG_BETA_DISK_ADD(BETA_DISK_TAG)
--- a/src/mame/drivers/badlands.cpp
+++ b/src/mame/drivers/badlands.cpp
@ -185,13 +185,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(badlands_state::sound_scanline)
 }
-MACHINE_START_MEMBER(badlands_state,badlands)
+void badlands_state::machine_start_badlands()
 {
 	save_item(NAME(m_pedal_value));
 }
-MACHINE_RESET_MEMBER(badlands_state,badlands)
+void badlands_state::machine_reset_badlands()
 {
 	m_pedal_value[0] = m_pedal_value[1] = 0x80;
@ -451,8 +451,8 @@ MACHINE_CONFIG_START(badlands_state::badlands)
 	MCFG_DEVICE_PROGRAM_MAP(audio_map)
 	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", badlands_state, sound_scanline, "screen", 0, 1)
-	MCFG_MACHINE_START_OVERRIDE(badlands_state,badlands)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_badlands, this));
-	MCFG_MACHINE_RESET_OVERRIDE(badlands_state,badlands)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_badlands, this));
 	MCFG_EEPROM_2816_ADD("eeprom")
 	MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@ -477,7 +477,7 @@ MACHINE_CONFIG_START(badlands_state::badlands)
 	MCFG_SCREEN_UPDATE_DRIVER(badlands_state, screen_update_badlands)
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(badlands_state,badlands)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_badlands, this));
 	/* sound hardware */
 	MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", INPUTLINE("maincpu", M68K_IRQ_2))
--- a/src/mame/drivers/badlandsbl.cpp
+++ b/src/mame/drivers/badlandsbl.cpp
@ -230,7 +230,7 @@ MACHINE_CONFIG_START(badlandsbl_state::badlandsb)
 //  MCFG_QUANTUM_PERFECT_CPU("maincpu")
-	MCFG_MACHINE_START_OVERRIDE(badlands_state,badlands)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_badlands, this));
 	MCFG_EEPROM_2816_ADD("eeprom")
 	MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@ -253,7 +253,7 @@ MACHINE_CONFIG_START(badlandsbl_state::badlandsb)
 	MCFG_SCREEN_UPDATE_DRIVER(badlandsbl_state, screen_update_badlandsbl)
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(badlands_state,badlands)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_badlands, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/battlex.cpp
+++ b/src/mame/drivers/battlex.cpp
@ -324,7 +324,7 @@ MACHINE_CONFIG_START(battlex_state::dodgeman)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_IO_MAP(dodgeman_io_map)
-	MCFG_VIDEO_START_OVERRIDE(battlex_state, dodgeman)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_dodgeman, this));
 	MCFG_DEVICE_ADD("ay2", AY8910, XTAL(10'000'000)/8)   // ?
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@ -845,8 +845,8 @@ MACHINE_CONFIG_START(bbc_state::bbca)
 	MCFG_RAM_EXTRA_OPTIONS("32K")
 	MCFG_RAM_DEFAULT_VALUE(0x00)
-	MCFG_MACHINE_START_OVERRIDE(bbc_state, bbca)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbca, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbca)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbca, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -868,7 +868,7 @@ MACHINE_CONFIG_START(bbc_state::bbca)
 	MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, bbc_state, bbc_hsync_changed))
 	MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, bbc_state, bbc_vsync_changed))
-	MCFG_VIDEO_START_OVERRIDE(bbc_state, bbc)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_bbc, this));
 	MCFG_DEFAULT_LAYOUT(layout_bbc)
@ -925,8 +925,8 @@ MACHINE_CONFIG_START(bbc_state::bbcb)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(bbcb_nofdc_mem)
-	MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcb)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbcb, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcb)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbcb, this));
 	/* internal ram */
 	MCFG_RAM_MODIFY(RAM_TAG)
@ -1053,8 +1053,8 @@ MACHINE_CONFIG_START(bbc_state::bbcbp)
 	MCFG_DEVICE_PROGRAM_MAP(bbcbp_mem)
 	MCFG_DEVICE_OPCODES_MAP(bbcbp_fetch)
-	MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcbp)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbcbp, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcbp)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbcbp, this));
 	/* fdc */
 	MCFG_DEVICE_REMOVE("fdc")
@ -1076,8 +1076,8 @@ MACHINE_CONFIG_START(bbc_state::bbcbp128)
 	MCFG_DEVICE_PROGRAM_MAP(bbcbp128_mem)
 	MCFG_DEVICE_OPCODES_MAP(bbcbp_fetch)
-	MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcbp)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbcbp, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcbp)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbcbp, this));
 MACHINE_CONFIG_END
@ -1094,7 +1094,7 @@ MACHINE_CONFIG_START(torch_state::torchf)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(bbcb_mem)
-	MCFG_MACHINE_RESET_OVERRIDE(bbc_state, torch)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_torch, this));
 	/* fdc */
 	MCFG_DEVICE_REMOVE("fdc")
@ -1310,8 +1310,8 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
 	MCFG_RAM_DEFAULT_SIZE("32K")
 	MCFG_RAM_DEFAULT_VALUE(0x00)
-	MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcm)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbcm, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcm)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbcm, this));
 	MCFG_DEFAULT_LAYOUT(layout_bbcm)
@ -1335,7 +1335,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
 	MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, bbc_state, bbc_hsync_changed))
 	MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, bbc_state, bbc_vsync_changed))
-	MCFG_VIDEO_START_OVERRIDE(bbc_state, bbc)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_bbc, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -1568,7 +1568,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(bbc_state::cfa3000)
 	bbcm(config);
-	MCFG_MACHINE_START_OVERRIDE(bbc_state, cfa3000)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cfa3000, this));
 	/* fdc */
 	MCFG_DEVICE_MODIFY("wd1770:0")
@ -1625,8 +1625,8 @@ MACHINE_CONFIG_START(bbc_state::bbcmc)
 	/* eeprom pcd8572 */
 	//MCFG_DEVICE_REMOVE("rtc")
-	MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcmc)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_bbcmc, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcmc)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bbcmc, this));
 	/* user via */
 	MCFG_DEVICE_MODIFY("via6522_1")
@ -1681,14 +1681,14 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(bbc_state::ltmpbp)
 	bbcbp(config);
 	/* basic machine hardware */
-	MCFG_MACHINE_RESET_OVERRIDE(bbc_state, ltmpbp)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ltmpbp, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(bbc_state::ltmpm)
 	bbcm(config);
 	/* basic machine hardware */
-	MCFG_MACHINE_RESET_OVERRIDE(bbc_state, ltmpm)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ltmpm, this));
 MACHINE_CONFIG_END
--- a/src/mame/drivers/bbusters.cpp
+++ b/src/mame/drivers/bbusters.cpp
@ -679,7 +679,7 @@ MACHINE_CONFIG_START(bbusters_state::bbusters)
 	MCFG_PALETTE_ADD("palette", 2048)
 	MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
-	MCFG_VIDEO_START_OVERRIDE(bbusters_state,bbuster)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_bbuster, this));
 	MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16)
 	MCFG_DEVICE_ADD("spriteram2", BUFFERED_SPRITERAM16)
@ -722,7 +722,7 @@ MACHINE_CONFIG_START(bbusters_state::mechatt)
 	MCFG_PALETTE_ADD("palette", 1024)
 	MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
-	MCFG_VIDEO_START_OVERRIDE(bbusters_state,mechatt)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mechatt, this));
 	MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16)
--- a/src/mame/drivers/bking.cpp
+++ b/src/mame/drivers/bking.cpp
@ -345,7 +345,7 @@ void bking_state::machine_start()
 	save_item(NAME(m_hit));
 }
-MACHINE_START_MEMBER(bking_state,bking3)
+void bking_state::machine_start_bking3()
 {
 	bking_state::machine_start();
@ -380,7 +380,7 @@ void bking_state::machine_reset()
 	m_soundnmi->in_w<1>(0);
 }
-MACHINE_RESET_MEMBER(bking_state,bking3)
+void bking_state::machine_reset_bking3()
 {
 	bking_state::machine_reset();
@ -452,8 +452,8 @@ MACHINE_CONFIG_START(bking_state::bking3)
 	MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(3'000'000))      /* xtal is 3MHz, divided by 4 internally */
-	MCFG_MACHINE_START_OVERRIDE(bking_state,bking3)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_bking3, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bking_state,bking3)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bking3, this));
 	MCFG_QUANTUM_TIME(attotime::from_hz(6000))
 MACHINE_CONFIG_END
--- a/src/mame/drivers/blitz68k.cpp
+++ b/src/mame/drivers/blitz68k.cpp
@ -176,8 +176,8 @@ public:
 	void init_megadblj();
 	void init_hermit();
 	void init_dualgame();
-	DECLARE_VIDEO_START(blitz68k);
+	void video_start_blitz68k() ATTR_COLD;
-	DECLARE_VIDEO_START(blitz68k_addr_factor1);
+	void video_start_blitz68k_addr_factor1() ATTR_COLD;
 	uint32_t screen_update_blitz68k(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_blitz68k_noblit(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	TIMER_DEVICE_CALLBACK_MEMBER(steaser_mcu_sim);
@ -224,15 +224,15 @@ struct blit_t
 	int addr_factor;
 } blit;
-VIDEO_START_MEMBER(blitz68k_state,blitz68k)
+void blitz68k_state::video_start_blitz68k()
 {
 	m_blit_buffer = std::make_unique<uint8_t[]>(512*256);
 	blit.addr_factor = 2;
 }
-VIDEO_START_MEMBER(blitz68k_state,blitz68k_addr_factor1)
+void blitz68k_state::video_start_blitz68k_addr_factor1()
 {
-	VIDEO_START_CALL_MEMBER(blitz68k);
+	video_start_blitz68k();
 	blit.addr_factor = 1;
 }
@ -1719,7 +1719,7 @@ MACHINE_CONFIG_START(blitz68k_state::ilpag)
 	MCFG_PALETTE_ADD("palette", 0x100)
-	MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this));
 	MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
 MACHINE_CONFIG_END
@ -1794,7 +1794,7 @@ MACHINE_CONFIG_START(blitz68k_state::cjffruit)
 	MCFG_PALETTE_ADD("palette", 0x100)
-	MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this));
 	MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
 MACHINE_CONFIG_END
@ -1826,7 +1826,7 @@ MACHINE_CONFIG_START(blitz68k_state::bankrob)
 	MCFG_PALETTE_ADD("palette", 0x100)
-	MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this));
 	MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
 MACHINE_CONFIG_END
@ -1856,7 +1856,7 @@ MACHINE_CONFIG_START(blitz68k_state::bankroba)
 	MCFG_PALETTE_ADD("palette", 0x100)
-	MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k_addr_factor1)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k_addr_factor1, this));
 	MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
 MACHINE_CONFIG_END
@ -1885,7 +1885,7 @@ MACHINE_CONFIG_START(blitz68k_state::deucesw2)
 	MCFG_PALETTE_ADD("palette", 0x100)
-	MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this));
 	MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
 MACHINE_CONFIG_END
@ -1916,7 +1916,7 @@ MACHINE_CONFIG_START(blitz68k_state::dualgame)
 	MCFG_PALETTE_ADD("palette", 0x100)
-	MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this));
 	MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
 MACHINE_CONFIG_END
@ -1945,7 +1945,7 @@ MACHINE_CONFIG_START(blitz68k_state::hermit)
 	MCFG_PALETTE_ADD("palette", 0x100)
-	MCFG_VIDEO_START_OVERRIDE(blitz68k_state,blitz68k)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_blitz68k, this));
 	MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
 MACHINE_CONFIG_END
--- a/src/mame/drivers/blmbycar.cpp
+++ b/src/mame/drivers/blmbycar.cpp
@ -333,13 +333,11 @@ GFXDECODE_END
 /***************************************************************************
                                Machine Drivers
 ***************************************************************************/
-MACHINE_START_MEMBER(blmbycar_state,blmbycar)
+void blmbycar_state::machine_start_blmbycar()
 {
 	save_item(NAME(m_pot_wheel));
 	save_item(NAME(m_old_val));
@ -347,13 +345,12 @@ MACHINE_START_MEMBER(blmbycar_state,blmbycar)
 	membank("okibank")->configure_entries(0, 16, memregion("oki")->base(), 0x10000);
 }
-MACHINE_RESET_MEMBER(blmbycar_state,blmbycar)
+void blmbycar_state::machine_reset_blmbycar()
 {
 	m_pot_wheel = 0;
 	m_old_val = 0;
 }
 MACHINE_CONFIG_START(blmbycar_state::blmbycar)
 	/* basic machine hardware */
@ -361,8 +358,8 @@ MACHINE_CONFIG_START(blmbycar_state::blmbycar)
 	MCFG_DEVICE_PROGRAM_MAP(blmbycar_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blmbycar_state,  irq1_line_hold)
-	MCFG_MACHINE_START_OVERRIDE(blmbycar_state,blmbycar)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_blmbycar, this));
-	MCFG_MACHINE_RESET_OVERRIDE(blmbycar_state,blmbycar)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_blmbycar, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -389,14 +386,14 @@ MACHINE_CONFIG_START(blmbycar_state::blmbycar)
 MACHINE_CONFIG_END
-MACHINE_START_MEMBER(blmbycar_state,watrball)
+void blmbycar_state::machine_start_watrball()
 {
 	save_item(NAME(m_retvalue));
 	membank("okibank")->configure_entries(0, 16, memregion("oki")->base(), 0x10000);
 }
-MACHINE_RESET_MEMBER(blmbycar_state,watrball)
+void blmbycar_state::machine_reset_watrball()
 {
 	m_retvalue = 0;
 }
@ -408,8 +405,8 @@ MACHINE_CONFIG_START(blmbycar_state::watrball)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(watrball_map)
-	MCFG_MACHINE_START_OVERRIDE(blmbycar_state,watrball)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_watrball, this));
-	MCFG_MACHINE_RESET_OVERRIDE(blmbycar_state,watrball)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_watrball, this));
 	/* video hardware */
 	MCFG_SCREEN_MODIFY("screen")
--- a/src/mame/drivers/blstroid.cpp
+++ b/src/mame/drivers/blstroid.cpp
@ -204,7 +204,7 @@ MACHINE_CONFIG_START(blstroid_state::blstroid)
 	MCFG_SCREEN_PALETTE("palette")
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, blstroid_state, video_int_write_line))
-	MCFG_VIDEO_START_OVERRIDE(blstroid_state,blstroid)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_blstroid, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
--- a/src/mame/drivers/blueprnt.cpp
+++ b/src/mame/drivers/blueprnt.cpp
@ -369,7 +369,7 @@ MACHINE_CONFIG_START(blueprnt_state::blueprnt)
 	MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
 	MCFG_SCREEN_SIZE(32*8, 32*8)
 	MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
-	MCFG_VIDEO_START_OVERRIDE(blueprnt_state, blueprnt)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_blueprnt, this));
 	MCFG_SCREEN_UPDATE_DRIVER(blueprnt_state, screen_update_blueprnt)
 	MCFG_SCREEN_PALETTE("palette")
--- a/src/mame/drivers/bml3.cpp
+++ b/src/mame/drivers/bml3.cpp
@ -974,7 +974,7 @@ MACHINE_CONFIG_START(bml3_state::bml3_common)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bml3_state,  bml3_timer_firq)
 //  MCFG_DEVICE_PERIODIC_INT_DRIVER(bml3_state, bml3_firq, 45)
-//  MCFG_MACHINE_RESET_OVERRIDE(bml3_state,bml3)
+//  set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bml3, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
--- a/src/mame/drivers/btime.cpp
+++ b/src/mame/drivers/btime.cpp
@ -1227,7 +1227,7 @@ static DISCRETE_SOUND_START( btime_sound_discrete )
 DISCRETE_SOUND_END
-MACHINE_START_MEMBER(btime_state,btime)
+void btime_state::machine_start_btime()
 {
 	save_item(NAME(m_btime_palette));
 	save_item(NAME(m_bnj_scroll1));
@ -1235,9 +1235,9 @@ MACHINE_START_MEMBER(btime_state,btime)
 	save_item(NAME(m_btime_tilemap));
 }
-MACHINE_START_MEMBER(btime_state,mmonkey)
+void btime_state::machine_start_mmonkey()
 {
-	MACHINE_START_CALL_MEMBER(btime);
+	machine_start_btime();
 	save_item(NAME(m_protection_command));
 	save_item(NAME(m_protection_status));
@ -1245,7 +1245,7 @@ MACHINE_START_MEMBER(btime_state,mmonkey)
 	save_item(NAME(m_protection_ret));
 }
-MACHINE_RESET_MEMBER(btime_state,btime)
+void btime_state::machine_reset_btime()
 {
 	/* by default, the audio NMI is disabled, except for bootlegs which don't use the enable */
 	if (m_audionmi.found())
@ -1260,16 +1260,16 @@ MACHINE_RESET_MEMBER(btime_state,btime)
 	m_btime_tilemap[3] = 0;
 }
-MACHINE_RESET_MEMBER(btime_state,lnc)
+void btime_state::machine_reset_lnc()
 {
 	*m_lnc_charbank = 1;
-	MACHINE_RESET_CALL_MEMBER(btime);
+	machine_reset_btime();
 }
-MACHINE_RESET_MEMBER(btime_state,mmonkey)
+void btime_state::machine_reset_mmonkey()
 {
-	MACHINE_RESET_CALL_MEMBER(lnc);
+	machine_reset_lnc();
 	m_protection_command = 0;
 	m_protection_status = 0;
@ -1296,8 +1296,8 @@ MACHINE_CONFIG_START(btime_state::btime)
 	MCFG_SCREEN_UPDATE_DRIVER(btime_state, screen_update_btime)
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_MACHINE_START_OVERRIDE(btime_state,btime)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_btime, this));
-	MCFG_MACHINE_RESET_OVERRIDE(btime_state,btime)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_btime, this));
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_btime)
@ -1356,7 +1356,7 @@ MACHINE_CONFIG_START(btime_state::lnc)
 	MCFG_DEVICE_REPLACE("maincpu", DECO_C10707, HCLK2)
 	MCFG_DEVICE_PROGRAM_MAP(lnc_map)
-	MCFG_MACHINE_RESET_OVERRIDE(btime_state,lnc)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lnc, this));
 	/* video hardware */
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_lnc)
@ -1388,8 +1388,8 @@ MACHINE_CONFIG_START(btime_state::mmonkey)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(mmonkey_map)
-	MCFG_MACHINE_START_OVERRIDE(btime_state,mmonkey)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mmonkey, this));
-	MCFG_MACHINE_RESET_OVERRIDE(btime_state,mmonkey)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mmonkey, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(btime_state::bnj)
@ -1403,7 +1403,7 @@ MACHINE_CONFIG_START(btime_state::bnj)
 	/* video hardware */
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_bnj)
-	MCFG_VIDEO_START_OVERRIDE(btime_state,bnj)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_bnj, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(btime_state, screen_update_bnj)
@ -1469,7 +1469,7 @@ MACHINE_CONFIG_START(btime_state::disco)
 	MCFG_PALETTE_MODIFY("palette")
 	MCFG_PALETTE_ENTRIES(32)
-	MCFG_VIDEO_START_OVERRIDE(btime_state,disco)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_disco, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(btime_state, screen_update_disco)
--- a/src/mame/drivers/bublbobl.cpp
+++ b/src/mame/drivers/bublbobl.cpp
@ -814,14 +814,14 @@ GFXDECODE_END
 *
 *************************************/
-MACHINE_START_MEMBER(bublbobl_state,common)
+void bublbobl_state::machine_start_common()
 {
 	m_sreset_old = CLEAR_LINE;
 	save_item(NAME(m_video_enable));
 	save_item(NAME(m_sreset_old));
 }
-MACHINE_RESET_MEMBER(bublbobl_state,common) // things common on both tokio and bubble bobble hw
+void bublbobl_state::machine_reset_common() // things common on both tokio and bubble bobble hw
 {
 	m_soundnmi->in_w<0>(0); // clear sound NMI stuff
 	m_soundnmi->in_w<1>(0);
@ -835,14 +835,14 @@ MACHINE_RESET_MEMBER(bublbobl_state,common) // things common on both tokio and b
 }
-MACHINE_START_MEMBER(bublbobl_state,tokio)
+void bublbobl_state::machine_start_tokio()
 {
-	MACHINE_START_CALL_MEMBER(common);
+	machine_start_common();
 }
-MACHINE_RESET_MEMBER(bublbobl_state,tokio)
+void bublbobl_state::machine_reset_tokio()
 {
-	MACHINE_RESET_CALL_MEMBER(common);
+	machine_reset_common();
 	tokio_bankswitch_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xFF); // force a bankswitch write of all zeroes, as /RESET clears the latch
 	tokio_videoctrl_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xFF); // TODO: does /RESET clear this the same as above? probably yes, needs tracing...
 }
@ -868,8 +868,8 @@ MACHINE_CONFIG_START(bublbobl_state::tokio)
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393, counts 128 vblanks before firing watchdog; same circuit as taitosj uses
-	MCFG_MACHINE_START_OVERRIDE(bublbobl_state, tokio)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_tokio, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bublbobl_state, tokio)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_tokio, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -926,9 +926,9 @@ MACHINE_CONFIG_START(bublbobl_state::tokiob)
 MACHINE_CONFIG_END
-MACHINE_START_MEMBER(bublbobl_state,bublbobl)
+void bublbobl_state::machine_start_bublbobl()
 {
-	MACHINE_START_CALL_MEMBER(common);
+	machine_start_common();
 	save_item(NAME(m_ddr1));
 	save_item(NAME(m_ddr2));
@ -944,9 +944,9 @@ MACHINE_START_MEMBER(bublbobl_state,bublbobl)
 	save_item(NAME(m_port4_out));
 }
-MACHINE_RESET_MEMBER(bublbobl_state,bublbobl)
+void bublbobl_state::machine_reset_bublbobl()
 {
-	MACHINE_RESET_CALL_MEMBER(common);
+	machine_reset_common();
 	bublbobl_bankswitch_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xFF); // force a bankswitch write of all zeroes, as /RESET clears the latch
 	m_ddr1 = 0;
@ -981,8 +981,8 @@ MACHINE_CONFIG_START(bublbobl_state::bublbobl_nomcu)
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393, counts 128 vblanks before firing watchdog; same circuit as taitosj uses
-	MCFG_MACHINE_START_OVERRIDE(bublbobl_state, bublbobl)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_bublbobl, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bublbobl_state, bublbobl)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bublbobl, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1027,17 +1027,17 @@ MACHINE_CONFIG_START(bublbobl_state::bublbobl)
 	MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("mcu", M6801_IRQ_LINE)) // same clock latches the INT pin on the second Z80
 MACHINE_CONFIG_END
-MACHINE_START_MEMBER(bublbobl_state,boblbobl)
+void bublbobl_state::machine_start_boblbobl()
 {
-	MACHINE_START_CALL_MEMBER(common);
+	machine_start_common();
 	save_item(NAME(m_ic43_a));
 	save_item(NAME(m_ic43_b));
 }
-MACHINE_RESET_MEMBER(bublbobl_state,boblbobl)
+void bublbobl_state::machine_reset_boblbobl()
 {
-	MACHINE_RESET_CALL_MEMBER(common);
+	machine_reset_common();
 	bublbobl_bankswitch_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xff); // force a bankswitch write of all zeroes, as /RESET clears the latch
 	m_ic43_a = 0;
@ -1052,14 +1052,14 @@ MACHINE_CONFIG_START(bublbobl_state::boblbobl)
 	MCFG_DEVICE_PROGRAM_MAP(bootleg_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold) // interrupt mode 1, unlike Bubble Bobble
-	MCFG_MACHINE_START_OVERRIDE(bublbobl_state, boblbobl)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_boblbobl, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bublbobl_state, boblbobl)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_boblbobl, this));
 MACHINE_CONFIG_END
-MACHINE_START_MEMBER(bub68705_state, bub68705)
+void bub68705_state::machine_start_bub68705()
 {
-	MACHINE_START_CALL_MEMBER(common);
+	machine_start_common();
 	save_item(NAME(m_port_a_out));
 	save_item(NAME(m_port_b_out));
@ -1070,9 +1070,9 @@ MACHINE_START_MEMBER(bub68705_state, bub68705)
 	m_port_b_out = 0xff;
 }
-MACHINE_RESET_MEMBER(bub68705_state, bub68705)
+void bub68705_state::machine_reset_bub68705()
 {
-	MACHINE_RESET_CALL_MEMBER(common);
+	machine_reset_common();
 	bublbobl_bankswitch_w(m_maincpu->space(AS_PROGRAM), 0, 0x00, 0xff); // force a bankswitch write of all zeroes, as /RESET clears the latch
 	m_address = 0;
@ -1089,8 +1089,8 @@ MACHINE_CONFIG_START(bub68705_state::bub68705)
 	MCFG_M68705_PORTB_W_CB(WRITE8(*this, bub68705_state, port_b_w))
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bub68705_state, bublbobl_m68705_interrupt) // ??? should come from the same clock which latches the INT pin on the second Z80
-	MCFG_MACHINE_START_OVERRIDE(bub68705_state, bub68705)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_bub68705, this));
-	MCFG_MACHINE_RESET_OVERRIDE(bub68705_state, bub68705)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_bub68705, this));
 MACHINE_CONFIG_END
--- a/src/mame/drivers/cabal.cpp
+++ b/src/mame/drivers/cabal.cpp
@ -56,13 +56,13 @@ Dip locations verified with Fabtek manual for the trackball version
 #include "speaker.h"
-MACHINE_START_MEMBER(cabal_state,cabalbl)
+void cabal_state::machine_start_cabalbl()
 {
 	save_item(NAME(m_sound_command1));
 	save_item(NAME(m_sound_command2));
 }
-MACHINE_RESET_MEMBER(cabal_state,cabalbl)
+void cabal_state::machine_reset_cabalbl()
 {
 	m_sound_command1 = m_sound_command2 = 0xff;
 }
@ -595,8 +595,8 @@ MACHINE_CONFIG_START(cabal_state::cabalbl)
 	MCFG_QUANTUM_TIME(attotime::from_hz(600))
-	MCFG_MACHINE_START_OVERRIDE(cabal_state,cabalbl)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cabalbl, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cabal_state,cabalbl)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cabalbl, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
--- a/src/mame/drivers/calcune.cpp
+++ b/src/mame/drivers/calcune.cpp
@ -41,8 +41,8 @@ public:
 	WRITE_LINE_MEMBER(vdp_lv6irqline_callback_genesis_68k);
 	WRITE_LINE_MEMBER(vdp_lv4irqline_callback_genesis_68k);
-	DECLARE_MACHINE_START(calcune);
+	void machine_start_calcune() ATTR_COLD;
-	DECLARE_MACHINE_RESET(calcune);
+	void machine_reset_calcune();
 	IRQ_CALLBACK_MEMBER(genesis_int_callback);
@ -198,7 +198,7 @@ uint32_t calcune_state::screen_update_calcune(screen_device &screen, bitmap_rgb3
 	return 0;
 }
-MACHINE_RESET_MEMBER(calcune_state,calcune)
+void calcune_state::machine_reset_calcune()
 {
 	m_vdp->device_reset_old();
 	m_vdp2->device_reset_old();
@ -242,7 +242,7 @@ WRITE_LINE_MEMBER(calcune_state::vdp_lv4irqline_callback_genesis_68k)
 		m_maincpu->set_input_line(4, CLEAR_LINE);
 }
-MACHINE_START_MEMBER(calcune_state,calcune)
+void calcune_state::machine_start_calcune()
 {
 	m_vdp->stop_timers();
 	m_vdp2->stop_timers();
@ -256,8 +256,8 @@ MACHINE_CONFIG_START(calcune_state::calcune)
 	MCFG_DEVICE_ADD("z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */
 	MCFG_DEVICE_DISABLE() /* no code is ever uploaded for the Z80, so it's unused here even if it is present on the PCB */
-	MCFG_MACHINE_START_OVERRIDE(calcune_state,calcune)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_calcune, this));
-	MCFG_MACHINE_RESET_OVERRIDE(calcune_state,calcune)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_calcune, this));
 	MCFG_SCREEN_ADD("megadriv", RASTER)
 	MCFG_SCREEN_REFRESH_RATE(60)
--- a/src/mame/drivers/camplynx.cpp
+++ b/src/mame/drivers/camplynx.cpp
@ -196,8 +196,8 @@ public:
 	DECLARE_WRITE8_MEMBER(port82_w); // banking 128k
 	DECLARE_WRITE8_MEMBER(port84_w); // dac port 48k
 	DECLARE_INPUT_CHANGED_MEMBER(brk_key);
-	DECLARE_MACHINE_RESET(lynx48k);
+	void machine_reset_lynx48k();
-	DECLARE_MACHINE_RESET(lynx128k);
+	void machine_reset_lynx128k();
 	void init_lynx48k();
 	void init_lynx128k();
 	DECLARE_FLOPPY_FORMATS(camplynx_floppy_formats);
@ -724,7 +724,7 @@ READ8_MEMBER( camplynx_state::port82_r )
 	return data;
 }
-MACHINE_RESET_MEMBER(camplynx_state, lynx48k)
+void camplynx_state::machine_reset_lynx48k()
 {
 	address_space &mem = m_maincpu->space(AS_PROGRAM);
 	m_port58 = 0;
@ -733,7 +733,7 @@ MACHINE_RESET_MEMBER(camplynx_state, lynx48k)
 	m_maincpu->reset();
 }
-MACHINE_RESET_MEMBER(camplynx_state, lynx128k)
+void camplynx_state::machine_reset_lynx128k()
 {
 	address_space &mem = m_maincpu->space(AS_PROGRAM);
 	m_port58 = 0;
@ -869,7 +869,7 @@ MACHINE_CONFIG_START(camplynx_state::lynx48k)
 	MCFG_DEVICE_PROGRAM_MAP(lynx48k_mem)
 	MCFG_DEVICE_IO_MAP(lynx48k_io)
-	MCFG_MACHINE_RESET_OVERRIDE(camplynx_state, lynx48k)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lynx48k, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -914,7 +914,7 @@ MACHINE_CONFIG_START(camplynx_state::lynx128k)
 	MCFG_DEVICE_PROGRAM_MAP(lynx128k_mem)
 	MCFG_DEVICE_IO_MAP(lynx128k_io)
-	MCFG_MACHINE_RESET_OVERRIDE(camplynx_state, lynx128k)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_lynx128k, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
--- a/src/mame/drivers/cat.cpp
+++ b/src/mame/drivers/cat.cpp
@ -287,9 +287,10 @@ public:
 	emu_timer *m_keyboard_timer;
 	emu_timer *m_6ms_timer;
-	DECLARE_MACHINE_START(cat);
+	void machine_start_cat() ATTR_COLD;
-	DECLARE_MACHINE_RESET(cat);
+	void machine_reset_cat();
-	DECLARE_VIDEO_START(cat);
+	void video_start_cat() ATTR_COLD;
 	void init_cat();
 	uint32_t screen_update_cat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -921,7 +922,7 @@ IRQ_CALLBACK_MEMBER(cat_state::cat_int_ack)
 	return M68K_INT_ACK_AUTOVECTOR;
 }
-MACHINE_START_MEMBER(cat_state,cat)
+void cat_state::machine_start_cat()
 {
 	m_duart_ktobf_ff = 0; // reset doesn't touch this
 	m_duart_prn_ack_prev_state = 1; // technically uninitialized
@ -934,7 +935,7 @@ MACHINE_START_MEMBER(cat_state,cat)
 	machine().device<nvram_device>("nvram")->set_base(m_svram, 0x4000);
 }
-MACHINE_RESET_MEMBER(cat_state,cat)
+void cat_state::machine_reset_cat()
 {
 	m_6ms_counter = 0;
 	m_wdt_counter = 0;
@ -942,7 +943,7 @@ MACHINE_RESET_MEMBER(cat_state,cat)
 	m_6ms_timer->adjust(attotime::zero, 0, attotime::from_hz((XTAL(19'968'000)/2)/65536));
 }
-VIDEO_START_MEMBER(cat_state,cat)
+void cat_state::video_start_cat()
 {
 }
@ -1061,8 +1062,8 @@ MACHINE_CONFIG_START(cat_state::cat)
 	MCFG_DEVICE_PROGRAM_MAP(cat_mem)
 	MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cat_state,cat_int_ack)
-	MCFG_MACHINE_START_OVERRIDE(cat_state,cat)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cat, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cat_state,cat)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cat, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1075,7 +1076,7 @@ MACHINE_CONFIG_START(cat_state::cat)
 	MCFG_PALETTE_ADD_MONOCHROME("palette")
-	MCFG_VIDEO_START_OVERRIDE(cat_state,cat)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cat, this));
 	MCFG_DEVICE_ADD( "duartn68681", MC68681, (XTAL(19'968'000)*2)/11 ) // duart is normally clocked by 3.6864mhz xtal, but cat seemingly uses a divider from the main xtal instead which probably yields 3.63054545Mhz. There is a trace to cut and a mounting area to allow using an actual 3.6864mhz xtal if you so desire
 	MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, cat_state, cat_duart_irq_handler))
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@ -2062,7 +2062,7 @@ GFXDECODE_END
 ***************************************************************************/
-MACHINE_START_MEMBER(cave_state,cave)
+void cave_state::machine_start_cave()
 {
 	m_vblank_end_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cave_state::cave_vblank_end), this));
@ -2077,7 +2077,7 @@ MACHINE_START_MEMBER(cave_state,cave)
 	save_item(NAME(m_agallet_vblank_irq));
 }
-MACHINE_RESET_MEMBER(cave_state,cave)
+void cave_state::machine_reset_cave()
 {
 	std::fill(std::begin(m_soundbuf_data), std::end(m_soundbuf_data), 0);
 	m_soundbuf_wptr = 0;
@ -2101,8 +2101,8 @@ MACHINE_CONFIG_START(cave_state::dfeveron)
 	MCFG_DEVICE_PROGRAM_MAP(dfeveron_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state,  cave_interrupt)
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2119,7 +2119,7 @@ MACHINE_CONFIG_START(cave_state::dfeveron)
 	MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
 	MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_2_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_2_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2142,8 +2142,8 @@ MACHINE_CONFIG_START(cave_state::ddonpach)
 	MCFG_DEVICE_PROGRAM_MAP(ddonpach_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state,  cave_interrupt)
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2160,7 +2160,7 @@ MACHINE_CONFIG_START(cave_state::ddonpach)
 	MCFG_PALETTE_ADD("palette", 0x8000 + 0x40*16)   // $400 extra entries for layers 1&2
 	MCFG_PALETTE_INIT_OWNER(cave_state,ddonpach)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2182,8 +2182,8 @@ MACHINE_CONFIG_START(cave_state::donpachi)
 	MCFG_DEVICE_PROGRAM_MAP(donpachi_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state,  cave_interrupt)
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2200,7 +2200,7 @@ MACHINE_CONFIG_START(cave_state::donpachi)
 	MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
 	MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2229,8 +2229,8 @@ MACHINE_CONFIG_START(cave_state::esprade)
 	MCFG_DEVICE_PROGRAM_MAP(esprade_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state,  cave_interrupt)
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2247,7 +2247,7 @@ MACHINE_CONFIG_START(cave_state::esprade)
 	MCFG_PALETTE_ADD("palette", 0x8000)
 	MCFG_PALETTE_INIT_OWNER(cave_state,cave)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2269,8 +2269,8 @@ MACHINE_CONFIG_START(cave_state::gaia)
 	MCFG_DEVICE_PROGRAM_MAP(gaia_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state,  cave_interrupt)
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2288,7 +2288,7 @@ MACHINE_CONFIG_START(cave_state::gaia)
 	MCFG_PALETTE_ADD("palette", 0x8000)
 	MCFG_PALETTE_INIT_OWNER(cave_state,cave)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2310,8 +2310,8 @@ MACHINE_CONFIG_START(cave_state::guwange)
 	MCFG_DEVICE_PROGRAM_MAP(guwange_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state,  cave_interrupt)
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2328,7 +2328,7 @@ MACHINE_CONFIG_START(cave_state::guwange)
 	MCFG_PALETTE_ADD("palette", 0x8000)
 	MCFG_PALETTE_INIT_OWNER(cave_state,cave)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2353,8 +2353,8 @@ MACHINE_CONFIG_START(cave_state::hotdogst)
 	MCFG_DEVICE_PROGRAM_MAP(hotdogst_sound_map)
 	MCFG_DEVICE_IO_MAP(hotdogst_sound_portmap)
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2371,7 +2371,7 @@ MACHINE_CONFIG_START(cave_state::hotdogst)
 	MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
 	MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2403,8 +2403,8 @@ MACHINE_CONFIG_START(cave_state::korokoro)
 	MCFG_DEVICE_PROGRAM_MAP(korokoro_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state,  cave_interrupt)
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2421,7 +2421,7 @@ MACHINE_CONFIG_START(cave_state::korokoro)
 	MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
 	MCFG_PALETTE_INIT_OWNER(cave_state,korokoro)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_1_layer)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_1_layer, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2456,8 +2456,8 @@ MACHINE_CONFIG_START(cave_state::mazinger)
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3))  /* a guess, and certainly wrong */
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2474,7 +2474,7 @@ MACHINE_CONFIG_START(cave_state::mazinger)
 	MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
 	MCFG_PALETTE_INIT_OWNER(cave_state,mazinger)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_2_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_2_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2513,8 +2513,8 @@ MACHINE_CONFIG_START(cave_state::metmqstr)
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3))  /* a guess, and certainly wrong */
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)    /* start with the watchdog armed */
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));    /* start with the watchdog armed */
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2531,7 +2531,7 @@ MACHINE_CONFIG_START(cave_state::metmqstr)
 	MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
 	MCFG_PALETTE_INIT_OWNER(cave_state,dfeveron)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2569,8 +2569,8 @@ MACHINE_CONFIG_START(cave_state::pacslot)
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3))  /* a guess, and certainly wrong */
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_EEPROM_SERIAL_ENABLE_STREAMING()
@ -2589,7 +2589,7 @@ MACHINE_CONFIG_START(cave_state::pacslot)
 	MCFG_PALETTE_ADD("palette", 0x8000)
 	MCFG_PALETTE_INIT_OWNER(cave_state,cave)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_1_layer)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_1_layer, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -2629,8 +2629,8 @@ MACHINE_CONFIG_START(cave_state::ppsatan)
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(1))  /* a guess, and certainly wrong */
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_lev2", cave_state, timer_lev2_cb, attotime::from_hz(60))
@ -2665,7 +2665,7 @@ MACHINE_CONFIG_START(cave_state::ppsatan)
 	MCFG_PALETTE_INIT_OWNER(cave_state,ppsatan)
 	MCFG_DEFAULT_LAYOUT(layout_ppsatan)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_3_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -2694,8 +2694,8 @@ MACHINE_CONFIG_START(cave_state::pwrinst2)
 	MCFG_DEVICE_PROGRAM_MAP(pwrinst2_sound_map)
 	MCFG_DEVICE_IO_MAP(pwrinst2_sound_portmap)
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2712,7 +2712,7 @@ MACHINE_CONFIG_START(cave_state::pwrinst2)
 	MCFG_PALETTE_ADD("palette", 0x8000+0x2800)
 	MCFG_PALETTE_INIT_OWNER(cave_state,pwrinst2)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_4_layers)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_4_layers, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2748,11 +2748,11 @@ TIMER_DEVICE_CALLBACK_MEMBER( cave_state::sailormn_startup )
 	m_maincpu->set_input_line(INPUT_LINE_RESET, PULSE_LINE);
 }
-MACHINE_RESET_MEMBER(cave_state,sailormn)
+void cave_state::machine_reset_sailormn()
 {
 	timer_device *startup = machine().device<timer_device>("startup");
 	startup->adjust(attotime::from_usec(1000), 0, attotime::zero);
-	MACHINE_RESET_CALL_MEMBER(cave);
+	machine_reset_cave();
 }
 MACHINE_CONFIG_START(cave_state::sailormn)
@ -2771,8 +2771,8 @@ MACHINE_CONFIG_START(cave_state::sailormn)
 //  MCFG_QUANTUM_TIME(attotime::from_hz(600))
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,sailormn)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_sailormn, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2789,7 +2789,7 @@ MACHINE_CONFIG_START(cave_state::sailormn)
 	MCFG_PALETTE_ADD("palette", 0x8000) /* $8000 palette entries for consistency with the other games */
 	MCFG_PALETTE_INIT_OWNER(cave_state,sailormn) // 4 bit sprites, 6 bit tiles
-	MCFG_VIDEO_START_OVERRIDE(cave_state,sailormn_3_layers) /* Layer 2 has 1 banked ROM */
+	set_video_start_cb(config, driver_callback_delegate(&video_start_sailormn_3_layers, this)); /* Layer 2 has 1 banked ROM */
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2829,8 +2829,8 @@ MACHINE_CONFIG_START(cave_state::tekkencw)
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3))  /* a guess, and certainly wrong */
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_EEPROM_SERIAL_ENABLE_STREAMING()
@ -2849,7 +2849,7 @@ MACHINE_CONFIG_START(cave_state::tekkencw)
 	MCFG_PALETTE_ADD("palette", 0x8000)
 	MCFG_PALETTE_INIT_OWNER(cave_state,cave)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_1_layer)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_1_layer, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -2885,8 +2885,8 @@ MACHINE_CONFIG_START(cave_state::tjumpman)
 	MCFG_WATCHDOG_ADD("watchdog")
 	MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3))  /* a guess, and certainly wrong */
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_EEPROM_SERIAL_ENABLE_STREAMING()
@ -2905,7 +2905,7 @@ MACHINE_CONFIG_START(cave_state::tjumpman)
 	MCFG_PALETTE_ADD("palette", 0x8000)
 	MCFG_PALETTE_INIT_OWNER(cave_state,cave)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_1_layer)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_1_layer, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -2930,7 +2930,7 @@ MACHINE_CONFIG_START(cave_state::uopoko)
 	MCFG_DEVICE_PROGRAM_MAP(uopoko_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state,  cave_interrupt)
-	MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cave, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 	MCFG_TIMER_DRIVER_ADD("int_timer", cave_state, cave_vblank_start)
@ -2947,7 +2947,7 @@ MACHINE_CONFIG_START(cave_state::uopoko)
 	MCFG_PALETTE_ADD("palette", 0x8000)
 	MCFG_PALETTE_INIT_OWNER(cave_state,cave)
-	MCFG_VIDEO_START_OVERRIDE(cave_state,cave_1_layer)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cave_1_layer, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/cbm2.cpp
+++ b/src/mame/drivers/cbm2.cpp
@ -140,12 +140,12 @@ public:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-	DECLARE_MACHINE_START( cbm2 );
+	void machine_start_cbm2()       ATTR_COLD;
-	DECLARE_MACHINE_START( cbm2_ntsc );
+	void machine_start_cbm2_ntsc()  ATTR_COLD;
-	DECLARE_MACHINE_START( cbm2_pal );
+	void machine_start_cbm2_pal()   ATTR_COLD;
-	DECLARE_MACHINE_START( cbm2x_ntsc );
+	void machine_start_cbm2x_ntsc() ATTR_COLD;
-	DECLARE_MACHINE_START( cbm2x_pal );
+	void machine_start_cbm2x_pal()	ATTR_COLD;
-	DECLARE_MACHINE_RESET( cbm2 );
+	void machine_reset_cbm2();
 	virtual void read_pla(offs_t offset, int ras, int cas, int refen, int eras, int ecas,
 		int *casseg1, int *casseg2, int *casseg3, int *casseg4, int *rasseg1, int *rasseg2, int *rasseg3, int *rasseg4);
@ -275,10 +275,10 @@ public:
 	required_device<mos6566_device> m_vic;
 	optional_shared_ptr<uint8_t> m_color_ram;
-	DECLARE_MACHINE_START( p500 );
+	void machine_start_p500()      ATTR_COLD;
-	DECLARE_MACHINE_START( p500_ntsc );
+	void machine_start_p500_ntsc() ATTR_COLD;
-	DECLARE_MACHINE_START( p500_pal );
+	void machine_start_p500_pal()  ATTR_COLD;
-	DECLARE_MACHINE_RESET( p500 );
+	void machine_reset_p500();
 	void read_pla1(offs_t offset, int busy2, int clrnibcsb, int procvid, int refen, int ba, int aec, int srw,
 		int *datxen, int *dramxen, int *clrniben, int *segf, int *_64kcasen, int *casenb, int *viddaten, int *viddat_tr);
@ -2117,10 +2117,10 @@ void cbm2_state::device_timer(emu_timer &timer, device_timer_id id, int param, v
 //-------------------------------------------------
-//  MACHINE_START( cbm2 )
+//  machine_start_cbm2()
 //-------------------------------------------------
-MACHINE_START_MEMBER( cbm2_state, cbm2 )
+void cbm2_state::machine_start_cbm2()
 {
 	// allocate memory
 	m_video_ram.allocate(m_video_ram_size);
@ -2147,64 +2147,64 @@ MACHINE_START_MEMBER( cbm2_state, cbm2 )
 //-------------------------------------------------
-//  MACHINE_START( cbm2_ntsc )
+//  machine_start_cbm2_ntsc()
 //-------------------------------------------------
-MACHINE_START_MEMBER( cbm2_state, cbm2_ntsc )
+void cbm2_state::machine_start_cbm2_ntsc()
 {
 	m_ntsc = 1;
-	MACHINE_START_CALL_MEMBER(cbm2);
+	machine_start_cbm2();
 }
 //-------------------------------------------------
-//  MACHINE_START( cbm2_pal )
+//  machine_start_cbm2_pal()
 //-------------------------------------------------
-MACHINE_START_MEMBER( cbm2_state, cbm2_pal )
+void cbm2_state::machine_start_cbm2_pal()
 {
 	m_ntsc = 0;
-	MACHINE_START_CALL_MEMBER(cbm2);
+	machine_start_cbm2();
 }
 //-------------------------------------------------
-//  MACHINE_START( cbm2x_ntsc )
+//  machine_start_cbm2x_ntsc()
 //-------------------------------------------------
-MACHINE_START_MEMBER( cbm2_state, cbm2x_ntsc )
+void cbm2_state::machine_start_cbm2x_ntsc()
 {
 	// allocate memory
 	m_extbuf_ram.allocate(0x800);
-	MACHINE_START_CALL_MEMBER(cbm2_ntsc);
+	machine_start_cbm2_ntsc();
 }
 //-------------------------------------------------
-//  MACHINE_START( cbm2x_pal )
+//  machine_start_cbm2x_pal()
 //-------------------------------------------------
-MACHINE_START_MEMBER( cbm2_state, cbm2x_pal )
+void cbm2_state::machine_start_cbm2x_pal()
 {
 	// allocate memory
 	m_extbuf_ram.allocate(0x800);
-	MACHINE_START_CALL_MEMBER(cbm2_pal);
+	machine_start_cbm2_pal();
 }
 //-------------------------------------------------
-//  MACHINE_START( p500 )
+//  machine_start_p500()
 //-------------------------------------------------
-MACHINE_START_MEMBER( p500_state, p500 )
+void p500_state::machine_start_p500()
 {
 	m_video_ram_size = 0x400;
-	MACHINE_START_CALL_MEMBER(cbm2);
+	machine_start_cbm2();
 	// allocate memory
 	m_color_ram.allocate(0x400);
@ -2218,14 +2218,14 @@ MACHINE_START_MEMBER( p500_state, p500 )
 //-------------------------------------------------
-//  MACHINE_START( p500_ntsc )
+//  machine_start_p500_ntsc()
 //-------------------------------------------------
-MACHINE_START_MEMBER( p500_state, p500_ntsc )
+void p500_state::machine_start_p500_ntsc()
 {
 	m_ntsc = 1;
-	MACHINE_START_CALL_MEMBER(p500);
+	machine_start_p500();
 }
@ -2233,15 +2233,15 @@ MACHINE_START_MEMBER( p500_state, p500_ntsc )
 //  MACHINE_START( p500_pal )
 //-------------------------------------------------
-MACHINE_START_MEMBER( p500_state, p500_pal )
+void p500_state::machine_start_p500_pal()
 {
 	m_ntsc = 0;
-	MACHINE_START_CALL_MEMBER(p500);
+	machine_start_p500();
 }
-MACHINE_RESET_MEMBER( cbm2_state, cbm2 )
+void cbm2_state::machine_reset_cbm2()
 {
 	m_dramon = 1;
 	m_busen1 = 1;
@ -2266,9 +2266,9 @@ m_ext_cia_pb = 0xff;
 }
-MACHINE_RESET_MEMBER( p500_state, p500 )
+void p500_state::machine_reset_p500()
 {
-	MACHINE_RESET_CALL_MEMBER(cbm2);
+	machine_reset_cbm2();
 	m_vic->reset();
@ -2310,8 +2310,8 @@ MACHINE_CONFIG_END
 //-------------------------------------------------
 MACHINE_CONFIG_START(p500_state::p500_ntsc)
-	MCFG_MACHINE_START_OVERRIDE(p500_state, p500_ntsc)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_p500_ntsc, this));
-	MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_p500, this));
 	// basic hardware
 	MCFG_DEVICE_ADD(M6509_TAG, M6509, XTAL(14'318'181)/14)
@ -2426,8 +2426,8 @@ MACHINE_CONFIG_END
 //-------------------------------------------------
 MACHINE_CONFIG_START(p500_state::p500_pal)
-	MCFG_MACHINE_START_OVERRIDE(p500_state, p500_pal)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_p500_pal, this));
-	MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_p500, this));
 	// basic hardware
 	MCFG_DEVICE_ADD(M6509_TAG, M6509, XTAL(17'734'472)/18)
@ -2539,8 +2539,8 @@ MACHINE_CONFIG_END
 //-------------------------------------------------
 MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc)
-	MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_ntsc)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm2_ntsc, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cbm2_state, cbm2)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cbm2, this));
 	// basic hardware
 	MCFG_DEVICE_ADD(M6509_TAG, M6509, XTAL(18'000'000)/9)
@ -2669,7 +2669,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(cbm2_state::cbm2lp_pal)
 	cbm2lp_ntsc(config);
-	MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_pal)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm2_pal, this));
 	MCFG_DEVICE_MODIFY(MOS6526_TAG)
 	MCFG_MOS6526_TOD(50)
@ -2733,7 +2733,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(cbm2hp_state::bx256hp)
 	b256hp(config);
-	MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_ntsc)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm2x_ntsc, this));
 	MCFG_DEVICE_ADD(EXT_I8088_TAG, I8088, XTAL(12'000'000))
 	MCFG_DEVICE_PROGRAM_MAP(ext_mem)
@ -2766,7 +2766,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(cbm2_state::cbm2hp_pal)
 	cbm2hp_ntsc(config);
-	MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_pal)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm2_pal, this));
 	// devices
 	MCFG_DEVICE_MODIFY(MOS6525_2_TAG)
@ -2803,7 +2803,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(cbm2hp_state::cbm730)
 	cbm720(config);
-	MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_pal)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cbm2x_pal, this));
 	MCFG_DEVICE_ADD(EXT_I8088_TAG, I8088, XTAL(12'000'000))
 	MCFG_DEVICE_PROGRAM_MAP(ext_mem)
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@ -296,7 +296,7 @@ WRITE_LINE_MEMBER(cclimber_state::toprollr_rombank_w)
 }
 #ifdef UNUSED_FUNCTION
-MACHINE_RESET_MEMBER(cclimber_state,cclimber)
+void cclimber_state::machine_reset_cclimber()
 {
 	/* Disable interrupts, River Patrol / Silver Land needs this otherwise returns bad RAM on POST */
 	m_nmi_mask = 0;
@ -1135,7 +1135,7 @@ MACHINE_CONFIG_START(cclimber_state::root)
 	MCFG_PALETTE_ADD("palette", 16*4+8*4)
 	MCFG_PALETTE_INIT_OWNER(cclimber_state,cclimber)
-	MCFG_VIDEO_START_OVERRIDE(cclimber_state,cclimber)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cclimber, this));
 MACHINE_CONFIG_END
@ -1244,7 +1244,7 @@ MACHINE_CONFIG_START(cclimber_state::toprollr)
 	MCFG_PALETTE_ENTRIES(32*5)
 	MCFG_PALETTE_INIT_OWNER(cclimber_state,toprollr)
-	MCFG_VIDEO_START_OVERRIDE(cclimber_state,toprollr)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_toprollr, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(cclimber_state, screen_update_toprollr)
 MACHINE_CONFIG_END
@ -1282,7 +1282,7 @@ MACHINE_CONFIG_START(cclimber_state::swimmer)
 	MCFG_PALETTE_ADD("palette", 32*8+4*8+1)
 	MCFG_PALETTE_INIT_OWNER(cclimber_state,swimmer)
-	MCFG_VIDEO_START_OVERRIDE(cclimber_state,swimmer)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_swimmer, this));
 	/* audio hardware */
 	SPEAKER(config, "speaker").front_center();
--- a/src/mame/drivers/ccs300.cpp
+++ b/src/mame/drivers/ccs300.cpp
@ -37,7 +37,7 @@ public:
 	{ }
 	void init_ccs300();
-	DECLARE_MACHINE_RESET(ccs300);
+	void machine_reset_ccs300();
 	DECLARE_WRITE8_MEMBER(port40_w);
 	void ccs300(machine_config &config);
@ -90,7 +90,7 @@ WRITE8_MEMBER( ccs300_state::port40_w )
 	membank("bankr0")->set_entry( (data) ? 1 : 0);
 }
-MACHINE_RESET_MEMBER( ccs300_state, ccs300 )
+void ccs300_state::machine_reset_ccs300()
 {
 	membank("bankr0")->set_entry(0); // point at rom
 	membank("bankw0")->set_entry(0); // always write to ram
@ -122,7 +122,7 @@ MACHINE_CONFIG_START(ccs300_state::ccs300)
 	MCFG_DEVICE_IO_MAP(ccs300_io)
 	MCFG_Z80_DAISY_CHAIN(daisy_chain)
-	MCFG_MACHINE_RESET_OVERRIDE(ccs300_state, ccs300)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ccs300, this));
 	/* video hardware */
 	MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@ -302,7 +302,7 @@ INTERRUPT_GEN_MEMBER( cdi_state::mcu_frame )
 	m_scc->mcu_frame();
 }
-MACHINE_RESET_MEMBER( cdi_state, cdimono1 )
+void cdi_state::machine_reset_cdimono1()
 {
 	uint16_t *src   = (uint16_t*)memregion("maincpu")->base();
 	uint16_t *dst   = m_planea;
@ -316,7 +316,7 @@ MACHINE_RESET_MEMBER( cdi_state, cdimono1 )
 	m_dmadac[1] = machine().device<dmadac_sound_device>("dac2");
 }
-MACHINE_RESET_MEMBER( cdi_state, cdimono2 )
+void cdi_state::machine_reset_cdimono2()
 {
 	uint16_t *src   = (uint16_t*)memregion("maincpu")->base();
 	uint16_t *dst   = m_planea;
@ -328,17 +328,17 @@ MACHINE_RESET_MEMBER( cdi_state, cdimono2 )
 	m_dmadac[1] = machine().device<dmadac_sound_device>("dac2");
 }
-MACHINE_RESET_MEMBER( cdi_state, quizard1 )
+void cdi_state::machine_reset_quizard1()
 {
-	MACHINE_RESET_CALL_MEMBER( cdimono1 );
+	machine_reset_cdimono1();
 	m_scc->set_quizard_mcu_value(0x021f);
 	m_scc->set_quizard_mcu_ack(0x5a);
 }
-MACHINE_RESET_MEMBER( cdi_state, quizard2 )
+void cdi_state::machine_reset_quizard2()
 {
-	MACHINE_RESET_CALL_MEMBER( cdimono1 );
+	machine_reset_cdimono1();
 	// 0x2b1: Italian
 	// 0x001: French
@ -350,17 +350,17 @@ MACHINE_RESET_MEMBER( cdi_state, quizard2 )
-MACHINE_RESET_MEMBER( cdi_state, quizard3 )
+void cdi_state::machine_reset_quizard3()
 {
-	MACHINE_RESET_CALL_MEMBER( cdimono1 );
+	machine_reset_cdimono1();
 	m_scc->set_quizard_mcu_value(0x00ae);
 	m_scc->set_quizard_mcu_ack(0x58);
 }
-MACHINE_RESET_MEMBER( cdi_state, quizard4 )
+void cdi_state::machine_reset_quizard4()
 {
-	MACHINE_RESET_CALL_MEMBER( cdimono1 );
+	machine_reset_cdimono1();
 	//m_scc->set_quizard_mcu_value(0x0139);
 	m_scc->set_quizard_mcu_value(0x011f);
@ -847,7 +847,7 @@ MACHINE_CONFIG_START(cdi_state::cdimono2)
 	MCFG_DEFAULT_LAYOUT(layout_cdi)
-	MCFG_MACHINE_RESET_OVERRIDE( cdi_state, cdimono2 )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cdimono2, this));
 	MCFG_CDI68070_ADD("scc68070")
 	MCFG_DEVICE_ADD("servo", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
@ -902,7 +902,7 @@ MACHINE_CONFIG_START(cdi_state::cdi910)
 	MCFG_DEFAULT_LAYOUT(layout_cdi)
-	MCFG_MACHINE_RESET_OVERRIDE( cdi_state, cdimono2 )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cdimono2, this));
 	MCFG_CDI68070_ADD("scc68070")
 	MCFG_DEVICE_ADD("servo", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
@ -935,7 +935,7 @@ MACHINE_CONFIG_END
 // CD-i Mono-I, with CD-ROM image device (MESS) and Software List (MESS)
 MACHINE_CONFIG_START(cdi_state::cdimono1)
 	cdimono1_base(config);
-	MCFG_MACHINE_RESET_OVERRIDE(cdi_state, cdimono1)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cdimono1, this));
 	MCFG_CDROM_ADD( "cdrom" )
 	MCFG_CDROM_INTERFACE("cdi_cdrom")
@ -958,7 +958,7 @@ READ8_MEMBER( cdi_state::quizard_mcu_p1_r )
 MACHINE_CONFIG_START(cdi_state::quizard1)
 	quizard(config);
-	MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard1 )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_quizard1, this));
 	MCFG_DEVICE_ADD("mcu", I8751, 8000000)
 	MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, cdi_state, quizard_mcu_p1_r))
@ -968,17 +968,17 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(cdi_state::quizard2)
 	quizard(config);
-	MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard2 )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_quizard2, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(cdi_state::quizard3)
 	quizard(config);
-	MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard3 )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_quizard3, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(cdi_state::quizard4)
 	quizard(config);
-	MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard4 )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_quizard4, this));
 	MCFG_DEVICE_ADD("mcu", I8751, 8000000)
 	MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, cdi_state, quizard_mcu_p1_r))
--- a/src/mame/drivers/centiped.cpp
+++ b/src/mame/drivers/centiped.cpp
@ -444,7 +444,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(centiped_state::generate_interrupt)
 	m_screen->update_partial(scanline);
 }
-MACHINE_START_MEMBER(centiped_state,centiped)
+void centiped_state::machine_start_centiped()
 {
 	save_item(NAME(m_oldpos));
 	save_item(NAME(m_sign));
@ -453,16 +453,16 @@ MACHINE_START_MEMBER(centiped_state,centiped)
 }
-MACHINE_RESET_MEMBER(centiped_state,centiped)
+void centiped_state::machine_reset_centiped()
 {
 	m_maincpu->set_input_line(0, CLEAR_LINE);
 	m_prg_bank = 0;
 }
-MACHINE_RESET_MEMBER(centiped_state,magworm)
+void centiped_state::machine_reset_magworm()
 {
-	MACHINE_RESET_CALL_MEMBER(centiped);
+	machine_reset_centiped();
 	/* kludge: clear RAM so that magworm can be reset cleanly */
 	memset(m_rambase, 0, 0x400);
@ -1716,8 +1716,8 @@ MACHINE_CONFIG_START(centiped_state::centiped_base)
 	/* basic machine hardware */
 	MCFG_DEVICE_ADD("maincpu", M6502, 12096000/8)  /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */
-	MCFG_MACHINE_START_OVERRIDE(centiped_state,centiped)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_centiped, this));
-	MCFG_MACHINE_RESET_OVERRIDE(centiped_state,centiped)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_centiped, this));
 	MCFG_ATARIVGEAROM_ADD("earom")
@ -1744,7 +1744,7 @@ MACHINE_CONFIG_START(centiped_state::centiped_base)
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_centiped)
 	MCFG_PALETTE_ADD("palette", 4+4*4*4*4)
-	MCFG_VIDEO_START_OVERRIDE(centiped_state,centiped)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_centiped, this));
 MACHINE_CONFIG_END
@ -1817,7 +1817,7 @@ MACHINE_CONFIG_START(centiped_state::magworm)
 	/* basic machine hardware */
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(magworm_map)
-	MCFG_MACHINE_RESET_OVERRIDE(centiped_state,magworm)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_magworm, this));
 	MCFG_DEVICE_MODIFY("outlatch") // 12A
 	MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, centiped_state, flip_screen_w))
@ -1848,7 +1848,7 @@ MACHINE_CONFIG_START(centiped_state::milliped)
 	MCFG_PALETTE_MODIFY("palette")
 	MCFG_PALETTE_ENTRIES(4*4+4*4*4*4*4)
-	MCFG_VIDEO_START_OVERRIDE(centiped_state,milliped)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_milliped, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(centiped_state, screen_update_milliped)
@ -1895,7 +1895,7 @@ MACHINE_CONFIG_START(centiped_state::warlords)
 	MCFG_PALETTE_ENTRIES(8*4+8*4)
 	MCFG_PALETTE_INIT_OWNER(centiped_state,warlords)
-	MCFG_VIDEO_START_OVERRIDE(centiped_state,warlords)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_warlords, this));
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(centiped_state, screen_update_warlords)
@ -1955,7 +1955,7 @@ MACHINE_CONFIG_START(centiped_state::bullsdrt)
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_centiped)
 	MCFG_PALETTE_ADD("palette", 4+4*4*4*4)
-	MCFG_VIDEO_START_OVERRIDE(centiped_state,bullsdrt)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_bullsdrt, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/champbas.cpp
+++ b/src/mame/drivers/champbas.cpp
@ -555,7 +555,7 @@ MACHINE_CONFIG_START(champbas_state::talbot)
 	MCFG_PALETTE_ADD("palette", 512)
 	MCFG_PALETTE_INDIRECT_ENTRIES(32)
 	MCFG_PALETTE_INIT_OWNER(champbas_state,champbas)
-	MCFG_VIDEO_START_OVERRIDE(champbas_state,champbas)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_champbas, this));
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
@ -602,7 +602,7 @@ MACHINE_CONFIG_START(champbas_state::champbas)
 	MCFG_PALETTE_ADD("palette", 512)
 	MCFG_PALETTE_INDIRECT_ENTRIES(32)
 	MCFG_PALETTE_INIT_OWNER(champbas_state,champbas)
-	MCFG_VIDEO_START_OVERRIDE(champbas_state,champbas)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_champbas, this));
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
@ -713,7 +713,7 @@ MACHINE_CONFIG_START(champbas_state::exctsccr)
 	MCFG_PALETTE_ADD("palette", 512)
 	MCFG_PALETTE_INDIRECT_ENTRIES(32)
 	MCFG_PALETTE_INIT_OWNER(champbas_state,exctsccr)
-	MCFG_VIDEO_START_OVERRIDE(champbas_state,exctsccr)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_exctsccr, this));
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
@ -779,7 +779,7 @@ MACHINE_CONFIG_START(champbas_state::exctsccrb)
 	MCFG_PALETTE_ADD("palette", 512)
 	MCFG_PALETTE_INDIRECT_ENTRIES(32)
 	MCFG_PALETTE_INIT_OWNER(champbas_state,exctsccr)
-	MCFG_VIDEO_START_OVERRIDE(champbas_state,exctsccr)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_exctsccr, this));
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
--- a/src/mame/drivers/champbwl.cpp
+++ b/src/mame/drivers/champbwl.cpp
@ -190,9 +190,9 @@ public:
 	DECLARE_READ8_MEMBER(trackball_reset_r);
 	DECLARE_WRITE8_MEMBER(champbwl_misc_w);
 	DECLARE_WRITE8_MEMBER(doraemon_outputs_w);
-	DECLARE_MACHINE_START(champbwl);
+	void machine_start_champbwl() ATTR_COLD;
-	DECLARE_MACHINE_RESET(champbwl);
+	void machine_reset_champbwl();
-	DECLARE_MACHINE_START(doraemon);
+	void machine_start_doraemon() ATTR_COLD;
 	DECLARE_PALETTE_INIT(champbwl);
 	uint32_t screen_update_champbwl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_doraemon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -450,7 +450,7 @@ static GFXDECODE_START( gfx_champbwl )
 	GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
 GFXDECODE_END
-MACHINE_START_MEMBER(champbwl_state,champbwl)
+void champbwl_state::machine_start_champbwl()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
@ -460,7 +460,7 @@ MACHINE_START_MEMBER(champbwl_state,champbwl)
 	save_item(NAME(m_last_trackball_val));
 }
-MACHINE_RESET_MEMBER(champbwl_state,champbwl)
+void champbwl_state::machine_reset_champbwl()
 {
 	m_screenflip = 0;
 	m_last_trackball_val[0] = 0;
@ -496,8 +496,8 @@ MACHINE_CONFIG_START(champbwl_state::champbwl)
 	MCFG_NVRAM_ADD_0FILL("nvram")
-	MCFG_MACHINE_START_OVERRIDE(champbwl_state,champbwl)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_champbwl, this));
-	MCFG_MACHINE_RESET_OVERRIDE(champbwl_state,champbwl)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_champbwl, this));
 	MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
 	MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@ -547,7 +547,7 @@ WRITE_LINE_MEMBER(champbwl_state::screen_vblank_doraemon)
 		m_seta001->setac_eof();
 }
-MACHINE_START_MEMBER(champbwl_state,doraemon)
+void champbwl_state::machine_start_doraemon()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
 	membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000);
@ -565,7 +565,7 @@ MACHINE_CONFIG_START(champbwl_state::doraemon)
 	MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
 	MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(2000), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW )
-	MCFG_MACHINE_START_OVERRIDE(champbwl_state,doraemon)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_doraemon, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
--- a/src/mame/drivers/chinagat.cpp
+++ b/src/mame/drivers/chinagat.cpp
@ -95,9 +95,9 @@ public:
 	TIMER_DEVICE_CALLBACK_MEMBER(chinagat_scanline);
 	void init_chinagat();
-	DECLARE_MACHINE_START(chinagat);
+	void machine_start_chinagat() ATTR_COLD;
-	DECLARE_MACHINE_RESET(chinagat);
+	void machine_reset_chinagat();
-	DECLARE_VIDEO_START(chinagat);
+	void video_start_chinagat() ATTR_COLD;
 	DECLARE_WRITE8_MEMBER(interrupt_w);
 	DECLARE_WRITE8_MEMBER(video_ctrl_w);
 	DECLARE_WRITE8_MEMBER(bankswitch_w);
@ -123,7 +123,7 @@ public:
 };
-VIDEO_START_MEMBER(chinagat_state,chinagat)
+void chinagat_state::video_start_chinagat()
 {
 	m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(chinagat_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(chinagat_state::background_scan),this), 16, 16, 32, 32);
 	m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(chinagat_state::get_fg_16color_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
@ -519,7 +519,7 @@ static GFXDECODE_START( gfx_chinagat )
 GFXDECODE_END
-MACHINE_START_MEMBER(chinagat_state,chinagat)
+void chinagat_state::machine_start_chinagat()
 {
 	/* configure banks */
 	membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000);
@ -540,7 +540,7 @@ MACHINE_START_MEMBER(chinagat_state,chinagat)
 }
-MACHINE_RESET_MEMBER(chinagat_state,chinagat)
+void chinagat_state::machine_reset_chinagat()
 {
 	m_scrollx_hi = 0;
 	m_scrolly_hi = 0;
@ -572,8 +572,8 @@ MACHINE_CONFIG_START(chinagat_state::chinagat)
 	MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
-	MCFG_MACHINE_START_OVERRIDE(chinagat_state,chinagat)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_chinagat, this));
-	MCFG_MACHINE_RESET_OVERRIDE(chinagat_state,chinagat)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_chinagat, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -585,7 +585,7 @@ MACHINE_CONFIG_START(chinagat_state::chinagat)
 	MCFG_PALETTE_ADD("palette", 384)
 	MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
-	MCFG_VIDEO_START_OVERRIDE(chinagat_state,chinagat)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_chinagat, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -626,8 +626,8 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub1)
 	MCFG_QUANTUM_TIME(attotime::from_hz(6000))  /* heavy interleaving to sync up sprite<->main cpu's */
-	MCFG_MACHINE_START_OVERRIDE(chinagat_state,chinagat)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_chinagat, this));
-	MCFG_MACHINE_RESET_OVERRIDE(chinagat_state,chinagat)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_chinagat, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -639,7 +639,7 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub1)
 	MCFG_PALETTE_ADD("palette", 384)
 	MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
-	MCFG_VIDEO_START_OVERRIDE(chinagat_state,chinagat)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_chinagat, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -673,8 +673,8 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub2)
 	MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
-	MCFG_MACHINE_START_OVERRIDE(chinagat_state,chinagat)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_chinagat, this));
-	MCFG_MACHINE_RESET_OVERRIDE(chinagat_state,chinagat)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_chinagat, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -686,7 +686,7 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub2)
 	MCFG_PALETTE_ADD("palette", 384)
 	MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
-	MCFG_VIDEO_START_OVERRIDE(chinagat_state,chinagat)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_chinagat, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/cinemat.cpp
+++ b/src/mame/drivers/cinemat.cpp
@ -1070,7 +1070,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(cinemat_state::sundance)
 	cinemat_jmi_8k(config);
 	sundance_sound(config);
-	MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_16level)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cinemat_16level, this));
 MACHINE_CONFIG_END
@ -1110,7 +1110,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(cinemat_state::solarq)
 	cinemat_jmi_16k(config);
 	solarq_sound(config);
-	MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_64level)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cinemat_64level, this));
 MACHINE_CONFIG_END
@ -1119,7 +1119,7 @@ MACHINE_CONFIG_START(cinemat_state::boxingb)
 	boxingb_sound(config);
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_VISIBLE_AREA(0, 1024, 0, 788)
-	MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_color)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cinemat_color, this));
 	MCFG_DEVICE_MODIFY("outlatch")
 	MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, cinemat_state, mux_select_w))
@ -1137,7 +1137,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(cinemat_state::wotwc)
 	cinemat_jmi_16k(config);
 	wotw_sound(config);
-	MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_color)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cinemat_color, this));
 MACHINE_CONFIG_END
@ -1157,7 +1157,7 @@ MACHINE_CONFIG_START(cinemat_state::qb3)
 	MCFG_DEVICE_IO_MAP(io_map_qb3)
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_VISIBLE_AREA(0, 1120, 0, 780)
-	MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_qb3color)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cinemat_qb3color, this));
 MACHINE_CONFIG_END
--- a/src/mame/drivers/clshroad.cpp
+++ b/src/mame/drivers/clshroad.cpp
@ -303,7 +303,7 @@ MACHINE_CONFIG_START(clshroad_state::firebatl)
 	MCFG_PALETTE_INDIRECT_ENTRIES(256)
 	MCFG_PALETTE_INIT_OWNER(clshroad_state,firebatl)
-	MCFG_VIDEO_START_OVERRIDE(clshroad_state,firebatl)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_firebatl, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -343,7 +343,7 @@ MACHINE_CONFIG_START(clshroad_state::clshroad)
 	MCFG_PALETTE_ADD("palette", 256)
 	MCFG_PALETTE_INIT_OWNER(clshroad_state,clshroad)
-	MCFG_VIDEO_START_OVERRIDE(clshroad_state,clshroad)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_clshroad, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/cninja.cpp
+++ b/src/mame/drivers/cninja.cpp
@ -785,12 +785,12 @@ DECOSPR_PRIORITY_CB_MEMBER(cninja_state::pri_callback)
 	return 0;
 }
-MACHINE_START_MEMBER(cninja_state,robocop2)
+void cninja_state::machine_start_robocop2()
 {
 	save_item(NAME(m_priority));
 }
-MACHINE_RESET_MEMBER(cninja_state,robocop2)
+void cninja_state::machine_reset_robocop2()
 {
 	m_priority = 0;
 }
@ -907,7 +907,7 @@ MACHINE_CONFIG_START(cninja_state::stoneage)
 	MCFG_PALETTE_ADD("palette", 2048)
 	MCFG_PALETTE_FORMAT(XBGR)
-	MCFG_VIDEO_START_OVERRIDE(cninja_state,stoneage)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_stoneage, this));
 	MCFG_DEVICE_ADD("spriteram1", BUFFERED_SPRITERAM16)
@ -1162,8 +1162,8 @@ MACHINE_CONFIG_START(cninja_state::robocop2)
 	MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_robocop2)
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_MACHINE_START_OVERRIDE(cninja_state,robocop2)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_robocop2, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cninja_state,robocop2)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_robocop2, this));
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_robocop2)
 	MCFG_PALETTE_ADD("palette", 2048)
@ -1254,9 +1254,9 @@ MACHINE_CONFIG_START(cninja_state::mutantf)
 	MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248) // same as robocop2? verify this from real pcb
 	MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_mutantf)
-	MCFG_MACHINE_START_OVERRIDE(cninja_state,robocop2)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_robocop2, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cninja_state,robocop2)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_robocop2, this));
-	MCFG_VIDEO_START_OVERRIDE(cninja_state,mutantf)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mutantf, this));
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_mutantf)
 	MCFG_PALETTE_ADD("palette", 2048)
--- a/src/mame/drivers/cntsteer.cpp
+++ b/src/mame/drivers/cntsteer.cpp
@ -106,12 +106,12 @@ public:
 	void init_zerotrgt();
 	TILE_GET_INFO_MEMBER(get_bg_tile_info);
 	TILE_GET_INFO_MEMBER(get_fg_tile_info);
-	DECLARE_MACHINE_START(cntsteer);
+	void machine_start_cntsteer() ATTR_COLD;
-	DECLARE_MACHINE_RESET(cntsteer);
+	void machine_reset_cntsteer();
-	DECLARE_VIDEO_START(cntsteer);
+	void video_start_cntsteer() ATTR_COLD;
-	DECLARE_MACHINE_START(zerotrgt);
+	void machine_start_zerotrgt() ATTR_COLD;
-	DECLARE_MACHINE_RESET(zerotrgt);
+	void machine_reset_zerotrgt();
-	DECLARE_VIDEO_START(zerotrgt);
+	void video_start_zerotrgt() ATTR_COLD;
 	DECLARE_PALETTE_INIT(zerotrgt);
 	uint32_t screen_update_cntsteer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_zerotrgt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -175,7 +175,7 @@ TILE_GET_INFO_MEMBER(cntsteer_state::get_fg_tile_info)
 	SET_TILE_INFO_MEMBER(0, code, 0x30 + ((attr & 0x78) >> 3), 0);
 }
-VIDEO_START_MEMBER(cntsteer_state,cntsteer)
+void cntsteer_state::video_start_cntsteer()
 {
 	m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 64);
 	m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, 8, 8, 32, 32);
@ -185,7 +185,7 @@ VIDEO_START_MEMBER(cntsteer_state,cntsteer)
 	//m_bg_tilemap->set_flip(TILEMAP_FLIPX | TILEMAP_FLIPY);
 }
-VIDEO_START_MEMBER(cntsteer_state,zerotrgt)
+void cntsteer_state::video_start_zerotrgt()
 {
 	m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64);
 	m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(cntsteer_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS_FLIP_X, 8, 8, 32, 32);
@ -873,7 +873,7 @@ GFXDECODE_END
 /***************************************************************************/
-MACHINE_START_MEMBER(cntsteer_state,cntsteer)
+void cntsteer_state::machine_start_cntsteer()
 {
 	save_item(NAME(m_flipscreen));
 	save_item(NAME(m_bg_bank));
@ -888,14 +888,14 @@ MACHINE_START_MEMBER(cntsteer_state,cntsteer)
 	save_item(NAME(m_disable_roz));
 }
-MACHINE_START_MEMBER(cntsteer_state,zerotrgt)
+void cntsteer_state::machine_start_zerotrgt()
 {
 	save_item(NAME(m_nmimask));
-	MACHINE_START_CALL_MEMBER(cntsteer);
+	machine_start_cntsteer();
 }
-MACHINE_RESET_MEMBER(cntsteer_state,zerotrgt)
+void cntsteer_state::machine_reset_zerotrgt()
 {
 	m_flipscreen = 0;
 	m_bg_bank = 0;
@ -912,10 +912,10 @@ MACHINE_RESET_MEMBER(cntsteer_state,zerotrgt)
 }
-MACHINE_RESET_MEMBER(cntsteer_state,cntsteer)
+void cntsteer_state::machine_reset_cntsteer()
 {
 	m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
-	MACHINE_RESET_CALL_MEMBER(zerotrgt);
+	machine_reset_zerotrgt();
 }
 MACHINE_CONFIG_START(cntsteer_state::cntsteer)
@ -932,8 +932,8 @@ MACHINE_CONFIG_START(cntsteer_state::cntsteer)
 	MCFG_DEVICE_PROGRAM_MAP(sound_map)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(cntsteer_state, sound_interrupt,  480)
-	MCFG_MACHINE_START_OVERRIDE(cntsteer_state,cntsteer)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cntsteer, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cntsteer_state,cntsteer)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cntsteer, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -953,7 +953,7 @@ MACHINE_CONFIG_START(cntsteer_state::cntsteer)
 	MCFG_PALETTE_ADD("palette", 256)
 //  MCFG_PALETTE_INIT_OWNER(cntsteer_state,zerotrgt)
-	MCFG_VIDEO_START_OVERRIDE(cntsteer_state,cntsteer)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cntsteer, this));
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
@ -989,8 +989,8 @@ MACHINE_CONFIG_START(cntsteer_state::zerotrgt)
 	MCFG_QUANTUM_TIME(attotime::from_hz(6000))
-	MCFG_MACHINE_START_OVERRIDE(cntsteer_state,zerotrgt)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_zerotrgt, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cntsteer_state,zerotrgt)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_zerotrgt, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1005,7 +1005,7 @@ MACHINE_CONFIG_START(cntsteer_state::zerotrgt)
 	MCFG_PALETTE_ADD("palette", 256)
 	MCFG_PALETTE_INIT_OWNER(cntsteer_state,zerotrgt)
-	MCFG_VIDEO_START_OVERRIDE(cntsteer_state,zerotrgt)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_zerotrgt, this));
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
--- a/src/mame/drivers/combatsc.cpp
+++ b/src/mame/drivers/combatsc.cpp
@ -643,7 +643,7 @@ GFXDECODE_END
 *
 *************************************/
-MACHINE_START_MEMBER(combatsc_state,combatsc)
+void combatsc_state::machine_start_combatsc()
 {
 	uint8_t *MEM = memregion("maincpu")->base() + 0x38000;
@ -665,9 +665,9 @@ MACHINE_START_MEMBER(combatsc_state,combatsc)
 	save_item(NAME(m_sign));
 }
-MACHINE_START_MEMBER(combatsc_state,combatscb)
+void combatsc_state::machine_start_combatscb()
 {
-	MACHINE_START_CALL_MEMBER( combatsc );
+	machine_start_combatsc();
 	membank("bl_abank")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x8000, 0x4000);
 }
@ -708,7 +708,7 @@ MACHINE_CONFIG_START(combatsc_state::combatsc)
 	MCFG_QUANTUM_TIME(attotime::from_hz(1200))
-	MCFG_MACHINE_START_OVERRIDE(combatsc_state,combatsc)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_combatsc, this));
 	MCFG_WATCHDOG_ADD("watchdog")
@ -728,7 +728,7 @@ MACHINE_CONFIG_START(combatsc_state::combatsc)
 	MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
 	MCFG_PALETTE_ENDIANNESS(ENDIANNESS_LITTLE)
 	MCFG_PALETTE_INIT_OWNER(combatsc_state,combatsc)
-	MCFG_VIDEO_START_OVERRIDE(combatsc_state,combatsc)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_combatsc, this));
 	MCFG_K007121_ADD("k007121_1")
 	MCFG_K007121_PALETTE("palette")
@ -762,7 +762,7 @@ MACHINE_CONFIG_START(combatsc_state::combatscb)
 	MCFG_QUANTUM_TIME(attotime::from_hz(1200))
-	MCFG_MACHINE_START_OVERRIDE(combatsc_state,combatscb)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_combatscb, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -779,7 +779,7 @@ MACHINE_CONFIG_START(combatsc_state::combatscb)
 	MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
 	MCFG_PALETTE_ENDIANNESS(ENDIANNESS_LITTLE)
 	MCFG_PALETTE_INIT_OWNER(combatsc_state,combatscb)
-	MCFG_VIDEO_START_OVERRIDE(combatsc_state,combatscb)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_combatscb, this));
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/coolpool.cpp
+++ b/src/mame/drivers/coolpool.cpp
@ -129,13 +129,13 @@ TMS340X0_FROM_SHIFTREG_CB_MEMBER(coolpool_state::from_shiftreg)
 *
 *************************************/
-MACHINE_RESET_MEMBER(coolpool_state,amerdart)
+void coolpool_state::machine_reset_amerdart()
 {
 	m_nvram_write_enable = 0;
 }
-MACHINE_RESET_MEMBER(coolpool_state,coolpool)
+void coolpool_state::machine_reset_coolpool()
 {
 	m_nvram_write_enable = 0;
 }
@ -735,7 +735,7 @@ MACHINE_CONFIG_START(coolpool_state::amerdart)
 	MCFG_GENERIC_LATCH_16_ADD("dsp2main")
 	MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("maincpu", 1))
-	MCFG_MACHINE_RESET_OVERRIDE(coolpool_state,amerdart)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_amerdart, this));
 	MCFG_NVRAM_ADD_0FILL("nvram")
 	MCFG_TIMER_DRIVER_ADD("nvram_timer", coolpool_state, nvram_write_timeout)
@ -780,7 +780,7 @@ MACHINE_CONFIG_START(coolpool_state::coolpool)
 	MCFG_GENERIC_LATCH_16_ADD("dsp2main")
 	MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("maincpu", 1))
-	MCFG_MACHINE_RESET_OVERRIDE(coolpool_state,coolpool)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_coolpool, this));
 	MCFG_NVRAM_ADD_0FILL("nvram")
 	MCFG_TIMER_DRIVER_ADD("nvram_timer", coolpool_state, nvram_write_timeout)
--- a/src/mame/drivers/cosmic.cpp
+++ b/src/mame/drivers/cosmic.cpp
@ -973,7 +973,7 @@ static const char *const cosmicg_sample_names[] =
 };
-MACHINE_START_MEMBER(cosmic_state,cosmic)
+void cosmic_state::machine_start_cosmic()
 {
 	save_item(NAME(m_sound_enabled));
 	save_item(NAME(m_march_select));
@ -985,7 +985,7 @@ MACHINE_START_MEMBER(cosmic_state,cosmic)
 	save_item(NAME(m_color_registers));
 }
-MACHINE_RESET_MEMBER(cosmic_state,cosmic)
+void cosmic_state::machine_reset_cosmic()
 {
 	m_pixel_clock = 0;
 	m_background_enable = 0;
@ -994,7 +994,7 @@ MACHINE_RESET_MEMBER(cosmic_state,cosmic)
 	m_color_registers[2] = 0;
 }
-MACHINE_RESET_MEMBER(cosmic_state,cosmicg)
+void cosmic_state::machine_reset_cosmicg()
 {
 	m_pixel_clock = 0;
 	m_background_enable = 0;
@ -1010,8 +1010,8 @@ MACHINE_CONFIG_START(cosmic_state::cosmic)
 	/* basic machine hardware */
 	MCFG_DEVICE_ADD("maincpu", Z80,Z80_MASTER_CLOCK/6) /* 1.8026 MHz */
-	MCFG_MACHINE_START_OVERRIDE(cosmic_state,cosmic)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cosmic, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cosmic_state,cosmic)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cosmic, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -1098,8 +1098,8 @@ MACHINE_CONFIG_START(cosmic_state::cosmicg)
 		fed to the tms9904 or tms9980.  Also, I have never heard of a tms9900/9980 operating under
 		1.5MHz.  So, if someone can check this... */
-	MCFG_MACHINE_START_OVERRIDE(cosmic_state,cosmic)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cosmic, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cosmic_state,cosmicg)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cosmicg, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@ -3360,19 +3360,19 @@ GFXDECODE_END
 *
 ********************************************************************/
-MACHINE_START_MEMBER(cps_state,common)
+void cps_state::machine_start_common()
 {
 }
-MACHINE_START_MEMBER(cps_state,cps1)
+void cps_state::machine_start_cps1()
 {
-	MACHINE_START_CALL_MEMBER(common);
+	machine_start_common();
 	membank("bank1")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x10000, 0x4000);
 }
-MACHINE_START_MEMBER(cps_state,qsound)
+void cps_state::machine_start_qsound()
 {
-	MACHINE_START_CALL_MEMBER(common);
+	machine_start_common();
 	membank("bank1")->configure_entries(0, 6, memregion("audiocpu")->base() + 0x10000, 0x4000);
 }
@ -3387,7 +3387,7 @@ MACHINE_CONFIG_START(cps_state::cps1_10MHz)
 	MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))  /* verified on pcb */
 	MCFG_DEVICE_PROGRAM_MAP(sub_map)
-	MCFG_MACHINE_START_OVERRIDE(cps_state,cps1)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cps1, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -3399,7 +3399,7 @@ MACHINE_CONFIG_START(cps_state::cps1_10MHz)
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cps1)
 	MCFG_PALETTE_ADD("palette", 0xc00)
-	MCFG_VIDEO_START_OVERRIDE(cps_state, cps1)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cps1, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -3466,7 +3466,7 @@ MACHINE_CONFIG_START(cps_state::qsound)
 	MCFG_DEVICE_OPCODES_MAP(qsound_decrypted_opcodes_map)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(cps_state, irq0_line_hold, 250) // measured (cps2.c)
-	MCFG_MACHINE_START_OVERRIDE(cps_state, qsound)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_qsound, this));
 	MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom")
--- a/src/mame/drivers/cps2.cpp
+++ b/src/mame/drivers/cps2.cpp
@ -1297,7 +1297,7 @@ INPUT_PORTS_END
 *
 *************************************/
-MACHINE_START_MEMBER(cps_state,cps2)
+void cps_state::machine_start_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
-	MCFG_MACHINE_START_OVERRIDE(cps_state, cps2)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cps2, this));
 	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)
-	MCFG_VIDEO_START_OVERRIDE(cps_state, cps2)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cps2, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
--- a/src/mame/drivers/cubo.cpp
+++ b/src/mame/drivers/cubo.cpp
@ -1061,7 +1061,7 @@ MACHINE_CONFIG_START(cubo_state::cubo)
 	MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga)
 	MCFG_SCREEN_NO_PALETTE
-	MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_amiga_aga, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
--- a/src/mame/drivers/cvs.cpp
+++ b/src/mame/drivers/cvs.cpp
@ -925,7 +925,7 @@ GFXDECODE_END
 *
 *************************************/
-MACHINE_START_MEMBER(cvs_state,cvs)
+void cvs_state::machine_start_cvs()
 {
 	/* allocate memory */
 	if (m_gfxdecode->gfx(1) != nullptr)
@ -949,7 +949,7 @@ MACHINE_START_MEMBER(cvs_state,cvs)
 	save_item(NAME(m_stars_scroll));
 }
-MACHINE_RESET_MEMBER(cvs_state,cvs)
+void cvs_state::machine_reset_cvs()
 {
 	m_character_banking_mode = 0;
 	m_character_ram_page_start = 0;
@ -984,11 +984,11 @@ MACHINE_CONFIG_START(cvs_state::cvs)
 	//MCFG_S2650_SENSE_INPUT(READLINE(*this, cvs_state, cvs_393hz_clock_r))
 	MCFG_S2650_SENSE_INPUT(READLINE("tms", tms5110_device, romclk_hack_r))
-	MCFG_MACHINE_START_OVERRIDE(cvs_state,cvs)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_cvs, this));
-	MCFG_MACHINE_RESET_OVERRIDE(cvs_state,cvs)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_cvs, this));
 	/* video hardware */
-	MCFG_VIDEO_START_OVERRIDE(cvs_state,cvs)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cvs, this));
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_cvs)
--- a/src/mame/drivers/czk80.cpp
+++ b/src/mame/drivers/czk80.cpp
@ -62,7 +62,7 @@ public:
 	{ }
 	void init_czk80();
-	DECLARE_MACHINE_RESET(czk80);
+	void machine_reset_czk80();
 	TIMER_CALLBACK_MEMBER(czk80_reset);
 	DECLARE_READ8_MEMBER(port80_r);
 	DECLARE_READ8_MEMBER(port81_r);
@ -161,7 +161,7 @@ TIMER_CALLBACK_MEMBER( czk80_state::czk80_reset)
 	membank("bankr0")->set_entry(1);
 }
-MACHINE_RESET_MEMBER( czk80_state, czk80 )
+void czk80_state::machine_reset_czk80()
 {
 	machine().scheduler().timer_set(attotime::from_usec(3), timer_expired_delegate(FUNC(czk80_state::czk80_reset),this));
 	membank("bankr0")->set_entry(0); // point at rom
@ -199,7 +199,7 @@ MACHINE_CONFIG_START(czk80_state::czk80)
 	MCFG_DEVICE_PROGRAM_MAP(czk80_mem)
 	MCFG_DEVICE_IO_MAP(czk80_io)
 	MCFG_Z80_DAISY_CHAIN(daisy_chain)
-	MCFG_MACHINE_RESET_OVERRIDE(czk80_state, czk80)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_czk80, this));
 	MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
 	MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(czk80_state, kbd_put))
--- a/src/mame/drivers/dambustr.cpp
+++ b/src/mame/drivers/dambustr.cpp
@ -262,7 +262,7 @@ MACHINE_CONFIG_START(dambustr_state::dambustr)
 	MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6)    /* 3.072 MHz */
 	MCFG_DEVICE_PROGRAM_MAP(dambustr_map)
-	MCFG_MACHINE_RESET_OVERRIDE(dambustr_state,galaxold)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_galaxold, this));
 	MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0)
 	MCFG_7474_OUTPUT_CB(WRITELINE(*this, dambustr_state,galaxold_7474_9m_1_callback))
@ -286,7 +286,7 @@ MACHINE_CONFIG_START(dambustr_state::dambustr)
 	MCFG_PALETTE_ADD("palette", 32+2+64+8)      /* 32 for the characters, 2 for the bullets, 64 for the stars, 8 for the background */
 	MCFG_PALETTE_INIT_OWNER(dambustr_state,dambustr)
-	MCFG_VIDEO_START_OVERRIDE(dambustr_state,dambustr)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_dambustr, this));
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
--- a/src/mame/drivers/dccons.cpp
+++ b/src/mame/drivers/dccons.cpp
@ -601,7 +601,7 @@ MACHINE_CONFIG_START(dc_cons_state::dc)
 	MCFG_DEVICE_ADD("soundcpu", ARM7, ((XTAL(33'868'800)*2)/3)/8)   // AICA bus clock is 2/3rds * 33.8688.  ARM7 gets 1 bus cycle out of each 8.
 	MCFG_DEVICE_PROGRAM_MAP(dc_audio_map)
-	MCFG_MACHINE_RESET_OVERRIDE(dc_cons_state,dc_console )
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dc_console, this));
 //  MCFG_MACRONIX_29LV160TMC_ADD("dcflash")
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@ -235,21 +235,21 @@ public:
 	uint8_t m_mjflove_irq_cause;
 	uint8_t m_daimyojn_palette_sel;
-	DECLARE_MACHINE_START(ddenlovr);
+	void machine_start_ddenlovr();
-	DECLARE_MACHINE_RESET(ddenlovr);
+	void machine_reset_ddenlovr();
-	DECLARE_VIDEO_START(ddenlovr);
+	void video_start_ddenlovr();
-	DECLARE_MACHINE_START(rongrong);
+	void machine_start_rongrong();
-	DECLARE_MACHINE_START(mmpanic);
+	void machine_start_mmpanic();
-	DECLARE_VIDEO_START(mmpanic);
+	void video_start_mmpanic();
-	DECLARE_MACHINE_START(hanakanz);
+	void machine_start_hanakanz();
-	DECLARE_VIDEO_START(hanakanz);
+	void video_start_hanakanz();
-	DECLARE_MACHINE_START(sryudens);
+	void machine_start_sryudens();
-	DECLARE_VIDEO_START(mjflove);
+	void video_start_mjflove();
-	DECLARE_MACHINE_START(seljan2);
+	void machine_start_seljan2();
-	DECLARE_MACHINE_START(mjflove);
+	void machine_start_mjflove();
-	DECLARE_MACHINE_START(funkyfig);
+	void machine_start_funkyfig();
-	DECLARE_MACHINE_START(mjmyster);
+	void machine_start_mjmyster();
-	DECLARE_MACHINE_START(hparadis);
+	void machine_start_hparadis();
 	uint32_t screen_update_ddenlovr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_htengoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@ -414,7 +414,7 @@ public:
 	DECLARE_READ8_MEMBER(htengoku_coin_r);
 	DECLARE_WRITE8_MEMBER(htengoku_rombank_w);
 	DECLARE_WRITE8_MEMBER(htengoku_blit_romregion_w);
-	DECLARE_VIDEO_START(htengoku);
+	void video_start_htengoku() ATTR_COLD;
 	DECLARE_WRITE8_MEMBER(htengoku_dsw_w);
 	DECLARE_READ8_MEMBER(htengoku_dsw_r);
 	DECLARE_WRITE8_MEMBER(quizchq_oki_bank_w);
@ -534,7 +534,7 @@ public:
 	void ultrchmp_map(address_map &map);
 };
-VIDEO_START_MEMBER(ddenlovr_state,ddenlovr)
+void ddenlovr_state::video_start_ddenlovr()
 {
 	m_blitter_irq_handler.bind_relative_to(*this);
@ -631,24 +631,24 @@ VIDEO_START_MEMBER(ddenlovr_state,ddenlovr)
 	save_pointer(NAME(m_ddenlovr_pixmap[7].get()), 512 * 512);
 }
-VIDEO_START_MEMBER(ddenlovr_state,mmpanic)
+void ddenlovr_state::video_start_mmpanic()
 {
-	VIDEO_START_CALL_MEMBER(ddenlovr);
+	video_start_ddenlovr();
 	m_extra_layers = 1;
 }
-VIDEO_START_MEMBER(ddenlovr_state,hanakanz)
+void ddenlovr_state::video_start_hanakanz()
 {
-	VIDEO_START_CALL_MEMBER(ddenlovr);
+	video_start_ddenlovr();
 	m_ddenlovr_blit_rom_bits = 16;
 	m_ddenlovr_blit_commands = hanakanz_commands;
 }
-VIDEO_START_MEMBER(ddenlovr_state,mjflove)
+void ddenlovr_state::video_start_mjflove()
 {
-	VIDEO_START_CALL_MEMBER(ddenlovr);
+	video_start_ddenlovr();
 	m_ddenlovr_blit_commands = mjflove_commands;
 }
@ -4182,10 +4182,10 @@ void ddenlovr_state::seljan2_portmap(address_map &map)
 ***************************************************************************/
 // htengoku uses the mixer chip from ddenlovr
-VIDEO_START_MEMBER(ddenlovr_state,htengoku)
+void ddenlovr_state::video_start_htengoku()
 {
-	VIDEO_START_CALL_MEMBER(ddenlovr);
+	video_start_ddenlovr();
-	VIDEO_START_CALL_MEMBER(hnoridur);
+	video_start_hnoridur();
 }
 uint32_t ddenlovr_state::screen_update_htengoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@ -4361,8 +4361,8 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku)
 	MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(20)
 	MCFG_ADDRESS_MAP_BANK_STRIDE(0x8000)
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,dynax)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_dynax, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,dynax)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_dynax, this));
 	MCFG_NVRAM_ADD_0FILL("nvram")
@ -4388,7 +4388,7 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku)
 	MCFG_PALETTE_ADD("palette", 16*256)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,htengoku)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_htengoku, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -9571,7 +9571,7 @@ INPUT_PORTS_END
 ***************************************************************************/
-MACHINE_START_MEMBER(ddenlovr_state,ddenlovr)
+void ddenlovr_state::machine_start_ddenlovr()
 {
 	save_item(NAME(m_input_sel));
 	save_item(NAME(m_dsw_sel));
@ -9595,7 +9595,7 @@ MACHINE_START_MEMBER(ddenlovr_state,ddenlovr)
 	save_item(NAME(m_palram));
 }
-MACHINE_RESET_MEMBER(ddenlovr_state,ddenlovr)
+void ddenlovr_state::machine_reset_ddenlovr()
 {
 	m_input_sel = 0;
 	m_dsw_sel = 0;
@ -9621,75 +9621,75 @@ MACHINE_RESET_MEMBER(ddenlovr_state,ddenlovr)
 	memset(m_palram, 0, ARRAY_LENGTH(m_palram));
 }
-MACHINE_START_MEMBER(ddenlovr_state,rongrong)
+void ddenlovr_state::machine_start_rongrong()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
 	membank("bank1")->configure_entries(0, 0x20, &ROM[0x010000], 0x8000);
 	membank("bank2")->configure_entries(0, 8,    &ROM[0x110000], 0x1000);
-	MACHINE_START_CALL_MEMBER(ddenlovr);
+	machine_start_ddenlovr();
 }
-MACHINE_START_MEMBER(ddenlovr_state,mmpanic)
+void ddenlovr_state::machine_start_mmpanic()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
 	membank("bank1")->configure_entries(0, 8,    &ROM[0x10000], 0x8000);
-	MACHINE_START_CALL_MEMBER(ddenlovr);
+	machine_start_ddenlovr();
 }
-MACHINE_START_MEMBER(ddenlovr_state,funkyfig)
+void ddenlovr_state::machine_start_funkyfig()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
 	membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000);
 	membank("bank2")->configure_entries(0, 8,    &ROM[0x90000], 0x1000);
-	MACHINE_START_CALL_MEMBER(ddenlovr);
+	machine_start_ddenlovr();
 }
-MACHINE_START_MEMBER(ddenlovr_state,hanakanz)
+void ddenlovr_state::machine_start_hanakanz()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
 	membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000);
 	membank("bank2")->configure_entries(0, 0x10, &ROM[0x90000], 0x1000);
-	MACHINE_START_CALL_MEMBER(ddenlovr);
+	machine_start_ddenlovr();
 }
-MACHINE_START_MEMBER(ddenlovr_state,mjmyster)
+void ddenlovr_state::machine_start_mjmyster()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
 	membank("bank1")->configure_entries(0, 8,    &ROM[0x10000], 0x8000);
 	membank("bank2")->configure_entries(0, 8,    &ROM[0x90000], 0x1000);
-	MACHINE_START_CALL_MEMBER(ddenlovr);
+	machine_start_ddenlovr();
 }
-MACHINE_START_MEMBER(ddenlovr_state,hparadis)
+void ddenlovr_state::machine_start_hparadis()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
 	membank("bank1")->configure_entries(0, 8,    &ROM[0x10000], 0x8000);
 	membank("bank2")->configure_entries(0, 8,    &ROM[0x50000], 0x1000);
-	MACHINE_START_CALL_MEMBER(ddenlovr);
+	machine_start_ddenlovr();
 }
-MACHINE_START_MEMBER(ddenlovr_state,mjflove)
+void ddenlovr_state::machine_start_mjflove()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
 	membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000);
 	membank("bank2")->configure_entries(0, 8,    &ROM[0x90000], 0x1000);
-	MACHINE_START_CALL_MEMBER(ddenlovr);
+	machine_start_ddenlovr();
 }
-MACHINE_START_MEMBER(ddenlovr_state,sryudens)
+void ddenlovr_state::machine_start_sryudens()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
 	membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000);
 	membank("bank2")->configure_entries(0, 0x10, &ROM[0x90000], 0x1000);
-	MACHINE_START_CALL_MEMBER(ddenlovr);
+	machine_start_ddenlovr();
 }
 /***************************************************************************
@ -9713,8 +9713,8 @@ MACHINE_CONFIG_START(ddenlovr_state::ddenlovr)
 	MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ddenlovr_state, ddenlovr_coincounter_0_w))
 	MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ddenlovr_state, ddenlovr_coincounter_1_w))
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_ddenlovr, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -9731,7 +9731,7 @@ MACHINE_CONFIG_START(ddenlovr_state::ddenlovr)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, ddenlovr_blitter_irq)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_ddenlovr, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -9816,7 +9816,7 @@ MACHINE_CONFIG_START(ddenlovr_state::ultrchmp)
 	MCFG_NVRAM_ADD_0FILL("nvram")
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this));
 MACHINE_CONFIG_END
 /***************************************************************************
@ -9841,8 +9841,8 @@ MACHINE_CONFIG_START(ddenlovr_state::quizchq)
 	MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, rongrong_select_w))
 	// bit 5 of 0x1b (SIO CTSB?) = blitter busy
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,rongrong)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_rongrong, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -9859,7 +9859,7 @@ MACHINE_CONFIG_START(ddenlovr_state::quizchq)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, rongrong_blitter_irq)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_ddenlovr, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -9930,8 +9930,8 @@ MACHINE_CONFIG_START(ddenlovr_state::mmpanic)
 	MCFG_DEVICE_PROGRAM_MAP(mmpanic_sound_map)
 	MCFG_DEVICE_IO_MAP(mmpanic_sound_portmap)
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mmpanic)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mmpanic, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -9948,7 +9948,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mmpanic)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mmpanic_blitter_irq)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mmpanic)  // extra layers
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mmpanic, this));  // extra layers
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -10018,8 +10018,8 @@ MACHINE_CONFIG_START(ddenlovr_state::hanakanz)
 	MCFG_DEVICE_PROGRAM_MAP(hanakanz_map)
 	MCFG_DEVICE_IO_MAP(hanakanz_portmap)
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanakanz, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -10034,7 +10034,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hanakanz)
 	MCFG_PALETTE_ADD("palette", 0x200)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,hanakanz) // blitter commands in the roms are shuffled around
+	set_video_start_cb(config, driver_callback_delegate(&video_start_hanakanz, this)); // blitter commands in the roms are shuffled around
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -10065,8 +10065,8 @@ MACHINE_CONFIG_START(ddenlovr_state::kotbinyo)
 	MCFG_DEVICE_PROGRAM_MAP(hanakanz_map)
 	MCFG_DEVICE_IO_MAP(kotbinyo_portmap)
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanakanz, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -10081,7 +10081,7 @@ MACHINE_CONFIG_START(ddenlovr_state::kotbinyo)
 	MCFG_PALETTE_ADD("palette", 0x200)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,hanakanz) // blitter commands in the roms are shuffled around
+	set_video_start_cb(config, driver_callback_delegate(&video_start_hanakanz, this)); // blitter commands in the roms are shuffled around
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -10159,7 +10159,7 @@ MACHINE_CONFIG_START(ddenlovr_state::funkyfig)
 	MCFG_TMPZ84C015_IN_PA_CB(READ8(*this, ddenlovr_state, funkyfig_dsw_r))
 	MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, funkyfig_rombank_w))
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,funkyfig)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_funkyfig, this));
 	MCFG_DEVICE_MODIFY("screen")
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0))
@ -10173,7 +10173,7 @@ MACHINE_CONFIG_START(ddenlovr_state::funkyfig)
 	MCFG_DEVICE_MODIFY("soundcpu")
 	MCFG_DEVICE_IO_MAP(funkyfig_sound_portmap)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,ddenlovr) // no extra layers?
+	set_video_start_cb(config, driver_callback_delegate(&video_start_ddenlovr, this)); // no extra layers?
 MACHINE_CONFIG_END
@ -10190,8 +10190,8 @@ MACHINE_CONFIG_START(ddenlovr_state::mjschuka)
 	MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, sryudens_rambank_w))
 	MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mjflove_rombank_w))
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanakanz, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -10208,7 +10208,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjschuka)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove)  // blitter commands in the roms are shuffled around
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this));  // blitter commands in the roms are shuffled around
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -10258,7 +10258,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyster)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq)
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjmyster, this));
 	MCFG_DEVICE_ADD("aysnd", AY8910, 3579545)
 	MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ddenlovr_state, ddenlovr_select_w))
@ -10296,7 +10296,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hginga)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq)
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjmyster, this));
 	MCFG_DEVICE_ADD("aysnd", AY8910, 3579545)
 	MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ddenlovr_state, hginga_dsw_r))
@ -10323,7 +10323,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hgokou)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq)
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjmyster, this));
 	MCFG_DEVICE_ADD("aysnd", AY8910, 3579545)
 	MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ddenlovr_state, hginga_dsw_r))
@ -10364,7 +10364,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyuniv)
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjmyster, this));
 	MCFG_DEVICE_MODIFY("rtc")
 	MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
@ -10393,7 +10393,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyornt)
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 4, 256-16+4-1)
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjmyster, this));
 	MCFG_DEVICE_MODIFY("rtc")
 	MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
@ -10441,7 +10441,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjflove)
 	MCFG_TMPZ84C015_IN_PA_CB(IOPORT("DSW2"))
 	MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, hanakanz_keyb_w))
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjflove)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjflove, this));
 	MCFG_DEVICE_MODIFY("screen")
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, mjflove_irq))
@ -10452,7 +10452,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjflove)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjflove_blitter_irq)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove)  // blitter commands in the roms are shuffled around
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this));  // blitter commands in the roms are shuffled around
 	MCFG_DEVICE_ADD("aysnd", AY8910, 28636363/8)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
@ -10471,7 +10471,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hparadis)
 	// the RTC seems unused
 	MCFG_DEVICE_REMOVE("rtc")
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hparadis)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_hparadis, this));
 MACHINE_CONFIG_END
@ -10483,8 +10483,8 @@ MACHINE_CONFIG_START(ddenlovr_state::jongtei)
 	MCFG_DEVICE_PROGRAM_MAP(hanakanz_map)
 	MCFG_DEVICE_IO_MAP(jongtei_portmap)
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanakanz, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -10501,7 +10501,7 @@ MACHINE_CONFIG_START(ddenlovr_state::jongtei)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjflove_blitter_irq)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,hanakanz) // blitter commands in the roms are shuffled around
+	set_video_start_cb(config, driver_callback_delegate(&video_start_hanakanz, this)); // blitter commands in the roms are shuffled around
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -10540,8 +10540,8 @@ MACHINE_CONFIG_START(ddenlovr_state::sryudens)
 	MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, sryudens_rambank_w))
 	MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mjflove_rombank_w))
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,sryudens)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_sryudens, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -10558,7 +10558,7 @@ MACHINE_CONFIG_START(ddenlovr_state::sryudens)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjflove_blitter_irq)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove)  // blitter commands in the roms are shuffled around
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this));  // blitter commands in the roms are shuffled around
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -10591,8 +10591,8 @@ MACHINE_CONFIG_START(ddenlovr_state::janshinp)
 	MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, sryudens_rambank_w))
 	MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mjflove_rombank_w))
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_hanakanz, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -10609,7 +10609,7 @@ MACHINE_CONFIG_START(ddenlovr_state::janshinp)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjflove_blitter_irq)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_ddenlovr, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -10632,7 +10632,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(ddenlovr_state::dtoyoken)
 	janshinp(config);
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove)  // blitter commands in the roms are shuffled around
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this));  // blitter commands in the roms are shuffled around
 MACHINE_CONFIG_END
@ -10640,7 +10640,7 @@ MACHINE_CONFIG_END
                             Return Of Sel Jan II
 ***************************************************************************/
-MACHINE_START_MEMBER(ddenlovr_state,seljan2)
+void ddenlovr_state::machine_start_seljan2()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
@ -10651,7 +10651,7 @@ MACHINE_START_MEMBER(ddenlovr_state,seljan2)
 	membank("bank2")->configure_entries(0, 0x10, &ROM[0x98000], 0x1000);
-	MACHINE_START_CALL_MEMBER(ddenlovr);
+	machine_start_ddenlovr();
 }
 MACHINE_CONFIG_START(ddenlovr_state::seljan2)
@ -10663,8 +10663,8 @@ MACHINE_CONFIG_START(ddenlovr_state::seljan2)
 	MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, hanakanz_keyb_w))
 	MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, sryudens_coincounter_w))
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,seljan2)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_seljan2, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -10681,7 +10681,7 @@ MACHINE_CONFIG_START(ddenlovr_state::seljan2)
 	MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, seljan2_blitter_irq)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove)  // blitter commands in the roms are shuffled around
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mjflove, this));  // blitter commands in the roms are shuffled around
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -10715,8 +10715,8 @@ MACHINE_CONFIG_START(ddenlovr_state::daimyojn)
 	MCFG_DEVICE_PROGRAM_MAP(hanakanz_map)
 	MCFG_DEVICE_IO_MAP(daimyojn_portmap)
-	MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjflove)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_mjflove, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddenlovr, this));
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
@ -10731,7 +10731,7 @@ MACHINE_CONFIG_START(ddenlovr_state::daimyojn)
 	MCFG_PALETTE_ADD("palette", 0x200)
-	MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,hanakanz) // blitter commands in the roms are shuffled around
+	set_video_start_cb(config, driver_callback_delegate(&video_start_hanakanz, this)); // blitter commands in the roms are shuffled around
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/ddragon.cpp
+++ b/src/mame/drivers/ddragon.cpp
@ -129,7 +129,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ddragon_state::ddragon_scanline)
 *
 *************************************/
-MACHINE_START_MEMBER(ddragon_state,ddragon)
+void ddragon_state::machine_start_ddragon()
 {
 	/* configure banks */
 	membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000);
@ -145,7 +145,7 @@ MACHINE_START_MEMBER(ddragon_state,ddragon)
 }
-MACHINE_RESET_MEMBER(ddragon_state,ddragon)
+void ddragon_state::machine_reset_ddragon()
 {
 	m_scrollx_hi = 0;
 	m_scrolly_hi = 0;
@ -959,8 +959,8 @@ MACHINE_CONFIG_START(ddragon_state::ddragon)
 	MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* heavy interleaving to sync up sprite<->main CPUs */
-	MCFG_MACHINE_START_OVERRIDE(ddragon_state,ddragon)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_ddragon, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddragon_state,ddragon)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddragon, this));
 	/* video hardware */
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon)
@ -972,7 +972,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon)
 	MCFG_SCREEN_UPDATE_DRIVER(ddragon_state, screen_update_ddragon)
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(ddragon_state,ddragon)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_ddragon, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -1031,8 +1031,8 @@ MACHINE_CONFIG_START(ddragon_state::ddragon6809)
 	MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* heavy interleaving to sync up sprite<->main CPUs */
-	MCFG_MACHINE_START_OVERRIDE(ddragon_state,ddragon)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_ddragon, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddragon_state,ddragon)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddragon, this));
 	/* video hardware */
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon)
@ -1044,7 +1044,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon6809)
 	MCFG_SCREEN_UPDATE_DRIVER(ddragon_state, screen_update_ddragon)
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(ddragon_state,ddragon)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_ddragon, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -1084,8 +1084,8 @@ MACHINE_CONFIG_START(ddragon_state::ddragon2)
 	MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* heavy interleaving to sync up sprite<->main CPUs */
-	MCFG_MACHINE_START_OVERRIDE(ddragon_state,ddragon)
+	set_machine_start_cb(config, driver_callback_delegate(&machine_start_ddragon, this));
-	MCFG_MACHINE_RESET_OVERRIDE(ddragon_state,ddragon)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_ddragon, this));
 	/* video hardware */
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ddragon)
@ -1097,7 +1097,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon2)
 	MCFG_SCREEN_UPDATE_DRIVER(ddragon_state, screen_update_ddragon)
 	MCFG_SCREEN_PALETTE("palette")
-	MCFG_VIDEO_START_OVERRIDE(ddragon_state,ddragon)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_ddragon, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/ddragon3.cpp
+++ b/src/mame/drivers/ddragon3.cpp
@ -938,7 +938,7 @@ MACHINE_CONFIG_END
 MACHINE_CONFIG_START(wwfwfest_state::wwfwfstb)
 	wwfwfest(config);
-	MCFG_VIDEO_START_OVERRIDE(wwfwfest_state,wwfwfstb)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_wwfwfstb, this));
 MACHINE_CONFIG_END
--- a/src/mame/drivers/dec0.cpp
+++ b/src/mame/drivers/dec0.cpp
@ -1651,7 +1651,7 @@ MACHINE_CONFIG_START(dec0_state::dec0)
 	MCFG_DEVICE_PROGRAM_MAP(dec0_s_map)
 	/* video hardware */
-	MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_dec0, this));
 	MCFG_PALETTE_MODIFY("palette")
 	MCFG_PALETTE_FORMAT(XBGR)
@ -1680,7 +1680,7 @@ MACHINE_CONFIG_START(dec0_state::dec1)
 	/* maincpu and audiocpu clocks and address maps differ per game */
 	/* video hardware */
-	MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0_nodma)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_dec0_nodma, this));
 	MCFG_PALETTE_MODIFY("palette")
 	MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
@ -1742,7 +1742,7 @@ MACHINE_CONFIG_START(dec0_automat_state::automat)
 	MCFG_DEVICE_PROGRAM_MAP(automat_s_map)
 	/* video hardware */
-	MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0_nodma)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_dec0_nodma, this));
 	MCFG_SCREEN_ADD("screen", RASTER)
 //  MCFG_SCREEN_REFRESH_RATE(57.41)
@ -1817,7 +1817,7 @@ MACHINE_CONFIG_START(dec0_automat_state::secretab)
 	MCFG_DEVICE_PROGRAM_MAP(secretab_s_map)
 	/* video hardware */
-	MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0_nodma)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_dec0_nodma, this));
 	MCFG_SCREEN_ADD("screen", RASTER)
 //  MCFG_SCREEN_REFRESH_RATE(57.41)
@ -1971,7 +1971,7 @@ MACHINE_CONFIG_START(dec0_state::ffantasybl)
 	MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_hippodrm)
 MACHINE_CONFIG_END
-MACHINE_RESET_MEMBER(dec0_state,slyspy)
+void dec0_state::machine_reset_slyspy()
 {
 	// set initial memory map
 	m_slyspy_state = 0;
@ -2011,7 +2011,7 @@ MACHINE_CONFIG_START(dec0_state::slyspy)
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(dec0_state, screen_update_slyspy)
-	MCFG_MACHINE_RESET_OVERRIDE(dec0_state,slyspy)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_slyspy, this));
 MACHINE_CONFIG_END
 MACHINE_CONFIG_START(dec0_state::midres)
--- a/src/mame/drivers/dec8.cpp
+++ b/src/mame/drivers/dec8.cpp
@ -1982,7 +1982,7 @@ MACHINE_CONFIG_START(dec8_state::lastmisn)
 	MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
 	MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
-	MCFG_VIDEO_START_OVERRIDE(dec8_state,lastmisn)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_lastmisn, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2047,7 +2047,7 @@ MACHINE_CONFIG_START(dec8_state::shackled)
 	MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
 	MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
-	MCFG_VIDEO_START_OVERRIDE(dec8_state,shackled)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_shackled, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2108,7 +2108,7 @@ MACHINE_CONFIG_START(dec8_state::gondo)
 	MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
 	MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
-	MCFG_VIDEO_START_OVERRIDE(dec8_state,gondo)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_gondo, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2169,7 +2169,7 @@ MACHINE_CONFIG_START(dec8_state::garyoret)
 	MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
 	MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
-	MCFG_VIDEO_START_OVERRIDE(dec8_state,garyoret)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_garyoret, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2229,7 +2229,7 @@ MACHINE_CONFIG_START(dec8_state::ghostb)
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ghostb)
 	MCFG_DECO_RMC3_ADD_PROMS("palette","proms",1024) // xxxxBBBBGGGGRRRR with custom weighting
-	MCFG_VIDEO_START_OVERRIDE(dec8_state,ghostb)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_ghostb, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2289,7 +2289,7 @@ MACHINE_CONFIG_START(dec8_state::csilver)
 	MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
 	MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
-	MCFG_VIDEO_START_OVERRIDE(dec8_state,lastmisn)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_lastmisn, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2353,7 +2353,7 @@ MACHINE_CONFIG_START(dec8_state::oscar)
 	MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
 	MCFG_DECO_RMC3_SET_PALETTE_SIZE(1024)
-	MCFG_VIDEO_START_OVERRIDE(dec8_state,oscar)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_oscar, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2407,7 +2407,7 @@ MACHINE_CONFIG_START(dec8_state::srdarwin)
 	MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
 	MCFG_DECO_RMC3_SET_PALETTE_SIZE(144)
-	MCFG_VIDEO_START_OVERRIDE(dec8_state,srdarwin)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_srdarwin, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@ -2464,7 +2464,7 @@ MACHINE_CONFIG_START(dec8_state::cobracom)
 	MCFG_DEVICE_ADD("palette", DECO_RMC3, 0) // xxxxBBBBGGGGRRRR with custom weighting
 	MCFG_DECO_RMC3_SET_PALETTE_SIZE(256)
-	MCFG_VIDEO_START_OVERRIDE(dec8_state,cobracom)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_cobracom, this));
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
--- a/src/mame/drivers/deco32.cpp
+++ b/src/mame/drivers/deco32.cpp
@ -1929,7 +1929,7 @@ MACHINE_CONFIG_START(captaven_state::captaven)
 	MCFG_DECO146_IN_PORTC_CB(IOPORT("IN1"))
 	MCFG_DECO146_SOUNDLATCH_IRQ_CB(INPUTLINE("audiocpu", 0))
-	MCFG_VIDEO_START_OVERRIDE(captaven_state, captaven)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_captaven, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -2011,7 +2011,7 @@ MACHINE_CONFIG_START(fghthist_state::fghthist)
 	MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE
 	MCFG_DECO146_SET_USE_MAGIC_ADDRESS_XOR
-	MCFG_VIDEO_START_OVERRIDE(fghthist_state, fghthist)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_fghthist, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -2137,7 +2137,7 @@ MACHINE_CONFIG_START(dragngun_state::dragngun)
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dragngun)
 	MCFG_PALETTE_ADD("palette", 2048)
-	MCFG_VIDEO_START_OVERRIDE(dragngun_state,dragngun)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_dragngun, this));
 	MCFG_DECO146_ADD("ioprot")
 	MCFG_DECO146_IN_PORTA_CB(IOPORT("INPUTS"))
@ -2235,7 +2235,7 @@ MACHINE_CONFIG_START(dragngun_state::lockload)
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dragngun)
 	MCFG_PALETTE_ADD("palette", 2048)
-	MCFG_VIDEO_START_OVERRIDE(dragngun_state, dragngun)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_dragngun, this));
 	MCFG_DEVICE_ADD("tilegen1", DECO16IC, 0)
 	MCFG_DECO16IC_SPLIT(0)
@ -2366,7 +2366,7 @@ MACHINE_CONFIG_START(nslasher_state::tattass)
 	MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE(*this, nslasher_state, tattass_sound_irq_w))
 	MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE
-	MCFG_VIDEO_START_OVERRIDE(nslasher_state,nslasher)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_nslasher, this));
 	/* sound hardware */
 	MCFG_DECOBSMT_ADD(DECOBSMT_TAG)
@ -2438,7 +2438,7 @@ MACHINE_CONFIG_START(nslasher_state::nslasher)
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "deco_ace", gfx_nslasher)
-	MCFG_VIDEO_START_OVERRIDE(nslasher_state, nslasher)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_nslasher, this));
 	MCFG_DECO104_ADD("ioprot")
 	MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0"))
--- a/src/mame/drivers/deco_mlc.cpp
+++ b/src/mame/drivers/deco_mlc.cpp
@ -503,7 +503,7 @@ GFXDECODE_END
 /******************************************************************************/
-MACHINE_RESET_MEMBER(deco_mlc_state,mlc)
+void deco_mlc_state::machine_reset_mlc()
 {
 	m_vbl_i = 0xffffffff;
 	m_raster_irq_timer = machine().device<timer_device>("int_timer");
@ -515,7 +515,7 @@ MACHINE_CONFIG_START(deco_mlc_state::avengrgs)
 	MCFG_DEVICE_ADD("maincpu", SH2,42000000/2) /* 21 MHz clock confirmed on real board */
 	MCFG_DEVICE_PROGRAM_MAP(avengrgs_map)
-	MCFG_MACHINE_RESET_OVERRIDE(deco_mlc_state,mlc)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mlc, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") /* Actually 93c45 */
 	MCFG_TIMER_DRIVER_ADD("int_timer", deco_mlc_state, interrupt_gen)
@ -534,7 +534,7 @@ MACHINE_CONFIG_START(deco_mlc_state::avengrgs)
 	MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
 	MCFG_PALETTE_MEMBITS(16)
-	MCFG_VIDEO_START_OVERRIDE(deco_mlc_state,mlc)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mlc, this));
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
@ -551,7 +551,7 @@ MACHINE_CONFIG_START(deco_mlc_state::mlc)
 	MCFG_DEVICE_ADD("maincpu", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */
 	MCFG_DEVICE_PROGRAM_MAP(decomlc_map)
-	MCFG_MACHINE_RESET_OVERRIDE(deco_mlc_state,mlc)
+	set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_mlc, this));
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") /* Actually 93c45 */
 	MCFG_TIMER_DRIVER_ADD("int_timer", deco_mlc_state, interrupt_gen)
@ -570,7 +570,7 @@ MACHINE_CONFIG_START(deco_mlc_state::mlc)
 	MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
 	MCFG_PALETTE_MEMBITS(16)
-	MCFG_VIDEO_START_OVERRIDE(deco_mlc_state,mlc)
+	set_video_start_cb(config, driver_callback_delegate(&video_start_mlc, this));
 	MCFG_DECO146_ADD("ioprot")
 	MCFG_DECO146_SET_USE_MAGIC_ADDRESS_XOR
--- a/Show More
+++ b/Show More