summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-05-16 21:56:39 +1000
committer Vas Crabb <vas@vastheman.com>2018-05-16 21:56:39 +1000
commit166638ce8093e04884166296469bda82882890fd (patch)
tree6dedcf3bde5d05843695efaf4949ab285d3193f1 /src/mame/includes
parent8e796a2075415427491a541b75884aea6e21f6a9 (diff)
Revert "- Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much"
This reverts commit c83e2a853d4e1643fcc85b68ada3c6f7f33adea4. Revert "fix compile. (nw)" This reverts commit a259ba3e366f442a22a9341755ff58163869860c. GCC is being bad and allowing invalid C++ that other compilers reject.
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/3do.h2
-rw-r--r--src/mame/includes/40love.h6
-rw-r--r--src/mame/includes/8080bw.h28
-rw-r--r--src/mame/includes/actfancr.h4
-rw-r--r--src/mame/includes/aerofgt.h20
-rw-r--r--src/mame/includes/alpha68k.h14
-rw-r--r--src/mame/includes/amiga.h4
-rw-r--r--src/mame/includes/ampoker2.h2
-rw-r--r--src/mame/includes/amstrad.h22
-rw-r--r--src/mame/includes/apollo.h4
-rw-r--r--src/mame/includes/apple2.h26
-rw-r--r--src/mame/includes/apple2gs.h10
-rw-r--r--src/mame/includes/apple3.h4
-rw-r--r--src/mame/includes/argus.h12
-rw-r--r--src/mame/includes/armedf.h8
-rw-r--r--src/mame/includes/astrocde.h2
-rw-r--r--src/mame/includes/astrof.h10
-rw-r--r--src/mame/includes/atarig1.h6
-rw-r--r--src/mame/includes/atarig42.h2
-rw-r--r--src/mame/includes/atarigt.h6
-rw-r--r--src/mame/includes/atarisy1.h6
-rw-r--r--src/mame/includes/atarisy2.h6
-rw-r--r--src/mame/includes/badlands.h6
-rw-r--r--src/mame/includes/battlex.h2
-rw-r--r--src/mame/includes/bbc.h32
-rw-r--r--src/mame/includes/bbusters.h4
-rw-r--r--src/mame/includes/bking.h6
-rw-r--r--src/mame/includes/blmbycar.h8
-rw-r--r--src/mame/includes/blstroid.h2
-rw-r--r--src/mame/includes/blueprnt.h2
-rw-r--r--src/mame/includes/bosco.h2
-rw-r--r--src/mame/includes/btime.h14
-rw-r--r--src/mame/includes/bublbobl.h21
-rw-r--r--src/mame/includes/cabal.h4
-rw-r--r--src/mame/includes/cave.h16
-rw-r--r--src/mame/includes/cclimber.h6
-rw-r--r--src/mame/includes/cdi.h12
-rw-r--r--src/mame/includes/centiped.h14
-rw-r--r--src/mame/includes/champbas.h4
-rw-r--r--src/mame/includes/cinemat.h12
-rw-r--r--src/mame/includes/clshroad.h4
-rw-r--r--src/mame/includes/cninja.h8
-rw-r--r--src/mame/includes/combatsc.h8
-rw-r--r--src/mame/includes/coolpool.h4
-rw-r--r--src/mame/includes/cosmic.h6
-rw-r--r--src/mame/includes/cps1.h40
-rw-r--r--src/mame/includes/cvs.h6
-rw-r--r--src/mame/includes/dc.h2
-rw-r--r--src/mame/includes/ddragon.h6
-rw-r--r--src/mame/includes/ddragon3.h2
-rw-r--r--src/mame/includes/dec0.h6
-rw-r--r--src/mame/includes/dec8.h16
-rw-r--r--src/mame/includes/deco32.h8
-rw-r--r--src/mame/includes/deco_mlc.h4
-rw-r--r--src/mame/includes/decocass.h62
-rw-r--r--src/mame/includes/digdug.h2
-rw-r--r--src/mame/includes/divebomb.h6
-rw-r--r--src/mame/includes/dkong.h22
-rw-r--r--src/mame/includes/docastle.h2
-rw-r--r--src/mame/includes/dynax.h32
-rw-r--r--src/mame/includes/eolith.h4
-rw-r--r--src/mame/includes/epos.h4
-rw-r--r--src/mame/includes/eprom.h4
-rw-r--r--src/mame/includes/equites.h4
-rw-r--r--src/mame/includes/espial.h2
-rw-r--r--src/mame/includes/exidy.h2
-rw-r--r--src/mame/includes/f1gp.h12
-rw-r--r--src/mame/includes/fantland.h8
-rw-r--r--src/mame/includes/fastfred.h6
-rw-r--r--src/mame/includes/firetrk.h4
-rw-r--r--src/mame/includes/flstory.h12
-rw-r--r--src/mame/includes/fm7.h8
-rw-r--r--src/mame/includes/freekick.h10
-rw-r--r--src/mame/includes/fromanc2.h10
-rw-r--r--src/mame/includes/fromance.h12
-rw-r--r--src/mame/includes/funworld.h10
-rw-r--r--src/mame/includes/gaelco.h4
-rw-r--r--src/mame/includes/gaelco2.h4
-rw-r--r--src/mame/includes/gaelco3d.h4
-rw-r--r--src/mame/includes/gaiden.h10
-rw-r--r--src/mame/includes/galaga.h6
-rw-r--r--src/mame/includes/galaxia.h4
-rw-r--r--src/mame/includes/galaxold.h56
-rw-r--r--src/mame/includes/galaxy.h4
-rw-r--r--src/mame/includes/galivan.h12
-rw-r--r--src/mame/includes/galspnbl.h2
-rw-r--r--src/mame/includes/gameplan.h16
-rw-r--r--src/mame/includes/gb.h12
-rw-r--r--src/mame/includes/gberet.h6
-rw-r--r--src/mame/includes/gladiatr.h8
-rw-r--r--src/mame/includes/goldstar.h12
-rw-r--r--src/mame/includes/gottlieb.h2
-rw-r--r--src/mame/includes/hec2hrp.h14
-rw-r--r--src/mame/includes/hitme.h2
-rw-r--r--src/mame/includes/hnayayoi.h2
-rw-r--r--src/mame/includes/holeland.h4
-rw-r--r--src/mame/includes/homedata.h22
-rw-r--r--src/mame/includes/hp48.h12
-rw-r--r--src/mame/includes/hyperspt.h2
-rw-r--r--src/mame/includes/ironhors.h2
-rw-r--r--src/mame/includes/itech32.h2
-rw-r--r--src/mame/includes/itech8.h4
-rw-r--r--src/mame/includes/jack.h10
-rw-r--r--src/mame/includes/jpmimpct.h10
-rw-r--r--src/mame/includes/kaneko16.h8
-rw-r--r--src/mame/includes/kangaroo.h2
-rw-r--r--src/mame/includes/karnov.h4
-rw-r--r--src/mame/includes/kaypro.h6
-rw-r--r--src/mame/includes/kchamp.h4
-rw-r--r--src/mame/includes/kickgoal.h4
-rw-r--r--src/mame/includes/kingobox.h4
-rw-r--r--src/mame/includes/konamigx.h24
-rw-r--r--src/mame/includes/ladyfrog.h4
-rw-r--r--src/mame/includes/lasso.h8
-rw-r--r--src/mame/includes/lastduel.h8
-rw-r--r--src/mame/includes/legionna.h12
-rw-r--r--src/mame/includes/leland.h14
-rw-r--r--src/mame/includes/liberate.h12
-rw-r--r--src/mame/includes/llc.h6
-rw-r--r--src/mame/includes/lsasquad.h3
-rw-r--r--src/mame/includes/lvcards.h4
-rw-r--r--src/mame/includes/lwings.h6
-rw-r--r--src/mame/includes/m10.h8
-rw-r--r--src/mame/includes/m62.h22
-rw-r--r--src/mame/includes/m72.h18
-rw-r--r--src/mame/includes/m90.h4
-rw-r--r--src/mame/includes/m92.h6
-rw-r--r--src/mame/includes/mac.h20
-rw-r--r--src/mame/includes/madalien.h2
-rw-r--r--src/mame/includes/mappy.h6
-rw-r--r--src/mame/includes/mbee.h16
-rw-r--r--src/mame/includes/mc1502.h4
-rw-r--r--src/mame/includes/mcr3.h2
-rw-r--r--src/mame/includes/mcr68.h6
-rw-r--r--src/mame/includes/megadriv.h14
-rw-r--r--src/mame/includes/megadriv_acbl.h4
-rw-r--r--src/mame/includes/megadriv_rad.h6
-rw-r--r--src/mame/includes/megasys1.h6
-rw-r--r--src/mame/includes/metro.h4
-rw-r--r--src/mame/includes/midtunit.h4
-rw-r--r--src/mame/includes/midvunit.h2
-rw-r--r--src/mame/includes/midwunit.h4
-rw-r--r--src/mame/includes/midxunit.h4
-rw-r--r--src/mame/includes/midyunit.h12
-rw-r--r--src/mame/includes/midzeus.h6
-rw-r--r--src/mame/includes/mitchell.h6
-rw-r--r--src/mame/includes/model1.h6
-rw-r--r--src/mame/includes/model2.h24
-rw-r--r--src/mame/includes/model3.h16
-rw-r--r--src/mame/includes/moo.h8
-rw-r--r--src/mame/includes/mpu4.h18
-rw-r--r--src/mame/includes/ms32.h2
-rw-r--r--src/mame/includes/mtx.h4
-rw-r--r--src/mame/includes/mw8080bw.h24
-rw-r--r--src/mame/includes/mystston.h4
-rw-r--r--src/mame/includes/mystwarr.h26
-rw-r--r--src/mame/includes/mz700.h4
-rw-r--r--src/mame/includes/n8080.h28
-rw-r--r--src/mame/includes/namcofl.h6
-rw-r--r--src/mame/includes/namconb1.h6
-rw-r--r--src/mame/includes/namcos2.h4
-rw-r--r--src/mame/includes/namcos21.h4
-rw-r--r--src/mame/includes/namcos22.h2
-rw-r--r--src/mame/includes/naomi.h2
-rw-r--r--src/mame/includes/nbmj8688.h12
-rw-r--r--src/mame/includes/nbmj8891.h2
-rw-r--r--src/mame/includes/nbmj9195.h4
-rw-r--r--src/mame/includes/nc.h4
-rw-r--r--src/mame/includes/nes.h8
-rw-r--r--src/mame/includes/ninjakd2.h12
-rw-r--r--src/mame/includes/niyanpai.h2
-rw-r--r--src/mame/includes/nmk16.h20
-rw-r--r--src/mame/includes/nova2001.h10
-rw-r--r--src/mame/includes/ojankohs.h16
-rw-r--r--src/mame/includes/opwolf.h2
-rw-r--r--src/mame/includes/orion.h12
-rw-r--r--src/mame/includes/pacman.h28
-rw-r--r--src/mame/includes/partner.h4
-rw-r--r--src/mame/includes/pc1251.h2
-rw-r--r--src/mame/includes/pc9801.h20
-rw-r--r--src/mame/includes/pce.h4
-rw-r--r--src/mame/includes/pgm.h6
-rw-r--r--src/mame/includes/phoenix.h4
-rw-r--r--src/mame/includes/playch10.h4
-rw-r--r--src/mame/includes/playmark.h18
-rw-r--r--src/mame/includes/polepos.h4
-rw-r--r--src/mame/includes/powerins.h2
-rw-r--r--src/mame/includes/primo.h2
-rw-r--r--src/mame/includes/psikyo.h4
-rw-r--r--src/mame/includes/psychic5.h10
-rw-r--r--src/mame/includes/punchout.h4
-rw-r--r--src/mame/includes/qdrmfgp.h8
-rw-r--r--src/mame/includes/qix.h4
-rw-r--r--src/mame/includes/quasar.h6
-rw-r--r--src/mame/includes/radio86.h2
-rw-r--r--src/mame/includes/raiden.h2
-rw-r--r--src/mame/includes/raiden2.h10
-rw-r--r--src/mame/includes/rallyx.h10
-rw-r--r--src/mame/includes/rbisland.h2
-rw-r--r--src/mame/includes/redalert.h8
-rw-r--r--src/mame/includes/rm380z.h2
-rw-r--r--src/mame/includes/rohga.h2
-rw-r--r--src/mame/includes/route16.h4
-rw-r--r--src/mame/includes/rpunch.h4
-rw-r--r--src/mame/includes/runaway.h2
-rw-r--r--src/mame/includes/s11.h2
-rw-r--r--src/mame/includes/s11a.h2
-rw-r--r--src/mame/includes/s11b.h2
-rw-r--r--src/mame/includes/s11c.h2
-rw-r--r--src/mame/includes/saturn.h2
-rw-r--r--src/mame/includes/sauro.h4
-rw-r--r--src/mame/includes/scramble.h4
-rw-r--r--src/mame/includes/seibuspi.h8
-rw-r--r--src/mame/includes/seta.h26
-rw-r--r--src/mame/includes/seta2.h12
-rw-r--r--src/mame/includes/shangkid.h4
-rw-r--r--src/mame/includes/simple_st0016.h2
-rw-r--r--src/mame/includes/slapfght.h4
-rw-r--r--src/mame/includes/sms.h12
-rw-r--r--src/mame/includes/snk.h24
-rw-r--r--src/mame/includes/snk6502.h14
-rw-r--r--src/mame/includes/snk68.h2
-rw-r--r--src/mame/includes/snookr10.h4
-rw-r--r--src/mame/includes/snowbros.h4
-rw-r--r--src/mame/includes/sorcerer.h2
-rw-r--r--src/mame/includes/spbactn.h4
-rw-r--r--src/mame/includes/special.h16
-rw-r--r--src/mame/includes/spectrum.h16
-rw-r--r--src/mame/includes/splash.h6
-rw-r--r--src/mame/includes/srmp2.h8
-rw-r--r--src/mame/includes/sslam.h4
-rw-r--r--src/mame/includes/ssv.h4
-rw-r--r--src/mame/includes/stv.h6
-rw-r--r--src/mame/includes/suna16.h8
-rw-r--r--src/mame/includes/suna8.h12
-rw-r--r--src/mame/includes/super80.h6
-rw-r--r--src/mame/includes/superqix.h10
-rw-r--r--src/mame/includes/suprnova.h10
-rw-r--r--src/mame/includes/svision.h2
-rw-r--r--src/mame/includes/system1.h6
-rw-r--r--src/mame/includes/system16.h14
-rw-r--r--src/mame/includes/taito_b.h14
-rw-r--r--src/mame/includes/taito_f2.h52
-rw-r--r--src/mame/includes/taito_f3.h4
-rw-r--r--src/mame/includes/taito_l.h16
-rw-r--r--src/mame/includes/taito_x.h2
-rw-r--r--src/mame/includes/taito_z.h8
-rw-r--r--src/mame/includes/tatsumi.h12
-rw-r--r--src/mame/includes/tecmo16.h4
-rw-r--r--src/mame/includes/tetrisp2.h10
-rw-r--r--src/mame/includes/thomson.h34
-rw-r--r--src/mame/includes/ti85.h14
-rw-r--r--src/mame/includes/tiamc1.h2
-rw-r--r--src/mame/includes/timeplt.h4
-rw-r--r--src/mame/includes/tmnt.h22
-rw-r--r--src/mame/includes/tnzs.h2
-rw-r--r--src/mame/includes/toaplan1.h12
-rw-r--r--src/mame/includes/toaplan2.h16
-rw-r--r--src/mame/includes/trackfld.h8
-rw-r--r--src/mame/includes/trs80.h6
-rw-r--r--src/mame/includes/tsamurai.h12
-rw-r--r--src/mame/includes/tubep.h8
-rw-r--r--src/mame/includes/tumbleb.h16
-rw-r--r--src/mame/includes/turbo.h6
-rw-r--r--src/mame/includes/twincobr.h4
-rw-r--r--src/mame/includes/tx1.h10
-rw-r--r--src/mame/includes/ut88.h8
-rw-r--r--src/mame/includes/vicdual.h10
-rw-r--r--src/mame/includes/vsnes.h16
-rw-r--r--src/mame/includes/vtech2.h4
-rw-r--r--src/mame/includes/warpwarp.h8
-rw-r--r--src/mame/includes/wc90.h2
-rw-r--r--src/mame/includes/wecleman.h12
-rw-r--r--src/mame/includes/wgp.h2
-rw-r--r--src/mame/includes/williams.h30
-rw-r--r--src/mame/includes/x1.h8
-rw-r--r--src/mame/includes/x68k.h2
-rw-r--r--src/mame/includes/xevious.h6
-rw-r--r--src/mame/includes/xmen.h2
-rw-r--r--src/mame/includes/yunsun16.h4
-rw-r--r--src/mame/includes/z80ne.h18
-rw-r--r--src/mame/includes/zaxxon.h4
282 files changed, 1237 insertions, 1235 deletions
diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h
index b9617277357..8d176a2401f 100644
--- a/src/mame/includes/3do.h
+++ b/src/mame/includes/3do.h
@@ -173,7 +173,7 @@ public:
DECLARE_WRITE32_MEMBER(_3do_clio_w);
virtual void machine_start() override;
virtual void machine_reset() override;
- void video_start__3do() ATTR_COLD;
+ DECLARE_VIDEO_START(_3do);
uint32_t screen_update__3do(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER( timer_x16_cb );
diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h
index 846c756dc9c..6f17fd32c7a 100644
--- a/src/mame/includes/40love.h
+++ b/src/mame/includes/40love.h
@@ -94,9 +94,9 @@ public:
void init_40love();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void video_start() override;
- void machine_start_40love() ATTR_COLD;
- void machine_reset_40love();
- void machine_reset_common();
+ DECLARE_MACHINE_START(40love);
+ DECLARE_MACHINE_RESET(40love);
+ DECLARE_MACHINE_RESET(common);
uint32_t screen_update_fortyl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void redraw_pixels();
void fortyl_set_scroll_x( int offset );
diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h
index a192f42db6f..0ed578644b3 100644
--- a/src/mame/includes/8080bw.h
+++ b/src/mame/includes/8080bw.h
@@ -128,20 +128,20 @@ public:
void init_vortex();
void init_attackfc();
- void machine_start_extra_8080bw() ATTR_COLD;
- void machine_start_rollingc() ATTR_COLD;
- void machine_start_sflush() ATTR_COLD;
- void machine_start_schaser() ATTR_COLD;
- void machine_start_schasercv() ATTR_COLD;
- void machine_reset_schaser();
- void machine_start_polaris() ATTR_COLD;
- void machine_start_darthvdr() ATTR_COLD;
- void machine_reset_darthvdr();
- void machine_start_extra_8080bw_sh() ATTR_COLD;
- void machine_start_extra_8080bw_vh() ATTR_COLD;
- void machine_start_schaser_sh() ATTR_COLD;
- void machine_reset_schaser_sh();
- void machine_start_claybust() ATTR_COLD;
+ DECLARE_MACHINE_START(extra_8080bw);
+ DECLARE_MACHINE_START(rollingc);
+ DECLARE_MACHINE_START(sflush);
+ DECLARE_MACHINE_START(schaser);
+ DECLARE_MACHINE_START(schasercv);
+ DECLARE_MACHINE_RESET(schaser);
+ DECLARE_MACHINE_START(polaris);
+ DECLARE_MACHINE_START(darthvdr);
+ DECLARE_MACHINE_RESET(darthvdr);
+ DECLARE_MACHINE_START(extra_8080bw_sh);
+ DECLARE_MACHINE_START(extra_8080bw_vh);
+ DECLARE_MACHINE_START(schaser_sh);
+ DECLARE_MACHINE_RESET(schaser_sh);
+ DECLARE_MACHINE_START(claybust);
DECLARE_PALETTE_INIT(rollingc);
DECLARE_PALETTE_INIT(sflush);
diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h
index d40065a38da..470306f3d4e 100644
--- a/src/mame/includes/actfancr.h
+++ b/src/mame/includes/actfancr.h
@@ -43,8 +43,8 @@ public:
DECLARE_WRITE8_MEMBER(triothep_control_select_w);
DECLARE_READ8_MEMBER(triothep_control_r);
DECLARE_WRITE8_MEMBER(actfancr_buffer_spriteram_w);
- void machine_start_triothep() ATTR_COLD;
- void machine_reset_triothep();
+ DECLARE_MACHINE_START(triothep);
+ DECLARE_MACHINE_RESET(triothep);
uint32_t screen_update_actfancr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void triothep(machine_config &config);
void actfancr(machine_config &config);
diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h
index 44f48a8e9f4..886d7db0a8f 100644
--- a/src/mame/includes/aerofgt.h
+++ b/src/mame/includes/aerofgt.h
@@ -102,16 +102,16 @@ public:
template<int Layer> TILE_GET_INFO_MEMBER(karatblz_tile_info);
template<int Layer> TILE_GET_INFO_MEMBER(spinlbrk_tile_info);
template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info);
- void machine_start_aerofgt() ATTR_COLD;
- void machine_start_spinlbrk() ATTR_COLD;
- void machine_reset_aerofgt();
- void video_start_pspikes() ATTR_COLD;
- void machine_start_common() ATTR_COLD;
- void machine_reset_common();
- void video_start_karatblz() ATTR_COLD;
- void video_start_spinlbrk() ATTR_COLD;
- void video_start_turbofrc() ATTR_COLD;
- void video_start_wbbc97() ATTR_COLD;
+ DECLARE_MACHINE_START(aerofgt);
+ DECLARE_MACHINE_START(spinlbrk);
+ DECLARE_MACHINE_RESET(aerofgt);
+ DECLARE_VIDEO_START(pspikes);
+ DECLARE_MACHINE_START(common);
+ DECLARE_MACHINE_RESET(common);
+ DECLARE_VIDEO_START(karatblz);
+ DECLARE_VIDEO_START(spinlbrk);
+ DECLARE_VIDEO_START(turbofrc);
+ DECLARE_VIDEO_START(wbbc97);
void init_banked_oki();
void init_kickball();
uint32_t screen_update_pspikes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h
index 23a4ecba753..61807f31ddb 100644
--- a/src/mame/includes/alpha68k.h
+++ b/src/mame/includes/alpha68k.h
@@ -93,15 +93,15 @@ public:
void init_kyros();
void init_sstingry();
TILE_GET_INFO_MEMBER(get_tile_info);
- void machine_start_common() ATTR_COLD;
- void machine_reset_common();
+ DECLARE_MACHINE_START(common);
+ DECLARE_MACHINE_RESET(common);
DECLARE_PALETTE_INIT(kyros);
DECLARE_PALETTE_INIT(paddlem);
- void machine_start_alpha68k_II() ATTR_COLD;
- void machine_reset_alpha68k_II();
- void video_start_alpha68k() ATTR_COLD;
- void machine_start_alpha68k_V() ATTR_COLD;
- void machine_reset_alpha68k_V();
+ DECLARE_MACHINE_START(alpha68k_II);
+ DECLARE_MACHINE_RESET(alpha68k_II);
+ DECLARE_VIDEO_START(alpha68k);
+ DECLARE_MACHINE_START(alpha68k_V);
+ DECLARE_MACHINE_RESET(alpha68k_V);
uint32_t screen_update_sstingry(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_kyros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_alpha68k_I(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index db1c5339f7b..63e5fc79375 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -412,8 +412,8 @@ public:
int m_aga_sprite_fetched_words;
int m_aga_sprite_dma_used_words[8];
- void video_start_amiga() ATTR_COLD;
- void video_start_amiga_aga() ATTR_COLD;
+ DECLARE_VIDEO_START( amiga );
+ DECLARE_VIDEO_START( amiga_aga );
DECLARE_PALETTE_INIT( amiga );
uint32_t screen_update_amiga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h
index f0d8540df7b..f4fe5ede1a7 100644
--- a/src/mame/includes/ampoker2.h
+++ b/src/mame/includes/ampoker2.h
@@ -32,7 +32,7 @@ public:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(s2k_get_bg_tile_info);
DECLARE_PALETTE_INIT(ampoker2);
- void video_start_sigma2k() ATTR_COLD;
+ DECLARE_VIDEO_START(sigma2k);
protected:
virtual void video_start() override;
diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h
index abbbc52286b..94ffc948eb5 100644
--- a/src/mame/includes/amstrad.h
+++ b/src/mame/includes/amstrad.h
@@ -212,21 +212,21 @@ public:
DECLARE_WRITE8_MEMBER(amstrad_cpc_io_w);
DECLARE_READ8_MEMBER(amstrad_psg_porta_read);
void amstrad_plus_seqcheck(int data);
- void machine_start_amstrad() ATTR_COLD;
- void machine_reset_amstrad();
- void video_start_amstrad() ATTR_COLD;
+ DECLARE_MACHINE_START(amstrad);
+ DECLARE_MACHINE_RESET(amstrad);
+ DECLARE_VIDEO_START(amstrad);
DECLARE_PALETTE_INIT(amstrad_cpc);
DECLARE_PALETTE_INIT(amstrad_cpc_green);
- void machine_start_plus() ATTR_COLD;
- void machine_reset_plus();
+ DECLARE_MACHINE_START(plus);
+ DECLARE_MACHINE_RESET(plus);
DECLARE_PALETTE_INIT(amstrad_plus);
- void machine_start_gx4000() ATTR_COLD;
- void machine_reset_gx4000();
- void machine_start_kccomp() ATTR_COLD;
- void machine_reset_kccomp();
+ DECLARE_MACHINE_START(gx4000);
+ DECLARE_MACHINE_RESET(gx4000);
+ DECLARE_MACHINE_START(kccomp);
+ DECLARE_MACHINE_RESET(kccomp);
DECLARE_PALETTE_INIT(kccomp);
- void machine_start_aleste() ATTR_COLD;
- void machine_reset_aleste();
+ DECLARE_MACHINE_START(aleste);
+ DECLARE_MACHINE_RESET(aleste);
DECLARE_PALETTE_INIT(aleste);
uint32_t screen_update_amstrad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_amstrad);
diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h
index aa4b6dacbd0..382cafb91bf 100644
--- a/src/mame/includes/apollo.h
+++ b/src/mame/includes/apollo.h
@@ -206,8 +206,8 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
- void machine_reset_apollo();
- void machine_start_apollo() ATTR_COLD;
+ DECLARE_MACHINE_RESET(apollo);
+ DECLARE_MACHINE_START(apollo);
IRQ_CALLBACK_MEMBER(apollo_irq_acknowledge);
IRQ_CALLBACK_MEMBER(apollo_pic_acknowledge);
diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h
index ed7bf1c15de..b88d02703ab 100644
--- a/src/mame/includes/apple2.h
+++ b/src/mame/includes/apple2.h
@@ -330,20 +330,20 @@ public:
write8_delegate wd_inh_d000;
read8_delegate rd_inh_e000;
write8_delegate wd_inh_e000;
- void machine_start_apple2orig() ATTR_COLD;
- void machine_start_apple2e() ATTR_COLD;
- void machine_start_apple2c() ATTR_COLD;
- void machine_start_apple2cp() ATTR_COLD;
- void machine_start_tk2000() ATTR_COLD;
- void machine_start_tk3000() ATTR_COLD;
- void machine_start_laser128() ATTR_COLD;
- void machine_start_space84() ATTR_COLD;
- void machine_start_laba2p() ATTR_COLD;
- void video_start_apple2() ATTR_COLD;
+ DECLARE_MACHINE_START(apple2orig);
+ DECLARE_MACHINE_START(apple2e);
+ DECLARE_MACHINE_START(apple2c);
+ DECLARE_MACHINE_START(apple2cp);
+ DECLARE_MACHINE_START(tk2000);
+ DECLARE_MACHINE_START(tk3000);
+ DECLARE_MACHINE_START(laser128);
+ DECLARE_MACHINE_START(space84);
+ DECLARE_MACHINE_START(laba2p);
+ DECLARE_VIDEO_START(apple2);
DECLARE_PALETTE_INIT(apple2);
- void video_start_apple2p() ATTR_COLD;
- void video_start_apple2e() ATTR_COLD;
- void video_start_apple2c() ATTR_COLD;
+ DECLARE_VIDEO_START(apple2p);
+ DECLARE_VIDEO_START(apple2e);
+ DECLARE_VIDEO_START(apple2c);
uint32_t screen_update_apple2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(apple2_interrupt);
DECLARE_WRITE_LINE_MEMBER(a2bus_irq_w);
diff --git a/src/mame/includes/apple2gs.h b/src/mame/includes/apple2gs.h
index 442f0217e32..76252a8459d 100644
--- a/src/mame/includes/apple2gs.h
+++ b/src/mame/includes/apple2gs.h
@@ -190,12 +190,12 @@ public:
write8_delegate write_delegates_2gs0400[2];
write8_delegate write_delegates_2gs2000[2];
write8_delegate write_delegates_2gs4000[2];
- void machine_start_apple2gs() ATTR_COLD;
- void machine_reset_apple2gs();
- void video_start_apple2gs() ATTR_COLD;
+ DECLARE_MACHINE_START(apple2gs);
+ DECLARE_MACHINE_RESET(apple2gs);
+ DECLARE_VIDEO_START(apple2gs);
DECLARE_PALETTE_INIT(apple2gs);
- void machine_start_apple2gsr1() ATTR_COLD;
- void machine_start_apple2gscommon() ATTR_COLD;
+ DECLARE_MACHINE_START(apple2gsr1);
+ DECLARE_MACHINE_START(apple2gscommon);
uint32_t screen_update_apple2gs(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(apple2gs_clock_tick);
TIMER_CALLBACK_MEMBER(apple2gs_qsecond_tick);
diff --git a/src/mame/includes/apple3.h b/src/mame/includes/apple3.h
index 9bd645750d9..b35a7c33665 100644
--- a/src/mame/includes/apple3.h
+++ b/src/mame/includes/apple3.h
@@ -91,8 +91,8 @@ public:
DECLARE_READ8_MEMBER(apple3_c0xx_r);
DECLARE_WRITE8_MEMBER(apple3_c0xx_w);
void init_apple3();
- void machine_reset_apple3();
- void video_start_apple3() ATTR_COLD;
+ DECLARE_MACHINE_RESET(apple3);
+ DECLARE_VIDEO_START(apple3);
uint32_t screen_update_apple3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(apple3_interrupt);
TIMER_CALLBACK_MEMBER(scanstart_cb);
diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h
index a352544e140..c111396fdb6 100644
--- a/src/mame/includes/argus.h
+++ b/src/mame/includes/argus.h
@@ -107,12 +107,12 @@ public:
TILE_GET_INFO_MEMBER(butasan_get_bg1_tile_info);
virtual void machine_start() override;
- void video_start_argus() ATTR_COLD;
- void video_reset_argus();
- void video_start_valtric() ATTR_COLD;
- void video_reset_valtric();
- void video_start_butasan() ATTR_COLD;
- void video_reset_butasan();
+ DECLARE_VIDEO_START(argus);
+ DECLARE_VIDEO_RESET(argus);
+ DECLARE_VIDEO_START(valtric);
+ DECLARE_VIDEO_RESET(valtric);
+ DECLARE_VIDEO_START(butasan);
+ DECLARE_VIDEO_RESET(butasan);
uint32_t screen_update_argus(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_valtric(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h
index cef31ba7402..b76b14045d6 100644
--- a/src/mame/includes/armedf.h
+++ b/src/mame/includes/armedf.h
@@ -94,10 +94,10 @@ public:
TILE_GET_INFO_MEMBER(get_armedf_tx_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- void machine_start_armedf() ATTR_COLD;
- void machine_reset_armedf();
- void video_start_terraf() ATTR_COLD;
- void video_start_armedf() ATTR_COLD;
+ DECLARE_MACHINE_START(armedf);
+ DECLARE_MACHINE_RESET(armedf);
+ DECLARE_VIDEO_START(terraf);
+ DECLARE_VIDEO_START(armedf);
uint32_t screen_update_armedf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority );
void armedf_drawgfx(bitmap_ind16 &dest_bmp,const rectangle &clip,gfx_element *gfx,
diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h
index 7a56b8bd2bc..4f35cefd134 100644
--- a/src/mame/includes/astrocde.h
+++ b/src/mame/includes/astrocde.h
@@ -154,7 +154,7 @@ public:
void init_astrocde();
virtual void video_start() override;
DECLARE_PALETTE_INIT(astrocde);
- void video_start_profpac() ATTR_COLD;
+ DECLARE_VIDEO_START(profpac);
DECLARE_PALETTE_INIT(profpac);
uint32_t screen_update_astrocde(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_profpac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h
index 57571b53e56..80b3c6a5029 100644
--- a/src/mame/includes/astrof.h
+++ b/src/mame/includes/astrof.h
@@ -76,11 +76,11 @@ public:
void init_sstarbtl();
void init_acombat3();
virtual void video_start() override;
- void machine_start_astrof() ATTR_COLD;
- void machine_start_abattle() ATTR_COLD;
- void machine_reset_abattle();
- void machine_start_spfghmk2() ATTR_COLD;
- void machine_start_tomahawk() ATTR_COLD;
+ DECLARE_MACHINE_START(astrof);
+ DECLARE_MACHINE_START(abattle);
+ DECLARE_MACHINE_RESET(abattle);
+ DECLARE_MACHINE_START(spfghmk2);
+ DECLARE_MACHINE_START(tomahawk);
uint32_t screen_update_astrof(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_tomahawk(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(irq_callback);
diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h
index a4282fc9779..f2cd433ae58 100644
--- a/src/mame/includes/atarig1.h
+++ b/src/mame/includes/atarig1.h
@@ -62,9 +62,9 @@ public:
void init_pitfightb();
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
- void machine_start_atarig1() ATTR_COLD;
- void machine_reset_atarig1();
- void video_start_atarig1() ATTR_COLD;
+ DECLARE_MACHINE_START(atarig1);
+ DECLARE_MACHINE_RESET(atarig1);
+ DECLARE_VIDEO_START(atarig1);
uint32_t screen_update_atarig1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void atarig1(machine_config &config);
void pitfightj(machine_config &config);
diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h
index 27011dd4b26..56ee8830eea 100644
--- a/src/mame/includes/atarig42.h
+++ b/src/mame/includes/atarig42.h
@@ -43,7 +43,7 @@ protected:
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
TILEMAP_MAPPER_MEMBER(atarig42_playfield_scan);
- void video_start_atarig42() ATTR_COLD;
+ DECLARE_VIDEO_START(atarig42);
uint32_t screen_update_atarig42(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void atarig42(machine_config &config);
void main_map(address_map &map);
diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h
index d29bac19e31..f42940f556f 100644
--- a/src/mame/includes/atarigt.h
+++ b/src/mame/includes/atarigt.h
@@ -86,9 +86,9 @@ public:
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
TILEMAP_MAPPER_MEMBER(atarigt_playfield_scan);
- void machine_start_atarigt() ATTR_COLD;
- void machine_reset_atarigt();
- void video_start_atarigt() ATTR_COLD;
+ DECLARE_MACHINE_START(atarigt);
+ DECLARE_MACHINE_RESET(atarigt);
+ DECLARE_VIDEO_START(atarigt);
uint32_t screen_update_atarigt(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void atarigt(machine_config &config);
void tmek(machine_config &config);
diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h
index 0e58ebc6e28..e7cf6d2253a 100644
--- a/src/mame/includes/atarisy1.h
+++ b/src/mame/includes/atarisy1.h
@@ -89,9 +89,9 @@ public:
void init_indytemp();
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
- void machine_start_atarisy1() ATTR_COLD;
- void machine_reset_atarisy1();
- void video_start_atarisy1() ATTR_COLD;
+ DECLARE_MACHINE_START(atarisy1);
+ DECLARE_MACHINE_RESET(atarisy1);
+ DECLARE_VIDEO_START(atarisy1);
uint32_t screen_update_atarisy1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(joystick_int);
TIMER_DEVICE_CALLBACK_MEMBER(atarisy1_reset_yscroll_callback);
diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h
index edccdc46f18..b274be89577 100644
--- a/src/mame/includes/atarisy2.h
+++ b/src/mame/includes/atarisy2.h
@@ -102,9 +102,9 @@ public:
void init_720();
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
- void machine_start_atarisy2() ATTR_COLD;
- void machine_reset_atarisy2();
- void video_start_atarisy2() ATTR_COLD;
+ DECLARE_MACHINE_START(atarisy2);
+ DECLARE_MACHINE_RESET(atarisy2);
+ DECLARE_VIDEO_START(atarisy2);
uint32_t screen_update_atarisy2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vblank_int);
TIMER_CALLBACK_MEMBER(delayed_int_enable_w);
diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h
index 7acc284634f..612aed65c48 100644
--- a/src/mame/includes/badlands.h
+++ b/src/mame/includes/badlands.h
@@ -59,9 +59,9 @@ public:
DECLARE_WRITE8_MEMBER(audio_io_w);
void init_badlands();
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
- void machine_start_badlands() ATTR_COLD;
- void machine_reset_badlands();
- void video_start_badlands() ATTR_COLD;
+ DECLARE_MACHINE_START(badlands);
+ DECLARE_MACHINE_RESET(badlands);
+ DECLARE_VIDEO_START(badlands);
uint32_t screen_update_badlands(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vblank_int);
DECLARE_WRITE16_MEMBER(video_int_ack_w);
diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h
index 747876fb864..b759c516566 100644
--- a/src/mame/includes/battlex.h
+++ b/src/mame/includes/battlex.h
@@ -47,7 +47,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- void video_start_dodgeman(); ATTR_COLD
+ DECLARE_VIDEO_START(dodgeman);
TILE_GET_INFO_MEMBER(get_dodgeman_bg_tile_info);
void dodgeman(machine_config &config);
void battlex(machine_config &config);
diff --git a/src/mame/includes/bbc.h b/src/mame/includes/bbc.h
index 325012c241e..1d81608cb24 100644
--- a/src/mame/includes/bbc.h
+++ b/src/mame/includes/bbc.h
@@ -145,22 +145,22 @@ public:
DECLARE_READ8_MEMBER(bbc_fe_r);
void init_bbc();
- void video_start_bbc() ATTR_COLD;
-
- void machine_start_bbca() ATTR_COLD;
- void machine_reset_bbca();
- void machine_start_bbcb() ATTR_COLD;
- void machine_reset_bbcb();
- void machine_reset_torch();
- void machine_start_bbcbp() ATTR_COLD;
- void machine_reset_bbcbp();
- void machine_start_bbcm() ATTR_COLD;
- void machine_reset_bbcm();
- void machine_start_bbcmc() ATTR_COLD;
- void machine_reset_bbcmc();
- void machine_reset_ltmpbp();
- void machine_reset_ltmpm();
- void machine_start_cfa3000() ATTR_COLD;
+ DECLARE_VIDEO_START(bbc);
+
+ DECLARE_MACHINE_START(bbca);
+ DECLARE_MACHINE_RESET(bbca);
+ DECLARE_MACHINE_START(bbcb);
+ DECLARE_MACHINE_RESET(bbcb);
+ DECLARE_MACHINE_RESET(torch);
+ DECLARE_MACHINE_START(bbcbp);
+ DECLARE_MACHINE_RESET(bbcbp);
+ DECLARE_MACHINE_START(bbcm);
+ DECLARE_MACHINE_RESET(bbcm);
+ DECLARE_MACHINE_START(bbcmc);
+ DECLARE_MACHINE_RESET(bbcmc);
+ DECLARE_MACHINE_RESET(ltmpbp);
+ DECLARE_MACHINE_RESET(ltmpm);
+ DECLARE_MACHINE_START(cfa3000);
DECLARE_PALETTE_INIT(bbc);
INTERRUPT_GEN_MEMBER(bbcb_keyscan);
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h
index 1c095b9da8c..8c026972105 100644
--- a/src/mame/includes/bbusters.h
+++ b/src/mame/includes/bbusters.h
@@ -65,8 +65,8 @@ public:
TILE_GET_INFO_MEMBER(get_pf2_tile_info);
virtual void machine_start() override;
- void video_start_bbuster() ATTR_COLD;
- void video_start_mechatt() ATTR_COLD;
+ DECLARE_VIDEO_START(bbuster);
+ DECLARE_VIDEO_START(mechatt);
uint32_t screen_update_bbuster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_mechatt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h
index c01f11a7457..69fc79967b6 100644
--- a/src/mame/includes/bking.h
+++ b/src/mame/includes/bking.h
@@ -88,9 +88,9 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(bking);
- void machine_start_bking3() ATTR_COLD;
- void machine_reset_bking3();
- void machine_reset_common();
+ DECLARE_MACHINE_START(bking3);
+ DECLARE_MACHINE_RESET(bking3);
+ DECLARE_MACHINE_RESET(common);
uint32_t screen_update_bking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_bking);
void bking(machine_config &config);
diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h
index 41401696dd0..8ceba7a8929 100644
--- a/src/mame/includes/blmbycar.h
+++ b/src/mame/includes/blmbycar.h
@@ -60,10 +60,10 @@ public:
void init_blmbycar();
virtual void video_start() override;
- void machine_start_blmbycar() ATTR_COLD;
- void machine_reset_blmbycar();
- void machine_start_watrball() ATTR_COLD;
- void machine_reset_watrball();
+ DECLARE_MACHINE_START(blmbycar);
+ DECLARE_MACHINE_RESET(blmbycar);
+ DECLARE_MACHINE_START(watrball);
+ DECLARE_MACHINE_RESET(watrball);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect );
diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h
index e45ad94966f..78c48fcbb0c 100644
--- a/src/mame/includes/blstroid.h
+++ b/src/mame/includes/blstroid.h
@@ -40,7 +40,7 @@ protected:
virtual void scanline_update(screen_device &screen, int scanline) override;
DECLARE_WRITE16_MEMBER(blstroid_halt_until_hblank_0_w);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
- void video_start_blstroid() ATTR_COLD;
+ DECLARE_VIDEO_START(blstroid);
uint32_t screen_update_blstroid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void main_map(address_map &map);
diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h
index 4481fc90abc..6d23fc3ddab 100644
--- a/src/mame/includes/blueprnt.h
+++ b/src/mame/includes/blueprnt.h
@@ -52,7 +52,7 @@ public:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
- void video_start_blueprnt() ATTR_COLD;
+ DECLARE_VIDEO_START(blueprnt);
DECLARE_PALETTE_INIT(blueprnt);
uint32_t screen_update_blueprnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
diff --git a/src/mame/includes/bosco.h b/src/mame/includes/bosco.h
index 256581d524b..fe5473e85f7 100644
--- a/src/mame/includes/bosco.h
+++ b/src/mame/includes/bosco.h
@@ -30,7 +30,7 @@ public:
TILEMAP_MAPPER_MEMBER(fg_tilemap_scan);
TILE_GET_INFO_MEMBER(bg_get_tile_info);
TILE_GET_INFO_MEMBER(fg_get_tile_info);
- void video_start_bosco() ATTR_COLD;
+ DECLARE_VIDEO_START(bosco);
DECLARE_PALETTE_INIT(bosco);
uint32_t screen_update_bosco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_bosco);
diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h
index a112e1b7553..38af9ef7f05 100644
--- a/src/mame/includes/btime.h
+++ b/src/mame/includes/btime.h
@@ -108,15 +108,15 @@ public:
void init_protennb();
void init_disco();
void init_lnc();
- void machine_start_btime() ATTR_COLD;
- void machine_reset_btime();
+ DECLARE_MACHINE_START(btime);
+ DECLARE_MACHINE_RESET(btime);
DECLARE_PALETTE_INIT(btime);
- void machine_reset_lnc();
+ DECLARE_MACHINE_RESET(lnc);
DECLARE_PALETTE_INIT(lnc);
- void machine_start_mmonkey() ATTR_COLD;
- void machine_reset_mmonkey();
- void video_start_bnj() ATTR_COLD;
- void video_start_disco() ATTR_COLD;
+ DECLARE_MACHINE_START(mmonkey);
+ DECLARE_MACHINE_RESET(mmonkey);
+ DECLARE_VIDEO_START(bnj);
+ DECLARE_VIDEO_START(disco);
uint32_t screen_update_btime(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_cookrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_lnc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h
index b18f7873728..1bf355da100 100644
--- a/src/mame/includes/bublbobl.h
+++ b/src/mame/includes/bublbobl.h
@@ -120,15 +120,14 @@ public:
void init_dland();
void init_common();
- void machine_start_tokio() ATTR_COLD;
- void machine_reset_tokio();
- void machine_start_bublbobl() ATTR_COLD;
- void machine_reset_bublbobl();
- void machine_start_boblbobl() ATTR_COLD;
- void machine_reset_boblbobl();
- void machine_start_common() ATTR_COLD;
- void machine_reset_common();
-
+ DECLARE_MACHINE_START(tokio);
+ DECLARE_MACHINE_RESET(tokio);
+ DECLARE_MACHINE_START(bublbobl);
+ DECLARE_MACHINE_RESET(bublbobl);
+ DECLARE_MACHINE_START(boblbobl);
+ DECLARE_MACHINE_RESET(boblbobl);
+ DECLARE_MACHINE_START(common);
+ DECLARE_MACHINE_RESET(common);
uint32_t screen_update_bublbobl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void configure_banks();
@@ -173,8 +172,8 @@ public:
INTERRUPT_GEN_MEMBER(bublbobl_m68705_interrupt);
- void machine_start_bub68705() ATTR_COLD;
- void machine_reset_bub68705();
+ DECLARE_MACHINE_START(bub68705);
+ DECLARE_MACHINE_RESET(bub68705);
void bub68705(machine_config &config);
protected:
diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h
index 3b53c024ad0..ec0a72e15d0 100644
--- a/src/mame/includes/cabal.h
+++ b/src/mame/includes/cabal.h
@@ -58,8 +58,8 @@ public:
DECLARE_WRITE8_MEMBER(cabalbl_2_adpcm_w);
void init_cabal();
- void machine_start_cabalbl() ATTR_COLD;
- void machine_reset_cabalbl();
+ DECLARE_MACHINE_START(cabalbl);
+ DECLARE_MACHINE_RESET(cabalbl);
virtual void video_start() override;
TILE_GET_INFO_MEMBER(get_back_tile_info);
diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h
index 1826ce8289c..3bae5ccb4c9 100644
--- a/src/mame/includes/cave.h
+++ b/src/mame/includes/cave.h
@@ -223,20 +223,20 @@ public:
void init_ppsatan();
TILE_GET_INFO_MEMBER(sailormn_get_tile_info_2);
template<int Chip> TILE_GET_INFO_MEMBER(get_tile_info);
- void machine_start_cave() ATTR_COLD;
- void machine_reset_cave();
- void machine_reset_sailormn();
- void video_start_cave_2_layers() ATTR_COLD;
+ DECLARE_MACHINE_START(cave);
+ DECLARE_MACHINE_RESET(cave);
+ DECLARE_MACHINE_RESET(sailormn);
+ DECLARE_VIDEO_START(cave_2_layers);
DECLARE_PALETTE_INIT(dfeveron);
- void video_start_cave_3_layers() ATTR_COLD;
+ DECLARE_VIDEO_START(cave_3_layers);
DECLARE_PALETTE_INIT(ddonpach);
DECLARE_PALETTE_INIT(cave);
- void video_start_cave_1_layer() ATTR_COLD;
+ DECLARE_VIDEO_START(cave_1_layer);
DECLARE_PALETTE_INIT(korokoro);
DECLARE_PALETTE_INIT(mazinger);
- void video_start_cave_4_layers() ATTR_COLD;
+ DECLARE_VIDEO_START(cave_4_layers);
DECLARE_PALETTE_INIT(pwrinst2);
- void video_start_sailormn_3_layers() ATTR_COLD;
+ DECLARE_VIDEO_START(sailormn_3_layers);
DECLARE_PALETTE_INIT(sailormn);
DECLARE_PALETTE_INIT(ppsatan);
uint32_t screen_update_cave(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h
index 09ae03334fb..7bdcfe6cb94 100644
--- a/src/mame/includes/cclimber.h
+++ b/src/mame/includes/cclimber.h
@@ -82,12 +82,12 @@ public:
void init_cannonb();
void init_dking();
void init_rpatrol();
- void video_start_cclimber() ATTR_COLD;
+ DECLARE_VIDEO_START(cclimber);
DECLARE_PALETTE_INIT(cclimber);
- void video_start_swimmer() ATTR_COLD;
+ DECLARE_VIDEO_START(swimmer);
DECLARE_PALETTE_INIT(swimmer);
DECLARE_PALETTE_INIT(yamato);
- void video_start_toprollr() ATTR_COLD;
+ DECLARE_VIDEO_START(toprollr);
DECLARE_PALETTE_INIT(toprollr);
TILE_GET_INFO_MEMBER(cclimber_get_pf_tile_info);
diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h
index 37136aea8b1..e39f6e83ba9 100644
--- a/src/mame/includes/cdi.h
+++ b/src/mame/includes/cdi.h
@@ -106,12 +106,12 @@ public:
virtual void machine_start() override { }
virtual void video_start() override;
- void machine_reset_cdimono1();
- void machine_reset_cdimono2();
- void machine_reset_quizard1();
- void machine_reset_quizard2();
- void machine_reset_quizard3();
- void machine_reset_quizard4();
+ DECLARE_MACHINE_RESET(cdimono1);
+ DECLARE_MACHINE_RESET(cdimono2);
+ DECLARE_MACHINE_RESET(quizard1);
+ DECLARE_MACHINE_RESET(quizard2);
+ DECLARE_MACHINE_RESET(quizard3);
+ DECLARE_MACHINE_RESET(quizard4);
DECLARE_READ8_MEMBER(servo_io_r);
DECLARE_WRITE8_MEMBER(servo_io_w);
DECLARE_READ8_MEMBER(slave_io_r);
diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h
index b6a659f92a6..2c2dcbf9f25 100644
--- a/src/mame/includes/centiped.h
+++ b/src/mame/includes/centiped.h
@@ -103,13 +103,13 @@ private:
TILE_GET_INFO_MEMBER(warlords_get_tile_info);
TILE_GET_INFO_MEMBER(milliped_get_tile_info);
TILE_GET_INFO_MEMBER(bullsdrt_get_tile_info);
- void machine_start_centiped() ATTR_COLD;
- void machine_reset_centiped();
- void video_start_centiped() ATTR_COLD;
- void video_start_bullsdrt() ATTR_COLD;
- void machine_reset_magworm();
- void video_start_milliped() ATTR_COLD;
- void video_start_warlords() ATTR_COLD;
+ DECLARE_MACHINE_START(centiped);
+ DECLARE_MACHINE_RESET(centiped);
+ DECLARE_VIDEO_START(centiped);
+ DECLARE_VIDEO_START(bullsdrt);
+ DECLARE_MACHINE_RESET(magworm);
+ DECLARE_VIDEO_START(milliped);
+ DECLARE_VIDEO_START(warlords);
DECLARE_PALETTE_INIT(warlords);
uint32_t screen_update_centiped(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_bullsdrt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h
index 0795ec1c11d..b938cc5f4e3 100644
--- a/src/mame/includes/champbas.h
+++ b/src/mame/includes/champbas.h
@@ -68,8 +68,8 @@ public:
DECLARE_PALETTE_INIT(champbas);
DECLARE_PALETTE_INIT(exctsccr);
- void video_start_champbas() ATTR_COLD;
- void video_start_exctsccr() ATTR_COLD;
+ DECLARE_VIDEO_START(champbas);
+ DECLARE_VIDEO_START(exctsccr);
TILE_GET_INFO_MEMBER(champbas_get_bg_tile_info);
TILE_GET_INFO_MEMBER(exctsccr_get_bg_tile_info);
diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h
index 9e9a83891c1..2841726dd98 100644
--- a/src/mame/includes/cinemat.h
+++ b/src/mame/includes/cinemat.h
@@ -98,12 +98,12 @@ public:
virtual void sound_start() override;
virtual void sound_reset() override;
virtual void video_start() override;
- void sound_reset_demon();
- void sound_reset_qb3();
- void video_start_cinemat_16level() ATTR_COLD;
- void video_start_cinemat_64level() ATTR_COLD;
- void video_start_cinemat_color() ATTR_COLD;
- void video_start_cinemat_qb3color() ATTR_COLD;
+ DECLARE_SOUND_RESET(demon);
+ DECLARE_SOUND_RESET(qb3);
+ DECLARE_VIDEO_START(cinemat_16level);
+ DECLARE_VIDEO_START(cinemat_64level);
+ DECLARE_VIDEO_START(cinemat_color);
+ DECLARE_VIDEO_START(cinemat_qb3color);
uint32_t screen_update_cinemat(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_spacewar(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_READ8_MEMBER(sound_porta_r);
diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h
index b2926d18ca8..6d8b89d6905 100644
--- a/src/mame/includes/clshroad.h
+++ b/src/mame/includes/clshroad.h
@@ -46,9 +46,9 @@ public:
void init_firebatl();
virtual void machine_reset() override;
- void video_start_firebatl() ATTR_COLD;
+ DECLARE_VIDEO_START(firebatl);
DECLARE_PALETTE_INIT(firebatl);
- void video_start_clshroad() ATTR_COLD;
+ DECLARE_VIDEO_START(clshroad);
DECLARE_PALETTE_INIT(clshroad);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h
index 353fe243bbc..b101a2e49fe 100644
--- a/src/mame/includes/cninja.h
+++ b/src/mame/includes/cninja.h
@@ -61,10 +61,10 @@ public:
DECLARE_WRITE8_MEMBER(cninjabl2_oki_bank_w);
void init_mutantf();
void init_cninjabl2();
- void machine_start_robocop2() ATTR_COLD;
- void machine_reset_robocop2();
- void video_start_stoneage() ATTR_COLD;
- void video_start_mutantf() ATTR_COLD;
+ DECLARE_MACHINE_START(robocop2);
+ DECLARE_MACHINE_RESET(robocop2);
+ DECLARE_VIDEO_START(stoneage);
+ DECLARE_VIDEO_START(mutantf);
uint32_t screen_update_cninja(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_cninjabl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_cninjabl2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h
index bc3803d4d23..957a217e8b4 100644
--- a/src/mame/includes/combatsc.h
+++ b/src/mame/includes/combatsc.h
@@ -104,11 +104,11 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info1_bootleg);
TILE_GET_INFO_MEMBER(get_text_info_bootleg);
virtual void machine_reset() override;
- void machine_start_combatsc() ATTR_COLD;
- void video_start_combatsc() ATTR_COLD;
+ DECLARE_MACHINE_START(combatsc);
+ DECLARE_VIDEO_START(combatsc);
DECLARE_PALETTE_INIT(combatsc);
- void machine_start_combatscb() ATTR_COLD;
- void video_start_combatscb() ATTR_COLD;
+ DECLARE_MACHINE_START(combatscb);
+ DECLARE_VIDEO_START(combatscb);
DECLARE_PALETTE_INIT(combatscb);
uint32_t screen_update_combatsc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_combatscb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h
index b2c8b7b9a5e..ee06b54ba88 100644
--- a/src/mame/includes/coolpool.h
+++ b/src/mame/includes/coolpool.h
@@ -68,8 +68,8 @@ public:
void init_coolpool();
void init_amerdart();
void init_9ballsht();
- void machine_reset_amerdart();
- void machine_reset_coolpool();
+ DECLARE_MACHINE_RESET(amerdart);
+ DECLARE_MACHINE_RESET(coolpool);
TIMER_DEVICE_CALLBACK_MEMBER(nvram_write_timeout);
TIMER_DEVICE_CALLBACK_MEMBER(amerdart_audio_int_gen);
void register_state_save();
diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h
index b4f735bbbb7..9cc06ec17dd 100644
--- a/src/mame/includes/cosmic.h
+++ b/src/mame/includes/cosmic.h
@@ -84,9 +84,9 @@ public:
void init_nomnlnd();
void init_cosmica();
void init_panic();
- void machine_start_cosmic() ATTR_COLD;
- void machine_reset_cosmic();
- void machine_reset_cosmicg();
+ DECLARE_MACHINE_START(cosmic);
+ DECLARE_MACHINE_RESET(cosmic);
+ DECLARE_MACHINE_RESET(cosmicg);
DECLARE_PALETTE_INIT(cosmicg);
DECLARE_PALETTE_INIT(panic);
DECLARE_PALETTE_INIT(cosmica);
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index f78aab06bc2..51ec10adafb 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -311,16 +311,16 @@ public:
TILE_GET_INFO_MEMBER(get_tile0_info);
TILE_GET_INFO_MEMBER(get_tile1_info);
TILE_GET_INFO_MEMBER(get_tile2_info);
- void machine_start_cps1() ATTR_COLD;
- void video_start_cps1() ATTR_COLD;
- void machine_start_common() ATTR_COLD;
- void machine_start_cps2() ATTR_COLD;
- void video_start_cps2() ATTR_COLD;
- void machine_start_qsound() ATTR_COLD;
- void machine_start_ganbare() ATTR_COLD;
- void machine_reset_cps();
- void video_start_cps() ATTR_COLD;
- void machine_start_sf2m1() ATTR_COLD;
+ DECLARE_MACHINE_START(cps1);
+ DECLARE_VIDEO_START(cps1);
+ DECLARE_MACHINE_START(common);
+ DECLARE_MACHINE_START(cps2);
+ DECLARE_VIDEO_START(cps2);
+ DECLARE_MACHINE_START(qsound);
+ DECLARE_MACHINE_START(ganbare);
+ DECLARE_MACHINE_RESET(cps);
+ DECLARE_VIDEO_START(cps);
+ DECLARE_MACHINE_START(sf2m1);
uint32_t screen_update_cps1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_cps1);
INTERRUPT_GEN_MEMBER(cps1_interrupt);
@@ -345,16 +345,16 @@ public:
void init_sf2b();
void init_slampic();
void init_wofabl();
- void machine_start_fcrash() ATTR_COLD;
- void machine_reset_fcrash();
- void machine_start_cawingbl() ATTR_COLD;
- void machine_start_dinopic() ATTR_COLD;
- void machine_start_knightsb() ATTR_COLD;
- void machine_start_kodb() ATTR_COLD;
- void machine_start_punipic() ATTR_COLD;
- void machine_start_sf2mdt() ATTR_COLD;
- void machine_start_slampic() ATTR_COLD;
- void machine_start_sgyxz() ATTR_COLD;
+ DECLARE_MACHINE_START(fcrash);
+ DECLARE_MACHINE_RESET(fcrash);
+ DECLARE_MACHINE_START(cawingbl);
+ DECLARE_MACHINE_START(dinopic);
+ DECLARE_MACHINE_START(knightsb);
+ DECLARE_MACHINE_START(kodb);
+ DECLARE_MACHINE_START(punipic);
+ DECLARE_MACHINE_START(sf2mdt);
+ DECLARE_MACHINE_START(slampic);
+ DECLARE_MACHINE_START(sgyxz);
DECLARE_WRITE16_MEMBER(cawingbl_soundlatch_w);
DECLARE_WRITE16_MEMBER(dinopic_layer_w);
DECLARE_WRITE16_MEMBER(dinopic_layer2_w);
diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h
index 94afa6eb9b7..b36f0b89159 100644
--- a/src/mame/includes/cvs.h
+++ b/src/mame/includes/cvs.h
@@ -127,9 +127,9 @@ public:
void init_hero();
void init_superbik();
void init_hunchbaka();
- void machine_start_cvs() ATTR_COLD;
- void machine_reset_cvs();
- void video_start_cvs() ATTR_COLD;
+ DECLARE_MACHINE_START(cvs);
+ DECLARE_MACHINE_RESET(cvs);
+ DECLARE_VIDEO_START(cvs);
DECLARE_PALETTE_INIT(cvs);
uint32_t screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(cvs_main_cpu_interrupt);
diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h
index 0aa161293e9..0c8c8558a1d 100644
--- a/src/mame/includes/dc.h
+++ b/src/mame/includes/dc.h
@@ -94,7 +94,7 @@ class dc_state : public driver_device
void generic_dma(uint32_t main_adr, void *dma_ptr, uint32_t length, uint32_t size, bool to_mainram);
TIMER_DEVICE_CALLBACK_MEMBER(dc_scanline);
- void machine_reset_dc_console();
+ DECLARE_MACHINE_RESET(dc_console);
void naomi_aw_base(machine_config &config);
void dc_audio_map(address_map &map);
diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h
index 25351b19e05..f1c6a6455bc 100644
--- a/src/mame/includes/ddragon.h
+++ b/src/mame/includes/ddragon.h
@@ -98,9 +98,9 @@ public:
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
uint32_t screen_update_ddragon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void machine_start_ddragon() ATTR_COLD;
- void machine_reset_ddragon();
- void video_start_ddragon() ATTR_COLD;
+ DECLARE_MACHINE_START(ddragon);
+ DECLARE_MACHINE_RESET(ddragon);
+ DECLARE_VIDEO_START(ddragon);
TIMER_DEVICE_CALLBACK_MEMBER(ddragon_scanline);
diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h
index 26b3184b66c..5c0855cf307 100644
--- a/src/mame/includes/ddragon3.h
+++ b/src/mame/includes/ddragon3.h
@@ -129,7 +129,7 @@ public:
TILE_GET_INFO_MEMBER(get_fg0_tile_info);
virtual void video_start() override;
- void video_start_wwfwfstb() ATTR_COLD;
+ DECLARE_VIDEO_START(wwfwfstb);
uint32_t screen_update_wwfwfest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void wwfwfest(machine_config &config);
diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h
index eb5e451dafa..2edfd3670d5 100644
--- a/src/mame/includes/dec0.h
+++ b/src/mame/includes/dec0.h
@@ -104,9 +104,9 @@ public:
void init_ffantasybl();
virtual void machine_start() override;
- void machine_reset_slyspy();
- void video_start_dec0() ATTR_COLD;
- void video_start_dec0_nodma() ATTR_COLD;
+ DECLARE_MACHINE_RESET(slyspy);
+ DECLARE_VIDEO_START(dec0);
+ DECLARE_VIDEO_START(dec0_nodma);
uint32_t screen_update_hbarrel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_baddudes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
index 92177bc69de..1c78b79f80d 100644
--- a/src/mame/includes/dec8.h
+++ b/src/mame/includes/dec8.h
@@ -157,14 +157,14 @@ public:
TILE_GET_INFO_MEMBER(get_gondo_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
- void video_start_lastmisn() ATTR_COLD;
- void video_start_shackled() ATTR_COLD;
- void video_start_gondo() ATTR_COLD;
- void video_start_garyoret() ATTR_COLD;
- void video_start_ghostb() ATTR_COLD;
- void video_start_oscar() ATTR_COLD;
- void video_start_srdarwin() ATTR_COLD;
- void video_start_cobracom() ATTR_COLD;
+ DECLARE_VIDEO_START(lastmisn);
+ DECLARE_VIDEO_START(shackled);
+ DECLARE_VIDEO_START(gondo);
+ DECLARE_VIDEO_START(garyoret);
+ DECLARE_VIDEO_START(ghostb);
+ DECLARE_VIDEO_START(oscar);
+ DECLARE_VIDEO_START(srdarwin);
+ DECLARE_VIDEO_START(cobracom);
void allocate_buffered_spriteram16();
uint32_t screen_update_lastmisn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_shackled(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h
index d7702f638e4..7250d0df2e9 100644
--- a/src/mame/includes/deco32.h
+++ b/src/mame/includes/deco32.h
@@ -112,7 +112,7 @@ public:
DECLARE_READ8_MEMBER(captaven_dsw3_r);
DECLARE_READ8_MEMBER(captaven_soundcpu_status_r);
- void video_start_captaven() ATTR_COLD;
+ DECLARE_VIDEO_START(captaven);
void init_captaven();
uint32_t screen_update_captaven(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -138,7 +138,7 @@ public:
DECLARE_READ32_MEMBER(unk_status_r);
void init_fghthist();
- void video_start_fghthist() ATTR_COLD;
+ DECLARE_VIDEO_START(fghthist);
uint32_t screen_update_fghthist(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -168,7 +168,7 @@ public:
void init_tattass();
void init_nslasher();
- void video_start_nslasher() ATTR_COLD;
+ DECLARE_VIDEO_START(nslasher);
uint32_t screen_update_nslasher(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -241,7 +241,7 @@ public:
void init_dragngun();
void init_dragngunj();
void init_lockload();
- void video_start_dragngun() ATTR_COLD;
+ DECLARE_VIDEO_START(dragngun);
void dragngun_init_common();
DECLARE_INPUT_CHANGED_MEMBER(lockload_gun_trigger);
diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h
index 3a6b067c407..e63af284675 100644
--- a/src/mame/includes/deco_mlc.h
+++ b/src/mame/includes/deco_mlc.h
@@ -76,8 +76,8 @@ public:
void init_mlc();
void init_avengrgs();
- void machine_reset_mlc();
- void video_start_mlc() ATTR_COLD;
+ DECLARE_MACHINE_RESET(mlc);
+ DECLARE_VIDEO_START(mlc);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_mlc);
TIMER_DEVICE_CALLBACK_MEMBER(interrupt_gen);
diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h
index aa8c4bcbaa0..29bc9666697 100644
--- a/src/mame/includes/decocass.h
+++ b/src/mame/includes/decocass.h
@@ -219,23 +219,23 @@ public:
m_type1_map = nullptr;
}
- void machine_reset_ctsttape();
- void machine_reset_chwy();
- void machine_reset_cdsteljn();
- void machine_reset_cterrani();
- void machine_reset_castfant();
- void machine_reset_csuperas();
- void machine_reset_cmanhat();
- void machine_reset_clocknch();
- void machine_reset_cprogolf();
- void machine_reset_cprogolfj();
- void machine_reset_cluckypo();
- void machine_reset_ctisland();
- void machine_reset_ctisland3();
- void machine_reset_cexplore();
- void machine_reset_cocean1a(); /* 10 */
- void machine_reset_cfboy0a1(); /* 12 */
- void machine_reset_clocknchj(); /* 11 */
+ DECLARE_MACHINE_RESET(ctsttape);
+ DECLARE_MACHINE_RESET(chwy);
+ DECLARE_MACHINE_RESET(cdsteljn);
+ DECLARE_MACHINE_RESET(cterrani);
+ DECLARE_MACHINE_RESET(castfant);
+ DECLARE_MACHINE_RESET(csuperas);
+ DECLARE_MACHINE_RESET(cmanhat);
+ DECLARE_MACHINE_RESET(clocknch);
+ DECLARE_MACHINE_RESET(cprogolf);
+ DECLARE_MACHINE_RESET(cprogolfj);
+ DECLARE_MACHINE_RESET(cluckypo);
+ DECLARE_MACHINE_RESET(ctisland);
+ DECLARE_MACHINE_RESET(ctisland3);
+ DECLARE_MACHINE_RESET(cexplore);
+ DECLARE_MACHINE_RESET(cocean1a); /* 10 */
+ DECLARE_MACHINE_RESET(cfboy0a1); /* 12 */
+ DECLARE_MACHINE_RESET(clocknchj); /* 11 */
void cprogolfj(machine_config &config);
void cfboy0a1(machine_config &config);
@@ -303,20 +303,20 @@ public:
{
}
- void machine_reset_cfishing();
- void machine_reset_cbtime();
- void machine_reset_cburnrub();
- void machine_reset_cgraplop();
- void machine_reset_cgraplop2();
- void machine_reset_clapapa();
- void machine_reset_cskater();
- void machine_reset_cprobowl();
- void machine_reset_cnightst();
- void machine_reset_cpsoccer();
- void machine_reset_csdtenis();
- void machine_reset_czeroize();
- void machine_reset_cppicf();
- void machine_reset_cfghtice();
+ DECLARE_MACHINE_RESET(cfishing);
+ DECLARE_MACHINE_RESET(cbtime);
+ DECLARE_MACHINE_RESET(cburnrub);
+ DECLARE_MACHINE_RESET(cgraplop);
+ DECLARE_MACHINE_RESET(cgraplop2);
+ DECLARE_MACHINE_RESET(clapapa);
+ DECLARE_MACHINE_RESET(cskater);
+ DECLARE_MACHINE_RESET(cprobowl);
+ DECLARE_MACHINE_RESET(cnightst);
+ DECLARE_MACHINE_RESET(cpsoccer);
+ DECLARE_MACHINE_RESET(csdtenis);
+ DECLARE_MACHINE_RESET(czeroize);
+ DECLARE_MACHINE_RESET(cppicf);
+ DECLARE_MACHINE_RESET(cfghtice);
void csdtenis(machine_config &config);
void cburnrub(machine_config &config);
diff --git a/src/mame/includes/digdug.h b/src/mame/includes/digdug.h
index 1df1206db55..32856d5c12a 100644
--- a/src/mame/includes/digdug.h
+++ b/src/mame/includes/digdug.h
@@ -22,7 +22,7 @@ public:
TILEMAP_MAPPER_MEMBER(tilemap_scan);
TILE_GET_INFO_MEMBER(bg_get_tile_info);
TILE_GET_INFO_MEMBER(tx_get_tile_info);
- void video_start_digdug() ATTR_COLD;
+ DECLARE_VIDEO_START(digdug);
DECLARE_PALETTE_INIT(digdug);
uint32_t screen_update_digdug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/divebomb.h b/src/mame/includes/divebomb.h
index 930b9a0dcbb..4de581ddb39 100644
--- a/src/mame/includes/divebomb.h
+++ b/src/mame/includes/divebomb.h
@@ -52,9 +52,9 @@ public:
uint8_t m_roz_pal;
bool m_roz_enable[2];
- void machine_reset_divebomb();
- void machine_start_divebomb() ATTR_COLD;
- void video_start_divebomb() ATTR_COLD;
+ DECLARE_MACHINE_RESET(divebomb);
+ DECLARE_MACHINE_START(divebomb);
+ DECLARE_VIDEO_START(divebomb);
DECLARE_PALETTE_INIT(divebomb);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h
index bda364b276e..6cde8a1ebea 100644
--- a/src/mame/includes/dkong.h
+++ b/src/mame/includes/dkong.h
@@ -256,21 +256,21 @@ public:
void init_dkong3hs();
TILE_GET_INFO_MEMBER(dkong_bg_tile_info);
TILE_GET_INFO_MEMBER(radarscp1_bg_tile_info);
- void machine_start_dkong2b() ATTR_COLD;
- void machine_reset_dkong();
- void machine_reset_ddk();
- void video_start_dkong() ATTR_COLD;
- void video_start_dkong_base() ATTR_COLD;
+ DECLARE_MACHINE_START(dkong2b);
+ DECLARE_MACHINE_RESET(dkong);
+ DECLARE_MACHINE_RESET(ddk);
+ DECLARE_VIDEO_START(dkong);
+ DECLARE_VIDEO_START(dkong_base);
DECLARE_PALETTE_INIT(dkong2b);
- void machine_start_dkong3() ATTR_COLD;
+ DECLARE_MACHINE_START(dkong3);
DECLARE_PALETTE_INIT(dkong3);
- void machine_start_radarscp() ATTR_COLD;
+ DECLARE_MACHINE_START(radarscp);
DECLARE_PALETTE_INIT(radarscp);
- void machine_start_radarscp1() ATTR_COLD;
+ DECLARE_MACHINE_START(radarscp1);
DECLARE_PALETTE_INIT(radarscp1);
- void machine_start_s2650() ATTR_COLD;
- void machine_reset_strtheat();
- void machine_reset_drakton();
+ DECLARE_MACHINE_START(s2650);
+ DECLARE_MACHINE_RESET(strtheat);
+ DECLARE_MACHINE_RESET(drakton);
DECLARE_WRITE8_MEMBER(M58817_command_w);
DECLARE_READ8_MEMBER(dkong_voice_status_r);
DECLARE_READ8_MEMBER(dkong_tune_r);
diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h
index 74cd1e4bb0a..34ea0e27bdb 100644
--- a/src/mame/includes/docastle.h
+++ b/src/mame/includes/docastle.h
@@ -72,7 +72,7 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(docastle);
- void video_start_dorunrun() ATTR_COLD;
+ DECLARE_VIDEO_START(dorunrun);
uint32_t screen_update_docastle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void video_start_common( uint32_t tile_transmask );
void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect );
diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h
index 711a6170ffb..1bc90064d8e 100644
--- a/src/mame/includes/dynax.h
+++ b/src/mame/includes/dynax.h
@@ -262,29 +262,29 @@ public:
DECLARE_WRITE_LINE_MEMBER(adpcm_int);
DECLARE_WRITE_LINE_MEMBER(adpcm_int_cpu1);
- void machine_reset_adpcm();
+ DECLARE_MACHINE_RESET(adpcm);
DECLARE_WRITE8_MEMBER(adpcm_reset_w);
DECLARE_WRITE_LINE_MEMBER(adpcm_reset_kludge_w);
DECLARE_WRITE8_MEMBER(tenkai_dswsel_w);
DECLARE_READ8_MEMBER(tenkai_dsw_r);
DECLARE_WRITE_LINE_MEMBER(tenkai_blitter_ack_w);
- void machine_reset_dynax();
- void machine_start_dynax() ATTR_COLD;
- void machine_start_hanamai() ATTR_COLD;
- void machine_start_hjingi() ATTR_COLD;
- void video_start_hanamai() ATTR_COLD;
- void video_start_hnoridur() ATTR_COLD;
+ DECLARE_MACHINE_RESET(dynax);
+ DECLARE_MACHINE_START(dynax);
+ DECLARE_MACHINE_START(hanamai);
+ DECLARE_MACHINE_START(hjingi);
+ DECLARE_VIDEO_START(hanamai);
+ DECLARE_VIDEO_START(hnoridur);
DECLARE_PALETTE_INIT(sprtmtch);
- void video_start_sprtmtch() ATTR_COLD;
- void machine_start_jantouki() ATTR_COLD;
- void video_start_jantouki() ATTR_COLD;
- void video_start_mjelctrn() ATTR_COLD;
- void video_start_mjembase() ATTR_COLD;
- void video_start_mjdialq2() ATTR_COLD;
- void video_start_mcnpshnt() ATTR_COLD;
+ DECLARE_VIDEO_START(sprtmtch);
+ DECLARE_MACHINE_START(jantouki);
+ DECLARE_VIDEO_START(jantouki);
+ DECLARE_VIDEO_START(mjelctrn);
+ DECLARE_VIDEO_START(mjembase);
+ DECLARE_VIDEO_START(mjdialq2);
+ DECLARE_VIDEO_START(mcnpshnt);
DECLARE_PALETTE_INIT(janyuki);
- void video_start_neruton() ATTR_COLD;
- void video_start_tenkai() ATTR_COLD;
+ DECLARE_VIDEO_START(neruton);
+ DECLARE_VIDEO_START(tenkai);
inline void blitter_plot_pixel( int layer, int mask, int x, int y, int pen, int wrap, int flags );
int blitter_drawgfx( int layer, int mask, memory_region *gfx, int src, int pen, int x, int y, int wrap, int flags );
diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h
index 24c4bf4aa31..616a5da4f4d 100644
--- a/src/mame/includes/eolith.h
+++ b/src/mame/includes/eolith.h
@@ -44,8 +44,8 @@ public:
void init_landbrka();
void init_landbrkb();
- void machine_reset_eolith();
- void video_start_eolith();
+ DECLARE_MACHINE_RESET(eolith);
+ DECLARE_VIDEO_START(eolith);
TIMER_DEVICE_CALLBACK_MEMBER(eolith_speedup);
diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h
index 5729c21aeef..df5ce02a6a9 100644
--- a/src/mame/includes/epos.h
+++ b/src/mame/includes/epos.h
@@ -37,8 +37,8 @@ public:
DECLARE_WRITE8_MEMBER(dealer_pal_w);
void init_dealer();
virtual void machine_reset() override;
- void machine_start_epos() ATTR_COLD;
- void machine_start_dealer() ATTR_COLD;
+ DECLARE_MACHINE_START(epos);
+ DECLARE_MACHINE_START(dealer);
DECLARE_PALETTE_INIT(epos);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void set_pal_color( uint8_t offset, uint8_t data );
diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h
index 11f06791b97..3f1e0f5e91a 100644
--- a/src/mame/includes/eprom.h
+++ b/src/mame/includes/eprom.h
@@ -45,8 +45,8 @@ protected:
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
TILE_GET_INFO_MEMBER(guts_get_playfield_tile_info);
- void video_start_eprom() ATTR_COLD;
- void video_start_guts() ATTR_COLD;
+ DECLARE_VIDEO_START(eprom);
+ DECLARE_VIDEO_START(guts);
uint32_t screen_update_eprom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_guts(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void update_palette();
diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h
index be2cf2f6264..9cb108b2a53 100644
--- a/src/mame/includes/equites.h
+++ b/src/mame/includes/equites.h
@@ -108,7 +108,7 @@ public:
void init_equites();
TILE_GET_INFO_MEMBER(equites_fg_info);
TILE_GET_INFO_MEMBER(equites_bg_info);
- void video_start_equites() ATTR_COLD;
+ DECLARE_VIDEO_START(equites);
DECLARE_PALETTE_INIT(equites);
uint32_t screen_update_equites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(equites_8155_timer_pulse);
@@ -165,7 +165,7 @@ protected:
DECLARE_WRITE16_MEMBER(splndrbt_bg_scrolly_w);
TILE_GET_INFO_MEMBER(splndrbt_fg_info);
TILE_GET_INFO_MEMBER(splndrbt_bg_info);
- void video_start_splndrbt() ATTR_COLD;
+ DECLARE_VIDEO_START(splndrbt);
DECLARE_PALETTE_INIT(splndrbt);
uint32_t screen_update_splndrbt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(splndrbt_scanline);
diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h
index c1f45947ff4..7474320046c 100644
--- a/src/mame/includes/espial.h
+++ b/src/mame/includes/espial.h
@@ -65,7 +65,7 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(espial);
- void video_start_netwars() ATTR_COLD;
+ DECLARE_VIDEO_START(netwars);
uint32_t screen_update_espial(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(espial_sound_nmi_gen);
TIMER_DEVICE_CALLBACK_MEMBER(espial_scanline);
diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h
index cbf4ae4efd5..92381382593 100644
--- a/src/mame/includes/exidy.h
+++ b/src/mame/includes/exidy.h
@@ -96,7 +96,7 @@ public:
void init_phantoma();
virtual void video_start() override;
- void machine_start_teetert() ATTR_COLD;
+ DECLARE_MACHINE_START(teetert);
uint32_t screen_update_exidy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h
index b3d121bf611..42197a9e967 100644
--- a/src/mame/includes/f1gp.h
+++ b/src/mame/includes/f1gp.h
@@ -91,12 +91,12 @@ public:
TILE_GET_INFO_MEMBER(f1gp_get_roz_tile_info);
TILE_GET_INFO_MEMBER(f1gp2_get_roz_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
- void machine_start_f1gp() ATTR_COLD;
- void machine_reset_f1gp();
- void video_start_f1gp() ATTR_COLD;
- void machine_start_f1gpb() ATTR_COLD;
- void video_start_f1gpb() ATTR_COLD;
- void video_start_f1gp2() ATTR_COLD;
+ DECLARE_MACHINE_START(f1gp);
+ DECLARE_MACHINE_RESET(f1gp);
+ DECLARE_VIDEO_START(f1gp);
+ DECLARE_MACHINE_START(f1gpb);
+ DECLARE_VIDEO_START(f1gpb);
+ DECLARE_VIDEO_START(f1gp2);
uint32_t screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_f1gp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h
index 12fef69ff46..8ca9c568f4a 100644
--- a/src/mame/includes/fantland.h
+++ b/src/mame/includes/fantland.h
@@ -64,10 +64,10 @@ public:
DECLARE_READ8_MEMBER(borntofi_inputs_r);
DECLARE_WRITE8_MEMBER(borntofi_msm5205_w);
DECLARE_CUSTOM_INPUT_MEMBER(wheelrun_wheel_r);
- void machine_start_fantland() ATTR_COLD;
- void machine_reset_fantland();
- void machine_start_borntofi() ATTR_COLD;
- void machine_reset_borntofi();
+ DECLARE_MACHINE_START(fantland);
+ DECLARE_MACHINE_RESET(fantland);
+ DECLARE_MACHINE_START(borntofi);
+ DECLARE_MACHINE_RESET(borntofi);
uint32_t screen_update_fantland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(fantland_irq);
INTERRUPT_GEN_MEMBER(fantland_sound_irq);
diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h
index 47e8285eb22..469eb864db0 100644
--- a/src/mame/includes/fastfred.h
+++ b/src/mame/includes/fastfred.h
@@ -79,9 +79,9 @@ public:
virtual void machine_start() override;
DECLARE_PALETTE_INIT(fastfred);
- void machine_start_imago() ATTR_COLD;
- void video_start_fastfred() ATTR_COLD;
- void video_start_imago() ATTR_COLD;
+ DECLARE_MACHINE_START(imago);
+ DECLARE_VIDEO_START(fastfred);
+ DECLARE_VIDEO_START(imago);
uint32_t screen_update_fastfred(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_imago(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h
index c9ba134d3d4..b5e533cef40 100644
--- a/src/mame/includes/firetrk.h
+++ b/src/mame/includes/firetrk.h
@@ -130,8 +130,8 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(firetrk);
- void video_start_superbug() ATTR_COLD;
- void video_start_montecar() ATTR_COLD;
+ DECLARE_VIDEO_START(superbug);
+ DECLARE_VIDEO_START(montecar);
DECLARE_PALETTE_INIT(montecar);
uint32_t screen_update_firetrk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_superbug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h
index e54f562f1a5..ce0ee008e02 100644
--- a/src/mame/includes/flstory.h
+++ b/src/mame/includes/flstory.h
@@ -88,12 +88,12 @@ public:
TILE_GET_INFO_MEMBER(victnine_get_tile_info);
TILE_GET_INFO_MEMBER(get_rumba_tile_info);
virtual void machine_start() override;
- void machine_reset_flstory();
- void video_start_flstory() ATTR_COLD;
- void video_start_victnine() ATTR_COLD;
- void machine_reset_rumba();
- void video_start_rumba() ATTR_COLD;
- void machine_reset_ta7630();
+ DECLARE_MACHINE_RESET(flstory);
+ DECLARE_VIDEO_START(flstory);
+ DECLARE_VIDEO_START(victnine);
+ DECLARE_MACHINE_RESET(rumba);
+ DECLARE_VIDEO_START(rumba);
+ DECLARE_MACHINE_RESET(ta7630);
uint32_t screen_update_flstory(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_victnine(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_rumba(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/fm7.h b/src/mame/includes/fm7.h
index 88816aee5f1..7010f83d176 100644
--- a/src/mame/includes/fm7.h
+++ b/src/mame/includes/fm7.h
@@ -159,10 +159,10 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
- void machine_start_fm7() ATTR_COLD;
- void machine_start_fm77av() ATTR_COLD;
- void machine_start_fm11() ATTR_COLD;
- void machine_start_fm16() ATTR_COLD;
+ DECLARE_MACHINE_START(fm7);
+ DECLARE_MACHINE_START(fm77av);
+ DECLARE_MACHINE_START(fm11);
+ DECLARE_MACHINE_START(fm16);
DECLARE_WRITE_LINE_MEMBER(fm7_fdc_intrq_w);
DECLARE_WRITE_LINE_MEMBER(fm7_fdc_drq_w);
diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h
index 4978c82d8a5..f7b984b754a 100644
--- a/src/mame/includes/freekick.h
+++ b/src/mame/includes/freekick.h
@@ -54,11 +54,11 @@ public:
void init_pbillrds();
TILE_GET_INFO_MEMBER(get_freek_tile_info);
virtual void video_start() override;
- void machine_start_pbillrd() ATTR_COLD;
- void machine_reset_freekick();
- void machine_start_freekick() ATTR_COLD;
- void machine_start_oigas() ATTR_COLD;
- void machine_reset_oigas();
+ DECLARE_MACHINE_START(pbillrd);
+ DECLARE_MACHINE_RESET(freekick);
+ DECLARE_MACHINE_START(freekick);
+ DECLARE_MACHINE_START(oigas);
+ DECLARE_MACHINE_RESET(oigas);
uint32_t screen_update_pbillrd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_freekick(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_gigas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h
index 85b8710cc94..d4aefe4a413 100644
--- a/src/mame/includes/fromanc2.h
+++ b/src/mame/includes/fromanc2.h
@@ -94,11 +94,11 @@ public:
template<int VRAM, int Layer> TILE_GET_INFO_MEMBER(fromanc2_get_tile_info);
template<int VRAM, int Layer> TILE_GET_INFO_MEMBER(fromancr_get_tile_info);
virtual void machine_reset() override;
- void machine_start_fromanc2() ATTR_COLD;
- void video_start_fromanc2() ATTR_COLD;
- void video_start_fromancr() ATTR_COLD;
- void machine_start_fromanc4() ATTR_COLD;
- void video_start_fromanc4() ATTR_COLD;
+ DECLARE_MACHINE_START(fromanc2);
+ DECLARE_VIDEO_START(fromanc2);
+ DECLARE_VIDEO_START(fromancr);
+ DECLARE_MACHINE_START(fromanc4);
+ DECLARE_VIDEO_START(fromanc4);
uint32_t screen_update_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
inline void fromanc2_dispvram_w( offs_t offset, uint16_t data, uint16_t mem_mask, int vram, int layer );
diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h
index f0edb0392a9..044b0385276 100644
--- a/src/mame/includes/fromance.h
+++ b/src/mame/includes/fromance.h
@@ -82,12 +82,12 @@ public:
TILE_GET_INFO_MEMBER(get_fromance_fg_tile_info);
TILE_GET_INFO_MEMBER(get_nekkyoku_bg_tile_info);
TILE_GET_INFO_MEMBER(get_nekkyoku_fg_tile_info);
- void machine_start_fromance() ATTR_COLD;
- void machine_reset_fromance();
- void video_start_nekkyoku() ATTR_COLD;
- void video_start_fromance() ATTR_COLD;
- void video_start_pipedrm() ATTR_COLD;
- void video_start_hatris() ATTR_COLD;
+ DECLARE_MACHINE_START(fromance);
+ DECLARE_MACHINE_RESET(fromance);
+ DECLARE_VIDEO_START(nekkyoku);
+ DECLARE_VIDEO_START(fromance);
+ DECLARE_VIDEO_START(pipedrm);
+ DECLARE_VIDEO_START(hatris);
uint32_t screen_update_fromance(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_pipedrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(crtc_interrupt_gen);
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h
index 19aff25804c..0c39ac93bdd 100644
--- a/src/mame/includes/funworld.h
+++ b/src/mame/includes/funworld.h
@@ -37,12 +37,12 @@ public:
void init_rcdino4();
void init_rcdinch();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- void video_start_funworld() ATTR_COLD;
+ DECLARE_VIDEO_START(funworld);
DECLARE_PALETTE_INIT(funworld);
- void video_start_magicrd2() ATTR_COLD;
- void video_start_chinatow() ATTR_COLD;
- void machine_start_lunapark() ATTR_COLD;
- void machine_reset_lunapark();
+ DECLARE_VIDEO_START(magicrd2);
+ DECLARE_VIDEO_START(chinatow);
+ DECLARE_MACHINE_START(lunapark);
+ DECLARE_MACHINE_RESET(lunapark);
uint32_t screen_update_funworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h
index 17128cc6479..ffb0157367d 100644
--- a/src/mame/includes/gaelco.h
+++ b/src/mame/includes/gaelco.h
@@ -57,8 +57,8 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_gaelco_screen1);
virtual void machine_start() override;
- void video_start_bigkarnk() ATTR_COLD;
- void video_start_maniacsq() ATTR_COLD;
+ DECLARE_VIDEO_START(bigkarnk);
+ DECLARE_VIDEO_START(maniacsq);
uint32_t screen_update_bigkarnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_maniacsq(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h
index d05c76bcce6..2b9c80638f3 100644
--- a/src/mame/includes/gaelco2.h
+++ b/src/mame/includes/gaelco2.h
@@ -45,8 +45,8 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen1);
TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen0_dual);
TILE_GET_INFO_MEMBER(get_tile_info_gaelco2_screen1_dual);
- void video_start_gaelco2() ATTR_COLD;
- void video_start_gaelco2_dual() ATTR_COLD;
+ DECLARE_VIDEO_START(gaelco2);
+ DECLARE_VIDEO_START(gaelco2_dual);
uint32_t screen_update_gaelco2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_gaelco2_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_gaelco2_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h
index de597c63be6..8aa9c02c07b 100644
--- a/src/mame/includes/gaelco3d.h
+++ b/src/mame/includes/gaelco3d.h
@@ -146,8 +146,8 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void machine_reset_gaelco3d2();
- void machine_reset_common();
+ DECLARE_MACHINE_RESET(gaelco3d2);
+ DECLARE_MACHINE_RESET(common);
uint32_t screen_update_gaelco3d(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vblank_gen);
TIMER_DEVICE_CALLBACK_MEMBER(adsp_autobuffer_irq);
diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h
index 24c2f5b40c9..83c6fb8acb7 100644
--- a/src/mame/includes/gaiden.h
+++ b/src/mame/includes/gaiden.h
@@ -109,11 +109,11 @@ public:
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info_raiga);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
- void machine_start_mastninj() ATTR_COLD;
- void machine_reset_raiga();
- void video_start_gaiden() ATTR_COLD;
- void video_start_drgnbowl() ATTR_COLD;
- void video_start_raiga() ATTR_COLD;
+ DECLARE_MACHINE_START(mastninj);
+ DECLARE_MACHINE_RESET(raiga);
+ DECLARE_VIDEO_START(gaiden);
+ DECLARE_VIDEO_START(drgnbowl);
+ DECLARE_VIDEO_START(raiga);
uint32_t screen_update_gaiden(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_drgnbowl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void drgnbowl_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index a02776d22d6..f26e6602349 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -76,9 +76,9 @@ public:
void init_gatsbee();
TILEMAP_MAPPER_MEMBER(tilemap_scan);
TILE_GET_INFO_MEMBER(get_tile_info);
- void machine_start_galaga() ATTR_COLD;
- void machine_reset_galaga();
- void video_start_galaga() ATTR_COLD;
+ DECLARE_MACHINE_START(galaga);
+ DECLARE_MACHINE_RESET(galaga);
+ DECLARE_VIDEO_START(galaga);
DECLARE_PALETTE_INIT(galaga);
uint32_t screen_update_galaga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_galaga);
diff --git a/src/mame/includes/galaxia.h b/src/mame/includes/galaxia.h
index 9606b215a5a..bf65a808a0e 100644
--- a/src/mame/includes/galaxia.h
+++ b/src/mame/includes/galaxia.h
@@ -25,9 +25,9 @@ public:
DECLARE_READ8_MEMBER(galaxia_collision_clear);
TILE_GET_INFO_MEMBER(get_galaxia_bg_tile_info);
TILE_GET_INFO_MEMBER(get_astrowar_bg_tile_info);
- void video_start_galaxia() ATTR_COLD;
+ DECLARE_VIDEO_START(galaxia);
DECLARE_PALETTE_INIT(galaxia);
- void video_start_astrowar() ATTR_COLD;
+ DECLARE_VIDEO_START(astrowar);
DECLARE_PALETTE_INIT(astrowar);
uint32_t screen_update_galaxia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_astrowar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index 0ae95217a0a..754a70921cc 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -170,9 +170,9 @@ public:
TILE_GET_INFO_MEMBER(rockclim_get_tile_info);
TILE_GET_INFO_MEMBER(harem_get_tile_info);
- void machine_reset_galaxold();
- void machine_reset_devilfsg();
- void machine_reset_hunchbkg();
+ DECLARE_MACHINE_RESET(galaxold);
+ DECLARE_MACHINE_RESET(devilfsg);
+ DECLARE_MACHINE_RESET(hunchbkg);
DECLARE_PALETTE_INIT(galaxold);
DECLARE_PALETTE_INIT(rockclim);
@@ -185,31 +185,31 @@ public:
DECLARE_PALETTE_INIT(dambustr);
DECLARE_PALETTE_INIT(turtles);
- void video_start_galaxold();
- void video_start_drivfrcg();
- void video_start_racknrol();
- void video_start_mooncrst();
- void video_start_scrambold();
- void video_start_newsin7();
- void video_start_pisces();
- void video_start_dkongjrm();
- void video_start_dkongjrmc();
- void video_start_rockclim();
- void video_start_galaxold_plain();
- void video_start_ozon1();
- void video_start_bongo();
- void video_start_ckongs();
- void video_start_darkplnt();
- void video_start_rescue();
- void video_start_minefld();
- void video_start_stratgyx();
- void video_start_mariner();
- void video_start_mimonkey();
- void video_start_scorpion();
- void video_start_ad2083();
- void video_start_dambustr();
- void video_start_harem();
- void video_start_bagmanmc();
+ DECLARE_VIDEO_START(galaxold);
+ DECLARE_VIDEO_START(drivfrcg);
+ DECLARE_VIDEO_START(racknrol);
+ DECLARE_VIDEO_START(mooncrst);
+ DECLARE_VIDEO_START(scrambold);
+ DECLARE_VIDEO_START(newsin7);
+ DECLARE_VIDEO_START(pisces);
+ DECLARE_VIDEO_START(dkongjrm);
+ DECLARE_VIDEO_START(dkongjrmc);
+ DECLARE_VIDEO_START(rockclim);
+ DECLARE_VIDEO_START(galaxold_plain);
+ DECLARE_VIDEO_START(ozon1);
+ DECLARE_VIDEO_START(bongo);
+ DECLARE_VIDEO_START(ckongs);
+ DECLARE_VIDEO_START(darkplnt);
+ DECLARE_VIDEO_START(rescue);
+ DECLARE_VIDEO_START(minefld);
+ DECLARE_VIDEO_START(stratgyx);
+ DECLARE_VIDEO_START(mariner);
+ DECLARE_VIDEO_START(mimonkey);
+ DECLARE_VIDEO_START(scorpion);
+ DECLARE_VIDEO_START(ad2083);
+ DECLARE_VIDEO_START(dambustr);
+ DECLARE_VIDEO_START(harem);
+ DECLARE_VIDEO_START(bagmanmc);
uint32_t screen_update_galaxold(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_dambustr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/galaxy.h b/src/mame/includes/galaxy.h
index da9bdd5049d..45fc06b272c 100644
--- a/src/mame/includes/galaxy.h
+++ b/src/mame/includes/galaxy.h
@@ -30,8 +30,8 @@ public:
void init_galaxy();
void init_galaxyp();
virtual void video_start() override;
- void machine_reset_galaxy();
- void machine_reset_galaxyp();
+ DECLARE_MACHINE_RESET(galaxy);
+ DECLARE_MACHINE_RESET(galaxyp);
uint32_t screen_update_galaxy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(galaxy_interrupt);
TIMER_CALLBACK_MEMBER(gal_video);
diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h
index 0a1e4aee680..7e31de535c8 100644
--- a/src/mame/includes/galivan.h
+++ b/src/mame/includes/galivan.h
@@ -60,12 +60,12 @@ public:
TILE_GET_INFO_MEMBER(ninjemak_get_bg_tile_info);
TILE_GET_INFO_MEMBER(ninjemak_get_tx_tile_info);
DECLARE_PALETTE_INIT(galivan);
- void machine_start_galivan() ATTR_COLD;
- void machine_reset_galivan();
- void video_start_galivan() ATTR_COLD;
- void machine_start_ninjemak() ATTR_COLD;
- void machine_reset_ninjemak();
- void video_start_ninjemak() ATTR_COLD;
+ DECLARE_MACHINE_START(galivan);
+ DECLARE_MACHINE_RESET(galivan);
+ DECLARE_VIDEO_START(galivan);
+ DECLARE_MACHINE_START(ninjemak);
+ DECLARE_MACHINE_RESET(ninjemak);
+ DECLARE_VIDEO_START(ninjemak);
uint32_t screen_update_galivan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_ninjemak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h
index c8c8fa840ac..cbd574532a3 100644
--- a/src/mame/includes/galspnbl.h
+++ b/src/mame/includes/galspnbl.h
@@ -53,7 +53,7 @@ public:
uint32_t screen_update_galspnbl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_background( bitmap_ind16 &bitmap, const rectangle &cliprect );
bitmap_ind16 m_sprite_bitmap;
- void video_start_galspnbl() ATTR_COLD;
+ DECLARE_VIDEO_START(galspnbl);
void mix_sprite_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int pri);
diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h
index 5d28eddcf01..0eb102f8e18 100644
--- a/src/mame/includes/gameplan.h
+++ b/src/mame/includes/gameplan.h
@@ -48,8 +48,6 @@ public:
m_screen(*this, "screen"),
m_soundlatch(*this, "soundlatch") { }
- void video_start() override;
-
/* machine state */
uint8_t m_current_port;
optional_shared_ptr<uint8_t> m_trvquest_question;
@@ -82,11 +80,15 @@ public:
DECLARE_WRITE_LINE_MEMBER(audio_trigger_w);
DECLARE_WRITE_LINE_MEMBER(r6532_irq);
DECLARE_WRITE8_MEMBER(r6532_soundlatch_w);
- void machine_start_gameplan() ATTR_COLD;
- void machine_reset_gameplan();
- void machine_start_trvquest() ATTR_COLD;
- void machine_reset_trvquest();
- void video_reset_gameplan();
+ DECLARE_MACHINE_START(gameplan);
+ DECLARE_MACHINE_RESET(gameplan);
+ DECLARE_MACHINE_START(trvquest);
+ DECLARE_MACHINE_RESET(trvquest);
+ DECLARE_VIDEO_START(gameplan);
+ DECLARE_VIDEO_RESET(gameplan);
+ DECLARE_VIDEO_START(leprechn);
+ DECLARE_VIDEO_START(trvquest);
+ DECLARE_VIDEO_START(common);
uint32_t screen_update_gameplan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_leprechn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(trvquest_interrupt);
diff --git a/src/mame/includes/gb.h b/src/mame/includes/gb.h
index affa28930cf..cd24651a6af 100644
--- a/src/mame/includes/gb.h
+++ b/src/mame/includes/gb.h
@@ -71,12 +71,12 @@ public:
DECLARE_WRITE8_MEMBER(gbc_io2_w);
DECLARE_READ8_MEMBER(gbc_io2_r);
DECLARE_PALETTE_INIT(gb);
- void machine_start_sgb() ATTR_COLD;
- void machine_reset_sgb();
+ DECLARE_MACHINE_START(sgb);
+ DECLARE_MACHINE_RESET(sgb);
DECLARE_PALETTE_INIT(sgb);
DECLARE_PALETTE_INIT(gbp);
- void machine_start_gbc() ATTR_COLD;
- void machine_reset_gbc();
+ DECLARE_MACHINE_START(gbc);
+ DECLARE_MACHINE_RESET(gbc);
DECLARE_PALETTE_INIT(gbc);
DECLARE_WRITE8_MEMBER(gb_timer_callback);
@@ -142,8 +142,8 @@ public:
DECLARE_READ8_MEMBER(megaduck_sound_r1);
DECLARE_WRITE8_MEMBER(megaduck_sound_w2);
DECLARE_READ8_MEMBER(megaduck_sound_r2);
- void machine_start_megaduck() ATTR_COLD;
- void machine_reset_megaduck();
+ DECLARE_MACHINE_START(megaduck);
+ DECLARE_MACHINE_RESET(megaduck);
DECLARE_PALETTE_INIT(megaduck);
DECLARE_READ8_MEMBER(cart_r);
diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h
index 80d230ef2d9..7e4568c3a96 100644
--- a/src/mame/includes/gberet.h
+++ b/src/mame/includes/gberet.h
@@ -57,9 +57,9 @@ public:
DECLARE_WRITE8_MEMBER(gberetb_scroll_w);
void init_mrgoemon();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- void machine_start_gberet() ATTR_COLD;
- void machine_reset_gberet();
- void video_start_gberet() ATTR_COLD;
+ DECLARE_MACHINE_START(gberet);
+ DECLARE_MACHINE_RESET(gberet);
+ DECLARE_VIDEO_START(gberet);
DECLARE_PALETTE_INIT(gberet);
uint32_t screen_update_gberet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_gberetb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h
index 72a393b4506..0c74c1d2b13 100644
--- a/src/mame/includes/gladiatr.h
+++ b/src/mame/includes/gladiatr.h
@@ -137,8 +137,8 @@ public:
void init_gladiatr();
- void machine_reset_gladiator();
- void video_start_gladiatr() ATTR_COLD;
+ DECLARE_MACHINE_RESET(gladiator);
+ DECLARE_VIDEO_START(gladiatr);
uint32_t screen_update_gladiatr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void swap_block(uint8_t *src1,uint8_t *src2,int len);
@@ -187,8 +187,8 @@ public:
void init_ppking();
- void machine_reset_ppking();
- void video_start_ppking() ATTR_COLD;
+ DECLARE_MACHINE_RESET(ppking);
+ DECLARE_VIDEO_START(ppking);
uint32_t screen_update_ppking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h
index 8ea0b2d39c2..f7780fe120a 100644
--- a/src/mame/includes/goldstar.h
+++ b/src/mame/includes/goldstar.h
@@ -44,9 +44,9 @@ public:
void init_cmast91();
void init_wcherry();
void init_super9();
- void video_start_goldstar() ATTR_COLD;
+ DECLARE_VIDEO_START(goldstar);
DECLARE_PALETTE_INIT(cm);
- void video_start_cherrym() ATTR_COLD;
+ DECLARE_VIDEO_START(cherrym);
DECLARE_PALETTE_INIT(cmast91);
DECLARE_PALETTE_INIT(lucky8);
uint32_t screen_update_goldstar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -210,8 +210,8 @@ public:
void init_flaming7();
void init_flam7_tw();
- void video_start_bingowng() ATTR_COLD;
- void video_start_magical() ATTR_COLD;
+ DECLARE_VIDEO_START(bingowng);
+ DECLARE_VIDEO_START(magical);
DECLARE_PALETTE_INIT(magodds);
uint32_t screen_update_bingowng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_magical(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -294,7 +294,7 @@ public:
DECLARE_WRITE8_MEMBER(reel2_attrram_w);
DECLARE_WRITE8_MEMBER(reel3_attrram_w);
- void video_start_sangho() ATTR_COLD;
+ DECLARE_VIDEO_START(sangho);
uint32_t screen_update_sangho(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void star100(machine_config &config);
@@ -340,7 +340,7 @@ public:
void init_unkch3();
void init_unkch4();
- void video_start_unkch() ATTR_COLD;
+ DECLARE_VIDEO_START(unkch);
uint32_t screen_update_unkch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h
index 7121cbcdc00..a7ca9e6128e 100644
--- a/src/mame/includes/gottlieb.h
+++ b/src/mame/includes/gottlieb.h
@@ -128,7 +128,7 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start_screwloo() ATTR_COLD;
+ DECLARE_VIDEO_START(screwloo);
uint32_t screen_update_gottlieb(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(gottlieb_interrupt);
TIMER_CALLBACK_MEMBER(laserdisc_philips_callback);
diff --git a/src/mame/includes/hec2hrp.h b/src/mame/includes/hec2hrp.h
index aac4d84b874..f263a6c4908 100644
--- a/src/mame/includes/hec2hrp.h
+++ b/src/mame/includes/hec2hrp.h
@@ -159,13 +159,13 @@ public:
DECLARE_WRITE8_MEMBER(hector_io_8255_w);
DECLARE_WRITE8_MEMBER(hector_mx40_io_port_w);
DECLARE_WRITE8_MEMBER(hector_mx80_io_port_w);
- void machine_start_hec2hrp() ATTR_COLD;
- void machine_reset_hec2hrp();
- void video_start_hec2hrp() ATTR_COLD;
- void machine_start_hec2hrx() ATTR_COLD;
- void machine_reset_hec2hrx();
- void machine_start_hec2mdhrx() ATTR_COLD;
- void machine_reset_hec2mdhrx();
+ DECLARE_MACHINE_START(hec2hrp);
+ DECLARE_MACHINE_RESET(hec2hrp);
+ DECLARE_VIDEO_START(hec2hrp);
+ DECLARE_MACHINE_START(hec2hrx);
+ DECLARE_MACHINE_RESET(hec2hrx);
+ DECLARE_MACHINE_START(hec2mdhrx);
+ DECLARE_MACHINE_RESET(hec2mdhrx);
uint32_t screen_update_hec2hrp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(Callback_CK);
diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h
index d8aa64d12e3..bfc2a61103e 100644
--- a/src/mame/includes/hitme.h
+++ b/src/mame/includes/hitme.h
@@ -49,7 +49,7 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start_barricad() ATTR_COLD;
+ DECLARE_VIDEO_START(barricad);
uint32_t screen_update_hitme(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_barricad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint8_t read_port_and_t0( int port );
diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h
index 753ffa56061..572f8b96045 100644
--- a/src/mame/includes/hnayayoi.h
+++ b/src/mame/includes/hnayayoi.h
@@ -43,7 +43,7 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start_untoucha() ATTR_COLD;
+ DECLARE_VIDEO_START(untoucha);
MC6845_UPDATE_ROW(hnayayoi_update_row);
MC6845_UPDATE_ROW(untoucha_update_row);
void common_vh_start( int num_pixmaps );
diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h
index fed7e8665bd..d8767ea979b 100644
--- a/src/mame/includes/holeland.h
+++ b/src/mame/includes/holeland.h
@@ -49,8 +49,8 @@ public:
TILE_GET_INFO_MEMBER(holeland_get_tile_info);
TILE_GET_INFO_MEMBER(crzrally_get_tile_info);
- void video_start_holeland() ATTR_COLD;
- void video_start_crzrally() ATTR_COLD;
+ DECLARE_VIDEO_START(holeland);
+ DECLARE_VIDEO_START(crzrally);
uint32_t screen_update_holeland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_crzrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h
index fcee3bae1d9..3bdb1516d22 100644
--- a/src/mame/includes/homedata.h
+++ b/src/mame/includes/homedata.h
@@ -120,21 +120,21 @@ public:
TILE_GET_INFO_MEMBER(mirderby_get_info1_0);
TILE_GET_INFO_MEMBER(mirderby_get_info0_1);
TILE_GET_INFO_MEMBER(mirderby_get_info1_1);
- void machine_start_homedata() ATTR_COLD;
- void machine_reset_homedata();
- void video_start_mrokumei() ATTR_COLD;
+ DECLARE_MACHINE_START(homedata);
+ DECLARE_MACHINE_RESET(homedata);
+ DECLARE_VIDEO_START(mrokumei);
DECLARE_PALETTE_INIT(mrokumei);
- void machine_start_reikaids() ATTR_COLD;
- void machine_reset_reikaids();
- void video_start_reikaids() ATTR_COLD;
+ DECLARE_MACHINE_START(reikaids);
+ DECLARE_MACHINE_RESET(reikaids);
+ DECLARE_VIDEO_START(reikaids);
DECLARE_PALETTE_INIT(reikaids);
- void machine_start_pteacher() ATTR_COLD;
- void machine_reset_pteacher();
- void video_start_pteacher() ATTR_COLD;
+ DECLARE_MACHINE_START(pteacher);
+ DECLARE_MACHINE_RESET(pteacher);
+ DECLARE_VIDEO_START(pteacher);
DECLARE_PALETTE_INIT(pteacher);
- void video_start_mirderby() ATTR_COLD;
+ DECLARE_VIDEO_START(mirderby);
DECLARE_PALETTE_INIT(mirderby);
- void video_start_lemnangl() ATTR_COLD;
+ DECLARE_VIDEO_START(lemnangl);
uint32_t screen_update_mrokumei(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_reikaids(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_pteacher(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h
index a7fa42ff064..4d281cbb793 100644
--- a/src/mame/includes/hp48.h
+++ b/src/mame/includes/hp48.h
@@ -65,12 +65,12 @@ public:
void init_hp48();
DECLARE_PALETTE_INIT(hp48);
- void machine_start_hp49g() ATTR_COLD;
- void machine_start_hp48gx() ATTR_COLD;
- void machine_start_hp48g() ATTR_COLD;
- void machine_start_hp48gp() ATTR_COLD;
- void machine_start_hp48sx() ATTR_COLD;
- void machine_start_hp48s() ATTR_COLD;
+ DECLARE_MACHINE_START(hp49g);
+ DECLARE_MACHINE_START(hp48gx);
+ DECLARE_MACHINE_START(hp48g);
+ DECLARE_MACHINE_START(hp48gp);
+ DECLARE_MACHINE_START(hp48sx);
+ DECLARE_MACHINE_START(hp48s);
uint32_t screen_update_hp48(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE8_MEMBER(io_w);
DECLARE_READ8_MEMBER(io_r);
diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h
index f6ac4137863..fb970fe84a7 100644
--- a/src/mame/includes/hyperspt.h
+++ b/src/mame/includes/hyperspt.h
@@ -50,7 +50,7 @@ public:
virtual void machine_start() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(hyperspt);
- void video_start_roadf() ATTR_COLD;
+ DECLARE_VIDEO_START(roadf);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(roadf_get_bg_tile_info);
diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h
index 9ee473d50ea..e19b20fb06e 100644
--- a/src/mame/includes/ironhors.h
+++ b/src/mame/includes/ironhors.h
@@ -44,7 +44,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(farwest_irq);
DECLARE_PALETTE_INIT(ironhors);
- void video_start_farwest() ATTR_COLD;
+ DECLARE_VIDEO_START(farwest);
void farwest(machine_config &config);
void ironhors(machine_config &config);
diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h
index 830eb7612b6..6ad5cadac4e 100644
--- a/src/mame/includes/itech32.h
+++ b/src/mame/includes/itech32.h
@@ -176,7 +176,7 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void machine_reset_drivedge();
+ DECLARE_MACHINE_RESET(drivedge);
void init_program_rom();
void init_sftm_common(int prot_addr);
void init_shuffle_bowl_common(int prot_addr);
diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h
index 305653f8672..a5e28d42777 100644
--- a/src/mame/includes/itech8.h
+++ b/src/mame/includes/itech8.h
@@ -133,8 +133,8 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start_slikshot() ATTR_COLD;
- void machine_start_sstrike() ATTR_COLD;
+ DECLARE_VIDEO_START(slikshot);
+ DECLARE_MACHINE_START(sstrike);
uint32_t screen_update_2layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_grmatch(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h
index eea4d31a739..d614ed3db75 100644
--- a/src/mame/includes/jack.h
+++ b/src/mame/includes/jack.h
@@ -68,12 +68,12 @@ public:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILEMAP_MAPPER_MEMBER(tilemap_scan_cols_flipy);
TILE_GET_INFO_MEMBER(joinem_get_bg_tile_info);
- void video_start_joinem() ATTR_COLD;
+ DECLARE_VIDEO_START(joinem);
DECLARE_PALETTE_INIT(joinem);
- void machine_start_striv() ATTR_COLD;
- void machine_reset_striv();
- void machine_start_joinem() ATTR_COLD;
- void machine_reset_joinem();
+ DECLARE_MACHINE_START(striv);
+ DECLARE_MACHINE_RESET(striv);
+ DECLARE_MACHINE_START(joinem);
+ DECLARE_MACHINE_RESET(joinem);
uint32_t screen_update_jack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_striv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index 4101c906c9b..3fc55f7dc44 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -112,11 +112,11 @@ public:
TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg);
TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update);
- void machine_start_jpmimpct() ATTR_COLD;
- void machine_reset_jpmimpct();
- void video_start_jpmimpct() ATTR_COLD;
- void machine_start_impctawp() ATTR_COLD;
- void machine_reset_impctawp();
+ DECLARE_MACHINE_START(jpmimpct);
+ DECLARE_MACHINE_RESET(jpmimpct);
+ DECLARE_VIDEO_START(jpmimpct);
+ DECLARE_MACHINE_START(impctawp);
+ DECLARE_MACHINE_RESET(impctawp);
TIMER_DEVICE_CALLBACK_MEMBER(duart_1_timer_event);
void impctawp(machine_config &config);
void jpmimpct(machine_config &config);
diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h
index e8ea1303582..eb8e44a726a 100644
--- a/src/mame/includes/kaneko16.h
+++ b/src/mame/includes/kaneko16.h
@@ -79,9 +79,9 @@ public:
void init_bakubrkr();
- void machine_reset_gtmr();
- void video_start_kaneko16() ATTR_COLD;
- void machine_reset_mgcrystl();
+ DECLARE_MACHINE_RESET(gtmr);
+ DECLARE_VIDEO_START(kaneko16);
+ DECLARE_MACHINE_RESET(mgcrystl);
uint32_t screen_update_kaneko16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
template<class _BitmapClass>
@@ -174,7 +174,7 @@ public:
void init_berlwallt();
void init_berlwall_common();
DECLARE_PALETTE_INIT(berlwall);
- void video_start_berlwall() ATTR_COLD;
+ DECLARE_VIDEO_START(berlwall);
uint32_t screen_update_berlwall(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void kaneko16_render_15bpp_bitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h
index 4363e187603..00bc4de7be1 100644
--- a/src/mame/includes/kangaroo.h
+++ b/src/mame/includes/kangaroo.h
@@ -33,7 +33,7 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void machine_start_kangaroo_mcu() ATTR_COLD;
+ DECLARE_MACHINE_START(kangaroo_mcu);
uint32_t screen_update_kangaroo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void videoram_write( uint16_t offset, uint8_t data, uint8_t mask );
void blitter_execute( );
diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h
index 63dda24ef84..59eda457c98 100644
--- a/src/mame/includes/karnov.h
+++ b/src/mame/includes/karnov.h
@@ -70,8 +70,8 @@ public:
TILE_GET_INFO_MEMBER(get_fix_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
- void video_start_karnov() ATTR_COLD;
- void video_start_wndrplnt() ATTR_COLD;
+ DECLARE_VIDEO_START(karnov);
+ DECLARE_VIDEO_START(wndrplnt);
uint32_t screen_update_karnov(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vbint_w);
void karnov_flipscreen_w( int data );
diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h
index 3f4ac29743e..1026d283edc 100644
--- a/src/mame/includes/kaypro.h
+++ b/src/mame/includes/kaypro.h
@@ -55,9 +55,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(fdc_drq_w);
DECLARE_READ8_MEMBER(kaypro_videoram_r);
DECLARE_WRITE8_MEMBER(kaypro_videoram_w);
- void machine_start_kayproii() ATTR_COLD;
- void machine_reset_kaypro();
- void video_start_kaypro() ATTR_COLD;
+ DECLARE_MACHINE_START(kayproii);
+ DECLARE_MACHINE_RESET(kaypro);
+ DECLARE_VIDEO_START(kaypro);
DECLARE_PALETTE_INIT(kaypro);
void init_kaypro();
uint32_t screen_update_kayproii(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h
index 1befddbb711..091ab8c3adf 100644
--- a/src/mame/includes/kchamp.h
+++ b/src/mame/includes/kchamp.h
@@ -71,8 +71,8 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(kchamp);
- void machine_start_kchampvs() ATTR_COLD;
- void machine_start_kchamp() ATTR_COLD;
+ DECLARE_MACHINE_START(kchampvs);
+ DECLARE_MACHINE_START(kchamp);
uint32_t screen_update_kchampvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_kchamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h
index 587150dcd4c..cc28d3df757 100644
--- a/src/mame/includes/kickgoal.h
+++ b/src/mame/includes/kickgoal.h
@@ -41,8 +41,8 @@ public:
TILEMAP_MAPPER_MEMBER(tilemap_scan_kicksbg);
TILEMAP_MAPPER_MEMBER(tilemap_scan_kicksbg2);
TILEMAP_MAPPER_MEMBER(tilemap_scan_actionhwbg2);
- void video_start_kickgoal() ATTR_COLD;
- void video_start_actionhw() ATTR_COLD;
+ DECLARE_VIDEO_START(kickgoal);
+ DECLARE_VIDEO_START(actionhw);
INTERRUPT_GEN_MEMBER(kickgoal_interrupt);
diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h
index ffe04ab8a13..079dcd02c30 100644
--- a/src/mame/includes/kingobox.h
+++ b/src/mame/includes/kingobox.h
@@ -61,9 +61,9 @@ public:
TILE_GET_INFO_MEMBER(ringking_get_bg_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
- void video_start_kingofb() ATTR_COLD;
+ DECLARE_VIDEO_START(kingofb);
DECLARE_PALETTE_INIT(kingofb);
- void video_start_ringking() ATTR_COLD;
+ DECLARE_VIDEO_START(ringking);
DECLARE_PALETTE_INIT(ringking);
uint32_t screen_update_kingofb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_ringking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h
index 0fb5aa6b4fd..26bf9f7a790 100644
--- a/src/mame/includes/konamigx.h
+++ b/src/mame/includes/konamigx.h
@@ -112,18 +112,18 @@ public:
TILE_GET_INFO_MEMBER(get_gx_psac3_alt_tile_info);
TILE_GET_INFO_MEMBER(get_gx_psac1a_tile_info);
TILE_GET_INFO_MEMBER(get_gx_psac1b_tile_info);
- void machine_start_konamigx() ATTR_COLD;
- void machine_reset_konamigx() ATTR_COLD;
- void video_start_konamigx_5bpp() ATTR_COLD;
- void video_start_dragoonj() ATTR_COLD;
- void video_start_le2() ATTR_COLD;
- void video_start_konamigx_6bpp() ATTR_COLD;
- void video_start_opengolf() ATTR_COLD;
- void video_start_racinfrc() ATTR_COLD;
- void video_start_konamigx_type3() ATTR_COLD;
- void video_start_konamigx_type4() ATTR_COLD;
- void video_start_konamigx_type4_vsn() ATTR_COLD;
- void video_start_konamigx_type4_sd2() ATTR_COLD;
+ DECLARE_MACHINE_START(konamigx);
+ DECLARE_MACHINE_RESET(konamigx);
+ DECLARE_VIDEO_START(konamigx_5bpp);
+ DECLARE_VIDEO_START(dragoonj);
+ DECLARE_VIDEO_START(le2);
+ DECLARE_VIDEO_START(konamigx_6bpp);
+ DECLARE_VIDEO_START(opengolf);
+ DECLARE_VIDEO_START(racinfrc);
+ DECLARE_VIDEO_START(konamigx_type3);
+ DECLARE_VIDEO_START(konamigx_type4);
+ DECLARE_VIDEO_START(konamigx_type4_vsn);
+ DECLARE_VIDEO_START(konamigx_type4_sd2);
uint32_t screen_update_konamigx(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_konamigx_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_konamigx_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h
index 9406188a68f..f5ac228b7ca 100644
--- a/src/mame/includes/ladyfrog.h
+++ b/src/mame/includes/ladyfrog.h
@@ -72,8 +72,8 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start_toucheme() ATTR_COLD;
- void video_start_ladyfrog_common() ATTR_COLD;
+ DECLARE_VIDEO_START(toucheme);
+ DECLARE_VIDEO_START(ladyfrog_common);
uint32_t screen_update_ladyfrog(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(nmi_callback);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h
index 3a6d44a8c31..472808438c4 100644
--- a/src/mame/includes/lasso.h
+++ b/src/mame/includes/lasso.h
@@ -72,11 +72,11 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(lasso);
- void machine_start_wwjgtin() ATTR_COLD;
- void machine_reset_wwjgtin();
- void video_start_wwjgtin() ATTR_COLD;
+ DECLARE_MACHINE_START(wwjgtin);
+ DECLARE_MACHINE_RESET(wwjgtin);
+ DECLARE_VIDEO_START(wwjgtin);
DECLARE_PALETTE_INIT(wwjgtin);
- void video_start_pinbo() ATTR_COLD;
+ DECLARE_VIDEO_START(pinbo);
uint32_t screen_update_lasso(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_chameleo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_wwjgtin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h
index 040625f1059..c2a7be4ea7f 100644
--- a/src/mame/includes/lastduel.h
+++ b/src/mame/includes/lastduel.h
@@ -65,10 +65,10 @@ public:
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_fix_info);
virtual void machine_reset() override;
- void machine_start_lastduel(); ATTR_COLD
- void video_start_lastduel(); ATTR_COLD
- void machine_start_madgear(); ATTR_COLD
- void video_start_madgear(); ATTR_COLD
+ DECLARE_MACHINE_START(lastduel);
+ DECLARE_VIDEO_START(lastduel);
+ DECLARE_MACHINE_START(madgear);
+ DECLARE_VIDEO_START(madgear);
uint32_t screen_update_lastduel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_madgear(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(lastduel_timer_cb);
diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h
index 9288fe4e9c9..f921881a2fb 100644
--- a/src/mame/includes/legionna.h
+++ b/src/mame/includes/legionna.h
@@ -82,12 +82,12 @@ public:
TILE_GET_INFO_MEMBER(get_fore_tile_info);
TILE_GET_INFO_MEMBER(get_fore_tile_info_denji);
TILE_GET_INFO_MEMBER(get_text_tile_info);
- void video_start_legionna() ATTR_COLD;
- void video_start_heatbrl() ATTR_COLD;
- void video_start_godzilla() ATTR_COLD;
- void video_start_denjinmk() ATTR_COLD;
- void video_start_grainbow() ATTR_COLD;
- void video_start_cupsoc() ATTR_COLD;
+ DECLARE_VIDEO_START(legionna);
+ DECLARE_VIDEO_START(heatbrl);
+ DECLARE_VIDEO_START(godzilla);
+ DECLARE_VIDEO_START(denjinmk);
+ DECLARE_VIDEO_START(grainbow);
+ DECLARE_VIDEO_START(cupsoc);
uint32_t screen_update_legionna(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_heatbrl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_godzilla(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h
index 2ce14d0ccdd..7f1157acf7f 100644
--- a/src/mame/includes/leland.h
+++ b/src/mame/includes/leland.h
@@ -172,13 +172,13 @@ public:
void init_indyheat();
void init_brutforc();
void init_asylum();
- void machine_start_ataxx() ATTR_COLD;
- void machine_reset_ataxx();
- void machine_start_leland() ATTR_COLD;
- void machine_reset_leland();
- void video_start_leland() ATTR_COLD;
- void video_start_leland2() ATTR_COLD;
- void video_start_ataxx() ATTR_COLD;
+ DECLARE_MACHINE_START(ataxx);
+ DECLARE_MACHINE_RESET(ataxx);
+ DECLARE_MACHINE_START(leland);
+ DECLARE_MACHINE_RESET(leland);
+ DECLARE_VIDEO_START(leland);
+ DECLARE_VIDEO_START(leland2);
+ DECLARE_VIDEO_START(ataxx);
uint32_t screen_update_leland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_ataxx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h
index 0a2230e3481..9390e408d5f 100644
--- a/src/mame/includes/liberate.h
+++ b/src/mame/includes/liberate.h
@@ -70,13 +70,13 @@ public:
TILE_GET_INFO_MEMBER(get_back_tile_info);
TILE_GET_INFO_MEMBER(get_fix_tile_info);
TILE_GET_INFO_MEMBER(prosport_get_back_tile_info);
- void machine_start_liberate() ATTR_COLD;
- void machine_reset_liberate();
- void video_start_liberate() ATTR_COLD;
+ DECLARE_MACHINE_START(liberate);
+ DECLARE_MACHINE_RESET(liberate);
+ DECLARE_VIDEO_START(liberate);
DECLARE_PALETTE_INIT(liberate);
- void video_start_prosport() ATTR_COLD;
- void video_start_boomrang() ATTR_COLD;
- void video_start_prosoccr() ATTR_COLD;
+ DECLARE_VIDEO_START(prosport);
+ DECLARE_VIDEO_START(boomrang);
+ DECLARE_VIDEO_START(prosoccr);
uint32_t screen_update_liberate(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_prosport(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_boomrang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h
index 912a2612682..f407e402694 100644
--- a/src/mame/includes/llc.h
+++ b/src/mame/includes/llc.h
@@ -46,9 +46,9 @@ public:
DECLARE_WRITE8_MEMBER(llc2_port1_b_w);
void init_llc2();
void init_llc1();
- void machine_start_llc1() ATTR_COLD;
- void machine_reset_llc1();
- void machine_reset_llc2();
+ DECLARE_MACHINE_START(llc1);
+ DECLARE_MACHINE_RESET(llc1);
+ DECLARE_MACHINE_RESET(llc2);
uint32_t screen_update_llc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_llc2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h
index d1058391fce..e7238b97012 100644
--- a/src/mame/includes/lsasquad.h
+++ b/src/mame/includes/lsasquad.h
@@ -48,7 +48,8 @@ public:
DECLARE_READ8_MEMBER(lsasquad_mcu_status_r);
DECLARE_READ8_MEMBER(daikaiju_mcu_status_r);
DECLARE_WRITE8_MEMBER(unk);
- void machine_start_lsasquad() ATTR_COLD;
+ DECLARE_MACHINE_START(lsasquad);
+ DECLARE_MACHINE_RESET(lsasquad);
uint32_t screen_update_lsasquad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_daikaiju(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(nmi_callback);
diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h
index 2132f047b1c..088308af814 100644
--- a/src/mame/includes/lvcards.h
+++ b/src/mame/includes/lvcards.h
@@ -24,8 +24,8 @@ public:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void video_start() override;
DECLARE_PALETTE_INIT(lvcards);
- void machine_start_lvpoker() ATTR_COLD;
- void machine_reset_lvpoker();
+ DECLARE_MACHINE_START(lvpoker);
+ DECLARE_MACHINE_RESET(lvpoker);
uint32_t screen_update_lvcards(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h
index 8cb518bc8ba..2630d6b9f37 100644
--- a/src/mame/includes/lwings.h
+++ b/src/mame/includes/lwings.h
@@ -70,9 +70,9 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
void init_avengersb();
- void video_start_trojan() ATTR_COLD;
- void video_start_avengers() ATTR_COLD;
- void video_start_avengersb() ATTR_COLD;
+ DECLARE_VIDEO_START(trojan);
+ DECLARE_VIDEO_START(avengers);
+ DECLARE_VIDEO_START(avengersb);
uint32_t screen_update_lwings(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_trojan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(lwings_interrupt);
diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h
index 369f1b9def3..d237339f637 100644
--- a/src/mame/includes/m10.h
+++ b/src/mame/includes/m10.h
@@ -102,11 +102,11 @@ public:
void init_ipminva1();
TILEMAP_MAPPER_MEMBER(tilemap_scan);
TILE_GET_INFO_MEMBER(get_tile_info);
- void machine_start_m10() ATTR_COLD;
- void machine_reset_m10();
- void video_start_m10() ATTR_COLD;
+ DECLARE_MACHINE_START(m10);
+ DECLARE_MACHINE_RESET(m10);
+ DECLARE_VIDEO_START(m10);
DECLARE_PALETTE_INIT(m10);
- void video_start_m15() ATTR_COLD;
+ DECLARE_VIDEO_START(m15);
uint32_t screen_update_m10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_m15(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(m15_interrupt);
diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h
index 4f9d75e1fe1..7c7204c7990 100644
--- a/src/mame/includes/m62.h
+++ b/src/mame/includes/m62.h
@@ -98,7 +98,7 @@ public:
TILE_GET_INFO_MEMBER(get_youjyudn_bg_tile_info);
TILE_GET_INFO_MEMBER(get_youjyudn_fg_tile_info);
TILE_GET_INFO_MEMBER(get_horizon_bg_tile_info);
- void machine_start_battroad() ATTR_COLD;
+ DECLARE_MACHINE_START(battroad);
void machine_init_save();
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -107,17 +107,17 @@ public:
DECLARE_PALETTE_INIT(m62_chr);
DECLARE_PALETTE_INIT(m62_lotlot_fg);
DECLARE_PALETTE_INIT(m62_battroad_fg);
- void video_start_kungfum() ATTR_COLD;
- void video_start_battroad() ATTR_COLD;
- void video_start_ldrun2() ATTR_COLD;
- void video_start_ldrun4() ATTR_COLD;
- void video_start_lotlot() ATTR_COLD;
- void video_start_kidniki() ATTR_COLD;
- void video_start_spelunkr() ATTR_COLD;
- void video_start_spelunk2() ATTR_COLD;
+ DECLARE_VIDEO_START(kungfum);
+ DECLARE_VIDEO_START(battroad);
+ DECLARE_VIDEO_START(ldrun2);
+ DECLARE_VIDEO_START(ldrun4);
+ DECLARE_VIDEO_START(lotlot);
+ DECLARE_VIDEO_START(kidniki);
+ DECLARE_VIDEO_START(spelunkr);
+ DECLARE_VIDEO_START(spelunk2);
DECLARE_PALETTE_INIT(spelunk2);
- void video_start_youjyudn() ATTR_COLD;
- void video_start_horizon() ATTR_COLD;
+ DECLARE_VIDEO_START(youjyudn);
+ DECLARE_VIDEO_START(horizon);
uint32_t screen_update_ldrun(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_kungfum(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_battroad(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h
index 40e771f698d..0c82d032a4e 100644
--- a/src/mame/includes/m72.h
+++ b/src/mame/includes/m72.h
@@ -158,15 +158,15 @@ public:
void machine_start() override;
void machine_reset() override;
- void video_start_m72() ATTR_COLD;
- void video_start_xmultipl() ATTR_COLD;
- void video_start_hharry() ATTR_COLD;
- void video_start_rtype2() ATTR_COLD;
- void video_start_m82() ATTR_COLD;
- void video_start_hharryu() ATTR_COLD;
- void video_start_poundfor() ATTR_COLD;
- void machine_start_kengo() ATTR_COLD;
- void machine_reset_kengo();
+ DECLARE_VIDEO_START(m72);
+ DECLARE_VIDEO_START(xmultipl);
+ DECLARE_VIDEO_START(hharry);
+ DECLARE_VIDEO_START(rtype2);
+ DECLARE_VIDEO_START(m82);
+ DECLARE_VIDEO_START(hharryu);
+ DECLARE_VIDEO_START(poundfor);
+ DECLARE_MACHINE_START(kengo);
+ DECLARE_MACHINE_RESET(kengo);
void init_dkgenm72();
void init_bchopper();
void init_gallop();
diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h
index 8e2605bc067..bc16bab9f5d 100644
--- a/src/mame/includes/m90.h
+++ b/src/mame/includes/m90.h
@@ -42,8 +42,8 @@ public:
virtual void machine_start() override;
virtual void video_start() override;
void common_tilemap_init();
- void video_start_bomblord() ATTR_COLD;
- void video_start_dynablsb() ATTR_COLD;
+ DECLARE_VIDEO_START(bomblord);
+ DECLARE_VIDEO_START(dynablsb);
uint32_t screen_update_m90(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_bomblord(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_dynablsb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h
index b9188d6f31a..ca04d7ca717 100644
--- a/src/mame/includes/m92.h
+++ b/src/mame/includes/m92.h
@@ -85,9 +85,9 @@ public:
void init_m92();
void init_m92_bank();
TILE_GET_INFO_MEMBER(get_pf_tile_info);
- void machine_reset_m92();
- void video_start_m92() ATTR_COLD;
- void video_start_ppan() ATTR_COLD;
+ DECLARE_MACHINE_RESET(m92);
+ DECLARE_VIDEO_START(m92);
+ DECLARE_VIDEO_START(ppan);
uint32_t screen_update_m92(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_ppan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(m92_scanline_interrupt);
diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h
index 97781e6189e..2a166288136 100644
--- a/src/mame/includes/mac.h
+++ b/src/mame/includes/mac.h
@@ -503,18 +503,18 @@ public:
void init_macpm7100();
void init_macpm8100();
void init_macpb100();
- void video_start_mac() ATTR_COLD;
+ DECLARE_VIDEO_START(mac);
DECLARE_PALETTE_INIT(mac);
- void video_start_macprtb() ATTR_COLD;
+ DECLARE_VIDEO_START(macprtb);
DECLARE_PALETTE_INIT(macgsc);
- void video_start_macsonora() ATTR_COLD;
- void video_reset_macsonora();
- void video_start_macdafb() ATTR_COLD;
- void video_reset_macdafb();
- void video_start_macv8() ATTR_COLD;
- void video_reset_maceagle();
- void video_start_macrbv() ATTR_COLD;
- void video_reset_macrbv();
+ DECLARE_VIDEO_START(macsonora);
+ DECLARE_VIDEO_RESET(macrbv);
+ DECLARE_VIDEO_START(macdafb);
+ DECLARE_VIDEO_RESET(macdafb);
+ DECLARE_VIDEO_START(macv8);
+ DECLARE_VIDEO_RESET(macsonora);
+ DECLARE_VIDEO_RESET(maceagle);
+ DECLARE_VIDEO_START(macrbv);
uint32_t screen_update_mac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_macprtb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_macse30(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h
index 15e8b4b1b8a..e253ccd5ac0 100644
--- a/src/mame/includes/madalien.h
+++ b/src/mame/includes/madalien.h
@@ -70,7 +70,7 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_BG_1);
TILE_GET_INFO_MEMBER(get_tile_info_BG_2);
TILE_GET_INFO_MEMBER(get_tile_info_FG);
- void video_start_madalien() ATTR_COLD;
+ DECLARE_VIDEO_START(madalien);
DECLARE_PALETTE_INIT(madalien);
uint32_t screen_update_madalien(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
inline int scan_helper(int col, int row, int section);
diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h
index 40ecfd63c72..e68f760c709 100644
--- a/src/mame/includes/mappy.h
+++ b/src/mame/includes/mappy.h
@@ -65,11 +65,11 @@ public:
TILE_GET_INFO_MEMBER(phozon_get_tile_info);
TILE_GET_INFO_MEMBER(mappy_get_tile_info);
virtual void machine_start() override;
- void video_start_superpac() ATTR_COLD;
+ DECLARE_VIDEO_START(superpac);
DECLARE_PALETTE_INIT(superpac);
- void video_start_phozon() ATTR_COLD;
+ DECLARE_VIDEO_START(phozon);
DECLARE_PALETTE_INIT(phozon);
- void video_start_mappy() ATTR_COLD;
+ DECLARE_VIDEO_START(mappy);
DECLARE_PALETTE_INIT(mappy);
uint32_t screen_update_superpac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_phozon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h
index 9030f013086..fcecfb87871 100644
--- a/src/mame/includes/mbee.h
+++ b/src/mame/includes/mbee.h
@@ -101,16 +101,16 @@ public:
void init_mbeepc();
void init_mbeeic();
void init_mbee128();
- void machine_reset_mbee();
- void video_start_mono() ATTR_COLD;
- void video_start_standard() ATTR_COLD;
- void video_start_premium() ATTR_COLD;
+ DECLARE_MACHINE_RESET(mbee);
+ DECLARE_VIDEO_START(mono);
+ DECLARE_VIDEO_START(standard);
+ DECLARE_VIDEO_START(premium);
DECLARE_PALETTE_INIT(standard);
DECLARE_PALETTE_INIT(premium);
- void machine_reset_mbee56();
- void machine_reset_mbee128();
- void machine_reset_mbee256();
- void machine_reset_mbeett();
+ DECLARE_MACHINE_RESET(mbee56);
+ DECLARE_MACHINE_RESET(mbee128);
+ DECLARE_MACHINE_RESET(mbee256);
+ DECLARE_MACHINE_RESET(mbeett);
uint32_t screen_update_mbee(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(timer_newkb);
DECLARE_QUICKLOAD_LOAD_MEMBER(mbee);
diff --git a/src/mame/includes/mc1502.h b/src/mame/includes/mc1502.h
index 51d430f0320..e9c89f66a23 100644
--- a/src/mame/includes/mc1502.h
+++ b/src/mame/includes/mc1502.h
@@ -57,8 +57,8 @@ public:
required_ioport_array<12> m_kbdio;
void init_mc1502();
- void machine_start_mc1502() ATTR_COLD;
- void machine_reset_mc1502();
+ DECLARE_MACHINE_START(mc1502);
+ DECLARE_MACHINE_RESET(mc1502);
TIMER_CALLBACK_MEMBER(keyb_signal_callback);
diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h
index 20319ee6b4e..e2084d51956 100644
--- a/src/mame/includes/mcr3.h
+++ b/src/mame/includes/mcr3.h
@@ -55,7 +55,7 @@ public:
void init_rampage();
void init_spyhunt();
void init_sarge();
- void video_start_spyhunt() ATTR_COLD;
+ DECLARE_VIDEO_START(spyhunt);
DECLARE_PALETTE_INIT(spyhunt);
uint32_t screen_update_mcr3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h
index 3981b434855..8fa90d260a9 100644
--- a/src/mame/includes/mcr68.h
+++ b/src/mame/includes/mcr68.h
@@ -69,9 +69,9 @@ public:
void init_archrivlb();
DECLARE_READ16_MEMBER(archrivlb_port_1_r);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- void machine_start_mcr68() ATTR_COLD;
- void machine_reset_mcr68();
- void video_start_mcr68() ATTR_COLD;
+ DECLARE_MACHINE_START(mcr68);
+ DECLARE_MACHINE_RESET(mcr68);
+ DECLARE_VIDEO_START(mcr68);
uint32_t screen_update_mcr68(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(scanline_cb);
TIMER_CALLBACK_MEMBER(mcr68_493_off_callback);
diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h
index a0c6ed63d54..e2f239afcd3 100644
--- a/src/mame/includes/megadriv.h
+++ b/src/mame/includes/megadriv.h
@@ -123,9 +123,9 @@ public:
void megadriv_stop_scanline_timer();
- void machine_start_megadriv() ATTR_COLD;
- void machine_reset_megadriv();
- void video_start_megadriv() ATTR_COLD;
+ DECLARE_MACHINE_START( megadriv );
+ DECLARE_MACHINE_RESET( megadriv );
+ DECLARE_VIDEO_START( megadriv );
uint32_t screen_update_megadriv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_megadriv);
@@ -170,10 +170,10 @@ public:
READ8_MEMBER(mess_md_io_read_data_port);
WRITE16_MEMBER(mess_md_io_write_data_port);
- void machine_start_md_common() ATTR_COLD; // setup ioport_port
- void machine_start_ms_megadriv() ATTR_COLD; // setup ioport_port + install cartslot handlers
- void machine_start_ms_megacd() ATTR_COLD; // setup ioport_port + dma delay for cd
- void machine_reset_ms_megadriv();
+ DECLARE_MACHINE_START( md_common ); // setup ioport_port
+ DECLARE_MACHINE_START( ms_megadriv ); // setup ioport_port + install cartslot handlers
+ DECLARE_MACHINE_START( ms_megacd ); // setup ioport_port + dma delay for cd
+ DECLARE_MACHINE_RESET( ms_megadriv );
DECLARE_WRITE_LINE_MEMBER(screen_vblank_console);
diff --git a/src/mame/includes/megadriv_acbl.h b/src/mame/includes/megadriv_acbl.h
index 11be22426d8..bf9d9fd440e 100644
--- a/src/mame/includes/megadriv_acbl.h
+++ b/src/mame/includes/megadriv_acbl.h
@@ -28,8 +28,8 @@ public:
DECLARE_READ16_MEMBER(puckpkmna_70001c_r);
DECLARE_READ16_MEMBER(puckpkmna_4b2476_r);
- void machine_start_md_bootleg() { machine_start_megadriv(); m_vdp->stop_timers(); }
- void machine_start_md_6button() ATTR_COLD;
+ DECLARE_MACHINE_START(md_bootleg) { MACHINE_START_CALL_MEMBER(megadriv); m_vdp->stop_timers(); }
+ DECLARE_MACHINE_START(md_6button);
void megadrvb(machine_config &config);
void megadrvb_6b(machine_config &config);
void md_bootleg(machine_config &config);
diff --git a/src/mame/includes/megadriv_rad.h b/src/mame/includes/megadriv_rad.h
index 1affba7aadc..e4899647745 100644
--- a/src/mame/includes/megadriv_rad.h
+++ b/src/mame/includes/megadriv_rad.h
@@ -15,9 +15,9 @@ public:
void init_megadriv_radica_6button_pal();
- void machine_start_megadriv_radica_6button() ATTR_COLD;
- void machine_start_megadriv_radica_3button() ATTR_COLD;
- void machine_reset_megadriv_radica();
+ DECLARE_MACHINE_START(megadriv_radica_6button);
+ DECLARE_MACHINE_START(megadriv_radica_3button);
+ DECLARE_MACHINE_RESET(megadriv_radica);
DECLARE_READ16_MEMBER(read);
DECLARE_READ16_MEMBER(read_a13);
diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h
index 37b570a9cea..1da991feee4 100644
--- a/src/mame/includes/megasys1.h
+++ b/src/mame/includes/megasys1.h
@@ -152,10 +152,10 @@ public:
void init_stdragona();
void init_stdragonb();
void init_systemz();
- void machine_reset_megasys1();
- void video_start_megasys1() ATTR_COLD;
+ DECLARE_MACHINE_RESET(megasys1);
+ DECLARE_VIDEO_START(megasys1);
DECLARE_PALETTE_INIT(megasys1);
- void machine_reset_megasys1_hachoo();
+ DECLARE_MACHINE_RESET(megasys1_hachoo);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank);
diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h
index dd7906ed079..ff522ce937c 100644
--- a/src/mame/includes/metro.h
+++ b/src/mame/includes/metro.h
@@ -98,8 +98,8 @@ public:
TILE_GET_INFO_MEMBER(metro_k053936_get_tile_info);
TILE_GET_INFO_MEMBER(metro_k053936_gstrik2_get_tile_info);
TILEMAP_MAPPER_MEMBER(tilemap_scan_gstrik2);
- void video_start_blzntrnd() ATTR_COLD;
- void video_start_gstrik2() ATTR_COLD;
+ DECLARE_VIDEO_START(blzntrnd);
+ DECLARE_VIDEO_START(gstrik2);
uint32_t screen_update_psac_vdp2_mix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(metro_vblank_irq);
INTERRUPT_GEN_MEMBER(metro_periodic_interrupt);
diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h
index 01d93922cf2..1726a072c16 100644
--- a/src/mame/includes/midtunit.h
+++ b/src/mame/includes/midtunit.h
@@ -85,8 +85,8 @@ public:
void init_jdreddp();
void init_mk2();
- void machine_reset_midtunit();
- void video_start_midtunit() ATTR_COLD;
+ DECLARE_MACHINE_RESET(midtunit);
+ DECLARE_VIDEO_START(midtunit);
void register_state_saving();
void init_tunit_generic(int sound);
diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h
index fcdc9304f48..c03eb47030a 100644
--- a/src/mame/includes/midvunit.h
+++ b/src/mame/includes/midvunit.h
@@ -155,7 +155,7 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void machine_reset_midvplus();
+ DECLARE_MACHINE_RESET(midvplus);
uint32_t screen_update_midvunit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(scanline_timer_cb);
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h
index 125c742c55e..34736675581 100644
--- a/src/mame/includes/midwunit.h
+++ b/src/mame/includes/midwunit.h
@@ -56,8 +56,8 @@ public:
void init_umk3r11();
void init_mk3r20();
- void machine_reset_midwunit();
- void video_start_midwunit() ATTR_COLD;
+ DECLARE_MACHINE_RESET(midwunit);
+ DECLARE_VIDEO_START(midwunit);
void register_state_saving();
void init_wunit_generic();
diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h
index 36cb0bbe4ba..b1bafb5c0c3 100644
--- a/src/mame/includes/midxunit.h
+++ b/src/mame/includes/midxunit.h
@@ -32,8 +32,8 @@ public:
DECLARE_WRITE16_MEMBER(midxunit_sound_w);
DECLARE_WRITE_LINE_MEMBER(midxunit_dcs_output_full);
void init_revx();
- void machine_reset_midxunit();
- void video_start_midxunit() ATTR_COLD;
+ DECLARE_MACHINE_RESET(midxunit);
+ DECLARE_VIDEO_START(midxunit);
void register_state_saving();
TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update);
diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h
index 84bcafd9612..a582129c94b 100644
--- a/src/mame/includes/midyunit.h
+++ b/src/mame/includes/midyunit.h
@@ -140,12 +140,12 @@ public:
void init_hiimpact();
void init_mkyturbo();
void init_term2la2();
- void machine_reset_midyunit();
- void video_start_midzunit() ATTR_COLD;
- void video_start_midyunit_4bit() ATTR_COLD;
- void video_start_midyunit_6bit() ATTR_COLD;
- void video_start_mkyawdim() ATTR_COLD;
- void video_start_common() ATTR_COLD;
+ DECLARE_MACHINE_RESET(midyunit);
+ DECLARE_VIDEO_START(midzunit);
+ DECLARE_VIDEO_START(midyunit_4bit);
+ DECLARE_VIDEO_START(midyunit_6bit);
+ DECLARE_VIDEO_START(mkyawdim);
+ DECLARE_VIDEO_START(common);
TIMER_CALLBACK_MEMBER(dma_callback);
TIMER_CALLBACK_MEMBER(autoerase_line);
diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h
index b5dfcb10902..d4a19a0fc9c 100644
--- a/src/mame/includes/midzeus.h
+++ b/src/mame/includes/midzeus.h
@@ -70,9 +70,9 @@ public:
void init_mk4();
void init_thegrid();
void init_crusnexo();
- void machine_start_midzeus() ATTR_COLD;
- void machine_reset_midzeus();
- void video_start_midzeus() ATTR_COLD;
+ DECLARE_MACHINE_START(midzeus);
+ DECLARE_MACHINE_RESET(midzeus);
+ DECLARE_VIDEO_START(midzeus);
uint32_t screen_update_midzeus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(display_irq);
TIMER_CALLBACK_MEMBER(display_irq_off);
diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h
index 78a06cffc35..9ca090695c0 100644
--- a/src/mame/includes/mitchell.h
+++ b/src/mame/includes/mitchell.h
@@ -123,9 +123,9 @@ public:
void init_blockbl();
void init_dokaben();
TILE_GET_INFO_MEMBER(get_tile_info);
- void machine_start_mitchell() ATTR_COLD;
- void machine_reset_mitchell();
- void video_start_pang() ATTR_COLD;
+ DECLARE_MACHINE_START(mitchell);
+ DECLARE_MACHINE_RESET(mitchell);
+ DECLARE_VIDEO_START(pang);
uint32_t screen_update_pang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(mitchell_irq);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h
index ec5e4321ebf..c89e12463e0 100644
--- a/src/mame/includes/model1.h
+++ b/src/mame/includes/model1.h
@@ -60,8 +60,8 @@ public:
}
// Machine
- void machine_start_model1() ATTR_COLD;
- void machine_reset_model1();
+ DECLARE_MACHINE_START(model1);
+ DECLARE_MACHINE_RESET(model1);
DECLARE_READ8_MEMBER(io_r);
DECLARE_WRITE8_MEMBER(io_w);
@@ -122,7 +122,7 @@ public:
DECLARE_WRITE8_MEMBER(r360_w);
// Rendering
- void video_start_model1() ATTR_COLD;
+ DECLARE_VIDEO_START(model1);
DECLARE_READ16_MEMBER(model1_listctl_r);
DECLARE_WRITE16_MEMBER(model1_listctl_w);
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 0fe91cd5c0b..02fe76586fc 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -69,7 +69,7 @@ public:
/* Public for access by MCFG */
TIMER_DEVICE_CALLBACK_MEMBER(model2_interrupt);
uint16_t crypt_read_callback(uint32_t addr);
- void machine_start_model2() ATTR_COLD;
+ DECLARE_MACHINE_START(model2);
/* Public for access by GAME() */
@@ -195,9 +195,9 @@ protected:
DECLARE_READ8_MEMBER(driveio_porth_r);
DECLARE_WRITE8_MEMBER(driveio_port_w);
void push_geo_data(uint32_t data);
- void video_start_model2() ATTR_COLD;
- void machine_reset_model2_common();
- void machine_reset_model2_scsp();
+ DECLARE_VIDEO_START(model2);
+ DECLARE_MACHINE_RESET(model2_common);
+ DECLARE_MACHINE_RESET(model2_scsp);
uint32_t screen_update_model2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
// DECLARE_WRITE_LINE_MEMBER(screen_vblank_model2);
// DECLARE_WRITE_LINE_MEMBER(sound_ready_w);
@@ -309,7 +309,7 @@ public:
m_copro_tgp_bank(*this, "copro_tgp_bank")
{}
- void machine_start_model2_tgp();
+ DECLARE_MACHINE_START(model2_tgp);
protected:
required_device<mb86234_device> m_copro_tgp;
@@ -346,7 +346,7 @@ protected:
DECLARE_WRITE32_MEMBER(copro_atan_w);
DECLARE_READ32_MEMBER(copro_atan_r);
- void machine_reset_model2_tgp();
+ DECLARE_MACHINE_RESET(model2_tgp);
void model2_tgp_mem(address_map &map);
@@ -373,7 +373,7 @@ public:
: model2_tgp_state(mconfig, type, tag)
{}
- void machine_reset_model2o();
+ DECLARE_MACHINE_RESET(model2o);
void model2o(machine_config &config);
void daytona(machine_config &config);
@@ -444,7 +444,7 @@ public:
: model2_tgp_state(mconfig, type, tag)
{}
- void machine_reset_model2a();
+ DECLARE_MACHINE_RESET(model2a);
void manxtt(machine_config &config);
void manxttdx(machine_config &config);
@@ -475,8 +475,8 @@ public:
m_copro_adsp(*this, "copro_adsp")
{}
- void machine_reset_model2b();
- void machine_start_model2b() ATTR_COLD;
+ DECLARE_MACHINE_RESET(model2b);
+ DECLARE_MACHINE_START(model2b);
void model2b(machine_config &config);
void model2b_0229(machine_config &config);
@@ -524,8 +524,8 @@ public:
m_copro_tgpx4_program(*this, "copro_tgpx4_program")
{}
- void machine_reset_model2c();
- void machine_start_model2c() ATTR_COLD;
+ DECLARE_MACHINE_RESET(model2c);
+ DECLARE_MACHINE_START(model2c);
void model2c(machine_config &config);
void model2c_5881(machine_config &config);
diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h
index 1224f3e42ee..7ca250b5f8f 100644
--- a/src/mame/includes/model3.h
+++ b/src/mame/includes/model3.h
@@ -267,14 +267,14 @@ public:
void init_magtruck();
void init_lamachin();
void init_model3_15();
- void machine_start_model3_10() ATTR_COLD;
- void machine_reset_model3_10();
- void machine_start_model3_15() ATTR_COLD;
- void machine_reset_model3_15();
- void machine_start_model3_20() ATTR_COLD;
- void machine_reset_model3_20();
- void machine_start_model3_21() ATTR_COLD;
- void machine_reset_model3_21();
+ DECLARE_MACHINE_START(model3_10);
+ DECLARE_MACHINE_RESET(model3_10);
+ DECLARE_MACHINE_START(model3_15);
+ DECLARE_MACHINE_RESET(model3_15);
+ DECLARE_MACHINE_START(model3_20);
+ DECLARE_MACHINE_RESET(model3_20);
+ DECLARE_MACHINE_START(model3_21);
+ DECLARE_MACHINE_RESET(model3_21);
TIMER_CALLBACK_MEMBER(model3_sound_timer_tick);
TIMER_CALLBACK_MEMBER(real3d_dma_timer_callback);
TIMER_DEVICE_CALLBACK_MEMBER(model3_interrupt);
diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h
index 3e967857287..541e4c197d3 100644
--- a/src/mame/includes/moo.h
+++ b/src/mame/includes/moo.h
@@ -73,10 +73,10 @@ public:
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
DECLARE_WRITE16_MEMBER(moo_prot_w);
DECLARE_WRITE16_MEMBER(moobl_oki_bank_w);
- void machine_start_moo() ATTR_COLD;
- void machine_reset_moo();
- void video_start_moo() ATTR_COLD;
- void video_start_bucky() ATTR_COLD;
+ DECLARE_MACHINE_START(moo);
+ DECLARE_MACHINE_RESET(moo);
+ DECLARE_VIDEO_START(moo);
+ DECLARE_VIDEO_START(bucky);
uint32_t screen_update_moo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(moo_interrupt);
INTERRUPT_GEN_MEMBER(moobl_interrupt);
diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h
index 50a98b12460..10d8f068012 100644
--- a/src/mame/includes/mpu4.h
+++ b/src/mame/includes/mpu4.h
@@ -245,15 +245,15 @@ public:
void init_m4andyfh();
void init_m4andyge();
void init_m4apachg();
- void machine_start_mod2() ATTR_COLD;
- void machine_reset_mpu4();
- void machine_start_mpu4yam() ATTR_COLD;
- void machine_start_mpu4oki() ATTR_COLD;
- void machine_start_mpu4oki_alt() ATTR_COLD;
- void machine_start_mod4oki_5r() ATTR_COLD;
- void machine_start_mod2_alt() ATTR_COLD;
- void machine_start_mpu4bwb() ATTR_COLD;
- void machine_start_mpu4cry() ATTR_COLD;
+ DECLARE_MACHINE_START(mod2);
+ DECLARE_MACHINE_RESET(mpu4);
+ DECLARE_MACHINE_START(mpu4yam);
+ DECLARE_MACHINE_START(mpu4oki);
+ DECLARE_MACHINE_START(mpu4oki_alt);
+ DECLARE_MACHINE_START(mod4oki_5r);
+ DECLARE_MACHINE_START(mod2_alt);
+ DECLARE_MACHINE_START(mpu4bwb);
+ DECLARE_MACHINE_START(mpu4cry);
TIMER_DEVICE_CALLBACK_MEMBER(gen_50hz);
template <unsigned N> DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); }
void bwboki(machine_config &config);
diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h
index 29fc19ed9a5..c306cb34c1d 100644
--- a/src/mame/includes/ms32.h
+++ b/src/mame/includes/ms32.h
@@ -118,7 +118,7 @@ public:
TILE_GET_INFO_MEMBER(get_ms32_extra_tile_info);
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start_f1superb() ATTR_COLD;
+ DECLARE_VIDEO_START(f1superb);
uint32_t screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(ms32_interrupt);
IRQ_CALLBACK_MEMBER(irq_callback);
diff --git a/src/mame/includes/mtx.h b/src/mame/includes/mtx.h
index fe576464c28..46538172426 100644
--- a/src/mame/includes/mtx.h
+++ b/src/mame/includes/mtx.h
@@ -85,8 +85,8 @@ public:
DECLARE_WRITE8_MEMBER(hrx_data_w);
DECLARE_READ8_MEMBER(hrx_attr_r);
DECLARE_WRITE8_MEMBER(hrx_attr_w);
- void machine_start_mtx512() ATTR_COLD;
- void machine_reset_mtx512();
+ DECLARE_MACHINE_START(mtx512);
+ DECLARE_MACHINE_RESET(mtx512);
TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
TIMER_DEVICE_CALLBACK_MEMBER(cassette_tick);
DECLARE_WRITE_LINE_MEMBER(ctc_trg1_w);
diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h
index 28197a5b9c8..75026d596c5 100644
--- a/src/mame/includes/mw8080bw.h
+++ b/src/mame/includes/mw8080bw.h
@@ -155,18 +155,18 @@ public:
DECLARE_WRITE8_MEMBER(bowler_audio_4_w);
DECLARE_WRITE8_MEMBER(bowler_audio_5_w);
DECLARE_WRITE8_MEMBER(bowler_audio_6_w);
- void machine_start_mw8080bw() ATTR_COLD;
- void machine_reset_mw8080bw();
- void machine_start_maze() ATTR_COLD;
- void machine_start_boothill() ATTR_COLD;
- void machine_start_desertgu() ATTR_COLD;
- void machine_start_gmissile() ATTR_COLD;
- void machine_start_m4() ATTR_COLD;
- void machine_start_clowns() ATTR_COLD;
- void machine_start_spcenctr() ATTR_COLD;
- void machine_start_phantom2() ATTR_COLD;
- void machine_start_invaders() ATTR_COLD;
- void sound_start_samples() ATTR_COLD;
+ DECLARE_MACHINE_START(mw8080bw);
+ DECLARE_MACHINE_RESET(mw8080bw);
+ DECLARE_MACHINE_START(maze);
+ DECLARE_MACHINE_START(boothill);
+ DECLARE_MACHINE_START(desertgu);
+ DECLARE_MACHINE_START(gmissile);
+ DECLARE_MACHINE_START(m4);
+ DECLARE_MACHINE_START(clowns);
+ DECLARE_MACHINE_START(spcenctr);
+ DECLARE_MACHINE_START(phantom2);
+ DECLARE_MACHINE_START(invaders);
+ DECLARE_SOUND_START(samples);
uint32_t screen_update_mw8080bw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_spcenctr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_phantom2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h
index 2f8ac4365f7..7dfd1fdad46 100644
--- a/src/mame/includes/mystston.h
+++ b/src/mame/includes/mystston.h
@@ -52,8 +52,8 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
- void video_start_mystston() ATTR_COLD;
- void video_reset_mystston() ATTR_COLD;
+ DECLARE_VIDEO_START(mystston);
+ DECLARE_VIDEO_RESET(mystston);
uint32_t screen_update_mystston(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(interrupt_callback);
void set_palette();
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index be62883df42..279f6e3b74b 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -67,19 +67,19 @@ public:
DECLARE_READ16_MEMBER(ddd_053936_tilerom_2_r);
TILE_GET_INFO_MEMBER(get_gai_936_tile_info);
TILE_GET_INFO_MEMBER(get_ult_936_tile_info);
- void machine_start_mystwarr() ATTR_COLD;
- void machine_reset_mystwarr();
- void video_start_mystwarr() ATTR_COLD;
- void machine_reset_viostorm();
- void video_start_viostorm() ATTR_COLD;
- void machine_reset_metamrph();
- void video_start_metamrph() ATTR_COLD;
- void machine_reset_dadandrn();
- void video_start_dadandrn() ATTR_COLD;
- void machine_reset_gaiapols();
- void video_start_gaiapols() ATTR_COLD;
- void machine_reset_martchmp();
- void video_start_martchmp() ATTR_COLD;
+ DECLARE_MACHINE_START(mystwarr);
+ DECLARE_MACHINE_RESET(mystwarr);
+ DECLARE_VIDEO_START(mystwarr);
+ DECLARE_MACHINE_RESET(viostorm);
+ DECLARE_VIDEO_START(viostorm);
+ DECLARE_MACHINE_RESET(metamrph);
+ DECLARE_VIDEO_START(metamrph);
+ DECLARE_MACHINE_RESET(dadandrn);
+ DECLARE_VIDEO_START(dadandrn);
+ DECLARE_MACHINE_RESET(gaiapols);
+ DECLARE_VIDEO_START(gaiapols);
+ DECLARE_MACHINE_RESET(martchmp);
+ DECLARE_VIDEO_START(martchmp);
uint32_t screen_update_mystwarr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_metamrph(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_dadandrn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/mz700.h b/src/mame/includes/mz700.h
index b480486b85a..fb499e9d70e 100644
--- a/src/mame/includes/mz700.h
+++ b/src/mame/includes/mz700.h
@@ -63,8 +63,8 @@ public:
DECLARE_WRITE8_MEMBER(mz800_cgram_w);
void init_mz800();
void init_mz700();
- void machine_reset_mz700();
- void machine_reset_mz800();
+ DECLARE_MACHINE_RESET(mz700);
+ DECLARE_MACHINE_RESET(mz800);
virtual void machine_start() override;
uint32_t screen_update_mz700(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_mz800(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h
index bafc7829a8d..142368729cd 100644
--- a/src/mame/includes/n8080.h
+++ b/src/mame/includes/n8080.h
@@ -80,22 +80,22 @@ public:
DECLARE_WRITE_LINE_MEMBER(n8080_inte_callback);
DECLARE_WRITE8_MEMBER(n8080_status_callback);
virtual void machine_start() override;
- void machine_reset_spacefev();
- void video_start_spacefev() ATTR_COLD;
+ DECLARE_MACHINE_RESET(spacefev);
+ DECLARE_VIDEO_START(spacefev);
DECLARE_PALETTE_INIT(n8080);
- void machine_reset_sheriff();
- void video_start_sheriff() ATTR_COLD;
- void machine_reset_helifire();
- void video_start_helifire() ATTR_COLD;
+ DECLARE_MACHINE_RESET(sheriff);
+ DECLARE_VIDEO_START(sheriff);
+ DECLARE_MACHINE_RESET(helifire);
+ DECLARE_VIDEO_START(helifire);
DECLARE_PALETTE_INIT(helifire);
- void sound_start_spacefev() ATTR_COLD;
- void sound_reset_spacefev();
- void sound_start_sheriff() ATTR_COLD;
- void sound_reset_sheriff();
- void sound_start_helifire() ATTR_COLD;
- void sound_reset_helifire();
- void machine_start_n8080() ATTR_COLD;
- void machine_reset_n8080();
+ DECLARE_SOUND_START(spacefev);
+ DECLARE_SOUND_RESET(spacefev);
+ DECLARE_SOUND_START(sheriff);
+ DECLARE_SOUND_RESET(sheriff);
+ DECLARE_SOUND_START(helifire);
+ DECLARE_SOUND_RESET(helifire);
+ DECLARE_MACHINE_START(n8080);
+ DECLARE_MACHINE_RESET(n8080);
uint32_t screen_update_spacefev(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_sheriff(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_helifire(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h
index 01b640a919e..c8b8a6a53fe 100644
--- a/src/mame/includes/namcofl.h
+++ b/src/mame/includes/namcofl.h
@@ -71,9 +71,9 @@ public:
DECLARE_WRITE32_MEMBER(namcofl_spritebank_w);
void init_speedrcr();
void init_finalapr();
- void machine_start_namcofl() ATTR_COLD;
- void machine_reset_namcofl();
- void video_start_namcofl() ATTR_COLD;
+ DECLARE_MACHINE_START(namcofl);
+ DECLARE_MACHINE_RESET(namcofl);
+ DECLARE_VIDEO_START(namcofl);
uint32_t screen_update_namcofl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(network_interrupt_callback);
TIMER_CALLBACK_MEMBER(vblank_interrupt_callback);
diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h
index 1aaa61e89f9..d2b4a9c69aa 100644
--- a/src/mame/includes/namconb1.h
+++ b/src/mame/includes/namconb1.h
@@ -102,9 +102,9 @@ public:
void init_gslgr94j();
void init_outfxies();
void init_gslgr94u();
- void machine_reset_namconb();
- void video_start_namconb1() ATTR_COLD;
- void video_start_namconb2() ATTR_COLD;
+ DECLARE_MACHINE_RESET(namconb);
+ DECLARE_VIDEO_START(namconb1);
+ DECLARE_VIDEO_START(namconb2);
void video_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int bROZ);
uint32_t screen_update_namconb1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_namconb2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index 75445484106..8c23fdebb35 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -236,8 +236,8 @@ public:
DECLARE_WRITE16_MEMBER( c355_obj_ram_w );
DECLARE_READ16_MEMBER( c355_obj_position_r );
DECLARE_WRITE16_MEMBER( c355_obj_position_w );
- void machine_start_namcos2() ATTR_COLD;
- void machine_reset_namcos2();
+ DECLARE_MACHINE_START(namcos2);
+ DECLARE_MACHINE_RESET(namcos2);
protected:
// C355 Motion Object internals
template<class _BitmapClass>
diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h
index 1cfb4f2244a..a42fb078c29 100644
--- a/src/mame/includes/namcos21.h
+++ b/src/mame/includes/namcos21.h
@@ -171,8 +171,8 @@ public:
void init_solvalou();
void init_cybsled();
void init_aircomb();
- void machine_start_namcos21() ATTR_COLD;
- void video_start_namcos21() ATTR_COLD;
+ DECLARE_MACHINE_START(namcos21);
+ DECLARE_VIDEO_START(namcos21);
uint32_t screen_update_namcos21(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_winrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_driveyes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h
index e3eac9736f7..d8a312c2d29 100644
--- a/src/mame/includes/namcos22.h
+++ b/src/mame/includes/namcos22.h
@@ -489,7 +489,7 @@ public:
virtual void machine_reset() override;
virtual void machine_start() override;
virtual void video_start() override;
- void machine_start_adillor() ATTR_COLD;
+ DECLARE_MACHINE_START(adillor);
uint32_t screen_update_namcos22s(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_namcos22(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(namcos22s_interrupt);
diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h
index 8e8973ea46c..66d3892c434 100644
--- a/src/mame/includes/naomi.h
+++ b/src/mame/includes/naomi.h
@@ -49,7 +49,7 @@ class naomi_state : public dc_state
required_device<eeprom_serial_93cxx_device> m_eeprom;
optional_shared_ptr<uint64_t> m_rombase;
- void machine_reset_naomi();
+ DECLARE_MACHINE_RESET(naomi);
void init_naomigd();
void init_ggxx();
void init_ggxxrl();
diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h
index 236502efd97..153186e91b0 100644
--- a/src/mame/includes/nbmj8688.h
+++ b/src/mame/includes/nbmj8688.h
@@ -73,16 +73,16 @@ public:
void init_kaguya2();
void init_mjcamera();
void init_kanatuen();
- void video_start_mbmj8688_pure_12bit() ATTR_COLD;
+ DECLARE_VIDEO_START(mbmj8688_pure_12bit);
DECLARE_PALETTE_INIT(mbmj8688_12bit);
- void video_start_mbmj8688_pure_16bit_LCD() ATTR_COLD;
+ DECLARE_VIDEO_START(mbmj8688_pure_16bit_LCD);
DECLARE_PALETTE_INIT(mbmj8688_16bit);
DECLARE_PALETTE_INIT(mbmj8688_lcd);
- void video_start_mbmj8688_8bit() ATTR_COLD;
+ DECLARE_VIDEO_START(mbmj8688_8bit);
DECLARE_PALETTE_INIT(mbmj8688_8bit);
- void video_start_mbmj8688_hybrid_16bit() ATTR_COLD;
- void video_start_mbmj8688_hybrid_12bit() ATTR_COLD;
- void video_start_mbmj8688_pure_16bit() ATTR_COLD;
+ DECLARE_VIDEO_START(mbmj8688_hybrid_16bit);
+ DECLARE_VIDEO_START(mbmj8688_hybrid_12bit);
+ DECLARE_VIDEO_START(mbmj8688_pure_16bit);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void vramflip();
diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h
index bf2e591ee11..61a8da24873 100644
--- a/src/mame/includes/nbmj8891.h
+++ b/src/mame/includes/nbmj8891.h
@@ -88,7 +88,7 @@ public:
void init_pairsnb();
void init_mjnanpas();
virtual void video_start() override;
- void video_start__1layer() ATTR_COLD;
+ DECLARE_VIDEO_START(_1layer);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void vramflip(int vram);
diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h
index a8299a648f6..5b7359da554 100644
--- a/src/mame/includes/nbmj9195.h
+++ b/src/mame/includes/nbmj9195.h
@@ -101,8 +101,8 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start__1layer() ATTR_COLD;
- void video_start_nb22090() ATTR_COLD;
+ DECLARE_VIDEO_START(_1layer);
+ DECLARE_VIDEO_START(nb22090);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
int blitter_r(int offset, int vram);
diff --git a/src/mame/includes/nc.h b/src/mame/includes/nc.h
index 33ee7000b59..39c51be1b2d 100644
--- a/src/mame/includes/nc.h
+++ b/src/mame/includes/nc.h
@@ -74,8 +74,8 @@ public:
DECLARE_WRITE8_MEMBER(nc200_poweroff_control_w);
DECLARE_PALETTE_INIT(nc);
- void machine_start_nc200() ATTR_COLD;
- void machine_reset_nc200();
+ DECLARE_MACHINE_START(nc200);
+ DECLARE_MACHINE_RESET(nc200);
uint32_t screen_update_nc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(nc_keyboard_timer_callback);
TIMER_DEVICE_CALLBACK_MEMBER(dummy_timer_callback);
diff --git a/src/mame/includes/nes.h b/src/mame/includes/nes.h
index edf8773686b..d0e88b52d56 100644
--- a/src/mame/includes/nes.h
+++ b/src/mame/includes/nes.h
@@ -96,10 +96,10 @@ public:
void init_famicom();
// these are needed until we modernize the FDS controller
- void machine_start_fds() ATTR_COLD;
- void machine_start_famitwin() ATTR_COLD;
- void machine_reset_fds();
- void machine_reset_famitwin();
+ DECLARE_MACHINE_START(fds);
+ DECLARE_MACHINE_START(famitwin);
+ DECLARE_MACHINE_RESET(fds);
+ DECLARE_MACHINE_RESET(famitwin);
void setup_disk(nes_disksys_device *slot);
void suborkbd(machine_config &config);
diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h
index a2930c0afab..6b25338a637 100644
--- a/src/mame/includes/ninjakd2.h
+++ b/src/mame/includes/ninjakd2.h
@@ -106,12 +106,12 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start_mnight() ATTR_COLD;
- void video_start_arkarea() ATTR_COLD;
- void video_start_robokid() ATTR_COLD;
- void machine_start_omegaf() ATTR_COLD;
- void machine_reset_omegaf();
- void video_start_omegaf() ATTR_COLD;
+ DECLARE_VIDEO_START(mnight);
+ DECLARE_VIDEO_START(arkarea);
+ DECLARE_VIDEO_START(robokid);
+ DECLARE_MACHINE_START(omegaf);
+ DECLARE_MACHINE_RESET(omegaf);
+ DECLARE_VIDEO_START(omegaf);
uint32_t screen_update_ninjakd2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_robokid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_omegaf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h
index 49cbefeafc5..656d2cc5bbf 100644
--- a/src/mame/includes/niyanpai.h
+++ b/src/mame/includes/niyanpai.h
@@ -85,7 +85,7 @@ public:
void init_niyanpai();
virtual void video_start() override;
- void machine_start_musobana() ATTR_COLD;
+ DECLARE_MACHINE_START(musobana);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
int blitter_r(int vram, int offset);
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
index 6f7d04a1bf0..a03a7cb7516 100644
--- a/src/mame/includes/nmk16.h
+++ b/src/mame/includes/nmk16.h
@@ -134,16 +134,16 @@ public:
TILE_GET_INFO_MEMBER(common_get_tx_tile_info);
TILE_GET_INFO_MEMBER(bjtwin_get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_tile_info_0_8bit);
- void video_start_macross() ATTR_COLD;
- void video_start_bioship() ATTR_COLD;
- void video_start_strahl() ATTR_COLD;
- void video_start_gunnail() ATTR_COLD;
- void video_start_macross2() ATTR_COLD;
- void video_start_raphero() ATTR_COLD;
- void video_start_bjtwin() ATTR_COLD;
- void video_start_afega() ATTR_COLD;
- void video_start_firehawk() ATTR_COLD;
- void video_start_grdnstrm() ATTR_COLD;
+ DECLARE_VIDEO_START(macross);
+ DECLARE_VIDEO_START(bioship);
+ DECLARE_VIDEO_START(strahl);
+ DECLARE_VIDEO_START(gunnail);
+ DECLARE_VIDEO_START(macross2);
+ DECLARE_VIDEO_START(raphero);
+ DECLARE_VIDEO_START(bjtwin);
+ DECLARE_VIDEO_START(afega);
+ DECLARE_VIDEO_START(firehawk);
+ DECLARE_VIDEO_START(grdnstrm);
uint32_t screen_update_tharrier(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_manybloc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_macross(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h
index 4a21c5ea268..da5cf099368 100644
--- a/src/mame/includes/nova2001.h
+++ b/src/mame/includes/nova2001.h
@@ -40,13 +40,13 @@ public:
void init_raiders5();
void init_pkunwar();
- void video_start_nova2001() ATTR_COLD;
+ DECLARE_VIDEO_START(nova2001);
DECLARE_PALETTE_INIT(nova2001);
DECLARE_PALETTE_DECODER(BBGGRRII);
- void machine_start_ninjakun() ATTR_COLD;
- void video_start_ninjakun() ATTR_COLD;
- void video_start_pkunwar() ATTR_COLD;
- void video_start_raiders5() ATTR_COLD;
+ DECLARE_MACHINE_START(ninjakun);
+ DECLARE_VIDEO_START(ninjakun);
+ DECLARE_VIDEO_START(pkunwar);
+ DECLARE_VIDEO_START(raiders5);
TILE_GET_INFO_MEMBER(nova2001_get_bg_tile_info);
TILE_GET_INFO_MEMBER(nova2001_get_fg_tile_info);
diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h
index 865139fbf76..11df115fcd4 100644
--- a/src/mame/includes/ojankohs.h
+++ b/src/mame/includes/ojankohs.h
@@ -94,15 +94,15 @@ public:
TILE_GET_INFO_MEMBER(ojankohs_get_tile_info);
TILE_GET_INFO_MEMBER(ojankoy_get_tile_info);
virtual void machine_reset() override;
- void machine_start_ojankohs() ATTR_COLD;
- void video_start_ojankohs() ATTR_COLD;
- void machine_start_ojankoy() ATTR_COLD;
- void video_start_ojankoy() ATTR_COLD;
+ DECLARE_MACHINE_START(ojankohs);
+ DECLARE_VIDEO_START(ojankohs);
+ DECLARE_MACHINE_START(ojankoy);
+ DECLARE_VIDEO_START(ojankoy);
DECLARE_PALETTE_INIT(ojankoy);
- void video_start_ccasino() ATTR_COLD;
- void machine_start_ojankoc() ATTR_COLD;
- void video_start_ojankoc() ATTR_COLD;
- void machine_start_common() ATTR_COLD;
+ DECLARE_VIDEO_START(ccasino);
+ DECLARE_MACHINE_START(ojankoc);
+ DECLARE_VIDEO_START(ojankoc);
+ DECLARE_MACHINE_START(common);
uint32_t screen_update_ojankohs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_ojankoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void ojankoc_flipscreen( address_space &space, int data );
diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h
index 85c09ab3312..2bf20a5c1ea 100644
--- a/src/mame/includes/opwolf.h
+++ b/src/mame/includes/opwolf.h
@@ -70,7 +70,7 @@ protected:
virtual void machine_start() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- void machine_reset_opwolf();
+ DECLARE_MACHINE_RESET(opwolf);
uint32_t screen_update_opwolf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(opwolf_timer_callback);
TIMER_CALLBACK_MEMBER(cchip_timer);
diff --git a/src/mame/includes/orion.h b/src/mame/includes/orion.h
index d07b2a87cc7..e9d6ba44bdb 100644
--- a/src/mame/includes/orion.h
+++ b/src/mame/includes/orion.h
@@ -72,13 +72,13 @@ public:
DECLARE_WRITE8_MEMBER(orionpro_memory_page_w);
DECLARE_READ8_MEMBER(orionpro_io_r);
DECLARE_WRITE8_MEMBER(orionpro_io_w);
- void machine_start_orion128() ATTR_COLD;
- void machine_reset_orion128();
- void video_start_orion128() ATTR_COLD;
+ DECLARE_MACHINE_START(orion128);
+ DECLARE_MACHINE_RESET(orion128);
+ DECLARE_VIDEO_START(orion128);
DECLARE_PALETTE_INIT(orion128);
- void machine_start_orionz80() ATTR_COLD;
- void machine_reset_orionz80();
- void machine_reset_orionpro();
+ DECLARE_MACHINE_START(orionz80);
+ DECLARE_MACHINE_RESET(orionz80);
+ DECLARE_MACHINE_RESET(orionpro);
uint32_t screen_update_orion128(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(orionz80_interrupt);
DECLARE_READ8_MEMBER(orion_romdisk_porta_r);
diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h
index 0807702d655..9ef8d9c4f50 100644
--- a/src/mame/includes/pacman.h
+++ b/src/mame/includes/pacman.h
@@ -170,15 +170,15 @@ public:
TILE_GET_INFO_MEMBER(s2650_get_tile_info);
TILEMAP_MAPPER_MEMBER(jrpacman_scan_rows);
TILE_GET_INFO_MEMBER(jrpacman_get_tile_info);
- void video_start_pacman() ATTR_COLD;
+ DECLARE_VIDEO_START(pacman);
DECLARE_PALETTE_INIT(pacman);
- void video_start_birdiy() ATTR_COLD;
- void video_start_s2650games() ATTR_COLD;
- void machine_reset_mschamp();
- void machine_reset_superabc();
- void machine_reset_maketrax();
- void video_start_pengo() ATTR_COLD;
- void video_start_jrpacman() ATTR_COLD;
+ DECLARE_VIDEO_START(birdiy);
+ DECLARE_VIDEO_START(s2650games);
+ DECLARE_MACHINE_RESET(mschamp);
+ DECLARE_MACHINE_RESET(superabc);
+ DECLARE_MACHINE_RESET(maketrax);
+ DECLARE_VIDEO_START(pengo);
+ DECLARE_VIDEO_START(jrpacman);
uint32_t screen_update_pacman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_s2650games(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
@@ -196,12 +196,12 @@ private:
public:
// epos.c
DECLARE_READ8_MEMBER(epos_decryption_w);
- void machine_start_theglobp() ATTR_COLD;
- void machine_reset_theglobp();
- void machine_start_eeekk() ATTR_COLD;
- void machine_reset_eeekk();
- void machine_start_acitya() ATTR_COLD;
- void machine_reset_acitya();
+ DECLARE_MACHINE_START(theglobp);
+ DECLARE_MACHINE_RESET(theglobp);
+ DECLARE_MACHINE_START(eeekk);
+ DECLARE_MACHINE_RESET(eeekk);
+ DECLARE_MACHINE_START(acitya);
+ DECLARE_MACHINE_RESET(acitya);
void birdiy(machine_config &config);
void rocktrv2(machine_config &config);
diff --git a/src/mame/includes/partner.h b/src/mame/includes/partner.h
index f7f41db7d04..a94e321a8cb 100644
--- a/src/mame/includes/partner.h
+++ b/src/mame/includes/partner.h
@@ -33,8 +33,8 @@ public:
DECLARE_WRITE8_MEMBER(partner_win_memory_page_w);
DECLARE_WRITE8_MEMBER(partner_mem_page_w);
void init_partner();
- void machine_start_partner() ATTR_COLD;
- void machine_reset_partner();
+ DECLARE_MACHINE_START(partner);
+ DECLARE_MACHINE_RESET(partner);
I8275_DRAW_CHARACTER_MEMBER(display_pixels);
DECLARE_FLOPPY_FORMATS( floppy_formats );
diff --git a/src/mame/includes/pc1251.h b/src/mame/includes/pc1251.h
index d61752359d1..18d86ad0c70 100644
--- a/src/mame/includes/pc1251.h
+++ b/src/mame/includes/pc1251.h
@@ -50,7 +50,7 @@ public:
DECLARE_READ8_MEMBER(pc1251_lcd_read);
DECLARE_WRITE8_MEMBER(pc1251_lcd_write);
virtual void machine_start() override;
- void machine_start_pc1260() ATTR_COLD;
+ DECLARE_MACHINE_START(pc1260);
required_device<sc61860_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h
index 02d2752a471..a65e61f435e 100644
--- a/src/mame/includes/pc9801.h
+++ b/src/mame/includes/pc9801.h
@@ -261,16 +261,16 @@ private:
UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels );
UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text );
- void machine_start_pc9801_common() ATTR_COLD;
- void machine_start_pc9801f() ATTR_COLD;
- void machine_start_pc9801rs() ATTR_COLD;
- void machine_start_pc9801bx2() ATTR_COLD;
- void machine_start_pc9821() ATTR_COLD;
- void machine_start_pc9821ap2() ATTR_COLD;
- void machine_reset_pc9801_common();
- void machine_reset_pc9801f();
- void machine_reset_pc9801rs();
- void machine_reset_pc9821();
+ DECLARE_MACHINE_START(pc9801_common);
+ DECLARE_MACHINE_START(pc9801f);
+ DECLARE_MACHINE_START(pc9801rs);
+ DECLARE_MACHINE_START(pc9801bx2);
+ DECLARE_MACHINE_START(pc9821);
+ DECLARE_MACHINE_START(pc9821ap2);
+ DECLARE_MACHINE_RESET(pc9801_common);
+ DECLARE_MACHINE_RESET(pc9801f);
+ DECLARE_MACHINE_RESET(pc9801rs);
+ DECLARE_MACHINE_RESET(pc9821);
DECLARE_PALETTE_INIT(pc9801);
DECLARE_WRITE_LINE_MEMBER(vrtc_irq);
diff --git a/src/mame/includes/pce.h b/src/mame/includes/pce.h
index e205773f75e..6ca8f8ce4cc 100644
--- a/src/mame/includes/pce.h
+++ b/src/mame/includes/pce.h
@@ -74,8 +74,8 @@ public:
void init_tg16();
void init_mess_pce();
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void machine_start_pce() ATTR_COLD;
- void machine_reset_mess_pce();
+ DECLARE_MACHINE_START(pce);
+ DECLARE_MACHINE_RESET(mess_pce);
void pce_common(machine_config &config);
void pce(machine_config &config);
void tg16(machine_config &config);
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index b7a5d39ca3c..117f67a16f6 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -97,9 +97,9 @@ public:
TILE_GET_INFO_MEMBER(get_pgm_tx_tilemap_tile_info);
TILE_GET_INFO_MEMBER(get_pgm_bg_tilemap_tile_info);
- void video_start_pgm() ATTR_COLD;
- void machine_start_pgm() ATTR_COLD;
- void machine_reset_pgm();
+ DECLARE_VIDEO_START(pgm);
+ DECLARE_MACHINE_START(pgm);
+ DECLARE_MACHINE_RESET(pgm);
uint32_t screen_update_pgm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_pgm);
TIMER_DEVICE_CALLBACK_MEMBER(pgm_interrupt);
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index 67429d88cde..083e0ae4432 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -32,8 +32,8 @@ public:
void init_oneprom_coindsw();
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- void machine_reset_phoenix();
- void video_start_phoenix() ATTR_COLD;
+ DECLARE_MACHINE_RESET(phoenix);
+ DECLARE_VIDEO_START(phoenix);
DECLARE_PALETTE_INIT(phoenix);
DECLARE_PALETTE_INIT(survival);
DECLARE_PALETTE_INIT(pleiads);
diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h
index 5810ba93582..13e01f0a630 100644
--- a/src/mame/includes/playch10.h
+++ b/src/mame/includes/playch10.h
@@ -101,8 +101,8 @@ private:
};
DECLARE_PALETTE_INIT(playch10);
- void machine_start_playch10_hboard() ATTR_COLD;
- void video_start_playch10_hboard() ATTR_COLD;
+ DECLARE_MACHINE_START(playch10_hboard);
+ DECLARE_VIDEO_START(playch10_hboard);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
void pc10_set_videorom_bank( int first, int count, int bank, int size );
diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h
index 1641a61cc49..2add2a3fc3b 100644
--- a/src/mame/includes/playmark.h
+++ b/src/mame/includes/playmark.h
@@ -95,15 +95,15 @@ public:
TILE_GET_INFO_MEMBER(bigtwinb_get_tx_tile_info);
TILE_GET_INFO_MEMBER(hrdtimes_get_fg_tile_info);
TILE_GET_INFO_MEMBER(hrdtimes_get_bg_tile_info);
- void machine_start_playmark() ATTR_COLD;
- void machine_reset_playmark() ATTR_COLD;
- void video_start_bigtwin() ATTR_COLD;
- void video_start_bigtwinb() ATTR_COLD;
- void video_start_wbeachvl() ATTR_COLD;
- void video_start_excelsr() ATTR_COLD;
- void video_start_hotmind() ATTR_COLD;
- void video_start_hrdtimes() ATTR_COLD;
- void video_start_luckboomh() ATTR_COLD;
+ DECLARE_MACHINE_START(playmark);
+ DECLARE_MACHINE_RESET(playmark);
+ DECLARE_VIDEO_START(bigtwin);
+ DECLARE_VIDEO_START(bigtwinb);
+ DECLARE_VIDEO_START(wbeachvl);
+ DECLARE_VIDEO_START(excelsr);
+ DECLARE_VIDEO_START(hotmind);
+ DECLARE_VIDEO_START(hrdtimes);
+ DECLARE_VIDEO_START(luckboomh);
TILEMAP_MAPPER_MEMBER(playmark_tilemap_scan_pages);
uint32_t screen_update_bigtwin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_bigtwinb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index eb85c958e8e..b7702b19237 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -105,8 +105,8 @@ public:
void init_polepos2();
TILE_GET_INFO_MEMBER(bg_get_tile_info);
TILE_GET_INFO_MEMBER(tx_get_tile_info);
- void machine_reset_polepos();
- void video_start_polepos() ATTR_COLD;
+ DECLARE_MACHINE_RESET(polepos);
+ DECLARE_VIDEO_START(polepos);
DECLARE_PALETTE_INIT(polepos);
uint32_t screen_update_polepos(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(polepos_scanline);
diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h
index 2991978aa72..170037d4b9b 100644
--- a/src/mame/includes/powerins.h
+++ b/src/mame/includes/powerins.h
@@ -39,7 +39,7 @@ public:
DECLARE_WRITE16_MEMBER(vram_1_w);
DECLARE_READ8_MEMBER(powerinsb_fake_ym2203_r);
- void machine_start_powerinsa() ATTR_COLD;
+ DECLARE_MACHINE_START(powerinsa);
TILE_GET_INFO_MEMBER(get_tile_info_0);
TILE_GET_INFO_MEMBER(get_tile_info_1);
diff --git a/src/mame/includes/primo.h b/src/mame/includes/primo.h
index 606f6bbad18..bc524e1406f 100644
--- a/src/mame/includes/primo.h
+++ b/src/mame/includes/primo.h
@@ -54,7 +54,7 @@ protected:
DECLARE_WRITE8_MEMBER(primo_FD_w);
virtual void machine_reset() override;
virtual void machine_start() override;
- void machine_reset_primob();
+ DECLARE_MACHINE_RESET(primob);
uint32_t screen_update_primo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
void primo_draw_scanline(bitmap_ind16 &bitmap, int primo_scanline);
diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h
index bd40b9249df..7ddf3b0eade 100644
--- a/src/mame/includes/psikyo.h
+++ b/src/mame/includes/psikyo.h
@@ -93,8 +93,8 @@ public:
template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
- void video_start_sngkace() ATTR_COLD;
- void video_start_psikyo() ATTR_COLD;
+ DECLARE_VIDEO_START(sngkace);
+ DECLARE_VIDEO_START(psikyo);
uint32_t screen_update_psikyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_psikyo_bootleg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_psikyo);
diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h
index f065104c9db..25b1af8f5ba 100644
--- a/src/mame/includes/psychic5.h
+++ b/src/mame/includes/psychic5.h
@@ -76,12 +76,12 @@ public:
TILE_GET_INFO_MEMBER(get_fg_tile_info);
virtual void machine_reset() override;
- void machine_start_psychic5() ATTR_COLD;
- void machine_start_bombsa() ATTR_COLD;
+ DECLARE_MACHINE_START(psychic5);
+ DECLARE_MACHINE_START(bombsa);
virtual void video_start() override;
- void video_start_psychic5() ATTR_COLD;
- void video_start_bombsa() ATTR_COLD;
- void video_reset_psychic5();
+ DECLARE_VIDEO_START(psychic5);
+ DECLARE_VIDEO_START(bombsa);
+ DECLARE_VIDEO_RESET(psychic5);
TIMER_DEVICE_CALLBACK_MEMBER(scanline);
diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h
index 58ad38d3d5b..97c1ad01871 100644
--- a/src/mame/includes/punchout.h
+++ b/src/mame/includes/punchout.h
@@ -78,8 +78,8 @@ public:
TILEMAP_MAPPER_MEMBER(armwrest_bs1_scan);
TILEMAP_MAPPER_MEMBER(armwrest_bs1_scan_flipx);
virtual void video_start() override;
- void video_start_armwrest() ATTR_COLD;
- void machine_reset_spnchout();
+ DECLARE_VIDEO_START(armwrest);
+ DECLARE_MACHINE_RESET(spnchout);
uint32_t screen_update_punchout_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_punchout_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_armwrest_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h
index c0356eb7420..39665416597 100644
--- a/src/mame/includes/qdrmfgp.h
+++ b/src/mame/includes/qdrmfgp.h
@@ -65,10 +65,10 @@ private:
DECLARE_READ16_MEMBER(gp2_ide_std_r);
DECLARE_READ16_MEMBER(inputs_r);
- void machine_start_qdrmfgp() ATTR_COLD;
- void video_start_qdrmfgp() ATTR_COLD;
- void machine_start_qdrmfgp2() ATTR_COLD;
- void video_start_qdrmfgp2() ATTR_COLD;
+ DECLARE_MACHINE_START(qdrmfgp);
+ DECLARE_VIDEO_START(qdrmfgp);
+ DECLARE_MACHINE_START(qdrmfgp2);
+ DECLARE_VIDEO_START(qdrmfgp2);
uint32_t screen_update_qdrmfgp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(qdrmfgp2_interrupt);
diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h
index 44c99cca584..31f59f808ef 100644
--- a/src/mame/includes/qix.h
+++ b/src/mame/includes/qix.h
@@ -115,8 +115,8 @@ public:
void init_zookeep();
void init_kram3();
virtual void machine_reset() override;
- void machine_start_qixmcu() ATTR_COLD;
- void video_start_qix() ATTR_COLD;
+ DECLARE_MACHINE_START(qixmcu);
+ DECLARE_VIDEO_START(qix);
TIMER_CALLBACK_MEMBER(pia_w_callback);
TIMER_CALLBACK_MEMBER(deferred_sndpia1_porta_w);
DECLARE_WRITE_LINE_MEMBER(qix_vsync_changed);
diff --git a/src/mame/includes/quasar.h b/src/mame/includes/quasar.h
index a7e204b609a..4b4a931a48c 100644
--- a/src/mame/includes/quasar.h
+++ b/src/mame/includes/quasar.h
@@ -26,9 +26,9 @@ public:
DECLARE_WRITE8_MEMBER(quasar_sh_command_w);
DECLARE_READ8_MEMBER(quasar_sh_command_r);
DECLARE_READ_LINE_MEMBER(audio_t1_r);
- void machine_start_quasar() ATTR_COLD;
- void machine_reset_quasar();
- void video_start_quasar() ATTR_COLD;
+ DECLARE_MACHINE_START(quasar);
+ DECLARE_MACHINE_RESET(quasar);
+ DECLARE_VIDEO_START(quasar);
DECLARE_PALETTE_INIT(quasar);
uint32_t screen_update_quasar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(quasar_interrupt);
diff --git a/src/mame/includes/radio86.h b/src/mame/includes/radio86.h
index e7b0c9983a7..5ac8d1e82b6 100644
--- a/src/mame/includes/radio86.h
+++ b/src/mame/includes/radio86.h
@@ -70,7 +70,7 @@ public:
DECLARE_WRITE8_MEMBER(radio86_pagesel);
void init_radioram();
void init_radio86();
- void machine_reset_radio86();
+ DECLARE_MACHINE_RESET(radio86);
DECLARE_PALETTE_INIT(radio86);
DECLARE_READ8_MEMBER(radio86_8255_portb_r2);
DECLARE_READ8_MEMBER(radio86_8255_portc_r2);
diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h
index e71300a30bf..376b075ca53 100644
--- a/src/mame/includes/raiden.h
+++ b/src/mame/includes/raiden.h
@@ -64,7 +64,7 @@ public:
TILE_GET_INFO_MEMBER(get_text_tile_info);
virtual void video_start() override;
- void video_start_raidenb() ATTR_COLD;
+ DECLARE_VIDEO_START(raidenb);
uint32_t screen_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint16_t *scrollregs);
uint32_t screen_update_raiden(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h
index 76b8bb05134..3d6a87ebe15 100644
--- a/src/mame/includes/raiden2.h
+++ b/src/mame/includes/raiden2.h
@@ -132,11 +132,11 @@ public:
TILE_GET_INFO_MEMBER(get_mid_tile_info);
TILE_GET_INFO_MEMBER(get_fore_tile_info);
TILE_GET_INFO_MEMBER(get_text_tile_info);
- void machine_reset_raiden2();
- void video_start_raiden2() ATTR_COLD;
- void machine_reset_zeroteam();
- void machine_reset_xsedae();
- void machine_reset_raidendx();
+ DECLARE_MACHINE_RESET(raiden2);
+ DECLARE_VIDEO_START(raiden2);
+ DECLARE_MACHINE_RESET(zeroteam);
+ DECLARE_MACHINE_RESET(xsedae);
+ DECLARE_MACHINE_RESET(raidendx);
uint32_t screen_update_raiden2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(raiden2_interrupt);
void combine32(uint32_t *val, int offset, uint16_t data, uint16_t mem_mask);
diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h
index 2f6ad308f92..d7f739742b7 100644
--- a/src/mame/includes/rallyx.h
+++ b/src/mame/includes/rallyx.h
@@ -72,13 +72,13 @@ public:
TILE_GET_INFO_MEMBER(rallyx_fg_get_tile_info);
TILE_GET_INFO_MEMBER(locomotn_bg_get_tile_info);
TILE_GET_INFO_MEMBER(locomotn_fg_get_tile_info);
- void machine_start_rallyx() ATTR_COLD;
- void video_start_rallyx() ATTR_COLD;
+ DECLARE_MACHINE_START(rallyx);
+ DECLARE_VIDEO_START(rallyx);
DECLARE_PALETTE_INIT(rallyx);
- void video_start_jungler() ATTR_COLD;
+ DECLARE_VIDEO_START(jungler);
DECLARE_PALETTE_INIT(jungler);
- void video_start_locomotn() ATTR_COLD;
- void video_start_commsega() ATTR_COLD;
+ DECLARE_VIDEO_START(locomotn);
+ DECLARE_VIDEO_START(commsega);
uint32_t screen_update_rallyx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_jungler(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_locomotn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/rbisland.h b/src/mame/includes/rbisland.h
index 2045b74c91f..05deffe9296 100644
--- a/src/mame/includes/rbisland.h
+++ b/src/mame/includes/rbisland.h
@@ -48,7 +48,7 @@ public:
void init_jumping();
void init_rbisland();
virtual void machine_start() override;
- void video_start_jumping() ATTR_COLD;
+ DECLARE_VIDEO_START(jumping);
uint32_t screen_update_rainbow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_jumping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(cchip_timer);
diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h
index d023bf1b1c2..da87a21ccc5 100644
--- a/src/mame/includes/redalert.h
+++ b/src/mame/includes/redalert.h
@@ -56,10 +56,10 @@ public:
DECLARE_WRITE8_MEMBER(redalert_ay8910_latch_2_w);
DECLARE_WRITE8_MEMBER(redalert_voice_command_w);
DECLARE_WRITE8_MEMBER(demoneye_audio_command_w);
- void video_start_redalert() ATTR_COLD;
- void video_start_ww3() ATTR_COLD;
- void sound_start_redalert() ATTR_COLD;
- void sound_start_demoneye() ATTR_COLD;
+ DECLARE_VIDEO_START(redalert);
+ DECLARE_VIDEO_START(ww3);
+ DECLARE_SOUND_START(redalert);
+ DECLARE_SOUND_START(demoneye);
uint32_t screen_update_redalert(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_demoneye(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_panther(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/rm380z.h b/src/mame/includes/rm380z.h
index 0d38306d977..79de425e7ad 100644
--- a/src/mame/includes/rm380z.h
+++ b/src/mame/includes/rm380z.h
@@ -133,7 +133,7 @@ public:
void init_rm380z34d();
void init_rm380z34e();
void init_rm480z();
- void machine_reset_rm480z();
+ DECLARE_MACHINE_RESET(rm480z);
void config_memory_map();
void update_screen(bitmap_ind16 &bitmap);
diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h
index 9615f2f09d1..7ce0373beab 100644
--- a/src/mame/includes/rohga.h
+++ b/src/mame/includes/rohga.h
@@ -57,7 +57,7 @@ public:
void init_schmeisr();
void init_hangzo();
void init_rohga();
- void video_start_wizdfire() ATTR_COLD;
+ DECLARE_VIDEO_START(wizdfire);
uint32_t screen_update_rohga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_wizdfire(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_nitrobal(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h
index b935a7ff8a7..6d39d812a5b 100644
--- a/src/mame/includes/route16.h
+++ b/src/mame/includes/route16.h
@@ -28,8 +28,8 @@ public:
DECLARE_READ8_MEMBER(speakres_in3_r);
DECLARE_WRITE8_MEMBER(speakres_out2_w);
DECLARE_WRITE8_MEMBER(stratvox_sn76477_w);
- void machine_start_speakres() ATTR_COLD;
- void machine_start_ttmahjng() ATTR_COLD;
+ DECLARE_MACHINE_START(speakres);
+ DECLARE_MACHINE_START(ttmahjng);
void init_route16();
uint32_t screen_update_route16(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h
index cc541836b54..e9ad46495e6 100644
--- a/src/mame/includes/rpunch.h
+++ b/src/mame/includes/rpunch.h
@@ -62,8 +62,8 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
- void video_start_rpunch() ATTR_COLD;
- void video_start_svolley() ATTR_COLD;
+ DECLARE_VIDEO_START(rpunch);
+ DECLARE_VIDEO_START(svolley);
uint32_t screen_update_rpunch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h
index 274b32430fd..87a33b920f1 100644
--- a/src/mame/includes/runaway.h
+++ b/src/mame/includes/runaway.h
@@ -31,7 +31,7 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start_qwak() ATTR_COLD;
+ DECLARE_VIDEO_START(qwak);
uint32_t screen_update_runaway(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_qwak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(interrupt_callback);
diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h
index b28f856dcee..9c73da17393 100644
--- a/src/mame/includes/s11.h
+++ b/src/mame/includes/s11.h
@@ -79,7 +79,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia_irq);
DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
- void machine_reset_s11();
+ DECLARE_MACHINE_RESET(s11);
void init_s11();
void s11(machine_config &config);
void s11_audio_map(address_map &map);
diff --git a/src/mame/includes/s11a.h b/src/mame/includes/s11a.h
index ec5a0a025db..3220a2d0f17 100644
--- a/src/mame/includes/s11a.h
+++ b/src/mame/includes/s11a.h
@@ -20,7 +20,7 @@ public:
DECLARE_WRITE8_MEMBER(bgbank_w);
DECLARE_WRITE8_MEMBER(dig0_w);
- void machine_reset_s11a();
+ DECLARE_MACHINE_RESET(s11a);
void init_s11a();
void s11a(machine_config &config);
diff --git a/src/mame/includes/s11b.h b/src/mame/includes/s11b.h
index 6b89b8a48b8..1ede5d1d446 100644
--- a/src/mame/includes/s11b.h
+++ b/src/mame/includes/s11b.h
@@ -27,7 +27,7 @@ public:
DECLARE_WRITE8_MEMBER(bg_speech_clock_w);
DECLARE_WRITE8_MEMBER(bg_speech_digit_w);
- void machine_reset_s11b();
+ DECLARE_MACHINE_RESET(s11b);
void init_s11b();
void init_s11b_invert();
diff --git a/src/mame/includes/s11c.h b/src/mame/includes/s11c.h
index 0647eb4ad01..5052ebbfcef 100644
--- a/src/mame/includes/s11c.h
+++ b/src/mame/includes/s11c.h
@@ -18,7 +18,7 @@ public:
: s11b_state(mconfig, type, tag)
{ }
- void machine_reset_s11c();
+ DECLARE_MACHINE_RESET(s11c);
void init_s11c();
void s11c(machine_config &config);
diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h
index c0b815c436f..bc5bed44f73 100644
--- a/src/mame/includes/saturn.h
+++ b/src/mame/includes/saturn.h
@@ -113,7 +113,7 @@ public:
required_device<palette_device> m_palette;
bitmap_rgb32 m_tmpbitmap;
- void video_start_stv_vdp2() ATTR_COLD;
+ DECLARE_VIDEO_START(stv_vdp2);
uint32_t screen_update_stv_vdp2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(saturn_scanline);
TIMER_DEVICE_CALLBACK_MEMBER(saturn_slave_scanline);
diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h
index a21beba25f6..a99dbc660ad 100644
--- a/src/mame/includes/sauro.h
+++ b/src/mame/includes/sauro.h
@@ -64,8 +64,8 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_fg);
void init_tecfri();
- void video_start_trckydoc() ATTR_COLD;
- void video_start_sauro() ATTR_COLD;
+ DECLARE_VIDEO_START(trckydoc);
+ DECLARE_VIDEO_START(sauro);
uint32_t screen_update_trckydoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_sauro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h
index 776e56a3725..684c36db84d 100644
--- a/src/mame/includes/scramble.h
+++ b/src/mame/includes/scramble.h
@@ -78,8 +78,8 @@ public:
void init_hustler();
void init_hustlerd();
void init_billiard();
- void machine_reset_scramble();
- void machine_reset_explorer();
+ DECLARE_MACHINE_RESET(scramble);
+ DECLARE_MACHINE_RESET(explorer);
DECLARE_WRITE_LINE_MEMBER(scramble_sh_7474_q_callback);
DECLARE_READ8_MEMBER( mariner_protection_1_r );
DECLARE_READ8_MEMBER( mariner_protection_2_r );
diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h
index 9f513726eda..33ea13e2c41 100644
--- a/src/mame/includes/seibuspi.h
+++ b/src/mame/includes/seibuspi.h
@@ -123,10 +123,10 @@ public:
virtual void machine_start() override;
virtual void video_start() override;
- void machine_reset_spi();
- void machine_reset_sxx2e();
- void video_start_ejanhs() ATTR_COLD;
- void video_start_sys386f() ATTR_COLD;
+ DECLARE_MACHINE_RESET(spi);
+ DECLARE_MACHINE_RESET(sxx2e);
+ DECLARE_VIDEO_START(ejanhs);
+ DECLARE_VIDEO_START(sys386f);
TILE_GET_INFO_MEMBER(get_text_tile_info);
TILE_GET_INFO_MEMBER(get_back_tile_info);
TILE_GET_INFO_MEMBER(get_midl_tile_info);
diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h
index 903d0456e2a..cef9c7e4a6c 100644
--- a/src/mame/includes/seta.h
+++ b/src/mame/includes/seta.h
@@ -187,22 +187,22 @@ public:
void init_pairlove();
template<int Offset> TILE_GET_INFO_MEMBER(twineagl_get_tile_info);
template<int Layer, int Offset> TILE_GET_INFO_MEMBER(get_tile_info);
- void video_start_seta_no_layers() ATTR_COLD;
- void video_start_kyustrkr_no_layers() ATTR_COLD;
- void video_start_twineagl_1_layer() ATTR_COLD;
- void video_start_seta_1_layer() ATTR_COLD;
- void machine_reset_calibr50();
+ DECLARE_VIDEO_START(seta_no_layers);
+ DECLARE_VIDEO_START(kyustrkr_no_layers);
+ DECLARE_VIDEO_START(twineagl_1_layer);
+ DECLARE_VIDEO_START(seta_1_layer);
+ DECLARE_MACHINE_RESET(calibr50);
DECLARE_PALETTE_INIT(palette_init_RRRRRGGGGGBBBBB_proms);
DECLARE_PALETTE_INIT(usclssic);
- void machine_start_usclssic() ATTR_COLD;
- void video_start_seta_2_layers() ATTR_COLD;
+ DECLARE_MACHINE_START(usclssic);
+ DECLARE_VIDEO_START(seta_2_layers);
DECLARE_PALETTE_INIT(blandia);
DECLARE_PALETTE_INIT(zingzip);
- void machine_start_wrofaero() ATTR_COLD;
+ DECLARE_MACHINE_START(wrofaero);
DECLARE_PALETTE_INIT(gundhara);
DECLARE_PALETTE_INIT(jjsquawk);
- void machine_start_keroppi() ATTR_COLD;
- void video_start_oisipuzl_2_layers() ATTR_COLD;
+ DECLARE_MACHINE_START(keroppi);
+ DECLARE_VIDEO_START(oisipuzl_2_layers);
uint32_t screen_update_seta_no_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_seta(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_usclssic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -360,9 +360,9 @@ public:
DECLARE_WRITE16_MEMBER(spritectrl_w);
- void machine_reset_setaroul();
+ DECLARE_MACHINE_RESET(setaroul);
- void video_start_setaroul_1_layer() ATTR_COLD;
+ DECLARE_VIDEO_START(setaroul_1_layer);
DECLARE_PALETTE_INIT(setaroul);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -414,7 +414,7 @@ public:
DECLARE_READ16_MEMBER(trackball_r);
- void video_start_jockeyc_1_layer() ATTR_COLD;
+ DECLARE_VIDEO_START(jockeyc_1_layer);
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h
index f3c80a8e970..7e2f1239a98 100644
--- a/src/mame/includes/seta2.h
+++ b/src/mame/includes/seta2.h
@@ -112,14 +112,14 @@ public:
void init_funcube();
void init_funcube2();
- void machine_start_mj4simai() ATTR_COLD;
- void machine_start_funcube() ATTR_COLD;
- void machine_reset_funcube();
+ DECLARE_MACHINE_START(mj4simai);
+ DECLARE_MACHINE_START(funcube);
+ DECLARE_MACHINE_RESET(funcube);
virtual void video_start() override;
- void video_start_yoffset() ATTR_COLD;
- void video_start_xoffset() ATTR_COLD;
- void video_start_xoffset1() ATTR_COLD;
+ DECLARE_VIDEO_START(yoffset);
+ DECLARE_VIDEO_START(xoffset);
+ DECLARE_VIDEO_START(xoffset1);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank);
diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h
index 6f85177dcea..588fcc00971 100644
--- a/src/mame/includes/shangkid.h
+++ b/src/mame/includes/shangkid.h
@@ -60,9 +60,9 @@ public:
void init_dynamski();
void init_shangkid();
void init_chinhero();
- void video_start_shangkid() ATTR_COLD;
+ DECLARE_VIDEO_START(shangkid);
DECLARE_PALETTE_INIT(dynamski);
- void machine_reset_shangkid();
+ DECLARE_MACHINE_RESET(shangkid);
uint32_t screen_update_shangkid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_dynamski(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h
index 813af65ed6c..b18a181c819 100644
--- a/src/mame/includes/simple_st0016.h
+++ b/src/mame/includes/simple_st0016.h
@@ -38,7 +38,7 @@ public:
void init_mayjisn2();
void init_renju();
virtual void machine_start() override;
- void video_start_st0016() ATTR_COLD;
+ DECLARE_VIDEO_START(st0016);
uint32_t screen_update_st0016(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(st0016_int);
void st0016(machine_config &config);
diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h
index f909f5235b3..522f8f873a3 100644
--- a/src/mame/includes/slapfght.h
+++ b/src/mame/includes/slapfght.h
@@ -106,8 +106,8 @@ public:
TILE_GET_INFO_MEMBER(get_pf_tile_info);
TILE_GET_INFO_MEMBER(get_pf1_tile_info);
TILE_GET_INFO_MEMBER(get_fix_tile_info);
- void video_start_perfrman() ATTR_COLD;
- void video_start_slapfight() ATTR_COLD;
+ DECLARE_VIDEO_START(perfrman);
+ DECLARE_VIDEO_START(slapfight);
void draw_perfrman_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int layer);
void draw_slapfight_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/sms.h b/src/mame/includes/sms.h
index 53eca9bab79..3c635f9ddcf 100644
--- a/src/mame/includes/sms.h
+++ b/src/mame/includes/sms.h
@@ -216,12 +216,12 @@ public:
void init_smsj();
void init_sms1();
void init_sms();
- void machine_start_sms() ATTR_COLD;
- void machine_reset_sms();
- void video_start_gamegear() ATTR_COLD;
- void video_reset_gamegear();
- void video_start_sms1() ATTR_COLD;
- void video_reset_sms1();
+ DECLARE_MACHINE_START(sms);
+ DECLARE_MACHINE_RESET(sms);
+ DECLARE_VIDEO_START(gamegear);
+ DECLARE_VIDEO_RESET(gamegear);
+ DECLARE_VIDEO_START(sms1);
+ DECLARE_VIDEO_RESET(sms1);
uint32_t screen_update_sms(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_sms1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h
index eb83cb6d2fc..c6fe8609725 100644
--- a/src/mame/includes/snk.h
+++ b/src/mame/includes/snk.h
@@ -173,19 +173,19 @@ public:
TILE_GET_INFO_MEMBER(tnk3_get_bg_tile_info);
TILE_GET_INFO_MEMBER(ikari_get_bg_tile_info);
TILE_GET_INFO_MEMBER(gwar_get_bg_tile_info);
- void video_start_marvins() ATTR_COLD;
+ DECLARE_VIDEO_START(marvins);
DECLARE_PALETTE_INIT(tnk3);
- void video_start_jcross() ATTR_COLD;
- void video_start_tnk3() ATTR_COLD;
- void video_start_ikari() ATTR_COLD;
- void video_start_gwar() ATTR_COLD;
- void video_start_tdfever() ATTR_COLD;
- void video_start_sgladiat() ATTR_COLD;
- void video_start_hal21() ATTR_COLD;
- void video_start_aso() ATTR_COLD;
- void video_start_psychos() ATTR_COLD;
- void video_start_snk_3bpp_shadow() ATTR_COLD;
- void video_start_snk_4bpp_shadow() ATTR_COLD;
+ DECLARE_VIDEO_START(jcross);
+ DECLARE_VIDEO_START(tnk3);
+ DECLARE_VIDEO_START(ikari);
+ DECLARE_VIDEO_START(gwar);
+ DECLARE_VIDEO_START(tdfever);
+ DECLARE_VIDEO_START(sgladiat);
+ DECLARE_VIDEO_START(hal21);
+ DECLARE_VIDEO_START(aso);
+ DECLARE_VIDEO_START(psychos);
+ DECLARE_VIDEO_START(snk_3bpp_shadow);
+ DECLARE_VIDEO_START(snk_4bpp_shadow);
uint32_t screen_update_marvins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_tnk3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_ikari(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h
index e20ef0e7dbc..2e3b338ea8a 100644
--- a/src/mame/includes/snk6502.h
+++ b/src/mame/includes/snk6502.h
@@ -69,15 +69,15 @@ public:
TILE_GET_INFO_MEMBER(satansat_get_fg_tile_info);
virtual void machine_start() override;
- void machine_reset_sasuke();
- void video_start_satansat() ATTR_COLD;
+ DECLARE_MACHINE_RESET(sasuke);
+ DECLARE_VIDEO_START(satansat);
DECLARE_PALETTE_INIT(satansat);
- void machine_reset_vanguard();
- void video_start_snk6502() ATTR_COLD;
+ DECLARE_MACHINE_RESET(vanguard);
+ DECLARE_VIDEO_START(snk6502);
DECLARE_PALETTE_INIT(snk6502);
- void machine_reset_satansat();
- void machine_reset_pballoon();
- void video_start_pballoon() ATTR_COLD;
+ DECLARE_MACHINE_RESET(satansat);
+ DECLARE_MACHINE_RESET(pballoon);
+ DECLARE_VIDEO_START(pballoon);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h
index 5dbd9271c0d..d5911655fe8 100644
--- a/src/mame/includes/snk68.h
+++ b/src/mame/includes/snk68.h
@@ -63,7 +63,7 @@ public:
virtual void machine_start() override;
virtual void video_start() override;
- void video_start_searchar() ATTR_COLD;
+ DECLARE_VIDEO_START(searchar);
void common_video_start();
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h
index 95695674d2d..1eebbf56b4c 100644
--- a/src/mame/includes/snookr10.h
+++ b/src/mame/includes/snookr10.h
@@ -32,8 +32,8 @@ public:
TILE_GET_INFO_MEMBER(crystalc_get_bg_tile_info);
virtual void video_start() override;
DECLARE_PALETTE_INIT(snookr10);
- void video_start_apple10() ATTR_COLD;
- void video_start_crystalc() ATTR_COLD;
+ DECLARE_VIDEO_START(apple10);
+ DECLARE_VIDEO_START(crystalc);
DECLARE_PALETTE_INIT(apple10);
DECLARE_PALETTE_INIT(crystalc);
uint32_t screen_update_snookr10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h
index a9470986e67..44910f0a213 100644
--- a/src/mame/includes/snowbros.h
+++ b/src/mame/includes/snowbros.h
@@ -62,8 +62,8 @@ public:
void init_toto();
void init_hyperpac();
void init_yutnori();
- void machine_reset_semiprot();
- void machine_reset_finalttr();
+ DECLARE_MACHINE_RESET(semiprot);
+ DECLARE_MACHINE_RESET(finalttr);
uint32_t screen_update_snowbros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_honeydol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h
index 27edded9157..7db223944cb 100644
--- a/src/mame/includes/sorcerer.h
+++ b/src/mame/includes/sorcerer.h
@@ -73,7 +73,7 @@ public:
DECLARE_WRITE8_MEMBER(sorcerer_fd_w);
DECLARE_WRITE8_MEMBER(sorcerer_fe_w);
DECLARE_WRITE8_MEMBER(sorcerer_ff_w);
- void machine_start_sorcererd() ATTR_COLD;
+ DECLARE_MACHINE_START(sorcererd);
void init_sorcerer();
TIMER_CALLBACK_MEMBER(sorcerer_cassette_tc);
TIMER_CALLBACK_MEMBER(sorcerer_serial_tc);
diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h
index 0b2038c542b..ca6c73ae5e4 100644
--- a/src/mame/includes/spbactn.h
+++ b/src/mame/includes/spbactn.h
@@ -71,8 +71,8 @@ public:
DECLARE_WRITE16_MEMBER(spbatnp_90124_w);
DECLARE_WRITE16_MEMBER(spbatnp_9012c_w);
- void video_start_spbactn() ATTR_COLD;
- void video_start_spbactnp() ATTR_COLD;
+ DECLARE_VIDEO_START(spbactn);
+ DECLARE_VIDEO_START(spbactnp);
//virtual void video_start();
diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h
index b852ceefcfd..3316daf0df4 100644
--- a/src/mame/includes/special.h
+++ b/src/mame/includes/special.h
@@ -87,15 +87,15 @@ public:
DECLARE_WRITE8_MEMBER(specialist_8255_portc_w);
void init_erik();
void init_special();
- void machine_reset_special();
- void video_start_special() ATTR_COLD;
- void machine_reset_erik();
- void video_start_erik() ATTR_COLD;
+ DECLARE_MACHINE_RESET(special);
+ DECLARE_VIDEO_START(special);
+ DECLARE_MACHINE_RESET(erik);
+ DECLARE_VIDEO_START(erik);
DECLARE_PALETTE_INIT(erik);
- void video_start_specialp() ATTR_COLD;
- void machine_start_specimx() ATTR_COLD;
- void machine_reset_specimx();
- void video_start_specimx() ATTR_COLD;
+ DECLARE_VIDEO_START(specialp);
+ DECLARE_MACHINE_START(specimx);
+ DECLARE_MACHINE_RESET(specimx);
+ DECLARE_VIDEO_START(specimx);
DECLARE_PALETTE_INIT(specimx);
uint32_t screen_update_special(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_erik(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h
index d27370207e4..015478568ac 100644
--- a/src/mame/includes/spectrum.h
+++ b/src/mame/includes/spectrum.h
@@ -160,15 +160,15 @@ public:
void init_spectrum();
void init_plus2();
void init_plus3();
- void machine_reset_spectrum();
- void video_start_spectrum() ATTR_COLD;
+ DECLARE_MACHINE_RESET(spectrum);
+ DECLARE_VIDEO_START(spectrum);
DECLARE_PALETTE_INIT(spectrum);
- void machine_reset_tc2048();
- void video_start_spectrum_128() ATTR_COLD;
- void machine_reset_spectrum_128();
- void machine_reset_spectrum_plus3();
- void machine_reset_ts2068();
- void video_start_ts2068() ATTR_COLD;
+ DECLARE_MACHINE_RESET(tc2048);
+ DECLARE_VIDEO_START(spectrum_128);
+ DECLARE_MACHINE_RESET(spectrum_128);
+ DECLARE_MACHINE_RESET(spectrum_plus3);
+ DECLARE_MACHINE_RESET(ts2068);
+ DECLARE_VIDEO_START(ts2068);
uint32_t screen_update_spectrum(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_tc2048(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_ts2068(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h
index 06a6f535ce7..dd9398884f9 100644
--- a/src/mame/includes/splash.h
+++ b/src/mame/includes/splash.h
@@ -81,9 +81,9 @@ public:
void init_splash();
void init_rebus();
virtual void video_start() override;
- void machine_start_splash() ATTR_COLD;
- void machine_start_roldfrog() ATTR_COLD;
- void machine_reset_splash();
+ DECLARE_MACHINE_START(splash);
+ DECLARE_MACHINE_START(roldfrog);
+ DECLARE_MACHINE_RESET(splash);
TILE_GET_INFO_MEMBER(get_tile_info_tilemap0);
TILE_GET_INFO_MEMBER(get_tile_info_tilemap1);
diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h
index afa2c7cf033..011a28ef847 100644
--- a/src/mame/includes/srmp2.h
+++ b/src/mame/includes/srmp2.h
@@ -61,12 +61,12 @@ public:
DECLARE_WRITE8_MEMBER(srmp3_irq_ack_w);
virtual void machine_start() override;
- void machine_start_srmp2() ATTR_COLD;
+ DECLARE_MACHINE_START(srmp2);
DECLARE_PALETTE_INIT(srmp2);
- void machine_start_srmp3() ATTR_COLD;
+ DECLARE_MACHINE_START(srmp3);
DECLARE_PALETTE_INIT(srmp3);
- void machine_start_rmgoldyh() ATTR_COLD;
- void machine_start_mjyuugi() ATTR_COLD;
+ DECLARE_MACHINE_START(rmgoldyh);
+ DECLARE_MACHINE_START(mjyuugi);
uint32_t screen_update_srmp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_srmp3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h
index 56207e7d847..095243adb99 100644
--- a/src/mame/includes/sslam.h
+++ b/src/mame/includes/sslam.h
@@ -67,8 +67,8 @@ public:
TILE_GET_INFO_MEMBER(get_sslam_md_tile_info);
TILE_GET_INFO_MEMBER(get_sslam_bg_tile_info);
TILE_GET_INFO_MEMBER(get_powerbls_bg_tile_info);
- void video_start_sslam() ATTR_COLD;
- void video_start_powerbls() ATTR_COLD;
+ DECLARE_VIDEO_START(sslam);
+ DECLARE_VIDEO_START(powerbls);
uint32_t screen_update_sslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_powerbls(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(music_playback);
diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h
index 12d8db2b306..dfb3fe1dfe8 100644
--- a/src/mame/includes/ssv.h
+++ b/src/mame/includes/ssv.h
@@ -126,8 +126,8 @@ public:
void init_mslider();
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start_gdfs() ATTR_COLD;
- void video_start_eaglshot() ATTR_COLD;
+ DECLARE_VIDEO_START(gdfs);
+ DECLARE_VIDEO_START(eaglshot);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_gdfs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h
index ceb430f1b11..8379c27af97 100644
--- a/src/mame/includes/stv.h
+++ b/src/mame/includes/stv.h
@@ -105,10 +105,10 @@ public:
void install_stvbios_speedups( void );
- void machine_start_stv() ATTR_COLD;
- void machine_reset_stv();
+ DECLARE_MACHINE_START(stv);
+ DECLARE_MACHINE_RESET(stv);
- void machine_reset_batmanfr();
+ DECLARE_MACHINE_RESET(batmanfr);
DECLARE_WRITE32_MEMBER(batmanfr_sound_comms_w);
optional_device<acclaim_rax_device> m_rax;
diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h
index 7f43401badc..95dbfde6b0f 100644
--- a/src/mame/includes/suna16.h
+++ b/src/mame/includes/suna16.h
@@ -72,10 +72,10 @@ public:
void init_uballoon();
virtual void video_start() override;
- void machine_start_bestbest() ATTR_COLD;
- void machine_start_bssoccer() ATTR_COLD;
- void machine_start_uballoon() ATTR_COLD;
- void machine_reset_uballoon();
+ DECLARE_MACHINE_START(bestbest);
+ DECLARE_MACHINE_START(bssoccer);
+ DECLARE_MACHINE_START(uballoon);
+ DECLARE_MACHINE_RESET(uballoon);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_bestbest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h
index 739d4f195bc..71b6c65da34 100644
--- a/src/mame/includes/suna8.h
+++ b/src/mame/includes/suna8.h
@@ -157,13 +157,13 @@ public:
void init_suna8();
void suna8_vh_start_common(bool has_text, GFXBANK_TYPE_T gfxbank_type);
- void video_start_suna8_text() ATTR_COLD;
- void video_start_suna8_sparkman() ATTR_COLD;
- void video_start_suna8_brickzn() ATTR_COLD;
- void video_start_suna8_starfigh() ATTR_COLD;
+ DECLARE_VIDEO_START(suna8_text);
+ DECLARE_VIDEO_START(suna8_sparkman);
+ DECLARE_VIDEO_START(suna8_brickzn);
+ DECLARE_VIDEO_START(suna8_starfigh);
- void machine_reset_brickzn();
- void machine_reset_hardhea2();
+ DECLARE_MACHINE_RESET(brickzn);
+ DECLARE_MACHINE_RESET(hardhea2);
uint32_t screen_update_suna8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(hardhea2_interrupt);
diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h
index 08e0361bf0f..bf8997d3786 100644
--- a/src/mame/includes/super80.h
+++ b/src/mame/includes/super80.h
@@ -80,9 +80,9 @@ public:
DECLARE_WRITE8_MEMBER(pio_port_a_w);
DECLARE_READ8_MEMBER(pio_port_b_r);
void init_super80();
- void machine_reset_super80();
- void machine_reset_super80r();
- void video_start_super80() ATTR_COLD;
+ DECLARE_MACHINE_RESET(super80);
+ DECLARE_MACHINE_RESET(super80r);
+ DECLARE_VIDEO_START(super80);
DECLARE_PALETTE_INIT(super80m);
DECLARE_QUICKLOAD_LOAD_MEMBER(super80);
MC6845_UPDATE_ROW(crtc_update_row);
diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h
index 19bcaaba1be..7f374ec778e 100644
--- a/src/mame/includes/superqix.h
+++ b/src/mame/includes/superqix.h
@@ -56,7 +56,7 @@ public:
void init_pbillian();
void init_hotsmash();
TILE_GET_INFO_MEMBER(sqix_get_bg_tile_info);
- void video_start_superqix() ATTR_COLD;
+ DECLARE_VIDEO_START(superqix);
DECLARE_PALETTE_DECODER(BBGGRRII);
uint32_t screen_update_superqix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void superqix_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
@@ -99,8 +99,8 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(frommcu_semaphore_input_r);
DECLARE_READ8_MEMBER(bootleg_in0_r);
INTERRUPT_GEN_MEMBER(sqix_timer_irq);
- void machine_start_superqix() ATTR_COLD;
- void machine_reset_superqix();
+ DECLARE_MACHINE_START(superqix);
+ DECLARE_MACHINE_RESET(superqix);
void sqix(machine_config &config);
void sqix_8031(machine_config &config);
@@ -154,8 +154,8 @@ public:
TILE_GET_INFO_MEMBER(pb_get_bg_tile_info);
- void machine_start_pbillian() ATTR_COLD;
- void video_start_pbillian() ATTR_COLD;
+ DECLARE_MACHINE_START(pbillian);
+ DECLARE_VIDEO_START(pbillian);
u32 screen_update_pbillian(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h
index 87e70415d19..440a612cfa6 100644
--- a/src/mame/includes/suprnova.h
+++ b/src/mame/includes/suprnova.h
@@ -145,11 +145,11 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
virtual void video_reset() override;
- void machine_reset_sknsa();
- void machine_reset_sknsj();
- void machine_reset_sknsu();
- void machine_reset_sknse();
- void machine_reset_sknsk();
+ DECLARE_MACHINE_RESET(sknsa);
+ DECLARE_MACHINE_RESET(sknsj);
+ DECLARE_MACHINE_RESET(sknsu);
+ DECLARE_MACHINE_RESET(sknse);
+ DECLARE_MACHINE_RESET(sknsk);
TILE_GET_INFO_MEMBER(get_tilemap_A_tile_info);
TILE_GET_INFO_MEMBER(get_tilemap_B_tile_info);
diff --git a/src/mame/includes/svision.h b/src/mame/includes/svision.h
index c474f7c40c5..147dd4cc63e 100644
--- a/src/mame/includes/svision.h
+++ b/src/mame/includes/svision.h
@@ -65,7 +65,7 @@ public:
DECLARE_PALETTE_INIT(svision);
DECLARE_PALETTE_INIT(svisionp);
DECLARE_PALETTE_INIT(svisionn);
- void machine_reset_tvlink();
+ DECLARE_MACHINE_RESET(tvlink);
uint32_t screen_update_svision(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_tvlink(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(svision_frame_int);
diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h
index e7a1585804f..fc1ddff36ae 100644
--- a/src/mame/includes/system1.h
+++ b/src/mame/includes/system1.h
@@ -113,9 +113,9 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void machine_start_system2() ATTR_COLD;
- void video_start_system2() ATTR_COLD;
- void machine_start_myherok() ATTR_COLD;
+ DECLARE_MACHINE_START(system2);
+ DECLARE_VIDEO_START(system2);
+ DECLARE_MACHINE_START(myherok);
uint32_t screen_update_system1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_system2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_system2_rowscroll(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h
index 17426ad3e94..23747d6d08e 100644
--- a/src/mame/includes/system16.h
+++ b/src/mame/includes/system16.h
@@ -195,7 +195,7 @@ public:
void init_goldnaxeb1();
void init_ddcrewbl();
void init_common();
- void machine_reset_ddcrewbl();
+ DECLARE_MACHINE_RESET(ddcrewbl);
TILEMAP_MAPPER_MEMBER(sys16_bg_map);
TILEMAP_MAPPER_MEMBER(sys16_text_map);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
@@ -206,12 +206,12 @@ public:
TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_infotxt);
TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_info0);
TILE_GET_INFO_MEMBER(get_s16a_bootleg_tile_info1);
- void video_start_system16() ATTR_COLD;
- void video_start_system18old() ATTR_COLD;
- void video_start_s16a_bootleg_shinobi() ATTR_COLD;
- void video_start_s16a_bootleg_passsht() ATTR_COLD;
- void video_start_s16a_bootleg_wb3bl() ATTR_COLD;
- void video_start_s16a_bootleg() ATTR_COLD;
+ DECLARE_VIDEO_START(system16);
+ DECLARE_VIDEO_START(system18old);
+ DECLARE_VIDEO_START(s16a_bootleg_shinobi);
+ DECLARE_VIDEO_START(s16a_bootleg_passsht);
+ DECLARE_VIDEO_START(s16a_bootleg_wb3bl);
+ DECLARE_VIDEO_START(s16a_bootleg);
uint32_t screen_update_system16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_system18old(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_s16a_bootleg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h
index 0c44ba7c4e4..114f60214b4 100644
--- a/src/mame/includes/taito_b.h
+++ b/src/mame/includes/taito_b.h
@@ -65,13 +65,13 @@ public:
DECLARE_WRITE8_MEMBER(mb87078_gain_changed);
DECLARE_INPUT_CHANGED_MEMBER(realpunc_sensor);
void init_taito_b();
- void video_start_taitob_color_order0() ATTR_COLD;
- void video_start_taitob_color_order1() ATTR_COLD;
- void video_start_taitob_color_order2() ATTR_COLD;
- void video_start_hitice() ATTR_COLD;
- void video_reset_hitice();
- void video_start_realpunc() ATTR_COLD;
- void video_start_taitob_core() ATTR_COLD;
+ DECLARE_VIDEO_START(taitob_color_order0);
+ DECLARE_VIDEO_START(taitob_color_order1);
+ DECLARE_VIDEO_START(taitob_color_order2);
+ DECLARE_VIDEO_START(hitice);
+ DECLARE_VIDEO_RESET(hitice);
+ DECLARE_VIDEO_START(realpunc);
+ DECLARE_VIDEO_START(taitob_core);
uint32_t screen_update_taitob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_realpunc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_taitob);
diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h
index 580eba40668..9b84c1cba65 100644
--- a/src/mame/includes/taito_f2.h
+++ b/src/mame/includes/taito_f2.h
@@ -144,32 +144,32 @@ public:
void init_cameltry();
void init_mjnquest();
void init_finalb();
- void machine_start_f2() ATTR_COLD;
- void video_start_taitof2_default() ATTR_COLD;
- void machine_start_common() ATTR_COLD;
- void video_start_taitof2_dondokod() ATTR_COLD;
- void video_start_taitof2_driftout() ATTR_COLD;
- void video_start_taitof2_finalb() ATTR_COLD;
- void video_start_taitof2_megab() ATTR_COLD;
- void video_start_taitof2_thundfox() ATTR_COLD;
- void video_start_taitof2_ssi() ATTR_COLD;
- void video_start_taitof2_gunfront() ATTR_COLD;
- void video_start_taitof2_growl() ATTR_COLD;
- void video_start_taitof2_mjnquest() ATTR_COLD;
- void video_start_taitof2_footchmp() ATTR_COLD;
- void video_start_taitof2_hthero() ATTR_COLD;
- void video_start_taitof2_koshien() ATTR_COLD;
- void video_start_taitof2_yuyugogo() ATTR_COLD;
- void video_start_taitof2_ninjak() ATTR_COLD;
- void video_start_taitof2_solfigtr() ATTR_COLD;
- void video_start_taitof2_pulirula() ATTR_COLD;
- void video_start_taitof2_metalb() ATTR_COLD;
- void video_start_taitof2_qzchikyu() ATTR_COLD;
- void video_start_taitof2_yesnoj() ATTR_COLD;
- void video_start_taitof2_deadconx() ATTR_COLD;
- void video_start_taitof2_deadconxj() ATTR_COLD;
- void video_start_taitof2_dinorex() ATTR_COLD;
- void video_start_taitof2_quiz() ATTR_COLD;
+ DECLARE_MACHINE_START(f2);
+ DECLARE_VIDEO_START(taitof2_default);
+ DECLARE_MACHINE_START(common);
+ DECLARE_VIDEO_START(taitof2_dondokod);
+ DECLARE_VIDEO_START(taitof2_driftout);
+ DECLARE_VIDEO_START(taitof2_finalb);
+ DECLARE_VIDEO_START(taitof2_megab);
+ DECLARE_VIDEO_START(taitof2_thundfox);
+ DECLARE_VIDEO_START(taitof2_ssi);
+ DECLARE_VIDEO_START(taitof2_gunfront);
+ DECLARE_VIDEO_START(taitof2_growl);
+ DECLARE_VIDEO_START(taitof2_mjnquest);
+ DECLARE_VIDEO_START(taitof2_footchmp);
+ DECLARE_VIDEO_START(taitof2_hthero);
+ DECLARE_VIDEO_START(taitof2_koshien);
+ DECLARE_VIDEO_START(taitof2_yuyugogo);
+ DECLARE_VIDEO_START(taitof2_ninjak);
+ DECLARE_VIDEO_START(taitof2_solfigtr);
+ DECLARE_VIDEO_START(taitof2_pulirula);
+ DECLARE_VIDEO_START(taitof2_metalb);
+ DECLARE_VIDEO_START(taitof2_qzchikyu);
+ DECLARE_VIDEO_START(taitof2_yesnoj);
+ DECLARE_VIDEO_START(taitof2_deadconx);
+ DECLARE_VIDEO_START(taitof2_deadconxj);
+ DECLARE_VIDEO_START(taitof2_dinorex);
+ DECLARE_VIDEO_START(taitof2_quiz);
uint32_t screen_update_taitof2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_taitof2_pri_roz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_taitof2_pri(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h
index ecf8a4d5eae..ce24143b28e 100644
--- a/src/mame/includes/taito_f3.h
+++ b/src/mame/includes/taito_f3.h
@@ -311,8 +311,8 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_vram);
TILE_GET_INFO_MEMBER(get_tile_info_pixel);
virtual void machine_start() override;
- void machine_reset_f3();
- void video_start_f3();
+ DECLARE_MACHINE_RESET(f3);
+ DECLARE_VIDEO_START(f3);
uint32_t screen_update_f3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_f3);
INTERRUPT_GEN_MEMBER(f3_interrupt2);
diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h
index 92b97723c0c..3cdc8dd7648 100644
--- a/src/mame/includes/taito_l.h
+++ b/src/mame/includes/taito_l.h
@@ -64,9 +64,9 @@ public:
DECLARE_WRITE8_MEMBER(vram_w);
template<int Offset> TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
- void machine_start_taito_l() ATTR_COLD;
- void video_start_taito_l() ATTR_COLD;
- void machine_reset_taito_l();
+ DECLARE_MACHINE_START(taito_l);
+ DECLARE_VIDEO_START(taito_l);
+ DECLARE_MACHINE_RESET(taito_l);
u32 screen_update_taitol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_taitol);
TIMER_DEVICE_CALLBACK_MEMBER(vbl_interrupt);
@@ -207,10 +207,10 @@ public:
void init_plottinga();
- void machine_reset_plotting();
- void machine_reset_puzznic();
- void machine_reset_palamed();
- void machine_reset_cachat();
+ DECLARE_MACHINE_RESET(plotting);
+ DECLARE_MACHINE_RESET(puzznic);
+ DECLARE_MACHINE_RESET(palamed);
+ DECLARE_MACHINE_RESET(cachat);
void palamed(machine_config &config);
void plotting(machine_config &config);
@@ -241,7 +241,7 @@ public:
DECLARE_WRITE8_MEMBER(bankg_w);
- void machine_start_horshoes();
+ DECLARE_MACHINE_RESET(horshoes);
void horshoes(machine_config &config);
void horshoes_map(address_map &map);
};
diff --git a/src/mame/includes/taito_x.h b/src/mame/includes/taito_x.h
index ba717767954..046dd3d6f42 100644
--- a/src/mame/includes/taito_x.h
+++ b/src/mame/includes/taito_x.h
@@ -26,7 +26,7 @@ public:
DECLARE_WRITE16_MEMBER(kyustrkr_input_w);
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
void init_kyustrkr();
- void machine_start_taitox() ATTR_COLD;
+ DECLARE_MACHINE_START(taitox);
INTERRUPT_GEN_MEMBER(interrupt);
TIMER_DEVICE_CALLBACK_MEMBER(cchip_irq_clear_cb);
diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h
index dab7c7c7df5..6b79c8fc58d 100644
--- a/src/mame/includes/taito_z.h
+++ b/src/mame/includes/taito_z.h
@@ -114,10 +114,10 @@ private:
DECLARE_READ16_MEMBER(sci_spriteframe_r);
DECLARE_WRITE16_MEMBER(sci_spriteframe_w);
DECLARE_WRITE16_MEMBER(contcirc_out_w);
- void machine_start_taitoz() ATTR_COLD;
- void machine_reset_taitoz();
- void video_start_taitoz() ATTR_COLD;
- void machine_start_bshark() ATTR_COLD;
+ DECLARE_MACHINE_START(taitoz);
+ DECLARE_MACHINE_RESET(taitoz);
+ DECLARE_VIDEO_START(taitoz);
+ DECLARE_MACHINE_START(bshark);
uint32_t screen_update_contcirc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_chasehq(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_bshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h
index 509a641f2bb..ab536791c21 100644
--- a/src/mame/includes/tatsumi.h
+++ b/src/mame/includes/tatsumi.h
@@ -91,8 +91,8 @@ public:
DECLARE_WRITE8_MEMBER(apache3_road_x_w);
void init_apache3();
- void machine_reset_apache3();
- void video_start_apache3() ATTR_COLD;
+ DECLARE_MACHINE_RESET(apache3);
+ DECLARE_VIDEO_START(apache3);
uint32_t screen_update_apache3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(apache3_68000_reset);
@@ -145,7 +145,7 @@ public:
DECLARE_WRITE16_MEMBER(roundup5_crt_w);
void init_roundup5();
- void video_start_roundup5() ATTR_COLD;
+ DECLARE_VIDEO_START(roundup5);
uint32_t screen_update_roundup5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void roundup5(machine_config &config);
@@ -193,8 +193,8 @@ public:
void init_cyclwarr();
template<int Bank> TILE_GET_INFO_MEMBER(get_tile_info_bigfight);
- void video_start_cyclwarr() ATTR_COLD;
- void video_start_bigfight() ATTR_COLD;
+ DECLARE_VIDEO_START(cyclwarr);
+ DECLARE_VIDEO_START(bigfight);
uint32_t screen_update_cyclwarr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_bigfight(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -212,7 +212,7 @@ private:
required_shared_ptr<uint16_t> m_cyclwarr_cpub_ram;
required_shared_ptr_array<uint16_t, 2> m_cyclwarr_videoram;
required_region_ptr<uint8_t> m_cyclwarr_tileclut;
-
+
std::vector<uint8_t> m_mask;
tilemap_t *m_layer[4];
diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h
index 30691890e87..8531ae1ee6b 100644
--- a/src/mame/includes/tecmo16.h
+++ b/src/mame/includes/tecmo16.h
@@ -73,8 +73,8 @@ public:
TILE_GET_INFO_MEMBER(tx_get_tile_info);
virtual void video_start() override;
- void video_start_ginkun() ATTR_COLD;
- void video_start_riot() ATTR_COLD;
+ DECLARE_VIDEO_START(ginkun);
+ DECLARE_VIDEO_START(riot);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h
index 954d85937c4..6a1fd83576c 100644
--- a/src/mame/includes/tetrisp2.h
+++ b/src/mame/includes/tetrisp2.h
@@ -125,10 +125,10 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_rocknms_sub_fg);
TILE_GET_INFO_MEMBER(get_tile_info_rocknms_sub_rot);
TILE_GET_INFO_MEMBER(stepstag_get_tile_info_fg);
- void video_start_tetrisp2() ATTR_COLD;
- void video_start_nndmseal() ATTR_COLD;
- void video_start_rockntread() ATTR_COLD;
- void video_start_rocknms() ATTR_COLD;
+ DECLARE_VIDEO_START(tetrisp2);
+ DECLARE_VIDEO_START(nndmseal);
+ DECLARE_VIDEO_START(rockntread);
+ DECLARE_VIDEO_START(rocknms);
uint32_t screen_update_tetrisp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_rockntread(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_rocknms_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -185,7 +185,7 @@ public:
DECLARE_WRITE16_MEMBER(stepstag_button_leds_w);
DECLARE_WRITE16_MEMBER( stepstag_palette_w );
void init_stepstag();
- void video_start_stepstag() ATTR_COLD;
+ DECLARE_VIDEO_START(stepstag);
uint32_t screen_update_stepstag_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_stepstag_mid(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_stepstag_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h
index 83dc7e3b3d4..9a8378836f6 100644
--- a/src/mame/includes/thomson.h
+++ b/src/mame/includes/thomson.h
@@ -176,8 +176,8 @@ public:
TIMER_CALLBACK_MEMBER( to7_game_update_cb );
DECLARE_READ8_MEMBER( to7_midi_r );
DECLARE_WRITE8_MEMBER( to7_midi_w );
- void machine_reset_to7();
- void machine_start_to7() ATTR_COLD;
+ DECLARE_MACHINE_RESET( to7 );
+ DECLARE_MACHINE_START( to7 );
DECLARE_WRITE_LINE_MEMBER( to770_sys_cb2_out );
DECLARE_READ8_MEMBER( to770_sys_porta_in );
void to7_update_cart_bank_postload();
@@ -186,8 +186,8 @@ public:
DECLARE_WRITE8_MEMBER( to770_timer_port_out );
DECLARE_READ8_MEMBER( to770_gatearray_r );
DECLARE_WRITE8_MEMBER( to770_gatearray_w );
- void machine_reset_to770();
- void machine_start_to770() ATTR_COLD;
+ DECLARE_MACHINE_RESET( to770 );
+ DECLARE_MACHINE_START( to770 );
void to7_lightpen_cb( int step );
void mo5_lightpen_cb( int step );
TIMER_CALLBACK_MEMBER( mo5_periodic_cb );
@@ -200,8 +200,8 @@ public:
DECLARE_WRITE8_MEMBER( mo5_cartridge_w );
DECLARE_READ8_MEMBER( mo5_cartridge_r );
DECLARE_WRITE8_MEMBER( mo5_ext_w );
- void machine_reset_mo5();
- void machine_start_mo5() ATTR_COLD;
+ DECLARE_MACHINE_RESET( mo5 );
+ DECLARE_MACHINE_START( mo5 );
DECLARE_WRITE8_MEMBER( to9_ieee_w );
DECLARE_READ8_MEMBER( to9_ieee_r );
DECLARE_READ8_MEMBER( to9_gatearray_r );
@@ -219,8 +219,8 @@ public:
DECLARE_WRITE8_MEMBER( to9_sys_porta_out );
DECLARE_WRITE8_MEMBER( to9_sys_portb_out );
DECLARE_WRITE8_MEMBER( to9_timer_port_out );
- void machine_reset_to9();
- void machine_start_to9() ATTR_COLD;
+ DECLARE_MACHINE_RESET( to9 );
+ DECLARE_MACHINE_START( to9 );
TIMER_CALLBACK_MEMBER( to8_kbd_timer_cb );
void to8_update_floppy_bank_postload();
void to8_update_ram_bank_postload();
@@ -239,12 +239,12 @@ public:
DECLARE_WRITE8_MEMBER( to8_timer_port_out );
DECLARE_WRITE_LINE_MEMBER( to8_timer_cp2_out );
void to8_lightpen_cb( int step );
- void machine_reset_to8();
- void machine_start_to8() ATTR_COLD;
+ DECLARE_MACHINE_RESET( to8 );
+ DECLARE_MACHINE_START( to8 );
DECLARE_READ8_MEMBER( to9p_timer_port_in );
DECLARE_WRITE8_MEMBER( to9p_timer_port_out );
- void machine_reset_to9p();
- void machine_start_to9p() ATTR_COLD;
+ DECLARE_MACHINE_RESET( to9p );
+ DECLARE_MACHINE_START( to9p );
void mo6_update_ram_bank_postload();
void mo6_update_cart_bank_postload();
DECLARE_WRITE8_MEMBER( mo6_cartridge_w );
@@ -262,16 +262,16 @@ public:
DECLARE_WRITE8_MEMBER( mo6_gatearray_w );
DECLARE_READ8_MEMBER( mo6_vreg_r );
DECLARE_WRITE8_MEMBER( mo6_vreg_w );
- void machine_reset_mo6();
- void machine_start_mo6() ATTR_COLD;
+ DECLARE_MACHINE_RESET( mo6 );
+ DECLARE_MACHINE_START( mo6 );
DECLARE_READ8_MEMBER( mo5nr_net_r );
DECLARE_WRITE8_MEMBER( mo5nr_net_w );
DECLARE_READ8_MEMBER( mo5nr_prn_r );
DECLARE_WRITE8_MEMBER( mo5nr_prn_w );
DECLARE_READ8_MEMBER( mo5nr_sys_portb_in );
DECLARE_WRITE8_MEMBER( mo5nr_sys_porta_out );
- void machine_reset_mo5nr();
- void machine_start_mo5nr() ATTR_COLD;
+ DECLARE_MACHINE_RESET( mo5nr );
+ DECLARE_MACHINE_START( mo5nr );
TIMER_CALLBACK_MEMBER( thom_lightpen_step );
TIMER_CALLBACK_MEMBER( thom_scanline_start );
@@ -317,7 +317,7 @@ public:
void overlayhalf_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len );
void overlay3_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len );
DECLARE_WRITE_LINE_MEMBER(thom_vblank);
- void video_start_thom() ATTR_COLD;
+ DECLARE_VIDEO_START( thom );
DECLARE_READ8_MEMBER( to7_5p14_r );
DECLARE_WRITE8_MEMBER( to7_5p14_w );
diff --git a/src/mame/includes/ti85.h b/src/mame/includes/ti85.h
index 3ea93115b9b..7cbbb239274 100644
--- a/src/mame/includes/ti85.h
+++ b/src/mame/includes/ti85.h
@@ -171,14 +171,14 @@ public:
virtual void machine_start() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(ti85);
- void machine_reset_ti85();
- void machine_reset_ti83p();
+ DECLARE_MACHINE_RESET(ti85);
+ DECLARE_MACHINE_RESET(ti83p);
DECLARE_PALETTE_INIT(ti82);
- void machine_start_ti86() ATTR_COLD;
- void machine_start_ti83p() ATTR_COLD;
- void machine_start_ti83pse() ATTR_COLD;
- void machine_start_ti84pse() ATTR_COLD;
- void machine_start_ti84p() ATTR_COLD;
+ DECLARE_MACHINE_START(ti86);
+ DECLARE_MACHINE_START(ti83p);
+ DECLARE_MACHINE_START(ti83pse);
+ DECLARE_MACHINE_START(ti84pse);
+ DECLARE_MACHINE_START(ti84p);
void ti8xpse_init_common();
uint32_t screen_update_ti85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h
index 17f66776ef1..21164bbea73 100644
--- a/src/mame/includes/tiamc1.h
+++ b/src/mame/includes/tiamc1.h
@@ -53,7 +53,7 @@ public:
TILE_GET_INFO_MEMBER(get_bg2_tile_info);
virtual void machine_reset() override;
virtual void video_start() override;
- void video_start_kot() ATTR_COLD;
+ DECLARE_VIDEO_START(kot);
DECLARE_PALETTE_INIT(tiamc1);
uint32_t screen_update_tiamc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_kot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h
index 115efce8b3b..c1b841dfe45 100644
--- a/src/mame/includes/timeplt.h
+++ b/src/mame/includes/timeplt.h
@@ -74,8 +74,8 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(timeplt);
- void video_start_chkun() ATTR_COLD;
- void video_start_psurge() ATTR_COLD;
+ DECLARE_VIDEO_START(chkun);
+ DECLARE_VIDEO_START(psurge);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h
index 1d7401acde7..b921a4d7c42 100644
--- a/src/mame/includes/tmnt.h
+++ b/src/mame/includes/tmnt.h
@@ -144,17 +144,17 @@ public:
void init_cuebrick();
TILE_GET_INFO_MEMBER(glfgreat_get_roz_tile_info);
TILE_GET_INFO_MEMBER(prmrsocr_get_roz_tile_info);
- void machine_start_common() ATTR_COLD;
- void machine_reset_common();
- void video_start_cuebrick() ATTR_COLD;
- void video_start_mia() ATTR_COLD;
- void machine_reset_tmnt();
- void video_start_tmnt() ATTR_COLD;
- void video_start_lgtnfght() ATTR_COLD;
- void video_start_blswhstl() ATTR_COLD;
- void video_start_glfgreat() ATTR_COLD;
- void machine_start_prmrsocr() ATTR_COLD;
- void video_start_prmrsocr() ATTR_COLD;
+ DECLARE_MACHINE_START(common);
+ DECLARE_MACHINE_RESET(common);
+ DECLARE_VIDEO_START(cuebrick);
+ DECLARE_VIDEO_START(mia);
+ DECLARE_MACHINE_RESET(tmnt);
+ DECLARE_VIDEO_START(tmnt);
+ DECLARE_VIDEO_START(lgtnfght);
+ DECLARE_VIDEO_START(blswhstl);
+ DECLARE_VIDEO_START(glfgreat);
+ DECLARE_MACHINE_START(prmrsocr);
+ DECLARE_VIDEO_START(prmrsocr);
uint32_t screen_update_mia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_tmnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_punkshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h
index 85f48cbaf77..ba15ac91114 100644
--- a/src/mame/includes/tnzs.h
+++ b/src/mame/includes/tnzs.h
@@ -181,7 +181,7 @@ public:
DECLARE_READ8_MEMBER(csport_r);
DECLARE_WRITE8_MEMBER(csport_w);
- void machine_reset_kageki();
+ DECLARE_MACHINE_RESET(kageki);
void init_kageki();
SAMPLES_START_CB_MEMBER(init_samples);
diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h
index b78de0f279d..195d5f47c60 100644
--- a/src/mame/includes/toaplan1.h
+++ b/src/mame/includes/toaplan1.h
@@ -133,11 +133,11 @@ public:
TILE_GET_INFO_MEMBER(get_pf2_tile_info);
TILE_GET_INFO_MEMBER(get_pf3_tile_info);
TILE_GET_INFO_MEMBER(get_pf4_tile_info);
- void machine_reset_toaplan1();
- void video_start_toaplan1() ATTR_COLD;
- void machine_reset_zerowing();
- void machine_reset_demonwld();
- void machine_reset_vimana();
+ DECLARE_MACHINE_RESET(toaplan1);
+ DECLARE_VIDEO_START(toaplan1);
+ DECLARE_MACHINE_RESET(zerowing);
+ DECLARE_MACHINE_RESET(demonwld);
+ DECLARE_MACHINE_RESET(vimana);
uint32_t screen_update_toaplan1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_toaplan1);
@@ -207,7 +207,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(coin_lockout_1_w);
DECLARE_WRITE_LINE_MEMBER(coin_lockout_2_w);
DECLARE_READ16_MEMBER(rallybik_tileram16_r);
- void video_start_rallybik() ATTR_COLD;
+ DECLARE_VIDEO_START(rallybik);
uint32_t screen_update_rallybik(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_rallybik);
diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h
index 584c0500665..bc96b7d3362 100644
--- a/src/mame/includes/toaplan2.h
+++ b/src/mame/includes/toaplan2.h
@@ -125,14 +125,14 @@ public:
void init_enmadaio();
TILE_GET_INFO_MEMBER(get_text_tile_info);
virtual void machine_start() override;
- void machine_reset_toaplan2();
- void video_start_toaplan2() ATTR_COLD;
- void machine_reset_ghox();
- void video_start_truxton2() ATTR_COLD;
- void video_start_fixeightbl() ATTR_COLD;
- void video_start_bgaregga() ATTR_COLD;
- void video_start_bgareggabl() ATTR_COLD;
- void video_start_batrider() ATTR_COLD;
+ DECLARE_MACHINE_RESET(toaplan2);
+ DECLARE_VIDEO_START(toaplan2);
+ DECLARE_MACHINE_RESET(ghox);
+ DECLARE_VIDEO_START(truxton2);
+ DECLARE_VIDEO_START(fixeightbl);
+ DECLARE_VIDEO_START(bgaregga);
+ DECLARE_VIDEO_START(bgareggabl);
+ DECLARE_VIDEO_START(batrider);
// Teki Paki sound
DECLARE_READ8_MEMBER(tekipaki_cmdavailable_r);
diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h
index ec55f766e06..4986bdee134 100644
--- a/src/mame/includes/trackfld.h
+++ b/src/mame/includes/trackfld.h
@@ -97,11 +97,11 @@ private:
DECLARE_WRITE_LINE_MEMBER(flipscreen_w);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- void machine_start_trackfld() ATTR_COLD;
- void machine_reset_trackfld();
- void video_start_trackfld() ATTR_COLD;
+ DECLARE_MACHINE_START(trackfld);
+ DECLARE_MACHINE_RESET(trackfld);
+ DECLARE_VIDEO_START(trackfld);
DECLARE_PALETTE_INIT(trackfld);
- void video_start_atlantol() ATTR_COLD;
+ DECLARE_VIDEO_START(atlantol);
uint32_t screen_update_trackfld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
DECLARE_WRITE_LINE_MEMBER(vblank_nmi);
diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h
index f52c8ea5d9d..699af1e4243 100644
--- a/src/mame/includes/trs80.h
+++ b/src/mame/includes/trs80.h
@@ -115,9 +115,9 @@ public:
TIMER_CALLBACK_MEMBER(cassette_data_callback);
DECLARE_WRITE_LINE_MEMBER(trs80_fdc_intrq_w);
DECLARE_QUICKLOAD_LOAD_MEMBER( trs80_cmd );
- void machine_reset_trs80m4();
- void machine_reset_lnw80();
- void machine_reset_cp500();
+ DECLARE_MACHINE_RESET(trs80m4);
+ DECLARE_MACHINE_RESET(lnw80);
+ DECLARE_MACHINE_RESET(cp500);
DECLARE_PALETTE_INIT(lnw80);
uint32_t screen_update_trs80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_trs80m4(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h
index 86731521e41..c34255e577d 100644
--- a/src/mame/includes/tsamurai.h
+++ b/src/mame/includes/tsamurai.h
@@ -58,12 +58,12 @@ public:
DECLARE_READ8_MEMBER(vsgongf_a100_r);
DECLARE_WRITE8_MEMBER(vsgongf_sound_command_w);
- void machine_start_m660() ATTR_COLD;
- void machine_start_tsamurai() ATTR_COLD;
- void machine_start_vsgongf() ATTR_COLD;
- void video_start_m660() ATTR_COLD;
- void video_start_tsamurai() ATTR_COLD;
- void video_start_vsgongf() ATTR_COLD;
+ DECLARE_MACHINE_START(m660);
+ DECLARE_MACHINE_START(tsamurai);
+ DECLARE_MACHINE_START(vsgongf);
+ DECLARE_VIDEO_START(m660);
+ DECLARE_VIDEO_START(tsamurai);
+ DECLARE_VIDEO_START(vsgongf);
void init_the26thz();
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h
index ef64d116ea7..f1cd24684f5 100644
--- a/src/mame/includes/tubep.h
+++ b/src/mame/includes/tubep.h
@@ -86,13 +86,13 @@ public:
DECLARE_WRITE8_MEMBER(ay8910_portB_1_w);
DECLARE_WRITE8_MEMBER(ay8910_portA_2_w);
DECLARE_WRITE8_MEMBER(ay8910_portB_2_w);
- void machine_start_tubep() ATTR_COLD;
- void machine_reset_tubep();
+ DECLARE_MACHINE_START(tubep);
+ DECLARE_MACHINE_RESET(tubep);
virtual void video_start() override;
virtual void video_reset() override;
DECLARE_PALETTE_INIT(tubep);
- void machine_start_rjammer() ATTR_COLD;
- void machine_reset_rjammer();
+ DECLARE_MACHINE_START(rjammer);
+ DECLARE_MACHINE_RESET(rjammer);
DECLARE_PALETTE_INIT(rjammer);
uint32_t screen_update_tubep(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_rjammer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h
index 1f6e74230ab..827a4e55927 100644
--- a/src/mame/includes/tumbleb.h
+++ b/src/mame/includes/tumbleb.h
@@ -102,14 +102,14 @@ public:
TILE_GET_INFO_MEMBER(pangpang_get_bg1_tile_info);
TILE_GET_INFO_MEMBER(pangpang_get_bg2_tile_info);
TILE_GET_INFO_MEMBER(pangpang_get_fg_tile_info);
- void machine_start_tumbleb() ATTR_COLD;
- void machine_reset_tumbleb();
- void video_start_tumblepb() ATTR_COLD;
- void video_start_fncywld() ATTR_COLD;
- void machine_reset_htchctch();
- void video_start_suprtrio() ATTR_COLD;
- void video_start_pangpang() ATTR_COLD;
- void video_start_sdfight() ATTR_COLD;
+ DECLARE_MACHINE_START(tumbleb);
+ DECLARE_MACHINE_RESET(tumbleb);
+ DECLARE_VIDEO_START(tumblepb);
+ DECLARE_VIDEO_START(fncywld);
+ DECLARE_MACHINE_RESET(htchctch);
+ DECLARE_VIDEO_START(suprtrio);
+ DECLARE_VIDEO_START(pangpang);
+ DECLARE_VIDEO_START(sdfight);
uint32_t screen_update_tumblepb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_jumpkids(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_fncywld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h
index 0e1ed280237..e14e4f89ea1 100644
--- a/src/mame/includes/turbo.h
+++ b/src/mame/includes/turbo.h
@@ -164,11 +164,11 @@ public:
void init_turbo_enc();
void init_turbo_noenc();
TILE_GET_INFO_MEMBER(get_fg_tile_info);
- void video_start_turbo() ATTR_COLD;
+ DECLARE_VIDEO_START(turbo);
DECLARE_PALETTE_INIT(turbo);
DECLARE_PALETTE_INIT(subroc3d);
- void machine_reset_buckrog();
- void video_start_buckrog() ATTR_COLD;
+ DECLARE_MACHINE_RESET(buckrog);
+ DECLARE_VIDEO_START(buckrog);
DECLARE_PALETTE_INIT(buckrog);
uint32_t screen_update_turbo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_subroc3d(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h
index 9963eacea9c..1b989a31c69 100644
--- a/src/mame/includes/twincobr.h
+++ b/src/mame/includes/twincobr.h
@@ -105,8 +105,8 @@ public:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
- void machine_reset_twincobr();
- void video_start_toaplan0() ATTR_COLD;
+ DECLARE_MACHINE_RESET(twincobr);
+ DECLARE_VIDEO_START(toaplan0);
uint32_t screen_update_toaplan0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(twincobr_vblank_irq);
DECLARE_WRITE_LINE_MEMBER(wardner_vblank_irq);
diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h
index 1d5d175e6fc..58e8a081144 100644
--- a/src/mame/includes/tx1.h
+++ b/src/mame/includes/tx1.h
@@ -195,13 +195,13 @@ public:
DECLARE_WRITE8_MEMBER(bb_coin_cnt_w);
DECLARE_READ8_MEMBER(tx1_ppi_porta_r);
DECLARE_READ8_MEMBER(tx1_ppi_portb_r);
- void machine_reset_tx1();
- void video_start_tx1() ATTR_COLD;
+ DECLARE_MACHINE_RESET(tx1);
+ DECLARE_VIDEO_START(tx1);
DECLARE_PALETTE_INIT(tx1);
- void machine_reset_buggyboy();
- void video_start_buggyboy() ATTR_COLD;
+ DECLARE_MACHINE_RESET(buggyboy);
+ DECLARE_VIDEO_START(buggyboy);
DECLARE_PALETTE_INIT(buggyboy);
- void video_start_buggybjr() ATTR_COLD;
+ DECLARE_VIDEO_START(buggybjr);
void tx1_draw_char(uint8_t *bitmap);
void tx1_draw_road_pixel(int screen, uint8_t *bmpaddr,
diff --git a/src/mame/includes/ut88.h b/src/mame/includes/ut88.h
index 82318cf8bb0..cf55789a581 100644
--- a/src/mame/includes/ut88.h
+++ b/src/mame/includes/ut88.h
@@ -60,10 +60,10 @@ public:
DECLARE_WRITE8_MEMBER(ut88_8255_porta_w);
void init_ut88();
void init_ut88mini();
- void machine_reset_ut88();
- void video_start_ut88() ATTR_COLD;
- void machine_start_ut88mini() ATTR_COLD;
- void machine_reset_ut88mini();
+ DECLARE_MACHINE_RESET(ut88);
+ DECLARE_VIDEO_START(ut88);
+ DECLARE_MACHINE_START(ut88mini);
+ DECLARE_MACHINE_RESET(ut88mini);
uint32_t screen_update_ut88(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void ut88(machine_config &config);
diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h
index 51a11cdf5d7..e37d4db8e83 100644
--- a/src/mame/includes/vicdual.h
+++ b/src/mame/includes/vicdual.h
@@ -86,7 +86,7 @@ public:
DECLARE_READ8_MEMBER(headon_io_r);
DECLARE_READ8_MEMBER(sspaceat_io_r);
DECLARE_WRITE8_MEMBER(headon_io_w);
- void machine_reset_headon2();
+ DECLARE_MACHINE_RESET(headon2);
DECLARE_READ8_MEMBER(headon2_io_r);
DECLARE_WRITE8_MEMBER(headon2_io_w);
DECLARE_WRITE8_MEMBER(digger_io_w);
@@ -147,8 +147,8 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(clear_coin_status);
- void machine_start_samurai() ATTR_COLD;
- void machine_start_frogs_audio() ATTR_COLD;
+ DECLARE_MACHINE_START(samurai);
+ DECLARE_MACHINE_START(frogs_audio);
virtual void machine_start() override;
@@ -247,8 +247,8 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(nsub_coin_pulse);
- void machine_start_nsub() ATTR_COLD;
- void machine_reset_nsub();
+ DECLARE_MACHINE_START(nsub);
+ DECLARE_MACHINE_RESET(nsub);
virtual pen_t choose_pen(uint8_t x, uint8_t y, pen_t back_pen) override;
void nsub(machine_config &config);
diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h
index 94295496252..c5c47a1ad98 100644
--- a/src/mame/includes/vsnes.h
+++ b/src/mame/includes/vsnes.h
@@ -77,14 +77,14 @@ public:
void init_platoon();
void init_rbibb();
void init_vsdual();
- void machine_start_vsnes() ATTR_COLD;
- void machine_reset_vsnes();
- void machine_start_vsdual() ATTR_COLD;
- void machine_reset_vsdual();
- void v_set_videorom_bank(int start, int count, int vrom_start_bank);
- void mapper4_set_prg();
- void mapper4_set_chr();
- void mapper4_irq(int scanline, int vblank, int blanked);
+ DECLARE_MACHINE_START(vsnes);
+ DECLARE_MACHINE_RESET(vsnes);
+ DECLARE_MACHINE_START(vsdual);
+ DECLARE_MACHINE_RESET(vsdual);
+ void v_set_videorom_bank( int start, int count, int vrom_start_bank );
+ void mapper4_set_prg( );
+ void mapper4_set_chr( );
+ void mapper4_irq( int scanline, int vblank, int blanked );
DECLARE_READ8_MEMBER( vsnes_bootleg_z80_latch_r );
DECLARE_WRITE8_MEMBER(bootleg_sound_write);
diff --git a/src/mame/includes/vtech2.h b/src/mame/includes/vtech2.h
index 3eabc0c54fd..0b6f0a3201c 100644
--- a/src/mame/includes/vtech2.h
+++ b/src/mame/includes/vtech2.h
@@ -64,8 +64,8 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(vtech2);
- void machine_reset_laser500();
- void machine_reset_laser700();
+ DECLARE_MACHINE_RESET(laser500);
+ DECLARE_MACHINE_RESET(laser700);
uint32_t screen_update_laser(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vtech2_interrupt);
diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h
index 7fbd929ecf6..41d5b6bb0ca 100644
--- a/src/mame/includes/warpwarp.h
+++ b/src/mame/includes/warpwarp.h
@@ -74,7 +74,7 @@ public:
DECLARE_WRITE8_MEMBER(geebee_videoram_w);
virtual void machine_start() override;
- void machine_reset_kaitei();
+ DECLARE_MACHINE_RESET(kaitei);
void init_navarone();
void init_geebee();
void init_kaitein();
@@ -82,11 +82,11 @@ public:
void init_sos();
void init_kaitei();
void init_bombbee();
- void video_start_geebee() ATTR_COLD;
+ DECLARE_VIDEO_START(geebee);
DECLARE_PALETTE_INIT(geebee);
- void video_start_warpwarp() ATTR_COLD;
+ DECLARE_VIDEO_START(warpwarp);
DECLARE_PALETTE_INIT(warpwarp);
- void video_start_navarone() ATTR_COLD;
+ DECLARE_VIDEO_START(navarone);
DECLARE_PALETTE_INIT(navarone);
TILEMAP_MAPPER_MEMBER(tilemap_scan);
diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h
index d4716cb76eb..5a9e80cd80c 100644
--- a/src/mame/includes/wc90.h
+++ b/src/mame/includes/wc90.h
@@ -76,7 +76,7 @@ public:
virtual void machine_start() override;
virtual void video_start() override;
- void video_start_wc90t() ATTR_COLD;
+ DECLARE_VIDEO_START(wc90t);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void wc90t(machine_config &config);
diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h
index ef7f6cffb35..a0532cc7335 100644
--- a/src/mame/includes/wecleman.h
+++ b/src/mame/includes/wecleman.h
@@ -103,13 +103,13 @@ public:
TILE_GET_INFO_MEMBER(wecleman_get_bg_tile_info);
TILE_GET_INFO_MEMBER(wecleman_get_fg_tile_info);
- void machine_start_wecleman() ATTR_COLD;
- void machine_reset_wecleman();
- void video_start_wecleman() ATTR_COLD;
+ DECLARE_MACHINE_START(wecleman);
+ DECLARE_MACHINE_RESET(wecleman);
+ DECLARE_VIDEO_START(wecleman);
- void machine_start_hotchase() ATTR_COLD;
- void machine_reset_hotchase();
- void video_start_hotchase() ATTR_COLD;
+ DECLARE_MACHINE_START(hotchase);
+ DECLARE_MACHINE_RESET(hotchase);
+ DECLARE_VIDEO_START(hotchase);
uint32_t screen_update_wecleman(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_hotchase(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h
index 01807d0426c..348912942f2 100644
--- a/src/mame/includes/wgp.h
+++ b/src/mame/includes/wgp.h
@@ -52,7 +52,7 @@ public:
DECLARE_WRITE16_MEMBER(piv_ctrl_word_w);
void init_wgp();
void init_wgp2();
- void video_start_wgp2() ATTR_COLD;
+ DECLARE_VIDEO_START(wgp2);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(cpub_interrupt);
diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h
index b5c94abed0e..0440a80209b 100644
--- a/src/mame/includes/williams.h
+++ b/src/mame/includes/williams.h
@@ -86,13 +86,13 @@ public:
void init_alienar();
void init_robotron();
void init_bubbles();
- void machine_start_defender() ATTR_COLD;
- void machine_reset_defender();
- void video_start_williams() ATTR_COLD;
- void machine_start_williams() ATTR_COLD;
- void machine_reset_williams();
- void machine_start_williams_common() ATTR_COLD;
- void machine_reset_williams_common();
+ DECLARE_MACHINE_START(defender);
+ DECLARE_MACHINE_RESET(defender);
+ DECLARE_VIDEO_START(williams);
+ DECLARE_MACHINE_START(williams);
+ DECLARE_MACHINE_RESET(williams);
+ DECLARE_MACHINE_START(williams_common);
+ DECLARE_MACHINE_RESET(williams_common);
uint32_t screen_update_williams(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(williams_count240_off_callback);
TIMER_CALLBACK_MEMBER(williams_deferred_snd_cmd_w);
@@ -169,9 +169,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(williams_snd_irq_b);
void init_blaster();
- void machine_start_blaster() ATTR_COLD;
- void machine_reset_blaster();
- void video_start_blaster() ATTR_COLD;
+ DECLARE_MACHINE_START(blaster);
+ DECLARE_MACHINE_RESET(blaster);
+ DECLARE_VIDEO_START(blaster);
uint32_t screen_update_blaster(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
inline void update_blaster_banking();
@@ -222,9 +222,9 @@ public:
void init_mysticm();
void init_tshoot();
void init_inferno();
- void machine_start_williams2() ATTR_COLD;
- void machine_reset_williams2();
- void video_start_williams2() ATTR_COLD;
+ DECLARE_MACHINE_START(williams2);
+ DECLARE_MACHINE_RESET(williams2);
+ DECLARE_VIDEO_START(williams2);
uint32_t screen_update_williams2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void williams2(machine_config &config);
void mysticm(machine_config &config);
@@ -264,8 +264,8 @@ public:
uint16_t m_joust2_current_sound_data;
void init_joust2();
- void machine_start_joust2() ATTR_COLD;
- void machine_reset_joust2();
+ DECLARE_MACHINE_START(joust2);
+ DECLARE_MACHINE_RESET(joust2);
TIMER_CALLBACK_MEMBER(joust2_deferred_snd_cmd_w);
DECLARE_WRITE8_MEMBER(joust2_snd_cmd_w);
DECLARE_WRITE_LINE_MEMBER(joust2_pia_3_cb1_w);
diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h
index d0dbc3437f3..7a1235b1446 100644
--- a/src/mame/includes/x1.h
+++ b/src/mame/includes/x1.h
@@ -132,11 +132,11 @@ public:
DECLARE_WRITE8_MEMBER(x1_portb_w);
DECLARE_WRITE8_MEMBER(x1_portc_w);
void init_x1_kanji();
- void machine_start_x1() ATTR_COLD;
- void machine_reset_x1();
- void video_start_x1() ATTR_COLD;
+ DECLARE_MACHINE_START(x1);
+ DECLARE_MACHINE_RESET(x1);
+ DECLARE_VIDEO_START(x1);
DECLARE_PALETTE_INIT(x1);
- void machine_reset_x1turbo();
+ DECLARE_MACHINE_RESET(x1turbo);
uint32_t screen_update_x1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_INPUT_CHANGED_MEMBER(ipl_reset);
DECLARE_INPUT_CHANGED_MEMBER(nmi_reset);
diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h
index cfea327023a..6339113c26b 100644
--- a/src/mame/includes/x68k.h
+++ b/src/mame/includes/x68k.h
@@ -272,7 +272,7 @@ public:
TILE_GET_INFO_MEMBER(x68k_get_bg1_tile);
TILE_GET_INFO_MEMBER(x68k_get_bg0_tile_16);
TILE_GET_INFO_MEMBER(x68k_get_bg1_tile_16);
- void video_start_x68000() ATTR_COLD;
+ DECLARE_VIDEO_START(x68000);
DECLARE_PALETTE_INIT(x68000);
uint32_t screen_update_x68000(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(x68k_led_callback);
diff --git a/src/mame/includes/xevious.h b/src/mame/includes/xevious.h
index 129320f8567..6bc6b9235dc 100644
--- a/src/mame/includes/xevious.h
+++ b/src/mame/includes/xevious.h
@@ -33,10 +33,10 @@ public:
void init_battles();
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- void video_start_xevious() ATTR_COLD;
+ DECLARE_VIDEO_START(xevious);
DECLARE_PALETTE_INIT(xevious);
- void machine_reset_xevios();
- void machine_reset_battles();
+ DECLARE_MACHINE_RESET(xevios);
+ DECLARE_MACHINE_RESET(battles);
uint32_t screen_update_xevious(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(battles_interrupt_4);
TIMER_DEVICE_CALLBACK_MEMBER(battles_nmi_generate);
diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h
index 4bf55c0b37b..ea8afb8f7a3 100644
--- a/src/mame/includes/xmen.h
+++ b/src/mame/includes/xmen.h
@@ -64,7 +64,7 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(xmen_frame_r);
virtual void machine_start() override;
virtual void machine_reset() override;
- void video_start_xmen6p() ATTR_COLD;
+ DECLARE_VIDEO_START(xmen6p);
uint32_t screen_update_xmen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_xmen6p_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_xmen6p_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h
index 5ba727f3dd9..60f74432c84 100644
--- a/src/mame/includes/yunsun16.h
+++ b/src/mame/includes/yunsun16.h
@@ -55,8 +55,8 @@ public:
DECLARE_WRITE16_MEMBER(vram_0_w);
DECLARE_WRITE16_MEMBER(vram_1_w);
void init_magicbub();
- void machine_start_shocking() ATTR_COLD;
- void machine_reset_shocking();
+ DECLARE_MACHINE_START(shocking);
+ DECLARE_MACHINE_RESET(shocking);
TILEMAP_MAPPER_MEMBER(tilemap_scan_pages);
TILE_GET_INFO_MEMBER(get_tile_info_0);
TILE_GET_INFO_MEMBER(get_tile_info_1);
diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h
index 0339c9e9d27..bddb77dc363 100644
--- a/src/mame/includes/z80ne.h
+++ b/src/mame/includes/z80ne.h
@@ -111,13 +111,13 @@ public:
void init_z80net();
void init_z80netb();
void init_z80ne();
- void machine_start_z80ne() ATTR_COLD;
- void machine_reset_z80ne();
- void machine_start_z80netb() ATTR_COLD;
- void machine_reset_z80netb();
- void machine_start_z80net() ATTR_COLD;
- void machine_reset_z80net();
- void machine_reset_z80ne_base();
+ DECLARE_MACHINE_START(z80ne);
+ DECLARE_MACHINE_RESET(z80ne);
+ DECLARE_MACHINE_START(z80netb);
+ DECLARE_MACHINE_RESET(z80netb);
+ DECLARE_MACHINE_START(z80net);
+ DECLARE_MACHINE_RESET(z80net);
+ DECLARE_MACHINE_RESET(z80ne_base);
DECLARE_INPUT_CHANGED_MEMBER(z80ne_reset);
DECLARE_INPUT_CHANGED_MEMBER(z80ne_nmi);
TIMER_CALLBACK_MEMBER(z80ne_cassette_tc);
@@ -186,8 +186,8 @@ private:
void z80netf_io(address_map &map);
void z80netf_mem(address_map &map);
- void machine_start_z80netf() ATTR_COLD;
- void machine_reset_z80netf();
+ DECLARE_MACHINE_START(z80netf);
+ DECLARE_MACHINE_RESET(z80netf);
DECLARE_WRITE8_MEMBER(lx390_motor_w);
DECLARE_READ8_MEMBER(lx390_reset_bank);
diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h
index 9b89c587a47..e72bd6c2c1d 100644
--- a/src/mame/includes/zaxxon.h
+++ b/src/mame/includes/zaxxon.h
@@ -87,8 +87,8 @@ public:
virtual void machine_start() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(zaxxon);
- void video_start_razmataz() ATTR_COLD;
- void video_start_congo() ATTR_COLD;
+ DECLARE_VIDEO_START(razmataz);
+ DECLARE_VIDEO_START(congo);
uint32_t screen_update_zaxxon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_futspy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_razmataz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);