From 82348086bcb13112e15046ce44599bd84abe88d6 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 21 Nov 2018 19:11:38 +1100 Subject: (nw) misc cleanup - mostly missing #include guards and inconsistent initialiser list formatting --- src/mame/drivers/1942.cpp | 16 +++---- src/mame/drivers/pk8000.cpp | 2 +- src/mame/drivers/seta.cpp | 32 ++++++------- src/mame/includes/1942.h | 11 +++-- src/mame/includes/1943.h | 12 +++-- src/mame/includes/20pacgal.h | 7 +-- src/mame/includes/40love.h | 6 +++ src/mame/includes/8080bw.h | 4 +- src/mame/includes/88games.h | 14 ++++-- src/mame/includes/abc80x.h | 4 +- src/mame/includes/ac1.h | 3 +- src/mame/includes/advision.h | 21 ++++----- src/mame/includes/aeroboto.h | 13 ++++-- src/mame/includes/airbustr.h | 6 +++ src/mame/includes/ajax.h | 6 +++ src/mame/includes/aliens.h | 13 ++++-- src/mame/includes/alpha68k.h | 9 +++- src/mame/includes/amstrad.h | 10 +++-- src/mame/includes/angelkds.h | 13 ++++-- src/mame/includes/apple3.h | 6 ++- src/mame/includes/aquarium.h | 12 +++-- src/mame/includes/arabian.h | 58 +++++++++++++++--------- src/mame/includes/armedf.h | 20 ++++++--- src/mame/includes/asterix.h | 14 ++++-- src/mame/includes/atari400.h | 2 + src/mame/includes/atarifb.h | 8 +++- src/mame/includes/atetris.h | 17 ++++--- src/mame/includes/badlands.h | 18 ++++---- src/mame/includes/bankp.h | 13 ++++-- src/mame/includes/baraduke.h | 11 ++++- src/mame/includes/battlnts.h | 13 ++++-- src/mame/includes/bigstrkb.h | 9 +++- src/mame/includes/bionicc.h | 11 +++-- src/mame/includes/bishi.h | 13 ++++-- src/mame/includes/bk.h | 10 +++-- src/mame/includes/bladestl.h | 11 +++-- src/mame/includes/blktiger.h | 15 +++++-- src/mame/includes/bloodbro.h | 14 ++++-- src/mame/includes/blueprnt.h | 13 ++++-- src/mame/includes/bottom9.h | 14 ++++-- src/mame/includes/brkthru.h | 13 ++++-- src/mame/includes/btime.h | 6 +++ src/mame/includes/cabal.h | 14 ++++-- src/mame/includes/cbuster.h | 6 +++ src/mame/includes/channelf.h | 11 ++--- src/mame/includes/chqflag.h | 7 +++ src/mame/includes/circus.h | 13 ++++-- src/mame/includes/circusc.h | 13 ++++-- src/mame/includes/cischeat.h | 3 +- src/mame/includes/citycon.h | 13 ++++-- src/mame/includes/compgolf.h | 13 ++++-- src/mame/includes/comquest.h | 5 ++- src/mame/includes/concept.h | 10 ++--- src/mame/includes/contra.h | 13 ++++-- src/mame/includes/cop01.h | 23 ++++++---- src/mame/includes/crgolf.h | 11 ++++- src/mame/includes/crimfght.h | 13 ++++-- src/mame/includes/crospang.h | 6 +++ src/mame/includes/cvs.h | 6 +++ src/mame/includes/cxhumax.h | 41 ++++++++--------- src/mame/includes/dai.h | 7 +-- src/mame/includes/darkmist.h | 13 ++++-- src/mame/includes/dbz.h | 13 ++++-- src/mame/includes/dcon.h | 13 ++++-- src/mame/includes/ddribble.h | 13 ++++-- src/mame/includes/deadang.h | 16 ++++--- src/mame/includes/dec0.h | 7 +++ src/mame/includes/decocass.h | 43 ++++++++++-------- src/mame/includes/dgn_beta.h | 9 ++-- src/mame/includes/djmain.h | 9 +++- src/mame/includes/dragrace.h | 4 +- src/mame/includes/drmicro.h | 14 ++++-- src/mame/includes/epos.h | 8 +++- src/mame/includes/espial.h | 13 ++++-- src/mame/includes/exedexes.h | 15 +++++-- src/mame/includes/exerion.h | 13 ++++-- src/mame/includes/exprraid.h | 7 +-- src/mame/includes/exterm.h | 13 ++++-- src/mame/includes/exzisus.h | 13 ++++-- src/mame/includes/fastfred.h | 6 +++ src/mame/includes/fastlane.h | 13 ++++-- src/mame/includes/fcombat.h | 19 +++++--- src/mame/includes/finalizr.h | 6 +++ src/mame/includes/firetrap.h | 13 ++++-- src/mame/includes/firetrk.h | 8 +++- src/mame/includes/flkatck.h | 9 +++- src/mame/includes/fm7.h | 4 +- src/mame/includes/funkybee.h | 13 ++++-- src/mame/includes/funworld.h | 5 +++ src/mame/includes/fuukifg2.h | 6 +++ src/mame/includes/fuukifg3.h | 7 +++ src/mame/includes/gaelco3d.h | 50 ++++++++++++--------- src/mame/includes/galaga.h | 2 +- src/mame/includes/galaxia.h | 9 +++- src/mame/includes/galaxian.h | 6 +++ src/mame/includes/galaxold.h | 3 +- src/mame/includes/galaxy.h | 8 ++-- src/mame/includes/galeb.h | 3 +- src/mame/includes/galivan.h | 20 ++++++--- src/mame/includes/galpani2.h | 11 ++++- src/mame/includes/galpanic.h | 22 +++++---- src/mame/includes/galspnbl.h | 12 +++-- src/mame/includes/gaplus.h | 15 +++---- src/mame/includes/gberet.h | 17 ++++--- src/mame/includes/gcpinbal.h | 6 +++ src/mame/includes/gijoe.h | 13 ++++-- src/mame/includes/ginganin.h | 13 ++++-- src/mame/includes/goal92.h | 13 ++++-- src/mame/includes/goindol.h | 13 ++++-- src/mame/includes/goldstar.h | 6 +++ src/mame/includes/gomoku.h | 9 ++-- src/mame/includes/gotya.h | 14 ++++-- src/mame/includes/gradius3.h | 13 ++++-- src/mame/includes/gunsmoke.h | 13 ++++-- src/mame/includes/gyruss.h | 10 ++++- src/mame/includes/hanaawas.h | 13 ++++-- src/mame/includes/hcastle.h | 17 ++++--- src/mame/includes/hexion.h | 12 +++-- src/mame/includes/higemaru.h | 13 ++++-- src/mame/includes/himesiki.h | 21 ++++++--- src/mame/includes/hitme.h | 7 +-- src/mame/includes/hp48.h | 4 +- src/mame/includes/hyperspt.h | 7 +-- src/mame/includes/ikki.h | 23 +++++++--- src/mame/includes/intv.h | 7 +-- src/mame/includes/iqblock.h | 13 ++++-- src/mame/includes/ironhors.h | 13 ++++-- src/mame/includes/itech32.h | 24 ++++++---- src/mame/includes/jack.h | 10 ++++- src/mame/includes/jackal.h | 15 +++++-- src/mame/includes/jailbrek.h | 13 ++++-- src/mame/includes/kaneko16.h | 20 ++++----- src/mame/includes/kchamp.h | 13 ++++-- src/mame/includes/kncljoe.h | 13 ++++-- src/mame/includes/konamigx.h | 2 + src/mame/includes/kramermc.h | 10 +++-- src/mame/includes/kyocera.h | 11 ++--- src/mame/includes/labyrunr.h | 13 ++++-- src/mame/includes/lasso.h | 13 ++++-- src/mame/includes/lastduel.h | 8 +++- src/mame/includes/lazercmd.h | 10 ++++- src/mame/includes/legionna.h | 36 ++++++++------- src/mame/includes/lethal.h | 13 ++++-- src/mame/includes/liberate.h | 13 ++++-- src/mame/includes/lisa.h | 4 +- src/mame/includes/lvcards.h | 13 ++++-- src/mame/includes/lviv.h | 3 +- src/mame/includes/m10.h | 13 ++++-- src/mame/includes/m107.h | 6 +++ src/mame/includes/m52.h | 8 +++- src/mame/includes/m57.h | 13 ++++-- src/mame/includes/m58.h | 11 ++++- src/mame/includes/m62.h | 18 +++++--- src/mame/includes/m92.h | 9 +++- src/mame/includes/mac.h | 10 ++--- src/mame/includes/macpci.h | 6 +-- src/mame/includes/macrossp.h | 10 ++++- src/mame/includes/madalien.h | 9 ++-- src/mame/includes/magmax.h | 14 ++++-- src/mame/includes/mainevt.h | 7 +++ src/mame/includes/mappy.h | 4 +- src/mame/includes/mbee.h | 3 +- src/mame/includes/mcr.h | 12 +++-- src/mame/includes/mcr3.h | 6 +++ src/mame/includes/mcr68.h | 10 ++++- src/mame/includes/meadows.h | 7 +++ src/mame/includes/megasys1.h | 12 +++-- src/mame/includes/megazone.h | 10 ++++- src/mame/includes/mermaid.h | 10 ++++- src/mame/includes/midtunit.h | 13 ++++-- src/mame/includes/midwunit.h | 20 ++++++--- src/mame/includes/midxunit.h | 13 ++++-- src/mame/includes/mikie.h | 13 ++++-- src/mame/includes/mikro80.h | 9 ++-- src/mame/includes/mjkjidai.h | 14 ++++-- src/mame/includes/momoko.h | 13 ++++-- src/mame/includes/moo.h | 14 ++++-- src/mame/includes/mrjong.h | 32 ++++++++----- src/mame/includes/mustache.h | 13 ++++-- src/mame/includes/mystwarr.h | 10 ++--- src/mame/includes/mz700.h | 3 +- src/mame/includes/mz80.h | 5 ++- src/mame/includes/namcona1.h | 18 +++++--- src/mame/includes/namconb1.h | 9 +++- src/mame/includes/namcos1.h | 7 +++ src/mame/includes/namcos86.h | 7 +++ src/mame/includes/naughtyb.h | 14 ++++-- src/mame/includes/nc.h | 3 +- src/mame/includes/newbrain.h | 4 +- src/mame/includes/nmk16.h | 13 ++++-- src/mame/includes/orao.h | 7 +-- src/mame/includes/osi.h | 6 +-- src/mame/includes/overdriv.h | 6 +++ src/mame/includes/pacland.h | 14 ++++-- src/mame/includes/parodius.h | 13 ++++-- src/mame/includes/pastelg.h | 14 ++++-- src/mame/includes/pcktgal.h | 13 ++++-- src/mame/includes/pcw.h | 19 ++++---- src/mame/includes/pgm.h | 2 + src/mame/includes/pingpong.h | 13 ++++-- src/mame/includes/pirates.h | 14 ++++-- src/mame/includes/pk8000.h | 14 ++++-- src/mame/includes/pk8020.h | 13 +++--- src/mame/includes/playmark.h | 14 ++++-- src/mame/includes/plygonet.h | 4 +- src/mame/includes/pmd85.h | 3 +- src/mame/includes/poly88.h | 10 +++-- src/mame/includes/pooyan.h | 13 ++++-- src/mame/includes/powerins.h | 3 +- src/mame/includes/psikyo.h | 6 +++ src/mame/includes/psikyosh.h | 14 ++++-- src/mame/includes/px8.h | 15 ++++--- src/mame/includes/qdrmfgp.h | 10 ++++- src/mame/includes/quasar.h | 9 +++- src/mame/includes/quizpani.h | 14 ++++-- src/mame/includes/raiden.h | 10 ++++- src/mame/includes/raiden2.h | 56 ++++++++++++----------- src/mame/includes/rallyx.h | 32 ++++++++----- src/mame/includes/rockrage.h | 13 ++++-- src/mame/includes/rocnrope.h | 10 ++++- src/mame/includes/rungun.h | 12 +++-- src/mame/includes/sauro.h | 13 ++++-- src/mame/includes/sbugger.h | 13 ++++-- src/mame/includes/scotrsht.h | 13 ++++-- src/mame/includes/scramble.h | 10 ++++- src/mame/includes/sderby.h | 6 +++ src/mame/includes/seicross.h | 14 ++++-- src/mame/includes/senjyo.h | 14 ++++-- src/mame/includes/seta.h | 33 +++++++------- src/mame/includes/shangha3.h | 11 ++++- src/mame/includes/shaolins.h | 13 ++++-- src/mame/includes/shootout.h | 13 ++++-- src/mame/includes/sidearms.h | 11 ++++- src/mame/includes/sidepckt.h | 10 ++++- src/mame/includes/simpsons.h | 14 ++++-- src/mame/includes/skyfox.h | 10 ++++- src/mame/includes/skykid.h | 7 +++ src/mame/includes/snookr10.h | 6 +++ src/mame/includes/sonson.h | 13 ++++-- src/mame/includes/sorcerer.h | 15 ++++--- src/mame/includes/speedatk.h | 13 ++++-- src/mame/includes/spiders.h | 6 +++ src/mame/includes/sprint2.h | 7 +-- src/mame/includes/spy.h | 14 ++++-- src/mame/includes/srmp2.h | 23 ++++++---- src/mame/includes/sslam.h | 13 ++++-- src/mame/includes/sspeedr.h | 8 +++- src/mame/includes/ssv.h | 10 ++++- src/mame/includes/stactics.h | 5 +++ src/mame/includes/starcrus.h | 11 ++++- src/mame/includes/stfight.h | 7 +++ src/mame/includes/sub.h | 12 ++--- src/mame/includes/subs.h | 2 + src/mame/includes/suna8.h | 6 +++ src/mame/includes/superqix.h | 31 ++++++++----- src/mame/includes/surpratk.h | 13 ++++-- src/mame/includes/system1.h | 12 +++-- src/mame/includes/system16.h | 6 +++ src/mame/includes/tankbatt.h | 13 ++++-- src/mame/includes/tceptor.h | 7 +++ src/mame/includes/tdv2324.h | 24 +++++----- src/mame/includes/tecmo16.h | 6 +++ src/mame/includes/terracre.h | 19 +++++--- src/mame/includes/thunderx.h | 14 ++++-- src/mame/includes/timeplt.h | 10 ++++- src/mame/includes/tmnt.h | 14 ++++-- src/mame/includes/toki.h | 13 ++++-- src/mame/includes/tp84.h | 8 ++-- src/mame/includes/trackfld.h | 7 +-- src/mame/includes/travrusa.h | 15 +++++-- src/mame/includes/trs80.h | 2 +- src/mame/includes/trs80m2.h | 4 +- src/mame/includes/tryout.h | 13 ++++-- src/mame/includes/tubep.h | 14 ++++-- src/mame/includes/tumbleb.h | 10 ++++- src/mame/includes/turbo.h | 6 +++ src/mame/includes/turrett.h | 14 +++--- src/mame/includes/tutankhm.h | 6 +++ src/mame/includes/twin16.h | 14 ++++-- src/mame/includes/ultraman.h | 6 +++ src/mame/includes/ut88.h | 2 +- src/mame/includes/v1050.h | 2 - src/mame/includes/vc4000.h | 105 ++++++++++++++++++++++--------------------- src/mame/includes/vector06.h | 7 +-- src/mame/includes/vendetta.h | 20 ++++++--- src/mame/includes/vulgus.h | 10 ++++- src/mame/includes/warpwarp.h | 10 ++++- src/mame/includes/williams.h | 31 ++++++++----- src/mame/includes/wiz.h | 10 ++++- src/mame/includes/x07.h | 20 ++++----- src/mame/includes/xevious.h | 7 +-- src/mame/includes/xexex.h | 10 ++++- src/mame/includes/xmen.h | 13 ++++-- src/mame/includes/xorworld.h | 13 ++++-- src/mame/includes/zaxxon.h | 12 +++-- src/mame/includes/zerozone.h | 6 +++ src/mame/video/advision.cpp | 6 +-- src/mame/video/bosco.cpp | 10 ++--- src/mame/video/galaga.cpp | 10 ++--- src/mame/video/pacland.cpp | 64 +++++++++++++------------- src/mame/video/pk8020.cpp | 17 +++---- src/mame/video/seta.cpp | 2 +- 302 files changed, 2635 insertions(+), 1084 deletions(-) diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp index ba67e7b30f0..c35f9baee7a 100644 --- a/src/mame/drivers/1942.cpp +++ b/src/mame/drivers/1942.cpp @@ -225,20 +225,20 @@ void _1942p_state::_1942p_map(address_map &map) map(0x0000, 0x7fff).rom(); map(0x8000, 0xbfff).bankr("bank1"); - map(0xd000, 0xd7ff).ram().w(FUNC(_1942_state::_1942_fgvideoram_w)).share("fg_videoram"); - map(0xd800, 0xdbff).ram().w(FUNC(_1942_state::_1942_bgvideoram_w)).share("bg_videoram"); + map(0xd000, 0xd7ff).ram().w(FUNC(_1942p_state::_1942_fgvideoram_w)).share("fg_videoram"); + map(0xd800, 0xdbff).ram().w(FUNC(_1942p_state::_1942_bgvideoram_w)).share("bg_videoram"); map(0xe000, 0xefff).ram(); map(0xce00, 0xcfff).ram().share("spriteram"); - map(0xdc02, 0xdc03).w(FUNC(_1942_state::_1942_scroll_w)); - map(0xc804, 0xc804).w(FUNC(_1942_state::_1942_c804_w)); - map(0xc805, 0xc805).w(FUNC(_1942_state::_1942_palette_bank_w)); + map(0xdc02, 0xdc03).w(FUNC(_1942p_state::_1942_scroll_w)); + map(0xc804, 0xc804).w(FUNC(_1942p_state::_1942_c804_w)); + map(0xc805, 0xc805).w(FUNC(_1942p_state::_1942_palette_bank_w)); map(0xf000, 0xf3ff).ram().w(FUNC(_1942p_state::_1942p_palette_w)).share("protopal"); - map(0xf400, 0xf400).w(FUNC(_1942_state::_1942_bankswitch_w)); + map(0xf400, 0xf400).w(FUNC(_1942p_state::_1942_bankswitch_w)); map(0xf500, 0xf500).w(m_soundlatch, FUNC(generic_latch_8_device::write)); map(0xf600, 0xf600).w(FUNC(_1942p_state::_1942p_f600_w)); @@ -634,12 +634,12 @@ MACHINE_CONFIG_START(_1942p_state::_1942p) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CPU_CLOCK_1942P) /* 4 MHz - verified on PCB */ MCFG_DEVICE_PROGRAM_MAP(_1942p_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _1942_state, irq0_line_hold) // note, powerups won't move down the screen with the original '1942' logic. + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _1942p_state, irq0_line_hold) // note, powerups won't move down the screen with the original '1942' logic. MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CPU_CLOCK_1942P) /* 4 MHz - verified on PCB */ MCFG_DEVICE_PROGRAM_MAP(_1942p_sound_map) MCFG_DEVICE_IO_MAP(_1942p_sound_io) - MCFG_DEVICE_PERIODIC_INT_DRIVER(_1942_state, irq0_line_hold, 4*60) + MCFG_DEVICE_PERIODIC_INT_DRIVER(_1942p_state, irq0_line_hold, 4*60) /* video hardware */ diff --git a/src/mame/drivers/pk8000.cpp b/src/mame/drivers/pk8000.cpp index e863bb47310..c832f6127c7 100644 --- a/src/mame/drivers/pk8000.cpp +++ b/src/mame/drivers/pk8000.cpp @@ -378,7 +378,7 @@ MACHINE_CONFIG_START(pk8000_state::pk8000) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 16) - MCFG_PALETTE_INIT_OWNER(pk8000_base_state, pk8000) + MCFG_PALETTE_INIT_OWNER(pk8000_state, pk8000) i8255_device &ppi1(I8255(config, "ppi8255_1")); ppi1.out_pa_callback().set(FUNC(pk8000_state::_80_porta_w)); diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 451ff7f4a64..b4dba0a304d 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -1396,7 +1396,9 @@ Note: on screen copyright is (c)1998 Coinmaster. #include -#if __uPD71054_TIMER +#define USE_uPD71054_TIMER 1 + +#if USE_uPD71054_TIMER // this mess should be replaced with pit8254, see madshark #define USED_TIMER_NUM 1 @@ -1490,7 +1492,7 @@ WRITE16_MEMBER(seta_state::timer_regs_w) break; } } -#endif // __uPD71054_TIMER +#endif // USE_uPD71054_TIMER @@ -2032,7 +2034,7 @@ void seta_state::wrofaero_map(address_map &map) map(0xa80000, 0xa80001).ram(); // ? 0x4000 map(0xb00000, 0xb03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound -#if __uPD71054_TIMER +#if USE_uPD71054_TIMER map(0xd00000, 0xd00007).w(FUNC(seta_state::timer_regs_w)); // ? #else map(0xd00000, 0xd00007).nopw(); // ? @@ -2091,7 +2093,7 @@ void seta_state::zingzipbl_map(address_map &map) map(0xa80000, 0xa80001).ram(); // ? 0x4000 map(0xb00000, 0xb03fff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // Sprites Code + X + Attr map(0xc00000, 0xc03fff).ram(); // soundram on original -#if __uPD71054_TIMER +#if USE_uPD71054_TIMER map(0xd00000, 0xd00007).w(FUNC(seta_state::timer_regs_w)); // ? #else map(0xd00000, 0xd00007).nopw(); // ? @@ -2126,7 +2128,7 @@ void seta_state::jjsquawb_map(address_map &map) // AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000 map(0xb0c000, 0xb0ffff).ram().rw(m_seta001, FUNC(seta001_device::spritecode_r16), FUNC(seta001_device::spritecode_w16)); // RZ: Sprites Code + X + Attr map(0xc00000, 0xc03fff).rw(m_x1, FUNC(x1_010_device::word_r), FUNC(x1_010_device::word_w)); // Sound -#if __uPD71054_TIMER +#if USE_uPD71054_TIMER map(0xd00000, 0xd00007).w(FUNC(seta_state::timer_regs_w)); // ? #else map(0xd00000, 0xd00007).nopw(); // ? @@ -8692,14 +8694,14 @@ MACHINE_CONFIG_END /*************************************************************************** Gundhara ***************************************************************************/ -#if __uPD71054_TIMER +#if USE_uPD71054_TIMER INTERRUPT_GEN_MEMBER(seta_state::wrofaero_interrupt) { device.execute().set_input_line(2, HOLD_LINE ); } MACHINE_START_MEMBER(seta_state,wrofaero){ uPD71054_timer_init(); } -#endif // __uPD71054_TIMER +#endif // USE_uPD71054_TIMER @@ -8714,17 +8716,17 @@ MACHINE_CONFIG_START(seta_state::gundhara) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */ MCFG_DEVICE_PROGRAM_MAP(wrofaero_map) -#if __uPD71054_TIMER +#if USE_uPD71054_TIMER MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1) #else MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_2_and_4, "screen", 0, 1) -#endif // __uPD71054_TIMER +#endif // USE_uPD71054_TIMER WATCHDOG_TIMER(config, "watchdog"); -#if __uPD71054_TIMER +#if USE_uPD71054_TIMER MCFG_MACHINE_START_OVERRIDE(seta_state, wrofaero ) -#endif // __uPD71054_TIMER +#endif // USE_uPD71054_TIMER MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") @@ -9589,17 +9591,17 @@ MACHINE_CONFIG_START(seta_state::wrofaero) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */ MCFG_DEVICE_PROGRAM_MAP(wrofaero_map) -#if __uPD71054_TIMER +#if USE_uPD71054_TIMER MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, wrofaero_interrupt) #else MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_2_and_4, "screen", 0, 1) -#endif // __uPD71054_TIMER +#endif // USE_uPD71054_TIMER WATCHDOG_TIMER(config, "watchdog"); -#if __uPD71054_TIMER +#if USE_uPD71054_TIMER MCFG_MACHINE_START_OVERRIDE(seta_state, wrofaero ) -#endif // __uPD71054_TIMER +#endif // USE_uPD71054_TIMER MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0) MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode") diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 5f867b403ca..30d720ec67e 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -5,6 +5,10 @@ 1942 ***************************************************************************/ +#ifndef MAME_INCLUDES_1942_H +#define MAME_INCLUDES_1942_H + +#pragma once #include "machine/gen_latch.h" #include "machine/timer.h" @@ -12,8 +16,6 @@ class _1942_state : public driver_device { - friend class _1942p_state; - public: _1942_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) @@ -24,7 +26,8 @@ public: , m_maincpu(*this, "maincpu") , m_gfxdecode(*this, "gfxdecode") , m_palette(*this, "palette") - , m_soundlatch(*this, "soundlatch") { } + , m_soundlatch(*this, "soundlatch") + { } void driver_init() override; @@ -97,3 +100,5 @@ protected: required_shared_ptr m_protopal; }; + +#endif // MAME_INCLUDES_1942_H diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index 67a197cfc70..490eb23775a 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -5,14 +5,18 @@ 1943 ***************************************************************************/ +#ifndef MAME_INCLUDES_1943_H +#define MAME_INCLUDES_1943_H + +#pragma once #include "emupal.h" class _1943_state : public driver_device { public: - _1943_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + _1943_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), @@ -69,8 +73,10 @@ private: virtual void video_start() override; DECLARE_PALETTE_INIT(1943); uint32_t screen_update_1943(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); + void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority); void c1943_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_1943_H diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h index 8b503fd3095..0c901497c37 100644 --- a/src/mame/includes/20pacgal.h +++ b/src/mame/includes/20pacgal.h @@ -31,7 +31,8 @@ public: m_mainbank(*this, "mainbank"), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void _20pacgal(machine_config &config); void _20pacgal_video(machine_config &config); @@ -100,8 +101,8 @@ protected: class _25pacman_state : public _20pacgal_state { public: - _25pacman_state(const machine_config &mconfig, device_type type, const char *tag) - : _20pacgal_state(mconfig, type, tag) + _25pacman_state(const machine_config &mconfig, device_type type, const char *tag) : + _20pacgal_state(mconfig, type, tag) { } void _25pacman(machine_config &config); diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index 10538c194d9..b1a7fbd82c1 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -1,5 +1,9 @@ // license:GPL-2.0+ // copyright-holders:Jarek Burczynski +#ifndef MAME_INCLUDES_40LOVE_H +#define MAME_INCLUDES_40LOVE_H + +#pragma once #include "machine/taito68705interface.h" #include "machine/gen_latch.h" @@ -114,3 +118,5 @@ private: uint8_t m_snd_ctrl2; uint8_t m_snd_ctrl3; }; + +#endif // MAME_INCLUDES_40LOVE_H diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index 1aa38f84a98..ab9195e1c3f 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -29,8 +29,8 @@ class _8080bw_state : public mw8080bw_state { public: - _8080bw_state(const machine_config &mconfig, device_type type, const char *tag) - : mw8080bw_state(mconfig, type, tag), + _8080bw_state(const machine_config &mconfig, device_type type, const char *tag) : + mw8080bw_state(mconfig, type, tag), m_schaser_effect_555_timer(*this, "schaser_sh_555"), m_claybust_gun_on(*this, "claybust_gun"), m_speaker(*this, "speaker"), diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index f2be76aa93d..dedf1a44e46 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -5,6 +5,11 @@ 88 Games *************************************************************************/ +#ifndef MAME_INCLUDES_88GAMES_H +#define MAME_INCLUDES_88GAMES_H + +#pragma once + #include "sound/upd7759.h" #include "video/k052109.h" #include "video/k051960.h" @@ -14,8 +19,8 @@ class _88games_state : public driver_device { public: - _88games_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + _88games_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k052109(*this, "k052109"), @@ -24,7 +29,8 @@ public: m_upd7759(*this, "upd%d", 1), m_bank0000(*this, "bank0000"), m_bank1000(*this, "bank1000"), - m_ram(*this, "ram") { } + m_ram(*this, "ram") + { } void _88games(machine_config &config); @@ -70,3 +76,5 @@ private: void main_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_88GAMES_H diff --git a/src/mame/includes/abc80x.h b/src/mame/includes/abc80x.h index ec65b0f910f..606b1013a46 100644 --- a/src/mame/includes/abc80x.h +++ b/src/mame/includes/abc80x.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once - #ifndef MAME_INCLUDES_ABC800_H #define MAME_INCLUDES_ABC800_H +#pragma once + #include "bus/abcbus/abcbus.h" #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" diff --git a/src/mame/includes/ac1.h b/src/mame/includes/ac1.h index ec7c616a69f..b8edbccb24d 100644 --- a/src/mame/includes/ac1.h +++ b/src/mame/includes/ac1.h @@ -5,10 +5,11 @@ * includes/ac1.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_AC1_H #define MAME_INCLUDES_AC1_H +#pragma once + #include "machine/z80pio.h" #include "imagedev/cassette.h" #include "emupal.h" diff --git a/src/mame/includes/advision.h b/src/mame/includes/advision.h index 1063d455b5c..6fc4f70231d 100644 --- a/src/mame/includes/advision.h +++ b/src/mame/includes/advision.h @@ -5,10 +5,11 @@ * includes/advision.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_ADVISION_H #define MAME_INCLUDES_ADVISION_H +#pragma once + #include "sound/dac.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" @@ -22,14 +23,14 @@ class advision_state : public driver_device { public: advision_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, I8048_TAG), - m_soundcpu(*this, COP411_TAG), - m_dac(*this, "dac"), - m_cart(*this, "cartslot"), - m_bank1(*this, "bank1"), - m_joy(*this, "joystick"), - m_palette(*this, "palette") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, I8048_TAG) + , m_soundcpu(*this, COP411_TAG) + , m_dac(*this, "dac") + , m_cart(*this, "cartslot") + , m_bank1(*this, "bank1") + , m_joy(*this, "joystick") + , m_palette(*this, "palette") { } required_device m_maincpu; @@ -78,7 +79,7 @@ public: int m_video_bank; int m_video_hpos; uint8_t m_led_latch[8]; - std::vector m_display; + std::unique_ptr m_display; /* sound state */ int m_sound_cmd; diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index 68f284179bc..d851db0b32c 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -5,14 +5,18 @@ Aeroboto ***************************************************************************/ +#ifndef MAME_INCLUDES_AEROBOTO_H +#define MAME_INCLUDES_AEROBOTO_H + +#pragma once #include "emupal.h" class aeroboto_state : public driver_device { public: - aeroboto_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + aeroboto_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), m_videoram(*this, "videoram"), m_hscroll(*this, "hscroll"), @@ -25,7 +29,8 @@ public: m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } /* memory pointers */ required_shared_ptr m_mainram; @@ -77,3 +82,5 @@ public: void main_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_AEROBOTO_H diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index c40c357f4a3..7a420c8c612 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -5,6 +5,10 @@ Air Buster *************************************************************************/ +#ifndef MAME_INCLUDES_AIRBUSTR_H +#define MAME_INCLUDES_AIRBUSTR_H + +#pragma once #include "machine/gen_latch.h" #include "machine/timer.h" @@ -90,3 +94,5 @@ public: void sound_io_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_AIRBUSTR_H diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index 2c045b4ee50..cbb7a31f09c 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia +#ifndef MAME_INCLUDES_AJAX_H +#define MAME_INCLUDES_AJAX_H + +#pragma once #include "machine/gen_latch.h" #include "machine/watchdog.h" @@ -71,3 +75,5 @@ protected: required_device m_soundlatch; output_finder<8> m_lamps; }; + +#endif // MAME_INCLUDES_AJAX_H diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h index f8bafbc52ae..7fd4d0a3a4b 100644 --- a/src/mame/includes/aliens.h +++ b/src/mame/includes/aliens.h @@ -5,6 +5,10 @@ Aliens *************************************************************************/ +#ifndef MAME_INCLUDES_ALIENS_H +#define MAME_INCLUDES_ALIENS_H + +#pragma once #include "machine/bankdev.h" #include "machine/gen_latch.h" @@ -15,8 +19,8 @@ class aliens_state : public driver_device { public: - aliens_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + aliens_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_bank0000(*this, "bank0000"), @@ -24,7 +28,8 @@ public: m_k052109(*this, "k052109"), m_k051960(*this, "k051960"), m_soundlatch(*this, "soundlatch"), - m_rombank(*this, "rombank") { } + m_rombank(*this, "rombank") + { } /* devices */ required_device m_maincpu; @@ -53,3 +58,5 @@ public: void aliens_sound_map(address_map &map); void bank0000_map(address_map &map); }; + +#endif // MAME_INCLUDES_ALIENS_H diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index c55baf3b67c..c03a55205d3 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -5,6 +5,10 @@ SNK/Alpha 68000 based games *************************************************************************/ +#ifndef MAME_INCLUDES_ALPHA68K_H +#define MAME_INCLUDES_ALPHA68K_H + +#pragma once #include "machine/74259.h" #include "machine/gen_latch.h" @@ -26,7 +30,8 @@ public: m_soundlatch(*this, "soundlatch"), m_color_proms(*this, "color_proms"), m_in(*this, "IN%u", 0U), - m_audiobank(*this, "audiobank") { } + m_audiobank(*this, "audiobank") + { } void tnextspc(machine_config &config); void alpha68k_II(machine_config &config); @@ -170,3 +175,5 @@ enum ALPHA68K_JONGBOU, // used in kyros_alpha_trigger_r & kyros_draw_sprites ALPHA68K_KYROS // used in kyros_draw_sprites }; + +#endif // MAME_INCLUDES_ALPHA68K_H diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h index 5394dda5d1c..7b3b1bda601 100644 --- a/src/mame/includes/amstrad.h +++ b/src/mame/includes/amstrad.h @@ -5,10 +5,11 @@ * includes/amstrad.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_AMSTRAD_H #define MAME_INCLUDES_AMSTRAD_H +#pragma once + #include "cpu/z80/z80.h" #include "sound/ay8910.h" #include "machine/upd765.h" @@ -127,8 +128,8 @@ public: TIMER_SET_RESOLUTION }; - amstrad_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + amstrad_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ay(*this, "ay"), m_fdc(*this, "upd765"), @@ -168,7 +169,8 @@ public: m_io_green_display(*this, "green_display"), m_io_ctrltype(*this,"controller_type"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } required_device m_maincpu; required_device m_ay; diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index eb4b63446fd..94addea45ea 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -5,12 +5,16 @@ Angel Kids *************************************************************************/ +#ifndef MAME_INCLUDES_ANGELKDS_H +#define MAME_INCLUDES_ANGELKDS_H + +#pragma once class angelkds_state : public driver_device { public: - angelkds_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + angelkds_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_bgtopvideoram(*this, "bgtopvideoram"), m_bgbotvideoram(*this, "bgbotvideoram"), m_txvideoram(*this, "txvideoram"), @@ -18,7 +22,8 @@ public: m_subcpu(*this, "sub"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_decrypted_opcodes(*this, "decrypted_opcodes") { } + m_decrypted_opcodes(*this, "decrypted_opcodes") + { } /* memory pointers */ required_shared_ptr m_bgtopvideoram; @@ -74,3 +79,5 @@ public: void sub_map(address_map &map); void sub_portmap(address_map &map); }; + +#endif // MAME_INCLUDES_ANGELKDS_H diff --git a/src/mame/includes/apple3.h b/src/mame/includes/apple3.h index 36e2c62702c..840d549b8e0 100644 --- a/src/mame/includes/apple3.h +++ b/src/mame/includes/apple3.h @@ -11,6 +11,8 @@ #ifndef MAME_INCLUDES_APPLE3_H #define MAME_INCLUDES_APPLE3_H +#pragma once + #include "cpu/m6502/m6502.h" #include "machine/ram.h" #include "machine/timer.h" @@ -38,8 +40,8 @@ class apple3_state : public driver_device { public: - apple3_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + apple3_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), m_via(*this, "via6522_%u", 0), diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index cce419c1a37..a5ef0d04b21 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood +#ifndef MAME_INCLUDES_AQUARIUM_H +#define MAME_INCLUDES_AQUARIUM_H + +#pragma once #include "machine/gen_latch.h" #include "machine/mb3773.h" @@ -11,8 +15,8 @@ class aquarium_state : public driver_device { public: - aquarium_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + aquarium_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_mid_videoram(*this, "mid_videoram"), m_bak_videoram(*this, "bak_videoram"), m_txt_videoram(*this, "txt_videoram"), @@ -26,7 +30,7 @@ public: m_screen(*this, "screen"), m_soundlatch(*this, "soundlatch"), m_watchdog(*this, "watchdog") - { } + { } /* memory pointers */ required_shared_ptr m_mid_videoram; @@ -71,3 +75,5 @@ public: void snd_map(address_map &map); void snd_portmap(address_map &map); }; + +#endif // MAME_INCLUDES_AQUARIUM_H diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index 2f438baf15d..8caf579387b 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -7,35 +7,36 @@ driver by Dan Boris ***************************************************************************/ +#ifndef MAME_INCLUDES_ARABIAN_H +#define MAME_INCLUDES_ARABIAN_H + +#pragma once #include "emupal.h" class arabian_state : public driver_device { public: - arabian_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + arabian_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_custom_cpu_ram(*this, "custom_cpu_ram"), m_blitter(*this, "blitter"), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } - /* memory pointers */ - required_shared_ptr m_custom_cpu_ram; - required_shared_ptr m_blitter; + void arabian(machine_config &config); - std::unique_ptr m_main_bitmap; - std::unique_ptr m_converted_gfx; +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; - /* video-related */ - uint8_t m_video_control; - uint8_t m_flip_screen; + void main_io_map(address_map &map); + void main_map(address_map &map); - /* MCU */ - uint8_t m_mcu_port_o; - uint8_t m_mcu_port_p; - uint8_t m_mcu_port_r[4]; +private: DECLARE_READ8_MEMBER(mcu_port_r0_r); DECLARE_READ8_MEMBER(mcu_port_r1_r); DECLARE_READ8_MEMBER(mcu_port_r2_r); @@ -51,16 +52,29 @@ public: DECLARE_WRITE8_MEMBER(arabian_videoram_w); DECLARE_WRITE8_MEMBER(ay8910_porta_w); DECLARE_WRITE8_MEMBER(ay8910_portb_w); - virtual void machine_start() override; - virtual void machine_reset() override; - virtual void video_start() override; DECLARE_PALETTE_INIT(arabian); uint32_t screen_update_arabian(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void blit_area( uint8_t plane, uint16_t src, uint8_t x, uint8_t y, uint8_t sx, uint8_t sy ); + void blit_area(uint8_t plane, uint16_t src, uint8_t x, uint8_t y, uint8_t sx, uint8_t sy); + + /* memory pointers */ + required_shared_ptr m_custom_cpu_ram; + required_shared_ptr m_blitter; + + std::unique_ptr m_main_bitmap; + std::unique_ptr m_converted_gfx; + + /* video-related */ + uint8_t m_video_control; + uint8_t m_flip_screen; + + /* MCU */ + uint8_t m_mcu_port_o; + uint8_t m_mcu_port_p; + uint8_t m_mcu_port_r[4]; + required_device m_maincpu; required_device m_mcu; required_device m_palette; - void arabian(machine_config &config); - void main_io_map(address_map &map); - void main_map(address_map &map); }; + +#endif // MAME_INCLUDES_ARABIAN_H diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index 77741c3b870..60df76e44b4 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Phil Stroffolino, Carlos A. Lozano +#ifndef MAME_INCLUDES_ARMEDF_H +#define MAME_INCLUDES_ARMEDF_H + +#pragma once #include "machine/nb1414m4.h" #include "machine/gen_latch.h" @@ -9,8 +13,8 @@ class armedf_state : public driver_device { public: - armedf_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + armedf_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_extra(*this, "extra"), m_nb1414m4(*this, "nb1414m4"), @@ -60,14 +64,14 @@ protected: required_device m_spriteram; required_device m_soundlatch; - /* memory pointers */ + // memory pointers std::unique_ptr m_text_videoram; required_shared_ptr m_spr_pal_clut; required_shared_ptr m_fg_videoram; required_shared_ptr m_bg_videoram; uint16_t m_legion_cmd[4]; // legionjb only! - /* video-related */ + // video-related tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; tilemap_t *m_tx_tilemap; @@ -139,11 +143,11 @@ protected: class bigfghtr_state : public armedf_state { public: - bigfghtr_state(const machine_config &mconfig, device_type type, const char *tag) - : armedf_state(mconfig, type, tag), + bigfghtr_state(const machine_config &mconfig, device_type type, const char *tag) : + armedf_state(mconfig, type, tag), m_mcu(*this, "mcu"), m_sharedram(*this, "sharedram") - { } + { } void bigfghtr(machine_config &config); @@ -159,3 +163,5 @@ private: void bigfghtr_mcu_io_map(address_map &map); void bigfghtr_mcu_map(address_map &map); }; + +#endif // MAME_INCLUDES_ARMEDF_H diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index 22be780bcde..5bceb9f5c59 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -5,6 +5,11 @@ Asterix *************************************************************************/ +#ifndef MAME_INCLUDES_ASTERIX_H +#define MAME_INCLUDES_ASTERIX_H + +#pragma once + #include "video/k053251.h" #include "video/k054156_k054157_k056832.h" #include "video/k053244_k053245.h" @@ -18,13 +23,14 @@ public: TIMER_NMI }; - asterix_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + asterix_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k056832(*this, "k056832"), m_k053244(*this, "k053244"), - m_k053251(*this, "k053251") { } + m_k053251(*this, "k053251") + { } /* video-related */ int m_sprite_colorbase; @@ -64,3 +70,5 @@ public: protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_ASTERIX_H diff --git a/src/mame/includes/atari400.h b/src/mame/includes/atari400.h index b5d0c083f9e..5fffac63604 100644 --- a/src/mame/includes/atari400.h +++ b/src/mame/includes/atari400.h @@ -14,6 +14,8 @@ #ifndef MAME_INCLUDES_ATARI400_H #define MAME_INCLUDES_ATARI400_H +#pragma once + #include "machine/6821pia.h" #include "machine/ram.h" #include "sound/pokey.h" diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index e4bbc66eb05..6827d9e22fd 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -5,6 +5,10 @@ Atari Football hardware *************************************************************************/ +#ifndef MAME_INCLUDES_ATARIFB_H +#define MAME_INCLUDES_ATARIFB_H + +#pragma once #include "sound/discrete.h" #include "emupal.h" @@ -114,6 +118,8 @@ protected: output_finder<2> m_leds; }; -/*----------- defined in audio/atarifb.c -----------*/ +//----------- defined in audio/atarifb.cpp ----------- DISCRETE_SOUND_EXTERN( atarifb_discrete ); DISCRETE_SOUND_EXTERN( abaseb_discrete ); + +#endif // MAME_INCLUDES_ATARIFB_H diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index 0f23296f613..a6d8e90fe29 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -5,6 +5,10 @@ Atari Tetris hardware *************************************************************************/ +#ifndef MAME_INCLUDES_ATETRIS_H +#define MAME_INCLUDES_ATETRIS_H + +#pragma once #include "includes/slapstic.h" #include "cpu/mcs48/mcs48.h" @@ -15,14 +19,15 @@ class atetris_state : public driver_device { public: - atetris_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + atetris_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), m_slapstic(*this, "slapstic"), m_videoram(*this, "videoram") - { } + { + } void atetris_base(machine_config &config); void atetris(machine_config &config); @@ -64,8 +69,8 @@ protected: class atetris_mcu_state : public atetris_state { public: - atetris_mcu_state(const machine_config &mconfig, device_type type, const char *tag) - : atetris_state(mconfig, type, tag), + atetris_mcu_state(const machine_config &mconfig, device_type type, const char *tag) : + atetris_state(mconfig, type, tag), m_mcu(*this, "mcu"), m_soundlatch(*this, "soundlatch%u", 1U), m_sn(*this, "sn%u", 1U) @@ -85,3 +90,5 @@ private: required_device_array m_soundlatch; required_device_array m_sn; }; + +#endif // MAME_INCLUDES_ATETRIS_H diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index 612aed65c48..1b45cffd8a9 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -33,15 +33,15 @@ class badlands_state : public driver_device { public: badlands_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), - m_soundcomm(*this, "soundcomm"), - m_screen(*this, "screen"), - m_gfxdecode(*this, "gfxdecode"), - m_playfield_tilemap(*this, "playfield"), - m_mob(*this, "mob") - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_audiocpu(*this, "audiocpu") + , m_soundcomm(*this, "soundcomm") + , m_screen(*this, "screen") + , m_gfxdecode(*this, "gfxdecode") + , m_playfield_tilemap(*this, "playfield") + , m_mob(*this, "mob") + { } required_device m_maincpu; optional_device m_audiocpu; diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index d5838de2248..5f7e9552a5b 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -5,21 +5,26 @@ Bank Panic ***************************************************************************/ +#ifndef MAME_INCLUDES_BANKP_H +#define MAME_INCLUDES_BANKP_H + +#pragma once #include "emupal.h" class bankp_state : public driver_device { public: - bankp_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + bankp_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } /* memory pointers */ required_shared_ptr m_videoram; @@ -54,3 +59,5 @@ public: void bankp_io_map(address_map &map); void bankp_map(address_map &map); }; + +#endif // MAME_INCLUDES_BANKP_H diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index e0d24f56c59..80cc9f4205e 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -1,13 +1,18 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia +#ifndef MAME_INCLUDES_BARADUKE_H +#define MAME_INCLUDES_BARADUKE_H + +#pragma once + #include "sound/namco.h" #include "emupal.h" class baraduke_state : public driver_device { public: - baraduke_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + baraduke_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_textram(*this, "textram"), @@ -68,3 +73,5 @@ protected: int m_copy_sprites; output_finder<2> m_lamps; }; + +#endif // MAME_INCLUDES_BARADUKE_H diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index 5d2c53c8de5..3d15885af5c 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -5,6 +5,10 @@ Konami Battlantis Hardware *************************************************************************/ +#ifndef MAME_INCLUDES_BATTLNTS_H +#define MAME_INCLUDES_BATTLNTS_H + +#pragma once #include "video/k007342.h" #include "video/k007420.h" @@ -12,14 +16,15 @@ class battlnts_state : public driver_device { public: - battlnts_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + battlnts_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k007342(*this, "k007342"), m_k007420(*this, "k007420"), m_gfxdecode(*this, "gfxdecode"), - m_rombank(*this, "rombank") { } + m_rombank(*this, "rombank") + { } /* video-related */ int m_spritebank; @@ -45,3 +50,5 @@ public: void battlnts_map(address_map &map); void battlnts_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_BATTLNTS_H diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index 84d069fd916..78716ec432b 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood +#ifndef MAME_INCLUDES_BIGSTRKB_H +#define MAME_INCLUDES_BIGSTRKB_H + +#pragma once #include "emupal.h" @@ -16,7 +20,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_vidreg1(*this, "vidreg1"), - m_vidreg2(*this, "vidreg2") { } + m_vidreg2(*this, "vidreg2") + { } required_device m_maincpu; required_device m_gfxdecode; @@ -49,3 +54,5 @@ public: void bigstrkb(machine_config &config); void bigstrkb_map(address_map &map); }; + +#endif // MAME_INCLUDES_BIGSTRKB_H diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index 8169e0ea7bc..236d1f2c200 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -6,6 +6,10 @@ Bionic Commando ***************************************************************************/ +#ifndef MAME_INCLUDES_BIONICC_H +#define MAME_INCLUDES_BIONICC_H + +#pragma once #include "machine/gen_latch.h" #include "machine/timer.h" @@ -17,8 +21,8 @@ class bionicc_state : public driver_device { public: - bionicc_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + bionicc_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), m_gfxdecode(*this, "gfxdecode"), @@ -36,7 +40,6 @@ public: void bionicc(machine_config &config); private: - void main_map(address_map &map); void sound_map(address_map &map); void mcu_io(address_map &map); @@ -89,3 +92,5 @@ private: /* misc */ int m_old_p3; }; + +#endif // MAME_INCLUDES_BIONICC_H diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index ea02dd2559d..7fc4b1b1ef0 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -5,6 +5,10 @@ Bishi Bashi Champ Mini Game Senshuken *************************************************************************/ +#ifndef MAME_INCLUDES_BISHI_H +#define MAME_INCLUDES_BISHI_H + +#pragma once #include "machine/timer.h" #include "video/k054156_k054157_k056832.h" @@ -20,15 +24,16 @@ class bishi_state : public driver_device { public: - bishi_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + bishi_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k056832(*this, "k056832"), m_k054338(*this, "k054338"), m_k055555(*this, "k055555"), m_palette(*this, "palette"), - m_screen(*this, "screen") { } + m_screen(*this, "screen") + { } DECLARE_READ16_MEMBER(control_r); DECLARE_WRITE16_MEMBER(control_w); @@ -66,3 +71,5 @@ private: required_device m_palette; required_device m_screen; }; + +#endif // MAME_INCLUDES_BISHI_H diff --git a/src/mame/includes/bk.h b/src/mame/includes/bk.h index f806b573af3..7b3f71263a8 100644 --- a/src/mame/includes/bk.h +++ b/src/mame/includes/bk.h @@ -5,20 +5,22 @@ * includes/bk.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_BK_H #define MAME_INCLUDES_BK_H +#pragma once + #include "imagedev/cassette.h" class bk_state : public driver_device { public: - bk_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + bk_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_bk0010_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), - m_cassette(*this, "cassette") { } + m_cassette(*this, "cassette") + { } uint16_t m_scrool; required_shared_ptr m_bk0010_video_ram; diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 0af0d8c4a41..ac46bc44430 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -5,6 +5,10 @@ Blades of Steel *************************************************************************/ +#ifndef MAME_INCLUDES_BLADESTL_H +#define MAME_INCLUDES_BLADESTL_H + +#pragma once #include "machine/gen_latch.h" #include "machine/timer.h" @@ -18,9 +22,8 @@ class bladestl_state : public driver_device { public: - bladestl_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - + bladestl_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k007342(*this, "k007342"), @@ -78,3 +81,5 @@ protected: output_finder<2> m_lamps; }; + +#endif // MAME_INCLUDES_BLADESTL_H diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 712294c98fa..cbe2d1cd9ab 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -5,6 +5,10 @@ Black Tiger ***************************************************************************/ +#ifndef MAME_INCLUDES_BLKTIGER_H +#define MAME_INCLUDES_BLKTIGER_H + +#pragma once #include "video/bufsprite.h" #include "emupal.h" @@ -12,15 +16,16 @@ class blktiger_state : public driver_device { public: - blktiger_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_spriteram(*this, "spriteram") , + blktiger_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_spriteram(*this, "spriteram"), m_txvideoram(*this, "txvideoram"), m_mcu(*this, "mcu"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } /* memory pointers */ required_device m_spriteram; @@ -82,3 +87,5 @@ public: void blktiger_sound_map(address_map &map); void blktigerbl_io_map(address_map &map); }; + +#endif // MAME_INCLUDES_BLKTIGER_H diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index a2df926c15d..e481d3f10b6 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Carlos A. Lozano +#ifndef MAME_INCLUDES_BLOODBRO_H +#define MAME_INCLUDES_BLOODBRO_H + +#pragma once + #include "audio/seibu.h" #include "sound/3812intf.h" #include "emupal.h" @@ -7,8 +12,8 @@ class bloodbro_state : public driver_device, protected seibu_sound_common { public: - bloodbro_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + bloodbro_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), @@ -18,7 +23,8 @@ public: m_spriteram(*this, "spriteram"), m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), - m_txvideoram(*this, "txvideoram") { } + m_txvideoram(*this, "txvideoram") + { } required_device m_maincpu; required_device m_gfxdecode; @@ -76,3 +82,5 @@ public: void weststry_map(address_map &map); void weststry_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_BLOODBRO_H diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index 37f9834e60f..88a1ae9c307 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -5,6 +5,10 @@ Blue Print ***************************************************************************/ +#ifndef MAME_INCLUDES_BLUEPRNT_H +#define MAME_INCLUDES_BLUEPRNT_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -12,8 +16,8 @@ class blueprnt_state : public driver_device { public: - blueprnt_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + blueprnt_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), @@ -22,7 +26,8 @@ public: m_videoram(*this, "videoram"), m_scrollram(*this, "scrollram"), m_spriteram(*this, "spriteram"), - m_colorram(*this, "colorram") { } + m_colorram(*this, "colorram") + { } /* device/memory pointers */ required_device m_maincpu; @@ -64,3 +69,5 @@ public: void sound_io(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_BLUEPRNT_H diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index f2813eaba65..34f8901c2f0 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -5,6 +5,11 @@ Bottom of the Ninth *************************************************************************/ +#ifndef MAME_INCLUDES_BOTTOM9_H +#define MAME_INCLUDES_BOTTOM9_H + +#pragma once + #include "sound/k007232.h" #include "video/k052109.h" #include "video/k051960.h" @@ -15,8 +20,8 @@ class bottom9_state : public driver_device { public: - bottom9_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + bottom9_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k007232_1(*this, "k007232_1"), @@ -24,7 +29,8 @@ public: m_k052109(*this, "k052109"), m_k051960(*this, "k051960"), m_k051316(*this, "k051316"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } /* misc */ int m_video_enable; @@ -66,3 +72,5 @@ public: void audio_map(address_map &map); void main_map(address_map &map); }; + +#endif // MAME_INCLUDES_BOTTOM9_H diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index d979f1ca805..bc5dc80e5d3 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -5,6 +5,10 @@ Break Thru ***************************************************************************/ +#ifndef MAME_INCLUDES_BRKTRHU_H +#define MAME_INCLUDES_BRKTRHU_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -12,8 +16,8 @@ class brkthru_state : public driver_device { public: - brkthru_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + brkthru_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), @@ -21,7 +25,8 @@ public: m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } /* memory pointers */ required_shared_ptr m_fg_videoram; @@ -65,3 +70,5 @@ public: void darwin_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_BRKTRHU_H diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 8eb56279862..699a3203a02 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -5,6 +5,10 @@ Burger Time hardware ***************************************************************************/ +#ifndef MAME_INCLUDES_BTIME_H +#define MAME_INCLUDES_BTIME_H + +#pragma once #include "machine/gen_latch.h" #include "machine/input_merger.h" @@ -153,3 +157,5 @@ public: void tisland_map(address_map &map); void zoar_map(address_map &map); }; + +#endif // MAME_INCLUDES_BTIME_H diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index b6f5a4dc960..ec9d7561d91 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Carlos A. Lozano +#ifndef MAME_INCLUDES_CABAL_H +#define MAME_INCLUDES_CABAL_H + +#pragma once + #include "audio/seibu.h" #include "sound/msm5205.h" #include "emupal.h" @@ -7,8 +12,8 @@ class cabal_state : public driver_device { public: - cabal_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + cabal_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_seibu_sound(*this, "seibu_sound"), @@ -20,7 +25,8 @@ public: m_palette(*this, "palette"), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), - m_videoram(*this, "videoram") { } + m_videoram(*this, "videoram") + { } required_device m_maincpu; required_device m_audiocpu; @@ -85,3 +91,5 @@ public: void sound_map(address_map &map); void trackball_main_map(address_map &map); }; + +#endif // MAME_INCLUDES_CABAL_H diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index bf95f66d9c7..a48725a787e 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -5,6 +5,10 @@ Crude Buster *************************************************************************/ +#ifndef MAME_INCLUDES_CBUSTER_H +#define MAME_INCLUDES_CBUSTER_H + +#pragma once #include "machine/gen_latch.h" #include "cpu/h6280/h6280.h" @@ -63,3 +67,5 @@ public: void sound_map(address_map &map); void twocrude_map(address_map &map); }; + +#endif // MAME_INCLUDES_CBUSTER_H diff --git a/src/mame/includes/channelf.h b/src/mame/includes/channelf.h index 849d972f623..e603d5be966 100644 --- a/src/mame/includes/channelf.h +++ b/src/mame/includes/channelf.h @@ -5,10 +5,11 @@ * includes/channelf.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_CHANNELF_H #define MAME_INCLUDES_CHANNELF_H +#pragma once + #include "cpu/f8/f8.h" #include "audio/channelf.h" @@ -22,10 +23,10 @@ class channelf_state : public driver_device { public: channelf_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_custom(*this,"custom"), - m_cart(*this, "cartslot") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_custom(*this,"custom") + , m_cart(*this, "cartslot") { } DECLARE_READ8_MEMBER(port_0_r); diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index 17d2d877379..a69717bc06d 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -5,6 +5,11 @@ Chequered Flag *************************************************************************/ +#ifndef MAME_INCLUDES_CHQFLAG_H +#define MAME_INCLUDES_CHQFLAG_H + +#pragma once + #include "machine/bankdev.h" #include "sound/k007232.h" #include "video/k051960.h" @@ -71,3 +76,5 @@ private: required_memory_bank m_rombank; void update_background_shadows(uint8_t data); }; + +#endif // MAME_INCLUDES_CHQFLAG_H diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index c3e7ded2c73..92e522ef416 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Mike Coates +#ifndef MAME_INCLUDES_CIRCUS_H +#define MAME_INCLUDES_CIRCUS_H + +#pragma once #include "machine/timer.h" #include "sound/discrete.h" @@ -9,14 +13,15 @@ class circus_state : public driver_device { public: - circus_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + circus_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), m_discrete(*this, "discrete"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } /* memory pointers */ required_shared_ptr m_videoram; @@ -77,3 +82,5 @@ extern const char *const circus_sample_names[]; extern const char *const crash_sample_names[]; extern const char *const ripcord_sample_names[]; extern const char *const robotbwl_sample_names[]; + +#endif // MAME_INCLUDES_CIRCUS_H diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 7f64996a30a..6b20e5ec7e9 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -5,6 +5,10 @@ Circus Charlie *************************************************************************/ +#ifndef MAME_INCLUDES_CIRCUSC_H +#define MAME_INCLUDES_CIRCUSC_H + +#pragma once #include "sound/dac.h" #include "sound/sn76496.h" @@ -14,8 +18,8 @@ class circusc_state : public driver_device { public: - circusc_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + circusc_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_scroll(*this, "scroll"), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), @@ -28,7 +32,8 @@ public: m_discrete(*this, "fltdisc"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } /* memory pointers */ required_shared_ptr m_scroll; @@ -79,3 +84,5 @@ public: void circusc_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_CIRCUSC_H diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index 2f5717bac31..947392938af 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -1,9 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia - #ifndef MAME_INCLUDES_CISCHEAT_H #define MAME_INCLUDES_CISCHEAT_H +#pragma once + // TODO: better inheritance, eventually split individual driver files #include "sound/okim6295.h" diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 969c9ea58f6..397bd70d733 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -5,21 +5,26 @@ City Connection *************************************************************************/ +#ifndef MAME_INCLUDES_CITYCON_H +#define MAME_INCLUDES_CITYCON_H + +#pragma once #include "emupal.h" class citycon_state : public driver_device { public: - citycon_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + citycon_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_linecolor(*this, "linecolor"), m_spriteram(*this, "spriteram"), m_scroll(*this, "scroll"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } /* memory pointers */ required_shared_ptr m_videoram; @@ -56,3 +61,5 @@ public: void citycon_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_CITYCON_H diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 06a6fc9a957..14e46d4f9fb 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -5,20 +5,25 @@ Competition Golf Final Round *************************************************************************/ +#ifndef MAME_INCLUDES_COMPGOLF_H +#define MAME_INCLUDES_COMPGOLF_H + +#pragma once #include "emupal.h" class compgolf_state : public driver_device { public: - compgolf_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + compgolf_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_bg_ram(*this, "bg_ram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } /* memory pointers */ required_shared_ptr m_videoram; @@ -57,3 +62,5 @@ public: void compgolf(machine_config &config); void compgolf_map(address_map &map); }; + +#endif // MAME_INCLUDES_COMPGOLF_H diff --git a/src/mame/includes/comquest.h b/src/mame/includes/comquest.h index bcbdb9d3dfd..ff9e76525f8 100644 --- a/src/mame/includes/comquest.h +++ b/src/mame/includes/comquest.h @@ -14,8 +14,9 @@ class comquest_state : public driver_device { public: comquest_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + { } uint8_t m_data[128][8]; void *m_timer; diff --git a/src/mame/includes/concept.h b/src/mame/includes/concept.h index f9020299822..e9f90eeba2c 100644 --- a/src/mame/includes/concept.h +++ b/src/mame/includes/concept.h @@ -24,22 +24,22 @@ #define ACIA_1_TAG "acia1" #define VIA_0_TAG "via6522_0" #define KBD_ACIA_TAG "kbacia" -#define SPEAKER_TAG "spkr" class concept_state : public driver_device { public: - concept_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + concept_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_acia0(*this, ACIA_0_TAG), m_acia1(*this, ACIA_1_TAG), m_via0(*this, VIA_0_TAG), m_kbdacia(*this, KBD_ACIA_TAG), - m_speaker(*this, SPEAKER_TAG), + m_speaker(*this, "spkr"), m_mm58274(*this,"mm58274c"), m_a2bus(*this, "a2bus"), - m_videoram(*this,"videoram") { } + m_videoram(*this,"videoram") + { } required_device m_maincpu; required_device m_acia0; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index 80115d52038..6441715a7ee 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -5,6 +5,10 @@ Contra / Gryzor *************************************************************************/ +#ifndef MAME_INCLUDES_CONTRA_H +#define MAME_INCLUDES_CONTRA_H + +#pragma once #include "video/k007121.h" #include "emupal.h" @@ -13,8 +17,8 @@ class contra_state : public driver_device { public: - contra_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + contra_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_fg_cram(*this, "fg_cram"), m_fg_vram(*this, "fg_vram"), m_tx_cram(*this, "tx_cram"), @@ -29,7 +33,8 @@ public: m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } /* memory pointers */ std::unique_ptr m_buffered_spriteram; @@ -85,3 +90,5 @@ public: void contra_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_CONTRA_H diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index 4579bf7cdf9..ff93f80f615 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -5,6 +5,10 @@ Cops 01 *************************************************************************/ +#ifndef MAME_INCLUDES_COP01_H +#define MAME_INCLUDES_COP01_H + +#pragma once #include "machine/gen_latch.h" #include "machine/nb1412m2.h" @@ -13,8 +17,8 @@ class cop01_state : public driver_device { public: - cop01_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + cop01_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_bgvideoram(*this, "bgvideoram"), m_spriteram(*this, "spriteram"), m_fgvideoram(*this, "fgvideoram"), @@ -22,7 +26,8 @@ public: m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } /* memory pointers */ required_shared_ptr m_bgvideoram; @@ -76,16 +81,18 @@ public: class mightguy_state : public cop01_state { public: - mightguy_state(const machine_config &mconfig, device_type type, const char *tag) - : cop01_state(mconfig, type, tag) - , m_prot(*this, "prot_chip") - {} - + mightguy_state(const machine_config &mconfig, device_type type, const char *tag) : + cop01_state(mconfig, type, tag), + m_prot(*this, "prot_chip") + { } void mightguy(machine_config &config); + private: void mightguy_io_map(address_map &map); void mightguy_audio_io_map(address_map &map); required_device m_prot; }; + +#endif // MAME_INCLUDES_COP01_H diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h index 39a9edcf3aa..f2898e7e2c5 100644 --- a/src/mame/includes/crgolf.h +++ b/src/mame/includes/crgolf.h @@ -5,6 +5,11 @@ Kitco Crowns Golf hardware **************************************************************************/ +#ifndef MAME_INCLUDES_CRGOLF_H +#define MAME_INCLUDES_CRGOLF_H + +#pragma once + #include "sound/msm5205.h" #include "machine/bankdev.h" #include "emupal.h" @@ -15,8 +20,8 @@ class crgolf_state : public driver_device { public: - crgolf_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + crgolf_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram_a(*this, "vrama"), m_videoram_b(*this, "vramb"), @@ -85,3 +90,5 @@ public: void sound_map(address_map &map); void vrambank_map(address_map &map); }; + +#endif // MAME_INCLUDES_CRGOLF_H diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index adccf2c8fb2..e77992fa5c1 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -5,6 +5,10 @@ Crime Fighters *************************************************************************/ +#ifndef MAME_INCLUDES_CRIMFGHT_H +#define MAME_INCLUDES_CRIMFGHT_H + +#pragma once #include "machine/bankdev.h" #include "machine/gen_latch.h" @@ -16,8 +20,8 @@ class crimfght_state : public driver_device { public: - crimfght_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + crimfght_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_bank0000(*this, "bank0000"), @@ -26,7 +30,8 @@ public: m_k051960(*this, "k051960"), m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch"), - m_rombank(*this, "rombank") { } + m_rombank(*this, "rombank") + { } /* devices */ required_device m_maincpu; @@ -62,3 +67,5 @@ private: int m_rmrd; int m_init; }; + +#endif // MAME_INCLUDES_CRIMFGHT_H diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index a4bb5438d81..45fe72ef674 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -5,6 +5,10 @@ Cross Pang *************************************************************************/ +#ifndef MAME_INCLUDES_CROSPANG_H +#define MAME_INCLUDES_CROSPANG_H + +#pragma once #include "machine/gen_latch.h" #include "video/decospr.h" @@ -72,3 +76,5 @@ public: void crospang_sound_io_map(address_map &map); void crospang_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_CROSPANG_H diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 697e86e9818..849b396b11a 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -5,6 +5,10 @@ Century CVS System ****************************************************************************/ +#ifndef MAME_INCLUDES_CVS_H +#define MAME_INCLUDES_CVS_H + +#pragma once #include "sound/dac.h" #include "sound/tms5110.h" @@ -153,3 +157,5 @@ protected: by allocating twice the amount, we can use the same gfx_layout */ }; + +#endif // MAME_INCLUDES_CVS_H diff --git a/src/mame/includes/cxhumax.h b/src/mame/includes/cxhumax.h index 65ea92f0c55..a72a39ea63f 100644 --- a/src/mame/includes/cxhumax.h +++ b/src/mame/includes/cxhumax.h @@ -1,38 +1,39 @@ // license:BSD-3-Clause // copyright-holders:Lukasz Markowski - #ifndef MAME_INCLUDES_CXHUMAX_H #define MAME_INCLUDES_CXHUMAX_H +#pragma once + #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" #include "machine/intelfsh.h" #include "machine/i2cmem.h" #include "machine/terminal.h" -#define MAX_CX_TIMERS 16 - -struct cx_timer_t -{ - uint32_t value; - uint32_t limit; - uint32_t mode; - uint32_t timebase; - emu_timer *timer; -}; - -struct cx_timer_regs_t -{ - cx_timer_t timer[MAX_CX_TIMERS]; - uint32_t timer_irq; -}; - class cxhumax_state : public driver_device { public: - cxhumax_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + static constexpr unsigned MAX_CX_TIMERS = 16; + + struct cx_timer_t + { + uint32_t value; + uint32_t limit; + uint32_t mode; + uint32_t timebase; + emu_timer *timer; + }; + + struct cx_timer_regs_t + { + cx_timer_t timer[MAX_CX_TIMERS]; + uint32_t timer_irq; + }; + + cxhumax_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_flash(*this, "flash"), m_ram(*this, "ram"), diff --git a/src/mame/includes/dai.h b/src/mame/includes/dai.h index 85462bdb2f3..85efb163cb0 100644 --- a/src/mame/includes/dai.h +++ b/src/mame/includes/dai.h @@ -23,15 +23,16 @@ class dai_state : public driver_device { public: - dai_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + dai_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pit(*this, "pit8253"), m_tms5501(*this, "tms5501"), m_sound(*this, "custom"), m_cassette(*this, "cassette"), m_ram(*this, RAM_TAG), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void dai(machine_config &config); diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 6435a6a1d16..554ba53fa98 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Nicola Salmoria, Tomasz Slanina +#ifndef MAME_INCLUDES_DARKMIST_H +#define MAME_INCLUDES_DARKMIST_H + +#pragma once #include "audio/t5182.h" #include "machine/timer.h" @@ -9,8 +13,8 @@ class darkmist_state : public driver_device { public: - darkmist_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + darkmist_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_t5182(*this, "t5182"), m_screen(*this, "screen"), @@ -25,7 +29,8 @@ public: m_fg_clut(*this, "fg_clut"), m_spr_clut(*this, "spr_clut"), m_tx_clut(*this, "tx_clut"), - m_decrypted_opcodes(*this, "decrypted_opcodes") { } + m_decrypted_opcodes(*this, "decrypted_opcodes") + { } void darkmist(machine_config &config); @@ -77,3 +82,5 @@ private: void decrypted_opcodes_map(address_map &map); void memmap(address_map &map); }; + +#endif // MAME_INCLUDES_DARKMIST_H diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index a709297de97..36fa5b921dd 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -5,6 +5,10 @@ Dragon Ball Z *************************************************************************/ +#ifndef MAME_INCLUDES_DBZ_H +#define MAME_INCLUDES_DBZ_H + +#pragma once #include "machine/gen_latch.h" #include "machine/k053252.h" @@ -18,8 +22,8 @@ class dbz_state : public driver_device { public: - dbz_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + dbz_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_bg1_videoram(*this, "bg1_videoram"), m_bg2_videoram(*this, "bg2_videoram"), m_maincpu(*this, "maincpu"), @@ -31,7 +35,8 @@ public: m_k053936_1(*this, "k053936_1"), m_k053936_2(*this, "k053936_2"), m_gfxdecode(*this, "gfxdecode"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void dbz(machine_config &config); @@ -85,3 +90,5 @@ private: void dbz_sound_io_map(address_map &map); void dbz_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_DBZ_H diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index d651a1262cf..f7647b6d06f 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail +#ifndef MAME_INCLUDES_DCON_H +#define MAME_INCLUDES_DCON_H + +#pragma once #include "audio/seibu.h" #include "emupal.h" @@ -7,8 +11,8 @@ class dcon_state : public driver_device, protected seibu_sound_common { public: - dcon_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + dcon_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_seibu_sound(*this, "seibu_sound"), m_gfxdecode(*this, "gfxdecode"), @@ -17,7 +21,8 @@ public: m_fore_data(*this, "fore_data"), m_mid_data(*this, "mid_data"), m_textram(*this, "textram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") + { } void dcon(machine_config &config); void sdgndmps(machine_config &config); @@ -67,3 +72,5 @@ private: void dcon_map(address_map &map); void sdgndmps_map(address_map &map); }; + +#endif // MAME_INCLUDES_DCON_H diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 50ac799c460..d65c35b56b6 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -5,6 +5,10 @@ Double Dribble ***************************************************************************/ +#ifndef MAME_INCLUDES_DDRIBBLE_H +#define MAME_INCLUDES_DDRIBBLE_H + +#pragma once #include "sound/flt_rc.h" #include "sound/vlm5030.h" @@ -13,8 +17,8 @@ class ddribble_state : public driver_device { public: - ddribble_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + ddribble_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), m_spriteram_1(*this, "spriteram_1"), m_sharedram(*this, "sharedram"), @@ -27,7 +31,8 @@ public: m_filter1(*this, "filter1"), m_filter2(*this, "filter2"), m_filter3(*this, "filter3"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode") + { } void ddribble(machine_config &config); @@ -86,3 +91,5 @@ private: void cpu2_map(address_map &map); void vlm_map(address_map &map); }; + +#endif // MAME_INCLUDES_DDRIBBLE_H diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index 5b38e95e279..4b9466dfa9b 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Haywood +#ifndef MAME_INCLUDES_DEADANG_H +#define MAME_INCLUDES_DEADANG_H + +#pragma once #include "audio/seibu.h" #include "machine/timer.h" @@ -9,8 +13,8 @@ class deadang_state : public driver_device { public: - deadang_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + deadang_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_scroll_ram(*this, "scroll_ram"), m_videoram(*this, "videoram"), m_video_data(*this, "video_data"), @@ -85,9 +89,9 @@ private: class popnrun_state : public deadang_state { public: - popnrun_state(const machine_config &mconfig, device_type type, const char *tag) - : deadang_state(mconfig, type, tag) - {} + popnrun_state(const machine_config &mconfig, device_type type, const char *tag) : + deadang_state(mconfig, type, tag) + { } void popnrun(machine_config &config); @@ -106,3 +110,5 @@ private: uint32_t popnrun_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void popnrun_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; + +#endif // MAME_INCLUDES_DEADANG_H diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 91682c0e678..d4915849aa2 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail +#ifndef MAME_INCLUDES_DEC0_H +#define MAME_INCLUDES_DEC0_H + +#pragma once + #include "machine/74157.h" #include "cpu/h6280/h6280.h" #include "machine/bankdev.h" @@ -197,3 +202,5 @@ private: void secretab_map(address_map &map); void secretab_s_map(address_map &map); }; + +#endif // MAME_INCLUDES_DEC0_H diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index ea19a7153e1..c38ae9b1442 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -1,5 +1,10 @@ // license:GPL-2.0+ // copyright-holders:Juergen Buchmueller, David Haywood +#ifndef MAME_INCLUDES_DECOCASS_H +#define MAME_INCLUDES_DECOCASS_H + +#pragma once + #ifdef MAME_DEBUG #define LOGLEVEL 5 #else @@ -24,24 +29,24 @@ class decocass_state : public driver_device { public: decocass_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_mcu(*this, "mcu"), - m_audiocpu(*this, "audiocpu"), - m_watchdog(*this, "watchdog"), - m_cassette(*this, "cassette"), - m_gfxdecode(*this, "gfxdecode"), - m_screen(*this, "screen"), - m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch"), - m_soundlatch2(*this, "soundlatch2"), - m_rambase(*this, "rambase"), - m_charram(*this, "charram"), - m_fgvideoram(*this, "fgvideoram"), - m_colorram(*this, "colorram"), - m_tileram(*this, "tileram"), - m_objectram(*this, "objectram"), - m_paletteram(*this, "paletteram") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_mcu(*this, "mcu") + , m_audiocpu(*this, "audiocpu") + , m_watchdog(*this, "watchdog") + , m_cassette(*this, "cassette") + , m_gfxdecode(*this, "gfxdecode") + , m_screen(*this, "screen") + , m_palette(*this, "palette") + , m_soundlatch(*this, "soundlatch") + , m_soundlatch2(*this, "soundlatch2") + , m_rambase(*this, "rambase") + , m_charram(*this, "charram") + , m_fgvideoram(*this, "fgvideoram") + , m_colorram(*this, "colorram") + , m_tileram(*this, "tileram") + , m_objectram(*this, "objectram") + , m_paletteram(*this, "paletteram") { } @@ -427,7 +432,6 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(decocass_widel_r); DECLARE_WRITE8_MEMBER(decocass_widel_w); @@ -436,3 +440,4 @@ private: int32_t m_widel_latch; /* latched enable PROM (1100xxxx written to E5x1) */ }; +#endif // MAME_INCLUDES_DECOCASS_H diff --git a/src/mame/includes/dgn_beta.h b/src/mame/includes/dgn_beta.h index 6deda4202a5..69fd714face 100644 --- a/src/mame/includes/dgn_beta.h +++ b/src/mame/includes/dgn_beta.h @@ -9,6 +9,8 @@ #ifndef MAME_INCLUDES_DGN_BETA_H #define MAME_INCLUDES_DGN_BETA_H +#pragma once + #include "video/mc6845.h" #include "machine/wd_fdc.h" #include "machine/6821pia.h" @@ -82,8 +84,8 @@ struct PageReg class dgn_beta_state : public driver_device { public: - dgn_beta_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + dgn_beta_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_mc6845(*this, "crtc"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), @@ -97,7 +99,8 @@ public: m_floppy1(*this, FDC_TAG ":1"), m_floppy2(*this, FDC_TAG ":2"), m_floppy3(*this, FDC_TAG ":3"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void dgnbeta(machine_config &config); diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index 4693d770840..77b4102384f 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:smf +#ifndef MAME_INCLUDES_DJMAIN_H +#define MAME_INCLUDES_DJMAIN_H + +#pragma once + #include "machine/ataintf.h" #include "video/konami_helper.h" #include "video/k054156_k054157_k056832.h" @@ -18,7 +23,7 @@ public: , m_ata(*this, "ata") , m_gfxdecode(*this, "gfxdecode") , m_palette(*this, "palette") - , m_turntable(*this, {"TT1", "TT2"}) + , m_turntable(*this, "TT%u", 1U) , m_sndram(*this, "sndram") , m_leds(*this, "led%u", 0U) { @@ -96,3 +101,5 @@ private: const uint8_t *m_ata_user_password; const uint8_t *m_ata_master_password; }; + +#endif // MAME_INCLUDES_DJMAIN_H diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index b5e33504f26..2cb8c5cd077 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -35,8 +35,8 @@ class dragrace_state : public driver_device { public: - dragrace_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + dragrace_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_playfield_ram(*this, "playfield_ram"), m_position_ram(*this, "position_ram"), m_discrete(*this, "discrete"), diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index fbc9e0a3abf..bbf59def64d 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -5,18 +5,24 @@ Dr. Micro *************************************************************************/ +#ifndef MAME_INCLUDES_DRMICRO_H +#define MAME_INCLUDES_DRMICRO_H + +#pragma once + #include "sound/msm5205.h" #include "emupal.h" class drmicro_state : public driver_device { public: - drmicro_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + drmicro_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_msm(*this, "msm"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void drmicro(machine_config &config); @@ -53,3 +59,5 @@ private: void drmicro_map(address_map &map); void io_map(address_map &map); }; + +#endif // MAME_INCLUDES_DRMICRO_H diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index 398e1d44543..0138da7f7f0 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -5,6 +5,10 @@ Epos games **************************************************************************/ +#ifndef MAME_INCLUDES_EPOS_H +#define MAME_INCLUDES_EPOS_H + +#pragma once #include "emupal.h" @@ -18,7 +22,7 @@ public: m_maincpu(*this, "maincpu"), m_palette(*this, "palette"), m_leds(*this, "led%u", 0U) - { } + { } void epos(machine_config &config); void dealer(machine_config &config); @@ -61,3 +65,5 @@ private: required_device m_palette; output_finder<2> m_leds; }; + +#endif // MAME_INCLUDES_EPOS_H diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index c6ac4c83416..adc0b3f453c 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -6,6 +6,10 @@ Espial hardware games (drivers: espial.cpp) ***************************************************************************/ +#ifndef MAME_INCLUDES_ESPIAL_H +#define MAME_INCLUDES_ESPIAL_H + +#pragma once #include "machine/gen_latch.h" #include "machine/timer.h" @@ -14,8 +18,8 @@ class espial_state : public driver_device { public: - espial_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + espial_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_attributeram(*this, "attributeram"), m_scrollram(*this, "scrollram"), @@ -27,7 +31,8 @@ public: m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void espial(machine_config &config); void netwars(machine_config &config); @@ -80,3 +85,5 @@ private: void espial_sound_map(address_map &map); void netwars_map(address_map &map); }; + +#endif // MAME_INCLUDES_ESPIAL_H diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index 10d7b0fca1a..0597ffd7c04 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -5,6 +5,10 @@ Exed Exes *************************************************************************/ +#ifndef MAME_INCLUDES_EXEDEXES_H +#define MAME_INCLUDES_EXEDEXES_H + +#pragma once #include "machine/timer.h" #include "video/bufsprite.h" @@ -13,9 +17,9 @@ class exedexes_state : public driver_device { public: - exedexes_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_spriteram(*this, "spriteram") , + exedexes_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_nbg_yscroll(*this, "nbg_yscroll"), @@ -23,7 +27,8 @@ public: m_bg_scroll(*this, "bg_scroll"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void exedexes(machine_config &config); @@ -67,3 +72,5 @@ private: void exedexes_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_EXEDEXES_H diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index b65bd926c12..a22cd9628d2 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -5,6 +5,10 @@ Jaleco Exerion *************************************************************************/ +#ifndef MAME_INCLUDES_EXERION_H +#define MAME_INCLUDES_EXERION_H + +#pragma once #include "emupal.h" #include "screen.h" @@ -26,15 +30,16 @@ class exerion_state : public driver_device { public: - exerion_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + exerion_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_main_ram(*this, "main_ram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void exerion(machine_config &config); void irion(machine_config &config); @@ -86,3 +91,5 @@ private: void main_map(address_map &map); void sub_map(address_map &map); }; + +#endif // MAME_INCLUDES_EXERION_H diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index 1df4f028091..14e625448e8 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -12,8 +12,8 @@ class exprraid_state : public driver_device { public: - exprraid_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + exprraid_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_slave(*this, "slave"), m_gfxdecode(*this, "gfxdecode"), @@ -22,7 +22,8 @@ public: m_main_ram(*this, "main_ram"), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram") { } + m_colorram(*this, "colorram") + { } void exprraid(machine_config &config); void exprboot(machine_config &config); diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h index 2c7f07361da..c096fc20f69 100644 --- a/src/mame/includes/exterm.h +++ b/src/mame/includes/exterm.h @@ -5,6 +5,10 @@ Gottlieb Exterminator hardware *************************************************************************/ +#ifndef MAME_INCLUDES_EXTERM_H +#define MAME_INCLUDES_EXTERM_H + +#pragma once #include "cpu/tms34010/tms34010.h" #include "machine/gen_latch.h" @@ -15,8 +19,8 @@ class exterm_state : public driver_device { public: - exterm_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + exterm_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_audioslave(*this, "audioslave"), @@ -27,7 +31,8 @@ public: m_master_videoram(*this, "master_videoram"), m_slave_videoram(*this, "slave_videoram"), m_dial(*this, "DIAL%u", 0U), - m_input(*this, "P%u", 1U) { } + m_input(*this, "P%u", 1U) + { } void exterm(machine_config &config); @@ -75,3 +80,5 @@ private: void sound_master_map(address_map &map); void sound_slave_map(address_map &map); }; + +#endif // MAME_INCLUDES_EXTERM_H diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h index 9a247cdfe79..7c4a879b67b 100644 --- a/src/mame/includes/exzisus.h +++ b/src/mame/includes/exzisus.h @@ -1,13 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Yochizo +#ifndef MAME_INCLUDES_EXZIUS_H +#define MAME_INCLUDES_EXZIUS_H + +#pragma once #include "emupal.h" class exzisus_state : public driver_device { public: - exzisus_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + exzisus_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_cpuc(*this, "cpuc"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), @@ -16,7 +20,8 @@ public: m_sharedram_ac(*this, "sharedram_ac"), m_sharedram_ab(*this, "sharedram_ab"), m_objectram0(*this, "objectram0"), - m_videoram0(*this, "videoram0") { } + m_videoram0(*this, "videoram0") + { } void exzisus(machine_config &config); @@ -45,3 +50,5 @@ private: void cpuc_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_EXZIUS_H diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h index be8769a0bc3..9bfd39d5e5e 100644 --- a/src/mame/includes/fastfred.h +++ b/src/mame/includes/fastfred.h @@ -6,6 +6,10 @@ driver by Zsolt Vasvari ***************************************************************************/ +#ifndef MAME_INCLUDES_FASTFRED_H +#define MAME_INCLUDES_FASTFRED_H + +#pragma once #include "machine/74259.h" #include "includes/galaxold.h" @@ -100,3 +104,5 @@ private: void jumpcoas_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_FASTFRED_H diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index f536427680e..09b0e033aaf 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -5,6 +5,10 @@ Fast Lane *************************************************************************/ +#ifndef MAME_INCLUDES_FASTLANE_H +#define MAME_INCLUDES_FASTLANE_H + +#pragma once #include "machine/timer.h" #include "sound/k007232.h" @@ -16,8 +20,8 @@ class fastlane_state : public driver_device { public: - fastlane_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + fastlane_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_k007121_regs(*this, "k007121_regs"), m_videoram1(*this, "videoram1"), @@ -28,7 +32,8 @@ public: m_k007121(*this, "k007121"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void fastlane(machine_config &config); @@ -74,3 +79,5 @@ private: DECLARE_WRITE8_MEMBER(volume_callback1); void fastlane_map(address_map &map); }; + +#endif // MAME_INCLUDES_FASTLANE_H diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index 998b14ac93b..f6c5e443483 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -1,18 +1,22 @@ // license:BSD-3-Clause // copyright-holders:Tomasz Slanina +#ifndef MAME_INCLUDES_FCOMBAT_H +#define MAME_INCLUDES_FCOMBAT_H + +#pragma once #include "emupal.h" -/* this is compied from Exerion, but it should be correct */ +// this is copied from Exerion, but it should be correct #define FCOMBAT_MASTER_CLOCK (20000000) #define FCOMBAT_CPU_CLOCK (FCOMBAT_MASTER_CLOCK / 6) #define FCOMBAT_AY8910_CLOCK (FCOMBAT_CPU_CLOCK / 2) #define FCOMBAT_PIXEL_CLOCK (FCOMBAT_MASTER_CLOCK / 3) #define FCOMBAT_HCOUNT_START (0x58) #define FCOMBAT_HTOTAL (512-FCOMBAT_HCOUNT_START) -#define FCOMBAT_HBEND (12*8) /* ?? */ -#define FCOMBAT_HBSTART (52*8) /* ?? */ +#define FCOMBAT_HBEND (12*8) // ?? +#define FCOMBAT_HBSTART (52*8) // #define FCOMBAT_VTOTAL (256) #define FCOMBAT_VBEND (16) #define FCOMBAT_VBSTART (240) @@ -29,13 +33,14 @@ class fcombat_state : public driver_device { public: - fcombat_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + fcombat_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void fcombat(machine_config &config); @@ -85,3 +90,5 @@ private: void audio_map(address_map &map); void main_map(address_map &map); }; + +#endif // MAME_INCLUDES_FCOMBAT_H diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index 2c9370800f9..15af5a71bcd 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -5,6 +5,10 @@ Konami Finalizer ***************************************************************************/ +#ifndef MAME_INCLUDES_FINALIZR_H +#define MAME_INCLUDES_FINALIZR_H + +#pragma once #include "machine/timer.h" #include "emupal.h" @@ -76,3 +80,5 @@ private: void sound_io_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_FINALIZR_H diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index 67b38b2afcc..4cdd2fa47d9 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -5,6 +5,10 @@ Fire Trap ***************************************************************************/ +#ifndef MAME_INCLUDES_FIRETRAP_H +#define MAME_INCLUDES_FIRETRAP_H + +#pragma once #include "machine/74157.h" #include "machine/gen_latch.h" @@ -14,8 +18,8 @@ class firetrap_state : public driver_device { public: - firetrap_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + firetrap_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_bg1videoram(*this, "bg1videoram"), m_bg2videoram(*this, "bg2videoram"), m_fgvideoram(*this, "fgvideoram"), @@ -26,7 +30,8 @@ public: m_adpcm_select(*this, "adpcm_select"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void firetrapbl(machine_config &config); void firetrap(machine_config &config); @@ -103,3 +108,5 @@ private: void firetrap_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_FIRETRAP_H diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 557eb036787..27a6e62b888 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -5,6 +5,10 @@ Atari Fire Truck + Super Bug + Monte Carlo driver *************************************************************************/ +#ifndef MAME_INCLUDES_FIRETRK_H +#define MAME_INCLUDES_FIRETRK_H + +#pragma once #include "machine/timer.h" #include "machine/watchdog.h" @@ -60,7 +64,7 @@ public: , m_bit_6(*this, "BIT_6") , m_bit_7(*this, "BIT_7") , m_dips(*this, {"DIP_0", "DIP_1"}) - , m_steer(*this, {"STEER_1", "STEER_2"}) + , m_steer(*this, "STEER_%u", 1U) , m_leds(*this, "led%u", 0U) { } @@ -173,3 +177,5 @@ private: DISCRETE_SOUND_EXTERN( firetrk_discrete ); DISCRETE_SOUND_EXTERN( superbug_discrete ); DISCRETE_SOUND_EXTERN( montecar_discrete ); + +#endif // MAME_INCLUDES_FIRETRK_H diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index a3b81cfe008..7e326171f78 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -5,6 +5,10 @@ Flak Attack / MX5000 *************************************************************************/ +#ifndef MAME_INCLUDES_FLKATCK_H +#define MAME_INCLUDES_FLKATCK_H + +#pragma once #include "machine/gen_latch.h" #include "machine/watchdog.h" @@ -24,7 +28,8 @@ public: m_k007232(*this, "k007232"), m_watchdog(*this, "watchdog"), m_gfxdecode(*this, "gfxdecode"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void flkatck(machine_config &config); @@ -68,3 +73,5 @@ private: void flkatck_map(address_map &map); void flkatck_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_FLKATCK_H diff --git a/src/mame/includes/fm7.h b/src/mame/includes/fm7.h index 27faf758134..1f086dab1e6 100644 --- a/src/mame/includes/fm7.h +++ b/src/mame/includes/fm7.h @@ -112,8 +112,8 @@ struct fm7_alu_t class fm7_state : public driver_device { public: - fm7_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + fm7_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_shared_ram(*this, "shared_ram"), m_boot_ram(*this, "boot_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index fcd71b828cd..83426afc323 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Zsolt Vasvari +#ifndef MAME_INCLUDES_FUNKYBEE_H +#define MAME_INCLUDES_FUNKYBEE_H + +#pragma once #include "machine/watchdog.h" #include "emupal.h" @@ -8,14 +12,15 @@ class funkybee_state : public driver_device { public: - funkybee_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + funkybee_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_watchdog(*this, "watchdog"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void funkybee(machine_config &config); @@ -50,3 +55,5 @@ private: void funkybee_map(address_map &map); void io_map(address_map &map); }; + +#endif // MAME_INCLUDES_FUNKYBEE_H diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index 1ff9958de2a..2afce283693 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Roberto Fresca, Peter Ferrie +#ifndef MAME_INCLUDES_FUNWORLD_H +#define MAME_INCLUDES_FUNWORLD_H + +#pragma once #include "emupal.h" @@ -100,3 +104,4 @@ protected: virtual void machine_reset() override; }; +#endif // MAME_INCLUDES_FUNWORLD_H diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index 42ce992bdf5..cc8a60debc2 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia,Paul Priest +#ifndef MAME_INCLUDES_FUUKIFG2_H +#define MAME_INCLUDES_FUUKIFG2_H + +#pragma once #include "machine/gen_latch.h" #include "sound/okim6295.h" @@ -84,3 +88,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_FUUKIFG2_H diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 5f5677955d2..9a1518a6a93 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Paul Priest, David Haywood, Luca Elia +#ifndef MAME_INCLUDES_FUUKIFG3_H +#define MAME_INCLUDES_FUUKIFG3_H + +#pragma once + #include "video/fuukifg.h" #include "emupal.h" #include "screen.h" @@ -91,3 +96,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_FUUKIFG3_H diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index b7f607e7369..5d1e74a831a 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -7,6 +7,10 @@ driver by Aaron Giles **************************************************************************/ +#ifndef MAME_INCLUDES_GAELCO3D_H +#define MAME_INCLUDES_GAELCO3D_H + +#pragma once #include "sound/dmadac.h" #include "video/poly.h" @@ -25,28 +29,28 @@ class gaelco3d_state : public driver_device { public: gaelco3d_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_adsp_ram_base(*this,"adsp_ram_base"), - m_m68k_ram_base(*this,"m68k_ram_base",0), - m_tms_comm_base(*this,"tms_comm_base",0), - m_adsp_control_regs(*this,"adsp_regs"), - m_adsp_fastram_base(*this,"adsp_fastram"), - m_maincpu(*this, "maincpu"), - m_adsp(*this, "adsp"), - m_eeprom(*this, "eeprom"), - m_tms(*this, "tms"), - m_dmadac(*this, "dac%u", 0U), - m_serial(*this, "serial"), - m_screen(*this, "screen"), - m_soundlatch(*this, "soundlatch"), - m_mainlatch(*this, "mainlatch"), - m_outlatch(*this, "outlatch"), - m_adsp_autobuffer_timer(*this, "adsp_timer"), - m_paletteram16(*this, "paletteram"), - m_paletteram32(*this, "paletteram"), - m_analog(*this, {"ANALOG0", "ANALOG1", "ANALOG2", "ANALOG3"}), - m_adsp_bank(*this, "adspbank") - { } + : driver_device(mconfig, type, tag) + , m_adsp_ram_base(*this, "adsp_ram_base") + , m_m68k_ram_base(*this, "m68k_ram_base", 0) + , m_tms_comm_base(*this, "tms_comm_base", 0) + , m_adsp_control_regs(*this, "adsp_regs") + , m_adsp_fastram_base(*this, "adsp_fastram") + , m_maincpu(*this, "maincpu") + , m_adsp(*this, "adsp") + , m_eeprom(*this, "eeprom") + , m_tms(*this, "tms") + , m_dmadac(*this, "dac%u", 0U) + , m_serial(*this, "serial") + , m_screen(*this, "screen") + , m_soundlatch(*this, "soundlatch") + , m_mainlatch(*this, "mainlatch") + , m_outlatch(*this, "outlatch") + , m_adsp_autobuffer_timer(*this, "adsp_timer") + , m_paletteram16(*this, "paletteram") + , m_paletteram32(*this, "paletteram") + , m_analog(*this, "ANALOG%u", 0U) + , m_adsp_bank(*this, "adspbank") + { } void footbpow(machine_config &config); void gaelco3d2(machine_config &config); @@ -176,3 +180,5 @@ private: void main_map(address_map &map); void tms_map(address_map &map); }; + +#endif // MAME_INCLUDES_GAELCO3D_H diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 1f0c3d4d088..0228f87adb7 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -107,7 +107,7 @@ protected: uint8_t col,set; }; - static struct star m_star_seed_tab[]; + static star const s_star_seed_tab[]; }; diff --git a/src/mame/includes/galaxia.h b/src/mame/includes/galaxia.h index 57953ec93af..edd9b6cacb5 100644 --- a/src/mame/includes/galaxia.h +++ b/src/mame/includes/galaxia.h @@ -5,6 +5,10 @@ Zaccaria Galaxia HW ****************************************************************************/ +#ifndef MAME_INCLUDES_GALAXIA_H +#define MAME_INCLUDES_GALAXIA_H + +#pragma once #include "includes/cvs.h" @@ -12,7 +16,8 @@ class galaxia_state : public cvs_state { public: galaxia_state(const machine_config &mconfig, device_type type, const char *tag) - : cvs_state(mconfig, type, tag) { } + : cvs_state(mconfig, type, tag) + { } void astrowar(machine_config &config); void galaxia(machine_config &config); @@ -42,3 +47,5 @@ private: void galaxia_io_map(address_map &map); void galaxia_mem_map(address_map &map); }; + +#endif // MAME_INCLUDES_GALAXIA_H diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index c494170ac87..f5a1b34d60b 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -5,6 +5,10 @@ Galaxian hardware family ***************************************************************************/ +#ifndef MAME_INCLUDES_GALAXIAN_H +#define MAME_INCLUDES_GALAXIAN_H + +#pragma once #include "machine/gen_latch.h" #include "machine/i8255.h" @@ -470,3 +474,5 @@ protected: rgb_t m_bullet_color[8]; uint8_t m_gfxbank[5]; }; + +#endif // MAME_INCLUDES_GALAXIAN_H diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 62aa98702d4..a1c6f7c7a24 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -11,10 +11,11 @@ - scobra.cpp ***************************************************************************/ - #ifndef MAME_INCLUDES_GALAXOLD_H #define MAME_INCLUDES_GALAXOLD_H +#pragma once + #include "machine/7474.h" #include "machine/timer.h" #include "emupal.h" diff --git a/src/mame/includes/galaxy.h b/src/mame/includes/galaxy.h index 0c1327972f5..362ab4abca9 100644 --- a/src/mame/includes/galaxy.h +++ b/src/mame/includes/galaxy.h @@ -5,10 +5,11 @@ * includes/galaxy.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_GALAXY_H #define MAME_INCLUDES_GALAXY_H +#pragma once + #include "imagedev/snapquik.h" #include "imagedev/cassette.h" #include "machine/ram.h" @@ -23,7 +24,9 @@ public: , m_screen(*this, "screen") , m_cassette(*this, "cassette") , m_ram(*this, RAM_TAG) - , m_region_gfx1(*this, "gfx1") {} + , m_region_gfx1(*this, "gfx1") + { + } void galaxy(machine_config &config); void galaxyp(machine_config &config); @@ -65,5 +68,4 @@ private: bitmap_ind16 m_bitmap; }; - #endif // MAME_INCLUDES_GALAXY_H diff --git a/src/mame/includes/galeb.h b/src/mame/includes/galeb.h index 292d318f921..b9ff2903ea3 100644 --- a/src/mame/includes/galeb.h +++ b/src/mame/includes/galeb.h @@ -5,10 +5,11 @@ * includes/galeb.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_GALEB_H #define MAME_INCLUDES_GALEB_H +#pragma once + #include "sound/dac.h" #include "emupal.h" diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index f50a2febcd5..04db06584e7 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -5,6 +5,10 @@ Galivan - Cosmo Police ***************************************************************************/ +#ifndef MAME_INCLUDES_GALIVAN_H +#define MAME_INCLUDES_GALIVAN_H + +#pragma once #include "machine/nb1412m2.h" #include "machine/nb1414m4.h" @@ -15,15 +19,16 @@ class galivan_state : public driver_device { public: - galivan_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + galivan_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_nb1414m4(*this, "nb1414m4"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void galivan(machine_config &config); void ninjemak(machine_config &config); @@ -95,10 +100,11 @@ private: class dangarj_state : public galivan_state { public: - dangarj_state(const machine_config &mconfig, device_type type, const char *tag) - : galivan_state(mconfig, type, tag), + dangarj_state(const machine_config &mconfig, device_type type, const char *tag) : + galivan_state(mconfig, type, tag), m_prot(*this, "prot_chip") - {} + { } + void dangarj(machine_config &config); private: @@ -106,3 +112,5 @@ private: void dangarj_io_map(address_map &map); }; + +#endif // MAME_INCLUDES_GALIVAN_H diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h index 1400116da4c..549864b963d 100644 --- a/src/mame/includes/galpani2.h +++ b/src/mame/includes/galpani2.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia +#ifndef MAME_INCLUDES_GALPANI2_H +#define MAME_INCLUDES_GALPANI2_H + +#pragma once + #include "video/kaneko_spr.h" #include "sound/okim6295.h" #include "machine/eepromser.h" @@ -9,8 +14,8 @@ class galpani2_state : public driver_device { public: - galpani2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + galpani2_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_subcpu(*this,"sub"), m_kaneko_spr(*this, "kan_spr"), @@ -78,3 +83,5 @@ private: void galpani2_mem1(address_map &map); void galpani2_mem2(address_map &map); }; + +#endif // MAME_INCLUDES_GALPANI2_H diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index 1a3654be71e..1b772443ca0 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_GALPANIC_H +#define MAME_INCLUDES_GALPANIC_H + +#pragma once #include "machine/timer.h" #include "video/kan_pand.h" @@ -10,14 +14,14 @@ class galpanic_state : public driver_device { public: galpanic_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_bgvideoram(*this, "bgvideoram"), - m_fgvideoram(*this, "fgvideoram"), - m_gfxdecode(*this, "gfxdecode"), - m_screen(*this, "screen"), - m_palette(*this, "palette"), - m_pandora(*this, "pandora") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_bgvideoram(*this, "bgvideoram") + , m_fgvideoram(*this, "fgvideoram") + , m_gfxdecode(*this, "gfxdecode") + , m_screen(*this, "screen") + , m_palette(*this, "palette") + , m_pandora(*this, "pandora") { } void galpanica(machine_config &config); @@ -51,3 +55,5 @@ private: void galpanic_oki_map(address_map &map); void galpanica_map(address_map &map); }; + +#endif // MAME_INCLUDES_GALPANIC_H diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 692b3eeed87..c345fe378b3 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -7,6 +7,10 @@ Gals Pinball *************************************************************************/ +#ifndef MAME_INCLUDES_GALSPNBL_H +#define MAME_INCLUDES_GALSPNBL_H + +#pragma once #include "machine/gen_latch.h" #include "video/tecmo_spr.h" @@ -16,8 +20,8 @@ class galspnbl_state : public driver_device { public: - galspnbl_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + galspnbl_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), @@ -30,7 +34,7 @@ public: m_sprgen(*this, "spritegen"), m_screen(*this, "screen"), m_soundlatch(*this, "soundlatch") - { } + { } void galspnbl(machine_config &config); @@ -64,3 +68,5 @@ private: void audio_map(address_map &map); void main_map(address_map &map); }; + +#endif // MAME_INCLUDES_GALSPNBL_H diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index 98ae9c3902a..3afe0ada2ce 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -11,17 +11,16 @@ #include "emupal.h" #include "screen.h" -#define MAX_STARS 250 - -struct star { - float x,y; - int col,set; -}; - - class gaplus_base_state : public driver_device { public: + static constexpr unsigned MAX_STARS = 250; + + struct star { + float x,y; + int col,set; + }; + enum { TIMER_NAMCOIO0_RUN, diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index e14bac0aeea..48299877ec9 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -5,6 +5,10 @@ Green Beret ***************************************************************************/ +#ifndef MAME_INCLUDES_GBERET_H +#define MAME_INCLUDES_GBERET_H + +#pragma once #include "machine/timer.h" #include "sound/sn76496.h" @@ -13,8 +17,8 @@ class gberet_state : public driver_device { public: - gberet_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + gberet_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_spriteram2(*this, "spriteram2"), @@ -24,7 +28,8 @@ public: m_sn(*this, "snsnd") , m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void gberetb(machine_config &config); void mrgoemon(machine_config &config); @@ -71,8 +76,8 @@ private: 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); TIMER_DEVICE_CALLBACK_MEMBER(gberet_interrupt_tick); - void gberet_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void gberetb_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void gberet_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + void gberetb_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; @@ -80,3 +85,5 @@ private: void gberetb_map(address_map &map); void mrgoemon_map(address_map &map); }; + +#endif // MAME_INCLUDES_GBERET_H diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index 6b7c76e0690..e499e5563d0 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Graves, R. Belmont +#ifndef MAME_INCLUDES_GCPINBAL_H +#define MAME_INCLUDES_GCPINBAL_H + +#pragma once #include "machine/eepromser.h" #include "machine/mb3773.h" @@ -88,3 +92,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_GCPINBAL_H diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h index 37a1eae06ff..cb2b0c68949 100644 --- a/src/mame/includes/gijoe.h +++ b/src/mame/includes/gijoe.h @@ -5,6 +5,10 @@ GI Joe *************************************************************************/ +#ifndef MAME_INCLUDES_GIJOE_H +#define MAME_INCLUDES_GIJOE_H + +#pragma once #include "sound/k054539.h" #include "video/k053251.h" @@ -17,8 +21,8 @@ class gijoe_state : public driver_device { public: - gijoe_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + gijoe_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_workram(*this, "workram"), m_maincpu(*this, "maincpu"), @@ -28,7 +32,8 @@ public: m_k053246(*this, "k053246"), m_k053251(*this, "k053251"), m_palette(*this, "palette"), - m_k054321(*this, "k054321") { } + m_k054321(*this, "k054321") + { } void gijoe(machine_config &config); @@ -74,3 +79,5 @@ private: void gijoe_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_GIJOE_H diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index 4693a6e02cb..6aee0fb9120 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -5,6 +5,10 @@ Ginga NinkyouDen *************************************************************************/ +#ifndef MAME_INCLUDES_GINGANIN_H +#define MAME_INCLUDES_GINGANIN_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -12,8 +16,8 @@ class ginganin_state : public driver_device { public: - ginganin_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + ginganin_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_txtram(*this, "txtram"), m_spriteram(*this, "spriteram"), m_vregs(*this, "vregs"), @@ -22,7 +26,8 @@ public: m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void ginganin(machine_config &config); @@ -68,3 +73,5 @@ private: void ginganin_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_GINGANIN_H diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index 25d8ce05b4a..294cd88a8ac 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -5,6 +5,10 @@ Goal! '92 *************************************************************************/ +#ifndef MAME_INCLUDES_GOAL92_H +#define MAME_INCLUDES_GOAL92_H + +#pragma once #include "machine/gen_latch.h" #include "sound/msm5205.h" @@ -13,8 +17,8 @@ class goal92_state : public driver_device { public: - goal92_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + goal92_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_bg_data(*this, "bg_data"), m_fg_data(*this, "fg_data"), m_tx_data(*this, "tx_data"), @@ -25,7 +29,8 @@ public: m_msm(*this, "msm"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void goal92(machine_config &config); @@ -79,3 +84,5 @@ private: void goal92_map(address_map &map); void sound_cpu(address_map &map); }; + +#endif // MAME_INCLUDES_GOAL92_H diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index 5b6a2c178eb..f475a9df5dc 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -5,14 +5,18 @@ Goindol *************************************************************************/ +#ifndef MAME_INCLUDES_GOINDOL_H +#define MAME_INCLUDES_GOINDOL_H + +#pragma once #include "emupal.h" class goindol_state : public driver_device { public: - goindol_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + goindol_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_ram(*this, "ram"), m_fg_scrolly(*this, "fg_scrolly"), m_fg_scrollx(*this, "fg_scrollx"), @@ -22,7 +26,8 @@ public: m_fg_videoram(*this, "fg_videoram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void goindol(machine_config &config); void init_goindol(); @@ -65,3 +70,5 @@ private: void goindol_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_GOINDOL_H diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index b2aa268f5e2..dd41a4748b7 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Roberto Fresca, Vas Crabb +#ifndef MAME_INCLUDES_GOLDSTAR_H +#define MAME_INCLUDES_GOLDSTAR_H + +#pragma once #include "machine/ds2401.h" #include "machine/i8255.h" @@ -377,3 +381,5 @@ private: optional_device m_ticket_dispenser; }; + +#endif // MAME_INCLUDES_GOLDSTAR_H diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index 4fbaad1ccb9..521e62b294c 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -3,21 +3,24 @@ #ifndef MAME_INCLUDES_GOMOKU_H #define MAME_INCLUDES_GOMOKU_H +#pragma once + #include "emupal.h" #include "screen.h" class gomoku_state : public driver_device { public: - gomoku_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + gomoku_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_bgram(*this, "bgram"), m_inputs(*this, {"IN0", "IN1", "DSW", "UNUSED0", "UNUSED1", "UNUSED2", "UNUSED3", "UNUSED4"}), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_screen(*this, "screen") { } + m_screen(*this, "screen") + { } void gomoku(machine_config &config); diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index caa111e0c1c..86826a9abad 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -1,13 +1,18 @@ // license:BSD-3-Clause // copyright-holders:Zsolt Vasvari +#ifndef MAME_INCLUDES_GOTYA_H +#define MAME_INCLUDES_GOTYA_H + +#pragma once + #include "sound/samples.h" #include "emupal.h" class gotya_state : public driver_device { public: - gotya_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + gotya_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_scroll(*this, "scroll"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), @@ -16,7 +21,8 @@ public: m_samples(*this, "samples"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void gotya(machine_config &config); @@ -56,3 +62,5 @@ private: required_device m_palette; void gotya_map(address_map &map); }; + +#endif // MAME_INCLUDES_GOTYA_H diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index 9bc9b099d85..68fb26ce4ec 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -5,6 +5,10 @@ Gradius 3 *************************************************************************/ +#ifndef MAME_INCLUDES_GRADIUS3_H +#define MAME_INCLUDES_GRADIUS3_H + +#pragma once #include "machine/timer.h" #include "sound/k007232.h" @@ -15,8 +19,8 @@ class gradius3_state : public driver_device { public: - gradius3_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + gradius3_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_gfxram(*this, "k052109"), m_gfxrom(*this, "k051960"), m_maincpu(*this, "maincpu"), @@ -24,7 +28,8 @@ public: m_subcpu(*this, "sub"), m_k007232(*this, "k007232"), m_k052109(*this, "k052109"), - m_k051960(*this, "k051960") { } + m_k051960(*this, "k051960") + { } void gradius3(machine_config &config); @@ -73,3 +78,5 @@ private: void gradius3_map2(address_map &map); void gradius3_s_map(address_map &map); }; + +#endif // MAME_INCLUDES_GRADIUS3_H diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index b8c0b19fc4a..7afafb81ba5 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -5,14 +5,18 @@ Gun.Smoke *************************************************************************/ +#ifndef MAME_INCLUDES_GUNSMOKE_H +#define MAME_INCLUDES_GUNSMOKE_H + +#pragma once #include "emupal.h" class gunsmoke_state : public driver_device { public: - gunsmoke_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + gunsmoke_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_scrollx(*this, "scrollx"), @@ -20,7 +24,8 @@ public: m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void gunsmoke(machine_config &config); @@ -58,3 +63,5 @@ private: void gunsmoke_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_GUNSMOKE_H diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index f20d08def1e..c30b4041bd5 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -5,6 +5,10 @@ Gyruss *************************************************************************/ +#ifndef MAME_INCLUDES_GYRUSS_H +#define MAME_INCLUDES_GYRUSS_H + +#pragma once #include "sound/discrete.h" #include "emupal.h" @@ -13,8 +17,8 @@ class gyruss_state : public driver_device { public: - gyruss_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + gyruss_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), m_audiocpu(*this, "audiocpu"), @@ -80,3 +84,5 @@ private: void main_cpu1_map(address_map &map); void main_cpu2_map(address_map &map); }; + +#endif // MAME_INCLUDES_GYRUSS_H diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index 341adeb623d..25f56747f9d 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -5,18 +5,23 @@ Hana Awase *************************************************************************/ +#ifndef MAME_INCLUDES_HANAAWAS_H +#define MAME_INCLUDES_HANAAWAS_H + +#pragma once #include "emupal.h" class hanaawas_state : public driver_device { public: - hanaawas_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + hanaawas_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode") + { } void hanaawas(machine_config &config); @@ -50,3 +55,5 @@ private: void hanaawas_map(address_map &map); void io_map(address_map &map); }; + +#endif // MAME_INCLUDES_HANAAWAS_H diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 411e33f0a96..a074d4bf4d4 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -5,6 +5,10 @@ Haunted Castle *************************************************************************/ +#ifndef MAME_INCLUDES_HCASTLE_H +#define MAME_INCLUDES_HCASTLE_H + +#pragma once #include "video/bufsprite.h" #include "sound/k007232.h" @@ -14,10 +18,10 @@ class hcastle_state : public driver_device { public: - hcastle_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_spriteram(*this, "spriteram"), - m_spriteram2(*this, "spriteram2") , + hcastle_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_spriteram(*this, "spriteram"), + m_spriteram2(*this, "spriteram2") , m_pf1_videoram(*this, "pf1_videoram"), m_pf2_videoram(*this, "pf2_videoram"), m_audiocpu(*this, "audiocpu"), @@ -26,7 +30,8 @@ public: m_k007232(*this, "k007232"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void hcastle(machine_config &config); @@ -78,3 +83,5 @@ private: void hcastle_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_HCASTLE_H diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index 8cfeb213714..9fa80410301 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_HEXION_H +#define MAME_INCLUDES_HEXION_H + +#pragma once #include "machine/k053252.h" #include "machine/timer.h" @@ -7,12 +11,12 @@ class hexion_state : public driver_device { public: - hexion_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) , + hexion_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_k053252(*this, "k053252"), m_gfxdecode(*this, "gfxdecode") - { } + { } void hexion(machine_config &config); void hexionb(machine_config &config); @@ -54,3 +58,5 @@ private: void hexion_map(address_map &map); void hexionb_map(address_map &map); }; + +#endif // MAME_INCLUDES_HEXION_H diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 9c8b595ee34..7d184898120 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -5,6 +5,10 @@ Pirate Ship Higemaru *************************************************************************/ +#ifndef MAME_INCLUDES_HIGEMARU_H +#define MAME_INCLUDES_HIGEMARU_H + +#pragma once #include "machine/timer.h" #include "emupal.h" @@ -12,14 +16,15 @@ class higemaru_state : public driver_device { public: - higemaru_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + higemaru_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void higemaru(machine_config &config); @@ -45,3 +50,5 @@ private: required_device m_palette; void higemaru_map(address_map &map); }; + +#endif // MAME_INCLUDES_HIGEMARU_H diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 656484a568e..f47fb3a77cd 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -6,6 +6,10 @@ Himeshikibu *************************************************************************/ +#ifndef MAME_INCLUDES_HIMESIKI_H +#define MAME_INCLUDES_HIMESIKI_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -13,8 +17,8 @@ class himesiki_state : public driver_device { public: - himesiki_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + himesiki_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_bg_ram(*this, "bg_ram"), m_spriteram_p103a(*this, "sprram_p103a"), m_spriteram(*this, "spriteram"), @@ -22,24 +26,25 @@ public: m_subcpu(*this, "sub"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void himesiki(machine_config &config); private: - /* memory pointers */ + // memory pointers required_shared_ptr m_bg_ram; required_shared_ptr m_spriteram_p103a; required_shared_ptr m_spriteram; - /* video-related */ + // video-related tilemap_t *m_bg_tilemap; int m_scrollx[2]; int m_scrolly; int m_flipscreen; - /* devices */ + // devices required_device m_maincpu; required_device m_subcpu; required_device m_gfxdecode; @@ -56,9 +61,11 @@ private: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_himesiki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void himesiki_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void himesiki_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void himesiki_iom0(address_map &map); void himesiki_iom1(address_map &map); void himesiki_prm0(address_map &map); void himesiki_prm1(address_map &map); }; + +#endif // MAME_INCLUDES_HIMESIKI_H diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index 7778c11c907..88306210ca0 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -22,13 +22,14 @@ class hitme_state : public driver_device { public: - hitme_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + hitme_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), m_gfxdecode(*this, "gfxdecode"), - m_screen(*this, "screen") { } + m_screen(*this, "screen") + { } void hitme(machine_config &config); void barricad(machine_config &config); diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h index 3582f1e219b..f81e4f0bd78 100644 --- a/src/mame/includes/hp48.h +++ b/src/mame/includes/hp48.h @@ -59,7 +59,9 @@ public: , m_dac(*this, "dac") , m_palette(*this, "palette") , m_screen(*this, "screen") - , m_port(*this, "port%u", 1U) {} + , m_port(*this, "port%u", 1U) + { + } void hp48s(machine_config &config); void hp48gp(machine_config &config); diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index 4d7cc66cd40..aa3abed5f83 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -16,8 +16,8 @@ class hyperspt_state : public driver_device { public: - hyperspt_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + hyperspt_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_scroll(*this, "scroll"), m_videoram(*this, "videoram"), @@ -30,7 +30,8 @@ public: m_vlm(*this, "vlm"), m_screen(*this, "screen"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void hyperspt(machine_config &config); void roadf(machine_config &config); diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index 342ef148d5f..b0cfa9f7e24 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -5,6 +5,10 @@ Ikki *************************************************************************/ +#ifndef MAME_INCLUDES_IKKI_H +#define MAME_INCLUDES_IKKI_H + +#pragma once #include "machine/timer.h" #include "emupal.h" @@ -13,8 +17,8 @@ class ikki_state : public driver_device { public: - ikki_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + ikki_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), m_videoram(*this, "videoram"), @@ -22,10 +26,16 @@ public: m_spriteram(*this, "spriteram"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void ikki(machine_config &config); +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; + private: required_device m_maincpu; required_device m_subcpu; @@ -47,13 +57,12 @@ private: DECLARE_READ8_MEMBER(ikki_e000_r); DECLARE_WRITE8_MEMBER(ikki_coin_counters); DECLARE_WRITE8_MEMBER(ikki_scrn_ctrl_w); - virtual void machine_start() override; - virtual void machine_reset() override; - virtual void video_start() override; DECLARE_PALETTE_INIT(ikki); uint32_t screen_update_ikki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(ikki_irq); - void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void ikki_cpu1(address_map &map); void ikki_cpu2(address_map &map); }; + +#endif // MAME_INCLUDES_IKKI_H diff --git a/src/mame/includes/intv.h b/src/mame/includes/intv.h index 67d9001fa71..88673886b2c 100644 --- a/src/mame/includes/intv.h +++ b/src/mame/includes/intv.h @@ -5,10 +5,11 @@ * includes/intv.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_INTV_H #define MAME_INCLUDES_INTV_H +#pragma once + #include "sound/ay8910.h" #include "video/stic.h" #include "video/tms9927.h" @@ -30,8 +31,8 @@ class intv_state : public driver_device { public: - intv_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + intv_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_sound(*this, "ay8914"), m_stic(*this, "stic"), diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index c78be4a0caa..2e19c9e830b 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -1,18 +1,23 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria, Ernesto Corvi +#ifndef MAME_INCLUDES_IQBLOCK_H +#define MAME_INCLUDES_IQBLOCK_H + +#pragma once #include "machine/timer.h" class iqblock_state : public driver_device { public: - iqblock_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + iqblock_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_gfxdecode(*this, "gfxdecode"), m_rambase(*this, "rambase"), m_bgvideoram(*this, "bgvideoram"), - m_fgvideoram(*this, "fgvideoram") { } + m_fgvideoram(*this, "fgvideoram") + { } void iqblock(machine_config &config); @@ -51,3 +56,5 @@ private: void main_map(address_map &map); void main_portmap(address_map &map); }; + +#endif // MAME_INCLUDES_IQBLOCK_H diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index 48a9cb351aa..96d1ced3b84 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -5,6 +5,10 @@ IronHorse *************************************************************************/ +#ifndef MAME_INCLUDES_IRONHORS_H +#define MAME_INCLUDES_IRONHORS_H + +#pragma once #include "machine/gen_latch.h" #include "machine/timer.h" @@ -15,8 +19,8 @@ class ironhors_state : public driver_device { public: - ironhors_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + ironhors_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_gfxdecode(*this, "gfxdecode"), @@ -29,7 +33,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_spriteram2(*this, "spriteram2"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") + { } void farwest(machine_config &config); void ironhors(machine_config &config); @@ -92,3 +97,5 @@ private: TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(farwest_get_bg_tile_info); }; + +#endif // MAME_INCLUDES_IRONHORS_H diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 6af883e5730..df6125eee76 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -6,6 +6,10 @@ (32-bit blitter variant) **************************************************************************/ +#ifndef MAME_INCLUDES_ITECH32_H +#define MAME_INCLUDES_ITECH32_H + +#pragma once #include "machine/6522via.h" #include "machine/nvram.h" @@ -15,18 +19,18 @@ #include "emupal.h" #include "screen.h" -#define VIDEO_CLOCK XTAL(8'000'000) /* video (pixel) clock */ -#define CPU_CLOCK XTAL(12'000'000) /* clock for 68000-based systems */ -#define CPU020_CLOCK XTAL(25'000'000) /* clock for 68EC020-based systems */ -#define SOUND_CLOCK XTAL(16'000'000) /* clock for sound board */ -#define TMS_CLOCK XTAL(40'000'000) /* TMS320C31 clocks on drivedge */ +#define VIDEO_CLOCK XTAL(8'000'000) // video (pixel) clock +#define CPU_CLOCK XTAL(12'000'000) // clock for 68000-based systems +#define CPU020_CLOCK XTAL(25'000'000) // clock for 68EC020-based systems +#define SOUND_CLOCK XTAL(16'000'000) // clock for sound board +#define TMS_CLOCK XTAL(40'000'000) // TMS320C31 clocks on drivedge class itech32_state : public driver_device { public: - itech32_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + itech32_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_via(*this, "via6522_0"), @@ -203,8 +207,8 @@ protected: class drivedge_state : public itech32_state { public: - drivedge_state(const machine_config &mconfig, device_type type, const char *tag) - : itech32_state(mconfig, type, tag), + drivedge_state(const machine_config &mconfig, device_type type, const char *tag) : + itech32_state(mconfig, type, tag), m_dsp1(*this, "dsp1"), m_dsp2(*this, "dsp2"), m_zbuf_control(*this, "zctl"), @@ -265,3 +269,5 @@ protected: uint8_t m_tms_spinning[2]; }; + +#endif // MAME_INCLUDES_ITECH32_H diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index c44858540da..49740a54908 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -6,6 +6,10 @@ Jack the Giant Killer *************************************************************************/ +#ifndef MAME_INCLUDES_JACK_H +#define MAME_INCLUDES_JACK_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -13,8 +17,8 @@ class jack_state : public driver_device { public: - jack_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + jack_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_spriteram(*this, "spriteram"), @@ -103,3 +107,5 @@ private: void striv_map(address_map &map); void unclepoo_map(address_map &map); }; + +#endif // MAME_INCLUDES_JACK_H diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 6f5ba11b080..fb74d00c537 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -1,6 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder // thanks-to:Kenneth Lin (original driver author) +#ifndef MAME_INCLUDES_JACKAL_H +#define MAME_INCLUDES_JACKAL_H + +#pragma once #include "emupal.h" @@ -12,14 +16,15 @@ class jackal_state : public driver_device { public: - jackal_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + jackal_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoctrl(*this, "videoctrl"), - m_dials(*this, {"DIAL0", "DIAL1"}), + m_dials(*this, "DIAL%u", 0U), m_mastercpu(*this, "master"), m_slavecpu(*this, "slave"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void jackal(machine_config &config); @@ -66,3 +71,5 @@ private: void master_map(address_map &map); void slave_map(address_map &map); }; + +#endif // MAME_INCLUDES_JACKAL_H diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 58993d445f5..c92ef5dab2b 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -5,6 +5,10 @@ Jailbreak ***************************************************************************/ +#ifndef MAME_INCLUDES_JAILBREK_H +#define MAME_INCLUDES_JAILBREK_H + +#pragma once #include "sound/vlm5030.h" #include "emupal.h" @@ -15,8 +19,8 @@ class jailbrek_state : public driver_device { public: - jailbrek_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + jailbrek_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), @@ -25,7 +29,8 @@ public: m_maincpu(*this, "maincpu"), m_vlm(*this, "vlm"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void jailbrek(machine_config &config); @@ -67,3 +72,5 @@ private: void jailbrek_map(address_map &map); void vlm_map(address_map &map); }; + +#endif // MAME_INCLUDES_JAILBREK_H diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index 4f6124fd323..7f46de6d9c8 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -5,10 +5,11 @@ -= Kaneko 16 Bit Games =- ***************************************************************************/ - #ifndef MAME_INCLUDES_KANEKO16_H #define MAME_INCLUDES_KANEKO16_H +#pragma once + #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" #include "machine/eepromser.h" @@ -30,8 +31,8 @@ class kaneko16_state : public driver_device { public: - kaneko16_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + kaneko16_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_ym2149(*this, "ym2149_%u", 1), @@ -147,8 +148,8 @@ public: class kaneko16_gtmr_state : public kaneko16_state { public: - kaneko16_gtmr_state(const machine_config &mconfig, device_type type, const char *tag) - : kaneko16_state(mconfig, type, tag) + kaneko16_gtmr_state(const machine_config &mconfig, device_type type, const char *tag) : + kaneko16_state(mconfig, type, tag) { } @@ -175,13 +176,12 @@ public: class kaneko16_berlwall_state : public kaneko16_state { public: - kaneko16_berlwall_state(const machine_config &mconfig, device_type type, const char *tag) - : kaneko16_state(mconfig, type, tag), + kaneko16_berlwall_state(const machine_config &mconfig, device_type type, const char *tag) : + kaneko16_state(mconfig, type, tag), m_bg15_select(*this, "bg15_select"), m_bg15_scroll(*this, "bg15_scroll"), m_bg15_bright(*this, "bg15_bright"), m_bgpalette(*this, "bgpalette") - { } @@ -222,8 +222,8 @@ public: class kaneko16_shogwarr_state : public kaneko16_state { public: - kaneko16_shogwarr_state(const machine_config &mconfig, device_type type, const char *tag) - : kaneko16_state(mconfig, type, tag), + kaneko16_shogwarr_state(const machine_config &mconfig, device_type type, const char *tag) : + kaneko16_state(mconfig, type, tag), m_calc3_prot(*this, "calc3_prot") { } diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index d0c0e167abd..3802d31ddfc 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -5,6 +5,10 @@ Karate Champ *************************************************************************/ +#ifndef MAME_INCLUDES_KCHAMP_H +#define MAME_INCLUDES_KCHAMP_H + +#pragma once #include "machine/74157.h" #include "machine/gen_latch.h" @@ -16,8 +20,8 @@ class kchamp_state : public driver_device { public: - kchamp_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + kchamp_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), @@ -30,7 +34,8 @@ public: m_dac(*this, "dac"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void kchamp(machine_config &config); void kchampvs(machine_config &config); @@ -97,3 +102,5 @@ private: void kchampvs_sound_io_map(address_map &map); void kchampvs_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_KCHAMP_H diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index b72b4508c55..dcf42e5b6d2 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -5,6 +5,10 @@ Knuckle Joe *************************************************************************/ +#ifndef MAME_INCLUDES_BLOODBRO_H +#define MAME_INCLUDES_BLOODBRO_H + +#pragma once #include "machine/gen_latch.h" #include "sound/ay8910.h" @@ -14,8 +18,8 @@ class kncljoe_state : public driver_device { public: - kncljoe_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + kncljoe_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_scrollregs(*this, "scrollregs"), m_spriteram(*this, "spriteram"), @@ -25,7 +29,8 @@ public: m_screen(*this, "screen"), m_palette(*this, "palette"), m_ay8910(*this, "aysnd"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void kncljoe(machine_config &config); @@ -75,3 +80,5 @@ private: void main_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_BLOODBRO_H diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index e527205cef9..2a116ca9f70 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -3,6 +3,8 @@ #ifndef MAME_INCLUDES_KONAMIGX_H #define MAME_INCLUDES_KONAMIGX_H +#pragma once + #include "cpu/tms57002/tms57002.h" #include "machine/adc083x.h" #include "machine/k053252.h" diff --git a/src/mame/includes/kramermc.h b/src/mame/includes/kramermc.h index d7b0047830c..ac7409f10d0 100644 --- a/src/mame/includes/kramermc.h +++ b/src/mame/includes/kramermc.h @@ -5,21 +5,23 @@ * includes/kramermc.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_KRAMERMC_H #define MAME_INCLUDES_KRAMERMC_H +#pragma once + #include "machine/z80pio.h" #include "emupal.h" class kramermc_state : public driver_device { public: - kramermc_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + kramermc_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void kramermc(machine_config &config); diff --git a/src/mame/includes/kyocera.h b/src/mame/includes/kyocera.h index da023d515d0..85a154e2f5b 100644 --- a/src/mame/includes/kyocera.h +++ b/src/mame/includes/kyocera.h @@ -158,8 +158,9 @@ protected: class trsm100_state : public kc85_state { public: - trsm100_state(const machine_config &mconfig, device_type type, const char *tag) - : kc85_state(mconfig, type, tag) { } + trsm100_state(const machine_config &mconfig, device_type type, const char *tag) : + kc85_state(mconfig, type, tag) + { } virtual void machine_start() override; void trsm100(machine_config &config); @@ -169,9 +170,9 @@ public: class pc8201_state : public kc85_state { public: - pc8201_state(const machine_config &mconfig, device_type type, const char *tag) - : kc85_state(mconfig, type, tag), - m_cas_cart(*this, "cas_cartslot") + pc8201_state(const machine_config &mconfig, device_type type, const char *tag) : + kc85_state(mconfig, type, tag), + m_cas_cart(*this, "cas_cartslot") { } virtual void machine_start() override; diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index c3a4e2d8ecb..20f1ad932cf 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -5,6 +5,10 @@ Labyrinth Runner *************************************************************************/ +#ifndef MAME_INCLUDES_LABYRUNR_H +#define MAME_INCLUDES_LABYRUNR_H + +#pragma once #include "video/k007121.h" #include "video/k051733.h" @@ -14,8 +18,8 @@ class labyrunr_state : public driver_device { public: - labyrunr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + labyrunr_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_k007121(*this, "k007121"), m_maincpu(*this,"maincpu"), m_scrollram(*this, "scrollram"), @@ -24,7 +28,8 @@ public: m_videoram2(*this, "videoram2"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void labyrunr(machine_config &config); @@ -62,3 +67,5 @@ private: INTERRUPT_GEN_MEMBER(labyrunr_timer_interrupt); void labyrunr_map(address_map &map); }; + +#endif // MAME_INCLUDES_LABYRUNR_H diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 179dbaf7359..c1642a8f8c0 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -5,6 +5,10 @@ Lasso and similar hardware ***************************************************************************/ +#ifndef MAME_INCLUDES_LASSO_H +#define MAME_INCLUDES_LASSO_H + +#pragma once #include "machine/gen_latch.h" #include "sound/sn76496.h" @@ -13,8 +17,8 @@ class lasso_state : public driver_device { public: - lasso_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + lasso_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), @@ -29,7 +33,8 @@ public: m_sn_2(*this, "sn76489.2"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void base(machine_config &config); void wwjgtin(machine_config &config); @@ -104,3 +109,5 @@ private: void wwjgtin_audio_map(address_map &map); void wwjgtin_main_map(address_map &map); }; + +#endif // MAME_INCLUDES_LASSO_H diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index a746370cd1e..f1c2d2470d4 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -5,6 +5,10 @@ Last Duel *************************************************************************/ +#ifndef MAME_INCLUDES_LASTDUEL_H +#define MAME_INCLUDES_LASTDUEL_H + +#pragma once #include "machine/gen_latch.h" #include "machine/timer.h" @@ -74,9 +78,11 @@ private: uint32_t screen_update_madgear(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(lastduel_timer_cb); TIMER_DEVICE_CALLBACK_MEMBER(madgear_timer_cb); - void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); + void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri); void lastduel_map(address_map &map); void madgear_map(address_map &map); void madgear_sound_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_LASTDUEL_H diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index 44c02722553..e2d3e5e3499 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -1,5 +1,9 @@ // license:GPL-2.0+ // copyright-holders:Juergen Buchmueller +#ifndef MAME_INCLUDES_LAZERCMD_H +#define MAME_INCLUDES_LAZERCMD_H + +#pragma once #include "cpu/s2650/s2650.h" #include "machine/timer.h" @@ -28,8 +32,8 @@ class lazercmd_state : public driver_device { public: - lazercmd_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + lazercmd_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dac0(*this, "dac0"), m_dac1(*this, "dac1"), @@ -89,3 +93,5 @@ private: void lazercmd_portmap(address_map &map); void medlanes_map(address_map &map); }; + +#endif // MAME_INCLUDES_LAZERCMD_H diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index a9924910073..7e24979c6f6 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Graves, Angelo Salese, David Haywood, Tomasz Slanina +#ifndef MAME_INCLUDES_LEGIONNA_H +#define MAME_INCLUDES_LEGIONNA_H + +#pragma once #include "sound/okim6295.h" #include "audio/seibu.h" @@ -12,21 +16,21 @@ class legionna_state : public driver_device, protected seibu_sound_common { public: legionna_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_spriteram(*this, "spriteram"), - m_swappal(*this, "swappal"), - m_layer_disable(0), - m_back_gfx_bank(0), - m_fore_gfx_bank(0), - m_mid_gfx_bank(0), - m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), - m_seibu_sound(*this, "seibu_sound"), - m_oki(*this, "oki"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette"), - m_crtc(*this, "crtc"), - m_raiden2cop(*this, "raiden2cop") + : driver_device(mconfig, type, tag) + , m_spriteram(*this, "spriteram") + , m_swappal(*this, "swappal") + , m_layer_disable(0) + , m_back_gfx_bank(0) + , m_fore_gfx_bank(0) + , m_mid_gfx_bank(0) + , m_maincpu(*this, "maincpu") + , m_audiocpu(*this, "audiocpu") + , m_seibu_sound(*this, "seibu_sound") + , m_oki(*this, "oki") + , m_gfxdecode(*this, "gfxdecode") + , m_palette(*this, "palette") + , m_crtc(*this, "crtc") + , m_raiden2cop(*this, "raiden2cop") { memset(scrollvals, 0, sizeof(uint16_t)*6); } @@ -126,3 +130,5 @@ private: void legionna_map(address_map &map); void godzilla_sound_io_map(address_map &map); }; + +#endif // MAME_INCLUDES_LEGIONNA_H diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index f72f3d70c15..b518681ae8a 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -5,6 +5,10 @@ Lethal Enforcers *************************************************************************/ +#ifndef MAME_INCLUDES_LETHAL_H +#define MAME_INCLUDES_LETHAL_H + +#pragma once #include "machine/bankdev.h" #include "sound/k054539.h" @@ -18,15 +22,16 @@ class lethal_state : public driver_device { public: - lethal_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + lethal_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_bank4000(*this, "bank4000"), m_k056832(*this, "k056832"), m_k053244(*this, "k053244"), m_k054321(*this, "k054321"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void lethalej(machine_config &config); void lethalen(machine_config &config); @@ -67,3 +72,5 @@ private: void le_main(address_map &map); void le_sound(address_map &map); }; + +#endif // MAME_INCLUDES_LETHAL_H diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index d8309f75b4c..9fb7944effa 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail +#ifndef MAME_INCLUDES_LIBERATE_H +#define MAME_INCLUDES_LIBERATE_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -7,8 +11,8 @@ class liberate_state : public driver_device { public: - liberate_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + liberate_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_bg_vram(*this, "bg_vram"), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), @@ -19,7 +23,8 @@ public: m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } void liberate_base(machine_config &config); void liberate(machine_config &config); @@ -106,3 +111,5 @@ private: void prosoccr_sound_map(address_map &map); void prosport_map(address_map &map); }; + +#endif // MAME_INCLUDES_LIBERATE_H diff --git a/src/mame/includes/lisa.h b/src/mame/includes/lisa.h index 330b764f6a1..00ace4b7069 100644 --- a/src/mame/includes/lisa.h +++ b/src/mame/includes/lisa.h @@ -105,8 +105,8 @@ struct lisa_features_t class lisa_state : public driver_device { public: - lisa_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + lisa_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_via0(*this, "via6522_0"), m_via1(*this, "via6522_1"), diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index e8fc12256e4..a49cf3f371d 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -1,17 +1,22 @@ // license:BSD-3-Clause // copyright-holders:Zsolt Vasvari, Curt Coder +#ifndef MAME_INCLUDES_LVCARDS_H +#define MAME_INCLUDES_LVCARDS_H + +#pragma once #include "emupal.h" class lvcards_state : public driver_device { public: - lvcards_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + lvcards_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode") { } + m_gfxdecode(*this, "gfxdecode") + { } void lvpoker(machine_config &config); void lvcards(machine_config &config); @@ -42,3 +47,5 @@ private: void lvpoker_map(address_map &map); void ponttehk_map(address_map &map); }; + +#endif // MAME_INCLUDES_LVCARDS_H diff --git a/src/mame/includes/lviv.h b/src/mame/includes/lviv.h index 69433b12046..e0fc9150e57 100644 --- a/src/mame/includes/lviv.h +++ b/src/mame/includes/lviv.h @@ -5,10 +5,11 @@ * includes/lviv.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_LVIV_H #define MAME_INCLUDES_LVIV_H +#pragma once + #include "imagedev/cassette.h" #include "imagedev/snapquik.h" #include "machine/i8255.h" diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 538c2240149..100b39c83c6 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -5,6 +5,10 @@ IREM M-10,M-11 and M-15 based hardware ****************************************************************************/ +#ifndef MAME_INCLUDES_M10_H +#define MAME_INCLUDES_M10_H + +#pragma once #include "sound/samples.h" #include "machine/74123.h" @@ -36,8 +40,8 @@ class m10_state : public driver_device { public: - m10_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + m10_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_memory(*this, "memory"), m_rom(*this, "rom"), m_videoram(*this, "videoram"), @@ -49,7 +53,8 @@ public: m_samples(*this, "samples"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void m15(machine_config &config); void headoni(machine_config &config); @@ -130,3 +135,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_M10_H diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index 69e37a8f7aa..11ef9978a95 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -5,6 +5,10 @@ Irem M107 hardware *************************************************************************/ +#ifndef MAME_INCLUDES_M107_H +#define MAME_INCLUDES_M107_H + +#pragma once #include "machine/pic8259.h" #include "machine/timer.h" @@ -96,3 +100,5 @@ private: void wpksoc_io_map(address_map &map); void wpksoc_map(address_map &map); }; + +#endif // MAME_INCLUDES_M107_H diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index 04cc7316a6b..297008286b9 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_M52_H +#define MAME_INCLUDES_M52_H + +#pragma once #include "emupal.h" #include "screen.h" @@ -91,4 +95,6 @@ protected: virtual DECLARE_WRITE8_MEMBER(m52_scroll_w) override; DECLARE_WRITE8_MEMBER(alpha1v_flipscreen_w); -}; \ No newline at end of file +}; + +#endif // MAME_INCLUDES_M52_H diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index bdb6ae4e60b..ad9135effa1 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -1,19 +1,24 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino +#ifndef MAME_INCLUDES_M57_H +#define MAME_INCLUDES_M57_H + +#pragma once #include "emupal.h" class m57_state : public driver_device { public: - m57_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + m57_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_scrollram(*this, "scrollram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void m57(machine_config &config); @@ -39,3 +44,5 @@ private: required_device m_palette; void main_map(address_map &map); }; + +#endif // MAME_INCLUDES_M57_H diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index 8946bf85491..3e9e1671df0 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -6,14 +6,19 @@ Irem M58 hardware ****************************************************************************/ +#ifndef MAME_INCLUDES_M58_H +#define MAME_INCLUDES_M58_H + +#pragma once + #include "emupal.h" #include "screen.h" class m58_state : public driver_device { public: - m58_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + m58_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), @@ -62,3 +67,5 @@ private: void draw_panel( bitmap_ind16 &bitmap, const rectangle &cliprect ); void yard_map(address_map &map); }; + +#endif // MAME_INCLUDES_M58_H diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index 3039730e3e6..f1122023a89 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:smf, David Haywood +#ifndef MAME_INCLUDES_M62_H +#define MAME_INCLUDES_M62_H + +#pragma once #include "audio/irem.h" #include "emupal.h" @@ -7,8 +11,8 @@ class m62_state : public driver_device { public: - m62_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + m62_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_m62_tileram(*this, "m62_tileram"), m_m62_textram(*this, "m62_textram"), @@ -146,10 +150,10 @@ private: uint32_t screen_update_youjyudn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_horizon(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void m62_amplify_contrast(bool include_fg); - void register_savestate( ); - void draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect, int colormask, int prioritymask, int priority ); - void m62_start( tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ); - void m62_textlayer( tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ); + void register_savestate(); + void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect, int colormask, int prioritymask, int priority); + void m62_start(tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2); + void m62_textlayer(tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2); required_device m_maincpu; optional_device m_fg_decode; required_device m_spr_decode; @@ -179,3 +183,5 @@ private: void youjyudn_io_map(address_map &map); void youjyudn_map(address_map &map); }; + +#endif // MAME_INCLUDES_M62_H diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index 4af8cb47be4..2c278699842 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -5,6 +5,10 @@ Irem M92 hardware *************************************************************************/ +#ifndef MAME_INCLUDES_M92_H +#define MAME_INCLUDES_M92_H + +#pragma once #include "video/bufsprite.h" #include "sound/okim6295.h" @@ -42,7 +46,8 @@ public: m_palette(*this, "palette"), m_upd71059c(*this, "upd71059c"), m_eeprom(*this, "eeprom", 16), - m_mainbank(*this, "mainbank") { } + m_mainbank(*this, "mainbank") + { } void m92(machine_config &config); void m92_banked(machine_config &config); @@ -129,3 +134,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_M92_H diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h index 3bba73a8bb9..562e294bfcc 100644 --- a/src/mame/includes/mac.h +++ b/src/mame/includes/mac.h @@ -7,10 +7,11 @@ * Macintosh driver declarations * ****************************************************************************/ - #ifndef MAME_INCLUDES_MAC_H #define MAME_INCLUDES_MAC_H +#pragma once + #include "machine/8530scc.h" #include "machine/6522via.h" #include "machine/ram.h" @@ -65,8 +66,8 @@ void mac_fdc_set_enable_lines(device_t *device, int enable_mask); class mac_state : public driver_device { public: - mac_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + mac_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_via1(*this, "via6522_0"), m_via2(*this, "via6522_1"), @@ -599,8 +600,7 @@ private: void kbd_shift_out(int data); void keyboard_receive(int val); void mac_driver_init(model_t model); - void mac_install_memory(offs_t memory_begin, offs_t memory_end, - offs_t memory_size, void *memory_data, int is_rom, const char *bank); + void mac_install_memory(offs_t memory_begin, offs_t memory_end, offs_t memory_size, void *memory_data, int is_rom, const char *bank); offs_t mac_dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); }; diff --git a/src/mame/includes/macpci.h b/src/mame/includes/macpci.h index e53d6ffdd6e..6fdbd2b9d62 100644 --- a/src/mame/includes/macpci.h +++ b/src/mame/includes/macpci.h @@ -30,8 +30,8 @@ class macpci_state : public driver_device { public: - macpci_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + macpci_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_via1(*this, "via6522_0"), m_awacs(*this, "awacs"), @@ -40,7 +40,7 @@ public: m_scc(*this, "scc"), m_539x_1(*this, MAC_539X_1_TAG), m_539x_2(*this, MAC_539X_2_TAG) - { } + { } void pippin(machine_config &config); diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 6b57a7a6703..d08b039c0c7 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -6,6 +6,10 @@ Macross Plus *************************************************************************/ +#ifndef MAME_INCLUDES_MACROSSP_H +#define MAME_INCLUDES_MACROSSP_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -14,8 +18,8 @@ class macrossp_state : public driver_device { public: - macrossp_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + macrossp_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_scra_videoram(*this, "scra_videoram"), m_scra_linezoom(*this, "scra_linezoom"), @@ -110,3 +114,5 @@ private: void macrossp_map(address_map &map); void macrossp_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_MACROSSP_H diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index 99c9cc5f10d..785ba29ef54 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -10,6 +10,8 @@ #ifndef MAME_INCLUDES_MADALIEN_H #define MAME_INCLUDES_MADALIEN_H +#pragma once + #include "machine/gen_latch.h" #include "sound/discrete.h" #include "emupal.h" @@ -21,8 +23,8 @@ class madalien_state : public driver_device { public: - madalien_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + madalien_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_charram(*this, "charram"), m_video_control(*this, "video_control"), @@ -39,7 +41,8 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch"), - m_soundlatch2(*this, "soundlatch2") { } + m_soundlatch2(*this, "soundlatch2") + { } void madalien(machine_config &config); void madalien_video(machine_config &config); diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index 4969ab55492..97e7a437ea0 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi +#ifndef MAME_INCLUDES_MAGMAX_H +#define MAME_INCLUDES_MAGMAX_H + +#pragma once + #include "screen.h" #include "machine/gen_latch.h" #include "sound/ay8910.h" @@ -8,8 +13,8 @@ class magmax_state : public driver_device { public: - magmax_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + magmax_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_vreg(*this, "vreg"), @@ -22,7 +27,8 @@ public: m_soundlatch(*this, "soundlatch"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void magmax(machine_config &config); @@ -69,3 +75,5 @@ private: void sound_io_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_MAGMAX_H diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h index e8e7b9994e4..81ec701f3ce 100644 --- a/src/mame/includes/mainevt.h +++ b/src/mame/includes/mainevt.h @@ -5,6 +5,11 @@ The Main Event / Devastators *************************************************************************/ +#ifndef MAME_INCLUDES_MAINEVT_H +#define MAME_INCLUDES_MAINEVT_H + +#pragma once + #include "sound/upd7759.h" #include "sound/k007232.h" #include "video/k052109.h" @@ -76,3 +81,5 @@ private: required_memory_bank m_rombank; output_finder<4> m_leds; }; + +#endif // MAME_INCLUDES_MAINEVT_H diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index f153e04c5eb..4bedd29328e 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -14,8 +14,8 @@ class mappy_state : public driver_device { public: - mappy_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + mappy_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h index a2f94339ca0..a19c14c3b60 100644 --- a/src/mame/includes/mbee.h +++ b/src/mame/includes/mbee.h @@ -5,10 +5,11 @@ * includes/mbee.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_MBEE_H #define MAME_INCLUDES_MBEE_H +#pragma once + #include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index d6f34072dcf..12742d2cc1d 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -5,6 +5,10 @@ Midway MCR system **************************************************************************/ +#ifndef MAME_INCLUDES_MCR_H +#define MAME_INCLUDES_MCR_H + +#pragma once #include "cpu/z80/z80.h" #include "machine/z80daisy.h" @@ -174,13 +178,14 @@ private: class mcr_nflfoot_state : public mcr_state { public: - mcr_nflfoot_state(const machine_config &mconfig, device_type type, const char *tag) - : mcr_state(mconfig, type, tag), + mcr_nflfoot_state(const machine_config &mconfig, device_type type, const char *tag) : + mcr_state(mconfig, type, tag), m_ipu(*this, "ipu"), m_ipu_sio(*this, "ipu_sio"), m_ipu_ctc(*this, "ipu_ctc"), m_ipu_pio0(*this, "ipu_pio0"), - m_ipu_pio1(*this, "ipu_pio1") {} + m_ipu_pio1(*this, "ipu_pio1") + { } DECLARE_WRITE_LINE_MEMBER(sio_txda_w); DECLARE_WRITE_LINE_MEMBER(sio_txdb_w); @@ -221,3 +226,4 @@ extern const z80_daisy_config mcr_ipu_daisy_chain[]; extern const gfx_layout mcr_bg_layout; extern const gfx_layout mcr_sprite_layout; +#endif // MAME_INCLUDES_MCR_H diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index 54a0c7fce58..647a04182df 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -5,6 +5,10 @@ Midway MCR-3 system **************************************************************************/ +#ifndef MAME_INCLUDES_MCR3_H +#define MAME_INCLUDES_MCR3_H + +#pragma once #include "machine/74259.h" #include "machine/adc0844.h" @@ -101,3 +105,5 @@ private: void mcr3_update_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int color_mask, int code_xor, int dx, int dy, int interlaced); void mcr_common_init(); }; + +#endif // MAME_INCLUDES_MCR3_H diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 8b2ad1cd1ee..4e3b6b53f51 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -5,6 +5,10 @@ Midway MCR-68k system ***************************************************************************/ +#ifndef MAME_INCLUDES_MCR68_H +#define MAME_INCLUDES_MCR68_H + +#pragma once #include "machine/timer.h" #include "machine/watchdog.h" @@ -17,8 +21,8 @@ class mcr68_state : public driver_device { public: - mcr68_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + mcr68_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_sounds_good(*this, "sg"), m_turbo_cheap_squeak(*this, "tcs"), m_cvsd_sound(*this, "cvsd"), @@ -101,3 +105,5 @@ private: required_device m_ptm; }; + +#endif // MAME_INCLUDES_MCR68_H diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index 77d9753888b..66bf2262f35 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -5,6 +5,11 @@ Meadows S2650 hardware *************************************************************************/ +#ifndef MAME_INCLUDES_MEADOWS_H +#define MAME_INCLUDES_MEADOWS_H + +#pragma once + #include "cpu/s2650/s2650.h" #include "sound/dac.h" #include "sound/samples.h" @@ -85,3 +90,5 @@ private: void minferno_data_map(address_map &map); void minferno_main_map(address_map &map); }; + +#endif // MAME_INCLUDES_MEADOWS_H diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index 1c095124e92..6249e26bb03 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -7,6 +7,10 @@ driver by Luca Elia (l.elia@tin.it) ***************************************************************************/ +#ifndef MAME_INCLUDES_MEGASYS1_H +#define MAME_INCLUDES_MEGASYS1_H + +#pragma once #include "machine/gen_latch.h" #include "machine/timer.h" @@ -19,8 +23,8 @@ class megasys1_state : public driver_device { public: - megasys1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + megasys1_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_objectram(*this, "objectram"), m_tmap(*this, "scroll%u", 0), m_ram(*this, "ram"), @@ -41,7 +45,7 @@ public: m_io_dsw(*this, "DSW"), m_io_dsw1(*this, "DSW1"), m_io_dsw2(*this, "DSW2") - { } + { } void system_A_soldam(machine_config &config); void system_B_monkelf(machine_config &config); @@ -203,3 +207,5 @@ private: void z80_sound_io_map(address_map &map); void z80_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_MEGASYS1_H diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index 3c71bd48ecd..b29132f065c 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -5,6 +5,10 @@ Megazone *************************************************************************/ +#ifndef MAME_INCLUDES_MEGAZONE_H +#define MAME_INCLUDES_MEGAZONE_H + +#pragma once #include "sound/flt_rc.h" #include "emupal.h" @@ -12,8 +16,8 @@ class megazone_state : public driver_device { public: - megazone_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + megazone_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_scrolly(*this, "scrolly"), m_scrollx(*this, "scrollx"), m_videoram(*this, "videoram"), @@ -77,3 +81,5 @@ private: void megazone_sound_io_map(address_map &map); void megazone_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_MEGAZONE_H diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index e5d193b9f1a..f4bcfd783e5 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -5,6 +5,10 @@ Mermaid *************************************************************************/ +#ifndef MAME_INCLUDES_MERMAID_H +#define MAME_INCLUDES_MERMAID_H + +#pragma once #include "machine/74259.h" #include "machine/ripple_counter.h" @@ -16,8 +20,8 @@ class mermaid_state : public driver_device { public: - mermaid_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + mermaid_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram2(*this, "videoram2"), m_videoram(*this, "videoram"), m_bg_scrollram(*this, "bg_scrollram"), @@ -112,3 +116,5 @@ private: DECLARE_WRITE_LINE_MEMBER(rougien_adpcm_int); void mermaid_map(address_map &map); }; + +#endif // MAME_INCLUDES_MERMAID_H diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h index 35585213ae5..e658d6ef542 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -6,6 +6,10 @@ Driver for Midway T-unit games. **************************************************************************/ +#ifndef MAME_INCLUDES_MIDTUNIT_H +#define MAME_INCLUDES_MIDTUNIT_H + +#pragma once #include "audio/dcs.h" #include "audio/williams.h" @@ -22,15 +26,16 @@ public: TIMER_DMA }; - midtunit_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + midtunit_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_dcs(*this, "dcs"), m_palette(*this, "palette"), m_cvsd_sound(*this, "cvsd"), m_adpcm_sound(*this, "adpcm"), m_nvram(*this, "nvram"), - m_gfxrom(*this, "gfxrom") { } + m_gfxrom(*this, "gfxrom") + { } void tunit_core(machine_config &config); void tunit_adpcm(machine_config &config); @@ -132,3 +137,5 @@ private: void main_map(address_map &map); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_MIDTUNIT_H diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h index ba88fd229e1..f1b39b35bb0 100644 --- a/src/mame/includes/midwunit.h +++ b/src/mame/includes/midwunit.h @@ -5,6 +5,10 @@ Driver for Midway Wolf-unit games. **************************************************************************/ +#ifndef MAME_INCLUDES_MIDWUNIT_H +#define MAME_INCLUDES_MIDWUNIT_H + +#pragma once #include "machine/midwayic.h" @@ -12,13 +16,13 @@ class midwunit_state : public midtunit_state { public: midwunit_state(const machine_config &mconfig, device_type type, const char *tag) - : midtunit_state(mconfig, type, tag), - m_midway_serial_pic(*this, "serial_security_sim"), - m_midway_serial_pic_emu(*this, "serial_security"), - m_nvram(*this, "nvram"), - m_mainram(*this, "mainram"), - m_ports(*this, { { "IN0", "IN1", "DSW", "IN2" } }) - { } + : midtunit_state(mconfig, type, tag) + , m_midway_serial_pic(*this, "serial_security_sim") + , m_midway_serial_pic_emu(*this, "serial_security") + , m_nvram(*this, "nvram") + , m_mainram(*this, "mainram") + , m_ports(*this, { { "IN0", "IN1", "DSW", "IN2" } }) + { } void wunit(machine_config &config); void wunit_picemu(machine_config &config); @@ -69,3 +73,5 @@ private: void init_mk3_common(); void main_map(address_map &map); }; + +#endif // MAME_INCLUDES_MIDWUNIT_H diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h index 1389d426bed..dbb5afbdb61 100644 --- a/src/mame/includes/midxunit.h +++ b/src/mame/includes/midxunit.h @@ -5,6 +5,10 @@ Driver for Midway X-unit games. **************************************************************************/ +#ifndef MAME_INCLUDES_MIDXUNIT_H +#define MAME_INCLUDES_MIDXUNIT_H + +#pragma once #include "machine/midwayic.h" @@ -12,9 +16,10 @@ class midxunit_state : public midtunit_state { public: midxunit_state(const machine_config &mconfig, device_type type, const char *tag) - : midtunit_state(mconfig, type, tag), - m_nvram(*this, "nvram"), - m_midway_serial_pic(*this, "serial_pic") { } + : midtunit_state(mconfig, type, tag) + , m_nvram(*this, "nvram") + , m_midway_serial_pic(*this, "serial_pic") + { } void midxunit(machine_config &config); @@ -52,3 +57,5 @@ private: uint8_t m_security_bits; bool m_adc_int; }; + +#endif // MAME_INCLUDES_MIDXUNIT_H diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index 98ab88b3188..1f8fdfc1c6c 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -5,21 +5,26 @@ Mikie *************************************************************************/ +#ifndef MAME_INCLUDES_MIKIE_H +#define MAME_INCLUDES_MIKIE_H + +#pragma once #include "emupal.h" class mikie_state : public driver_device { public: - mikie_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + mikie_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void mikie(machine_config &config); @@ -60,3 +65,5 @@ private: void mikie_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_MIKIE_H diff --git a/src/mame/includes/mikro80.h b/src/mame/includes/mikro80.h index 4596c7c67c8..f05a86919d2 100644 --- a/src/mame/includes/mikro80.h +++ b/src/mame/includes/mikro80.h @@ -9,6 +9,8 @@ #ifndef MAME_INCLUDES_MIKRO80_H #define MAME_INCLUDES_MIKRO80_H +#pragma once + #include "machine/i8255.h" #include "imagedev/cassette.h" #include "sound/dac.h" @@ -21,8 +23,8 @@ public: TIMER_RESET }; - mikro80_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + mikro80_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_cursor_ram(*this, "cursor_ram"), m_video_ram(*this, "video_ram"), m_ppi8255(*this, "ppi8255"), @@ -40,7 +42,8 @@ public: m_io_line7(*this, "LINE7"), m_io_line8(*this, "LINE8") , m_dac(*this, "dac"), - m_maincpu(*this, "maincpu") { } + m_maincpu(*this, "maincpu") + { } void kristall(machine_config &config); void radio99(machine_config &config); diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index a4b1ed5be23..8524ba78051 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_MJKJIDAI_H +#define MAME_INCLUDES_MJKJIDAI_H + +#pragma once + #include "machine/nvram.h" #include "sound/msm5205.h" #include "emupal.h" @@ -7,8 +12,8 @@ class mjkjidai_state : public driver_device { public: - mjkjidai_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + mjkjidai_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_msm(*this, "msm"), m_nvram(*this, "nvram"), @@ -16,7 +21,8 @@ public: m_palette(*this, "palette"), m_adpcmrom(*this, "adpcm"), m_videoram(*this, "videoram"), - m_row(*this, "ROW.%u", 0) { } + m_row(*this, "ROW.%u", 0) + { } void mjkjidai(machine_config &config); @@ -57,3 +63,5 @@ private: void mjkjidai_io_map(address_map &map); void mjkjidai_map(address_map &map); }; + +#endif // MAME_INCLUDES_MJKJIDAI_H diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index c1f5b341ab0..2fa187ad9a9 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -5,21 +5,26 @@ Momoko 120% *************************************************************************/ +#ifndef MAME_INCLUDES_MOMOKO_H +#define MAME_INCLUDES_MOMOKO_H + +#pragma once #include "emupal.h" class momoko_state : public driver_device { public: - momoko_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + momoko_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_bg_scrolly(*this, "bg_scrolly"), m_bg_scrollx(*this, "bg_scrollx"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void momoko(machine_config &config); @@ -62,3 +67,5 @@ private: void momoko_map(address_map &map); void momoko_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_MOMOKO_H diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index 21034aeca14..dc2fe807dd6 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -5,6 +5,11 @@ Wild West C.O.W.boys of Moo Mesa / Bucky O'Hare *************************************************************************/ +#ifndef MAME_INCLUDES_MOO_H +#define MAME_INCLUDES_MOO_H + +#pragma once + #include "sound/okim6295.h" #include "sound/k054539.h" #include "machine/k053252.h" @@ -21,8 +26,8 @@ class moo_state : public driver_device { public: - moo_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + moo_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_workram(*this, "workram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), @@ -36,7 +41,8 @@ public: m_k054338(*this, "k054338"), m_palette(*this, "palette"), m_screen(*this, "screen"), - m_k054321(*this, "k054321") { } + m_k054321(*this, "k054321") + { } void bucky(machine_config &config); void moo(machine_config &config); @@ -95,3 +101,5 @@ private: void moobl_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_MOO_H diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index c3b51c38c12..85b6277a70a 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -5,29 +5,28 @@ Mr. Jong *************************************************************************/ +#ifndef MAME_INCLUDES_MRJONG_H +#define MAME_INCLUDES_MRJONG_H + +#pragma once #include "emupal.h" class mrjong_state : public driver_device { public: - mrjong_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + mrjong_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void mrjong(machine_config &config); private: - /* memory pointers */ - required_shared_ptr m_videoram; - required_shared_ptr m_colorram; - - /* video-related */ - tilemap_t *m_bg_tilemap; DECLARE_READ8_MEMBER(io_0x03_r); DECLARE_WRITE8_MEMBER(mrjong_videoram_w); DECLARE_WRITE8_MEMBER(mrjong_colorram_w); @@ -37,9 +36,20 @@ private: DECLARE_PALETTE_INIT(mrjong); uint32_t screen_update_mrjong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + + void mrjong_io_map(address_map &map); + void mrjong_map(address_map &map); + + /* memory pointers */ + required_shared_ptr m_videoram; + required_shared_ptr m_colorram; + + /* video-related */ + tilemap_t *m_bg_tilemap = nullptr; + required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; - void mrjong_io_map(address_map &map); - void mrjong_map(address_map &map); }; + +#endif // MAME_INCLUDES_MRJONG_H diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index 4395cd37722..852843dd6bb 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Tomasz Slanina +#ifndef MAME_INCLUDES_MUSTACHE_H +#define MAME_INCLUDES_MUSTACHE_H + +#pragma once #include "audio/seibu.h" // for seibu_sound_decrypt on the MAIN cpu (not sound) #include "machine/timer.h" @@ -9,15 +13,16 @@ class mustache_state : public driver_device { public: - mustache_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + mustache_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), m_palette(*this, "palette"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_dswb(*this, "DSWB") { } + m_dswb(*this, "DSWB") + { } void mustache(machine_config &config); @@ -52,3 +57,5 @@ private: void decrypted_opcodes_map(address_map &map); void memmap(address_map &map); }; + +#endif // MAME_INCLUDES_MUSTACHE_H diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index ebbdc16a5a9..e4fcd8b5f11 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -14,12 +14,12 @@ class mystwarr_state : public konamigx_state { public: - mystwarr_state(const machine_config &mconfig, device_type type, const char *tag) - : konamigx_state(mconfig, type, tag), + mystwarr_state(const machine_config &mconfig, device_type type, const char *tag) : + konamigx_state(mconfig, type, tag), m_k054321(*this, "k054321"), - m_gx_workram(*this,"gx_workram"), - m_spriteram(*this,"spriteram") - { } + m_gx_workram(*this, "gx_workram"), + m_spriteram(*this, "spriteram") + { } void martchmp(machine_config &config); void mystwarr(machine_config &config); diff --git a/src/mame/includes/mz700.h b/src/mame/includes/mz700.h index 5cc2b6cb1ce..b6318fab99a 100644 --- a/src/mame/includes/mz700.h +++ b/src/mame/includes/mz700.h @@ -6,10 +6,11 @@ * Reference: http://sharpmz.computingmuseum.com * ******************************************************************************/ - #ifndef MAME_INCLUDES_MZ700_H #define MAME_INCLUDES_MZ700_H +#pragma once + #include "bus/centronics/ctronics.h" #include "imagedev/cassette.h" #include "machine/bankdev.h" diff --git a/src/mame/includes/mz80.h b/src/mame/includes/mz80.h index 93436c93434..9291111510a 100644 --- a/src/mame/includes/mz80.h +++ b/src/mame/includes/mz80.h @@ -5,10 +5,11 @@ * includes/mz80.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_MZ80_H #define MAME_INCLUDES_MZ80_H +#pragma once + #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/pit8253.h" @@ -30,7 +31,7 @@ public: , m_p_ram(*this, "p_ram") , m_p_videoram(*this, "videoram") , m_p_chargen(*this, "chargen") - { } + { } void mz80kj(machine_config &config); void mz80k(machine_config &config); diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index b9e8392e034..264c91c1fde 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -5,6 +5,10 @@ Namco NA-1 System hardware ***************************************************************************/ +#ifndef MAME_INCLUDES_NAMCONA1_H +#define MAME_INCLUDES_NAMCONA1_H + +#pragma once #include "machine/eeprompar.h" #include "machine/timer.h" @@ -17,8 +21,8 @@ class namcona1_state : public driver_device { public: - namcona1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + namcona1_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), m_gfxdecode(*this, "gfxdecode"), @@ -179,8 +183,8 @@ protected: class namcona2_state : public namcona1_state { public: - namcona2_state(const machine_config &mconfig, device_type type, const char *tag) - : namcona1_state(mconfig, type, tag) + namcona2_state(const machine_config &mconfig, device_type type, const char *tag) : + namcona1_state(mconfig, type, tag) {} void c70(machine_config &config); @@ -195,8 +199,8 @@ public: class xday2_namcona2_state : public namcona2_state { public: - xday2_namcona2_state(const machine_config &mconfig, device_type type, const char *tag) - : namcona2_state(mconfig, type, tag), + xday2_namcona2_state(const machine_config &mconfig, device_type type, const char *tag) : + namcona2_state(mconfig, type, tag), m_rtc(*this, "rtc") {} @@ -214,3 +218,5 @@ private: void xday2_main_map(address_map &map); }; + +#endif // MAME_INCLUDES_NAMCONA1_H diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h index 07fc4f29eac..0b3a27f9b12 100644 --- a/src/mame/includes/namconb1.h +++ b/src/mame/includes/namconb1.h @@ -5,6 +5,10 @@ Namco System NB-1 hardware ***************************************************************************/ +#ifndef MAME_INCLUDES_NAMCONB1_H +#define MAME_INCLUDES_NAMCONB1_H + +#pragma once #include "machine/eeprompar.h" #include "machine/timer.h" @@ -44,7 +48,8 @@ public: m_spritebank32(*this, "spritebank32"), m_tilebank32(*this, "tilebank32"), m_rozbank32(*this, "rozbank32"), - m_namconb_shareram(*this, "namconb_share") { } + m_namconb_shareram(*this, "namconb_share") + { } void namconb1(machine_config &config); void namconb2(machine_config &config); @@ -161,3 +166,5 @@ private: void namconb1_am(address_map &map); void namconb2_am(address_map &map); }; + +#endif // MAME_INCLUDES_NAMCONB1_H diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index bde79e71ccd..13be3197c3e 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi +#ifndef MAME_INCLUDES_NAMCOS1_H +#define MAME_INCLUDES_NAMCOS1_H + +#pragma once + #include "cpu/m6800/m6801.h" #include "cpu/m6809/m6809.h" #include "machine/c117.h" @@ -139,3 +144,5 @@ private: void sub_map(address_map &map); void virtual_map(address_map &map); }; + +#endif // MAME_INCLUDES_NAMCOS1_H diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index fa090a12320..73a07091b59 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_NAMCOS86_H +#define MAME_INCLUDES_NAMCOS86_H + +#pragma once + #include "machine/watchdog.h" #include "sound/namco.h" #include "sound/n63701x.h" @@ -109,3 +114,5 @@ private: inline void get_tile_info(tile_data &tileinfo,int tile_index,int layer,uint8_t *vram); void set_scroll(int layer); }; + +#endif // MAME_INCLUDES_NAMCOS86_H diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index d53355feb35..1b226cd3f32 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Brad Oliver,Sal and John Bugliarisi,Paul Priest +#ifndef MAME_INCLUDES_NAUGHTYB_H +#define MAME_INCLUDES_NAUGHTYB_H + +#pragma once + #include "audio/pleiads.h" #include "emupal.h" #include "screen.h" @@ -7,8 +12,8 @@ class naughtyb_state : public driver_device { public: - naughtyb_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + naughtyb_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_naughtyb_custom(*this, "naughtyb_custom"), m_popflame_custom(*this, "popflame_custom"), @@ -17,7 +22,8 @@ public: m_palette(*this, "palette"), m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), - m_scrollreg(*this, "scrollreg") { } + m_scrollreg(*this, "scrollreg") + { } void popflame(machine_config &config); void naughtyb(machine_config &config); @@ -67,3 +73,5 @@ private: void naughtyb_map(address_map &map); void popflame_map(address_map &map); }; + +#endif // MAME_INCLUDES_NAUGHTYB_H diff --git a/src/mame/includes/nc.h b/src/mame/includes/nc.h index bf223001273..cf35feedda9 100644 --- a/src/mame/includes/nc.h +++ b/src/mame/includes/nc.h @@ -5,10 +5,11 @@ * includes/nc.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_NC_H #define MAME_INCLUDES_NC_H +#pragma once + #include "bus/centronics/ctronics.h" #include "machine/upd765.h" // for NC200 disk drive interface #include "machine/i8251.h" diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h index 765c3f2669b..631456f0e01 100644 --- a/src/mame/includes/newbrain.h +++ b/src/mame/includes/newbrain.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once - #ifndef MAME_INCLUDES_NEWBRAIN_H #define MAME_INCLUDES_NEWBRAIN_H +#pragma once + #include "bus/newbrain/exp.h" #include "bus/rs232/rs232.h" diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index 064e8dad5c3..d3df34dfe97 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -1,6 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni,Nicola Salmoria,Bryan McPhail,David Haywood,R. Belmont,Alex Marshall,Angelo Salese,Luca Elia // thanks-to:Richard Bush +#ifndef MAME_INCLUDES_NMK16_H +#define MAME_INCLUDES_NMK16_H + +#pragma once #include "machine/nmk112.h" #include "sound/okim6295.h" @@ -34,7 +38,8 @@ public: m_okibank(*this, "okibank%u", 1U), m_dsw_io(*this, "DSW%u", 1U), m_in_io(*this, "IN%u", 0U), - m_sprdma_base(0x8000) { } + m_sprdma_base(0x8000) + { } void vandyke(machine_config &config); void redhawkb(machine_config &config); @@ -252,8 +257,8 @@ protected: class nmk16_tomagic_state : public nmk16_state { public: - nmk16_tomagic_state(const machine_config &mconfig, device_type type, const char *tag) - : nmk16_state(mconfig, type, tag) + nmk16_tomagic_state(const machine_config &mconfig, device_type type, const char *tag) : + nmk16_state(mconfig, type, tag) {} void tomagic(machine_config &config); @@ -264,3 +269,5 @@ private: void tomagic_sound_map(address_map &map); void tomagic_sound_io_map(address_map &map); }; + +#endif //MAME_INCLUDES_NMK16_H diff --git a/src/mame/includes/orao.h b/src/mame/includes/orao.h index 31bb01625f8..7ea550cec4b 100644 --- a/src/mame/includes/orao.h +++ b/src/mame/includes/orao.h @@ -5,18 +5,19 @@ * includes/orao.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_ORAO_H #define MAME_INCLUDES_ORAO_H +#pragma once + #include "sound/spkrdev.h" #include "imagedev/cassette.h" class orao_state : public driver_device { public: - orao_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + orao_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_memory(*this, "memory"), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), diff --git a/src/mame/includes/osi.h b/src/mame/includes/osi.h index 6d064ac5b39..62357dcdd9a 100644 --- a/src/mame/includes/osi.h +++ b/src/mame/includes/osi.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder, Robbbert, Wilbert Pol -#pragma once - #ifndef MAME_INCLUDES_OSI_H #define MAME_INCLUDES_OSI_H +#pragma once + #include "cpu/m6502/m6502.h" #include "formats/basicdsk.h" @@ -43,7 +43,7 @@ public: , m_io_keyboard(*this, "ROW%u", 0) , m_io_sound(*this, "Sound") , m_io_reset(*this, "Reset") - { } + { } uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER( keyboard_r ); diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index 21f4fc1e168..fa1d31aa051 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -5,6 +5,10 @@ Over Drive *************************************************************************/ +#ifndef MAME_INCLUDES_OVERDRIV_H +#define MAME_INCLUDES_OVERDRIV_H + +#pragma once #include "machine/k053252.h" #include "machine/timer.h" @@ -83,3 +87,5 @@ private: output_finder<> m_led; int m_fake_timer; }; + +#endif // MAME_INCLUDES_OVERDRIV_H diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index dea05452eb4..6c29eecf757 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi +#ifndef MAME_INCLUDES_PACLAND_H +#define MAME_INCLUDES_PACLAND_H + +#pragma once + #include "cpu/m6800/m6801.h" #include "sound/namco.h" #include "emupal.h" @@ -8,8 +13,8 @@ class pacland_state : public driver_device { public: - pacland_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + pacland_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), m_cus30(*this, "namco"), @@ -19,6 +24,7 @@ public: m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), m_spriteram(*this, "spriteram"), + m_color_prom(*this, "proms"), m_leds(*this, "led%u", 0U) { } @@ -32,11 +38,11 @@ public: required_shared_ptr m_videoram; required_shared_ptr m_videoram2; required_shared_ptr m_spriteram; + required_region_ptr m_color_prom; output_finder<2> m_leds; uint8_t m_palette_bank; - const uint8_t *m_color_prom; tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; bitmap_ind16 m_fg_bitmap; @@ -77,3 +83,5 @@ public: void main_map(address_map &map); void mcu_map(address_map &map); }; + +#endif // MAME_INCLUDES_PACLAND_H diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index eb924d8bfe7..89338f8e4e5 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -5,6 +5,10 @@ Parodius *************************************************************************/ +#ifndef MAME_INCLUDES_PARODIUS_H +#define MAME_INCLUDES_PARODIUS_H + +#pragma once #include "machine/bankdev.h" #include "video/k053244_k053245.h" @@ -20,15 +24,16 @@ public: TIMER_NMI }; - parodius_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + parodius_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_bank0000(*this, "bank0000"), m_bank2000(*this, "bank2000"), m_k052109(*this, "k052109"), m_k053245(*this, "k053245"), - m_k053251(*this, "k053251") { } + m_k053251(*this, "k053251") + { } /* video-related */ int m_layer_colorbase[3]; @@ -66,3 +71,5 @@ public: protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_PARODIUS_H diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index db88d65a08a..e140c84af1b 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi +#ifndef MAME_INCLUDES_PASTELG_H +#define MAME_INCLUDES_PASTELG_H + +#pragma once + #include "machine/nb1413m3.h" #include "emupal.h" #include "screen.h" @@ -12,12 +17,13 @@ public: TIMER_BLITTER }; - pastelg_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) , + pastelg_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_nb1413m3(*this, "nb1413m3"), m_screen(*this, "screen"), - m_clut(*this, "clut") { } + m_clut(*this, "clut") + { } required_device m_maincpu; required_device m_nb1413m3; @@ -71,3 +77,5 @@ public: protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_PASTELG_H diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index 050be605ab8..cfe3f886eb4 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail +#ifndef MAME_INCLUDES_PCKTGAL_H +#define MAME_INCLUDES_PCKTGAL_H + +#pragma once #include "machine/gen_latch.h" #include "sound/msm5205.h" @@ -9,8 +13,8 @@ class pcktgal_state : public driver_device { public: - pcktgal_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + pcktgal_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_msm(*this, "msm"), @@ -18,7 +22,8 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") + { } required_device m_maincpu; required_device m_audiocpu; @@ -53,3 +58,5 @@ public: void pcktgal_map(address_map &map); void pcktgal_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_PCKTGAL_H diff --git a/src/mame/includes/pcw.h b/src/mame/includes/pcw.h index 21852d81d96..09443e670f2 100644 --- a/src/mame/includes/pcw.h +++ b/src/mame/includes/pcw.h @@ -5,10 +5,11 @@ * includes/pcw.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_PCW_H #define MAME_INCLUDES_PCW_H +#pragma once + #include "machine/upd765.h" #include "machine/ram.h" #include "machine/timer.h" @@ -32,14 +33,14 @@ class pcw_state : public driver_device { public: pcw_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_fdc(*this, "upd765"), - m_floppy(*this, "upd765:%u", 0U), - m_ram(*this, RAM_TAG), - m_beeper(*this, "beeper"), - m_screen(*this, "screen"), - m_palette(*this, "palette") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_fdc(*this, "upd765") + , m_floppy(*this, "upd765:%u", 0U) + , m_ram(*this, RAM_TAG) + , m_beeper(*this, "beeper") + , m_screen(*this, "screen") + , m_palette(*this, "palette") { } int m_boot; diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 9434e7de09b..55cd9610a9e 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -3,6 +3,8 @@ #ifndef MAME_INCLUDES_PGM_H #define MAME_INCLUDES_PGM_H +#pragma once + #include "machine/igs025.h" #include "machine/igs022.h" #include "machine/igs028.h" diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index 6fc95dbe9e4..3aba860b091 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Jarek Parchanski +#ifndef MAME_INCLUDES_PINGPONG_H +#define MAME_INCLUDES_PINGPONG_H + +#pragma once #include "machine/timer.h" #include "emupal.h" @@ -7,14 +11,15 @@ class pingpong_state : public driver_device { public: - pingpong_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + pingpong_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } int m_intenable; int m_question_addr_high; @@ -45,3 +50,5 @@ public: void merlinmm_map(address_map &map); void pingpong_map(address_map &map); }; + +#endif // MAME_INCLUDES_PINGPONG_H diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index c9e158df93a..3e75ed67d2e 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:David Haywood,Nicola Salmoria,Paul Priest +#ifndef MAME_INCLUDES_PIRATES_H +#define MAME_INCLUDES_PIRATES_H + +#pragma once + #include "machine/eepromser.h" #include "sound/okim6295.h" #include "emupal.h" @@ -7,8 +12,8 @@ class pirates_state : public driver_device { public: - pirates_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + pirates_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), m_oki(*this, "oki"), @@ -18,7 +23,8 @@ public: m_scroll(*this, "scroll"), m_tx_tileram(*this, "tx_tileram"), m_fg_tileram(*this, "fg_tileram"), - m_bg_tileram(*this, "bg_tileram") { } + m_bg_tileram(*this, "bg_tileram") + { } void pirates(machine_config &config); @@ -65,3 +71,5 @@ private: void decrypt_oki(); void pirates_map(address_map &map); }; + +#endif // MAME_INCLUDES_PIRATES_H diff --git a/src/mame/includes/pk8000.h b/src/mame/includes/pk8000.h index 946a755f1a7..8855b7f7498 100644 --- a/src/mame/includes/pk8000.h +++ b/src/mame/includes/pk8000.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Miodrag Milanovic +#ifndef MAME_INCLUDES_PK8000_H +#define MAME_INCLUDES_PK8000_H + +#pragma once #include "emupal.h" @@ -7,10 +11,9 @@ class pk8000_base_state : public driver_device { public: pk8000_base_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) , - m_maincpu(*this, "maincpu") { } - - DECLARE_PALETTE_INIT(pk8000); + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + { } DECLARE_READ8_MEMBER(_84_porta_r); DECLARE_WRITE8_MEMBER(_84_porta_w); @@ -30,6 +33,7 @@ protected: DECLARE_READ8_MEMBER(color_r); DECLARE_WRITE8_MEMBER(color_w); + DECLARE_PALETTE_INIT(pk8000); uint32_t video_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *videomem); uint8_t m_text_start; @@ -43,3 +47,5 @@ protected: uint8_t m_video_enable; required_device m_maincpu; }; + +#endif // MAME_INCLUDES_PK8000_H diff --git a/src/mame/includes/pk8020.h b/src/mame/includes/pk8020.h index 3d3f4b57f49..42ecbfc4672 100644 --- a/src/mame/includes/pk8020.h +++ b/src/mame/includes/pk8020.h @@ -5,10 +5,11 @@ * includes/pk8020.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_PK8020_H #define MAME_INCLUDES_PK8020_H +#pragma once + #include "imagedev/cassette.h" #include "machine/i8251.h" #include "machine/i8255.h" @@ -24,8 +25,8 @@ class pk8020_state : public driver_device { public: - pk8020_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + pk8020_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ppi8255_1(*this, "ppi8255_1"), m_ppi8255_2(*this, "ppi8255_2"), @@ -43,7 +44,8 @@ public: m_speaker(*this, "speaker"), m_region_maincpu(*this, "maincpu"), m_region_gfx1(*this, "gfx1"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void pk8020(machine_config &config); @@ -72,7 +74,6 @@ private: DECLARE_WRITE8_MEMBER(devices_w); virtual void machine_start() override; virtual void machine_reset() override; - virtual void video_start() override; DECLARE_PALETTE_INIT(pk8020); uint32_t screen_update_pk8020(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(pk8020_interrupt); @@ -103,7 +104,7 @@ private: required_device m_pic8259; required_device m_speaker; required_memory_region m_region_maincpu; - required_memory_region m_region_gfx1; + required_region_ptr m_region_gfx1; ioport_port *m_io_port[16]; required_device m_palette; void pk8020_set_bank(uint8_t data); diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 282f1c9c35c..017d5ce7169 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria, Pierpaolo Prazzoli, Quench +#ifndef MAME_INCLUDES_PLAYMARK_H +#define MAME_INCLUDES_PLAYMARK_H + +#pragma once + #include "sound/okim6295.h" #include "machine/eepromser.h" #include "machine/ticket.h" @@ -9,8 +14,8 @@ class playmark_state : public driver_device { public: - playmark_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + playmark_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_bgvideoram(*this, "bgvideoram"), m_videoram1(*this, "videoram1"), m_videoram2(*this, "videoram2"), @@ -25,7 +30,8 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_ticket(*this, "ticket"), - m_token(*this, "token") { } + m_token(*this, "token") + { } void wbeachvl(machine_config &config); void hrdtimes(machine_config &config); @@ -142,3 +148,5 @@ protected: void oki_map(address_map &map); void wbeachvl_main_map(address_map &map); }; + +#endif // MAME_INCLUDES_PLAYMARK_H diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index f6ff2d98faa..8c5685b0b99 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -21,8 +21,8 @@ static const uint16_t dsp56k_bank04_size = 0x1fc0; class polygonet_state : public driver_device { public: - polygonet_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + polygonet_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_dsp(*this, "dsp"), diff --git a/src/mame/includes/pmd85.h b/src/mame/includes/pmd85.h index 8d7e254b1a7..9be9bf5711f 100644 --- a/src/mame/includes/pmd85.h +++ b/src/mame/includes/pmd85.h @@ -5,10 +5,11 @@ * includes/pmd85.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_PMD85_H #define MAME_INCLUDES_PMD85_H +#pragma once + #include "machine/i8251.h" #include "machine/pit8253.h" #include "machine/i8255.h" diff --git a/src/mame/includes/poly88.h b/src/mame/includes/poly88.h index f1f32c56713..22e8071d21f 100644 --- a/src/mame/includes/poly88.h +++ b/src/mame/includes/poly88.h @@ -5,10 +5,11 @@ * includes/poly88.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_POLY88_H #define MAME_INCLUDES_POLY88_H +#pragma once + #include "machine/i8251.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" @@ -23,8 +24,8 @@ public: TIMER_CASSETTE }; - poly88_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + poly88_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), m_uart(*this, "uart"), @@ -36,7 +37,8 @@ public: m_line3(*this, "LINE3"), m_line4(*this, "LINE4"), m_line5(*this, "LINE5"), - m_line6(*this, "LINE6") { } + m_line6(*this, "LINE6") + { } void poly88(machine_config &config); void poly8813(machine_config &config); diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index 4988429bea7..31a4396bb9d 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -1,20 +1,25 @@ // license:BSD-3-Clause // copyright-holders:Allard van der Bas +#ifndef MAME_INCLUDES_POOYAN_H +#define MAME_INCLUDES_POOYAN_H + +#pragma once #include "emupal.h" class pooyan_state : public driver_device { public: - pooyan_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + pooyan_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_spriteram2(*this, "spriteram2") { } + m_spriteram2(*this, "spriteram2") + { } void pooyan(machine_config &config); @@ -55,3 +60,5 @@ private: DECLARE_WRITE_LINE_MEMBER(vblank_irq); void main_map(address_map &map); }; + +#endif // MAME_INCLUDES_POOYAN_H diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index cb13c3ff166..66792390e30 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -16,7 +16,8 @@ public: m_vctrl_0(*this, "vctrl_0"), m_vram(*this, "vram_%u", 0U), m_spriteram(*this, "spriteram"), - m_okibank(*this, "okibank") { } + m_okibank(*this, "okibank") + { } void powerinsa(machine_config &config); void powerinsb(machine_config &config); diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 2c4d4400034..8c00c43e865 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -5,6 +5,10 @@ Psikyo Games *************************************************************************/ +#ifndef MAME_INCLUDES_PSIKYO_H +#define MAME_INCLUDES_PSIKYO_H + +#pragma once #include "machine/gen_latch.h" #include "sound/okim6295.h" @@ -137,3 +141,5 @@ private: void sngkace_sound_io_map(address_map &map); void sngkace_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_PSIKYO_H diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 8c04eab5ed8..4888a0db224 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Paul Priest +#ifndef MAME_INCLUDES_PSIKYOSH_H +#define MAME_INCLUDES_PSIKYOSH_H + +#pragma once + #include "video/bufsprite.h" #include "machine/eepromser.h" #include "cpu/sh/sh2.h" @@ -27,8 +32,8 @@ class psikyosh_state : public driver_device { public: - psikyosh_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + psikyosh_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_bgram(*this, "bgram"), m_zoomram(*this, "zoomram"), @@ -38,7 +43,8 @@ public: m_eeprom(*this, "eeprom"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void psikyo3v1(machine_config &config); void psikyo5(machine_config &config); @@ -95,3 +101,5 @@ private: void ps3v1_map(address_map &map); void ps5_map(address_map &map); }; + +#endif // MAME_INCLUDES_PSIKYOSH_H diff --git a/src/mame/includes/px8.h b/src/mame/includes/px8.h index 4fa8dd60fcf..dcb938dd071 100644 --- a/src/mame/includes/px8.h +++ b/src/mame/includes/px8.h @@ -1,10 +1,10 @@ // license:GPL-2.0+ // copyright-holders:Curt Coder,Dirk Best -#pragma once - #ifndef MAME_INCLUDES_PX8_H #define MAME_INCLUDES_PX8_H +#pragma once + #include "cpu/z80/z80.h" #include "cpu/m6800/m6801.h" @@ -32,11 +32,12 @@ class px8_state : public driver_device { public: px8_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, UPD70008_TAG), - m_cassette(*this, "cassette"), - m_ram(*this, RAM_TAG), - m_video_ram(*this, "video_ram"){ } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, UPD70008_TAG) + , m_cassette(*this, "cassette") + , m_ram(*this, RAM_TAG) + , m_video_ram(*this, "video_ram") + { } void px8(machine_config &config); diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index 1af14dca6d0..e8edc94c0c7 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Hau +#ifndef MAME_INCLUDES_QDRMFGP_H +#define MAME_INCLUDES_QDRMFGP_H + +#pragma once #include "machine/ataintf.h" #include "machine/timer.h" @@ -12,8 +16,8 @@ class qdrmfgp_state : public driver_device { public: - qdrmfgp_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + qdrmfgp_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_nvram(*this, "nvram"), m_workram(*this, "workram"), @@ -85,3 +89,5 @@ private: void qdrmfgp_k054539_map(address_map &map); void qdrmfgp_map(address_map &map); }; + +#endif // MAME_INCLUDES_QDRMFGP_H diff --git a/src/mame/includes/quasar.h b/src/mame/includes/quasar.h index 167bf2d88d9..fb83d5dd49a 100644 --- a/src/mame/includes/quasar.h +++ b/src/mame/includes/quasar.h @@ -5,6 +5,10 @@ Zaccaria Quasar ****************************************************************************/ +#ifndef MAME_INCLUDES_QUASAR_H +#define MAME_INCLUDES_QUASAR_H + +#pragma once #include "includes/cvs.h" @@ -12,7 +16,8 @@ class quasar_state : public cvs_state { public: quasar_state(const machine_config &mconfig, device_type type, const char *tag) - : cvs_state(mconfig, type, tag) { } + : cvs_state(mconfig, type, tag) + { } void quasar(machine_config &config); @@ -41,3 +46,5 @@ private: void sound_map(address_map &map); void sound_portmap(address_map &map); }; + +#endif // MAME_INCLUDES_QUASAR_H diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h index f9c9c099c4a..0108bc4a0f5 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -1,17 +1,23 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Pierpaolo Prazzoli +#ifndef MAME_INCLUDES_QUIZPANI_H +#define MAME_INCLUDES_QUIZPANI_H + +#pragma once + #include "machine/nmk112.h" class quizpani_state : public driver_device { public: - quizpani_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + quizpani_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_scrollreg(*this, "scrollreg"), m_bg_videoram(*this, "bg_videoram"), - m_txt_videoram(*this, "txt_videoram") { } + m_txt_videoram(*this, "txt_videoram") + { } required_device m_maincpu; required_device m_gfxdecode; @@ -39,3 +45,5 @@ public: void quizpani(machine_config &config); void quizpani_map(address_map &map); }; + +#endif // MAME_INCLUDES_QUIZPANI_H diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index a143e8e4bab..216cde7092c 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -5,6 +5,10 @@ Seibu Raiden hardware *******************************************************************************/ +#ifndef MAME_INCLUDES_RAIDEN_H +#define MAME_INCLUDES_RAIDEN_H + +#pragma once #include "audio/seibu.h" #include "video/bufsprite.h" @@ -13,8 +17,8 @@ class raiden_state : public driver_device, protected seibu_sound_common { public: - raiden_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + raiden_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), m_seibu_sound(*this, "seibu_sound"), @@ -89,3 +93,5 @@ public: void sei80bu_encrypted_full_map(address_map &map); void sub_map(address_map &map); }; + +#endif // MAME_INCLUDES_RAIDEN_H diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index 047860f919c..81058005859 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -1,5 +1,10 @@ // license:LGPL-2.1+ // copyright-holders:Olivier Galibert, Angelo Salese, David Haywood, Tomasz Slanina +#ifndef MAME_INCLUDES_RAIDEN2_H +#define MAME_INCLUDES_RAIDEN2_H + +#pragma once + #include "audio/seibu.h" #include "machine/seibucop/seibucop.h" #include "video/seibu_crtc.h" @@ -9,34 +14,33 @@ class raiden2_state : public driver_device { public: raiden2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - sprites(*this, "sprites") , - m_maincpu(*this, "maincpu"), - m_seibu_sound(*this, "seibu_sound"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette"), - - bg_bank(0), - fg_bank(0), - mid_bank(0), - tx_bank(0), - raiden2_tilemap_enable(0), - prg_bank(0), - cop_bank(0), - - sprite_prot_x(0), - sprite_prot_y(0), - dst1(0), - cop_spr_maxx(0), - cop_spr_off(0), - - tile_buffer(320, 256), - sprite_buffer(320, 256), - m_raiden2cop(*this, "raiden2cop") + : driver_device(mconfig, type, tag) + , sprites(*this, "sprites") + , m_maincpu(*this, "maincpu") + , m_seibu_sound(*this, "seibu_sound") + , m_gfxdecode(*this, "gfxdecode") + , m_palette(*this, "palette") + + , bg_bank(0) + , fg_bank(0) + , mid_bank(0) + , tx_bank(0) + , raiden2_tilemap_enable(0) + , prg_bank(0) + , cop_bank(0) + + , sprite_prot_x(0) + , sprite_prot_y(0) + , dst1(0) + , cop_spr_maxx(0) + , cop_spr_off(0) + + , tile_buffer(320, 256) + , sprite_buffer(320, 256) + , m_raiden2cop(*this, "raiden2cop") { memset(scrollvals, 0, sizeof(uint16_t)*6); memset(sprite_prot_src_addr, 0, sizeof(uint16_t)*2); - } std::unique_ptr m_back_data; @@ -160,3 +164,5 @@ public: protected: virtual void machine_start() override; }; + +#endif // MAME_INCLUDES_RAIDEN2_H diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index 201442d01ea..6e2fdd0d64f 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -1,22 +1,27 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_RALLYX_H +#define MAME_INCLUDES_RALLYX_H + +#pragma once + #include "audio/timeplt.h" #include "sound/namco.h" #include "sound/samples.h" #include "emupal.h" -struct jungler_star -{ - int x, y, color; -}; - -#define JUNGLER_MAX_STARS 1000 - class rallyx_state : public driver_device { public: - rallyx_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + struct jungler_star + { + int x, y, color; + }; + + static constexpr unsigned JUNGLER_MAX_STARS = 1000; + + rallyx_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_radarattr(*this, "radarattr"), m_maincpu(*this, "maincpu"), @@ -24,7 +29,8 @@ public: m_samples(*this, "samples"), m_timeplt_audio(*this, "timeplt_audio"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } /* memory pointers */ required_shared_ptr m_videoram; @@ -87,8 +93,8 @@ public: DECLARE_WRITE_LINE_MEMBER(jungler_vblank_irq); inline void rallyx_get_tile_info( tile_data &tileinfo, int tile_index, int ram_offs); inline void locomotn_get_tile_info(tile_data &tileinfo,int tile_index,int ram_offs); - void calculate_star_field( ); - void rallyx_video_start_common( ); + void calculate_star_field(); + void rallyx_video_start_common(); void plot_star( bitmap_ind16 &bitmap, const rectangle &cliprect, int x, int y, int color ); void draw_stars( bitmap_ind16 &bitmap, const rectangle &cliprect ); void rallyx_draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); @@ -105,3 +111,5 @@ public: void jungler_map(address_map &map); void rallyx_map(address_map &map); }; + +#endif // MAME_INCLUDES_RALLYX_H diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 6004680dcb8..67b56612f2f 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -5,6 +5,10 @@ Rock'n Rage *************************************************************************/ +#ifndef MAME_INCLUDES_ROCKRAGE_H +#define MAME_INCLUDES_ROCKRAGE_H + +#pragma once #include "machine/gen_latch.h" #include "sound/vlm5030.h" @@ -15,8 +19,8 @@ class rockrage_state : public driver_device { public: - rockrage_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + rockrage_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k007342(*this, "k007342"), @@ -25,7 +29,8 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch"), - m_rombank(*this, "rombank") { } + m_rombank(*this, "rombank") + { } void rockrage(machine_config &config); @@ -63,3 +68,5 @@ private: void rockrage_sound_map(address_map &map); void rockrage_vlm_map(address_map &map); }; + +#endif // MAME_INCLUDES_ROCKRAGE_H diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index 5f388114fa8..06b1f416162 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -1,13 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Chris Hardy +#ifndef MAME_INCLUDES_ROCNROPE_H +#define MAME_INCLUDES_ROCNROPE_H + +#pragma once #include "emupal.h" class rocnrope_state : public driver_device { public: - rocnrope_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + rocnrope_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), @@ -52,3 +56,5 @@ private: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void rocnrope_map(address_map &map); }; + +#endif // MAME_INCLUDES_ROCNROPE_H diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index d0c20986cb6..6b32dbc65dc 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -5,6 +5,10 @@ Run and Gun / Slam Dunk *************************************************************************/ +#ifndef MAME_INCLUDES_RUNGUN_H +#define MAME_INCLUDES_RUNGUN_H + +#pragma once #include "sound/k054539.h" #include "machine/k053252.h" @@ -18,8 +22,8 @@ class rungun_state : public driver_device { public: - rungun_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + rungun_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_k054539_1(*this, "k054539_1"), @@ -33,7 +37,7 @@ public: m_screen(*this, "screen"), m_k054321(*this, "k054321"), m_sysreg(*this, "sysreg") - { } + { } void rng(machine_config &config); void rng_dual(machine_config &config); @@ -120,3 +124,5 @@ private: void rungun_map(address_map &map); void rungun_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_RUNGUN_H diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index 5edb6df55d7..e44e3fd4bc6 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Zsolt Vasvari +#ifndef MAME_INCLUDES_SAURO_H +#define MAME_INCLUDES_SAURO_H + +#pragma once #include "machine/74259.h" #include "machine/gen_latch.h" @@ -9,8 +13,8 @@ class sauro_state : public driver_device { public: - sauro_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + sauro_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), @@ -21,7 +25,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), - m_colorram2(*this, "colorram2") { } + m_colorram2(*this, "colorram2") + { } void trckydoc(machine_config &config); void tecfri(machine_config &config); @@ -89,3 +94,5 @@ private: void saurob_sound_map(address_map &map); void trckydoc_map(address_map &map); }; + +#endif // MAME_INCLUDES_SAURO_H diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index 20a717ded99..0bb1693e600 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -1,17 +1,22 @@ // license:BSD-3-Clause // copyright-holders:David Haywood +#ifndef MAME_INCLUDES_SBUGGER_H +#define MAME_INCLUDES_SBUGGER_H + +#pragma once #include "emupal.h" class sbugger_state : public driver_device { public: - sbugger_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + sbugger_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_videoram_attr(*this, "videoram_attr"), - m_videoram(*this, "videoram") { } + m_videoram(*this, "videoram") + { } void sbugger(machine_config &config); @@ -36,3 +41,5 @@ private: void sbugger_io_map(address_map &map); void sbugger_map(address_map &map); }; + +#endif // MAME_INCLUDES_SBUGGER_H diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index f7e1da43703..58dfaddb6cd 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Pierpaolo Prazzoli +#ifndef MAME_INCLUDES_SCOTRSHT_H +#define MAME_INCLUDES_SCOTRSHT_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -7,8 +11,8 @@ class scotrsht_state : public driver_device { public: - scotrsht_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + scotrsht_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), @@ -17,7 +21,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_scroll(*this, "scroll") { } + m_scroll(*this, "scroll") + { } void scotrsht(machine_config &config); @@ -59,3 +64,5 @@ private: void scotrsht_sound_map(address_map &map); void scotrsht_sound_port(address_map &map); }; + +#endif // MAME_INCLUDES_SCOTRSHT_H diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h index 3ff5f8c1821..d7a6745d972 100644 --- a/src/mame/includes/scramble.h +++ b/src/mame/includes/scramble.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_SCRAMBLE_H +#define MAME_INCLUDES_SCRAMBLE_H + +#pragma once #include "machine/gen_latch.h" #include "machine/i8255.h" @@ -12,8 +16,8 @@ class scramble_state : public galaxold_state { public: - scramble_state(const machine_config &mconfig, device_type type, const char *tag) - : galaxold_state(mconfig, type, tag), + scramble_state(const machine_config &mconfig, device_type type, const char *tag) : + galaxold_state(mconfig, type, tag), m_konami_7474(*this, "konami_7474"), m_ppi8255_0(*this, "ppi8255_0"), m_ppi8255_1(*this, "ppi8255_1"), @@ -147,3 +151,5 @@ private: std::unique_ptr m_harem_decrypted_data; std::unique_ptr m_harem_decrypted_opcodes; }; + +#endif // MAME_INCLUDES_SCRAMBLE_H diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 8e88291856f..d2b296df083 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Roberto Fresca +#ifndef MAME_INCLUDES_SDERBY_H +#define MAME_INCLUDES_SDERBY_H + +#pragma once #include "emupal.h" @@ -69,3 +73,5 @@ private: required_device m_palette; output_finder<7> m_lamps; }; + +#endif // MAME_INCLUDES_SDERBY_H diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index 8ca54f5d284..943086625c9 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_SEICROSS_H +#define MAME_INCLUDES_SEICROSS_H + +#pragma once + #include "machine/nvram.h" #include "sound/dac.h" #include "emupal.h" @@ -7,8 +12,8 @@ class seicross_state : public driver_device { public: - seicross_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + seicross_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mcu(*this, "mcu"), m_dac(*this, "dac"), @@ -21,7 +26,8 @@ public: m_row_scroll(*this, "row_scroll"), m_spriteram2(*this, "spriteram2"), m_colorram(*this, "colorram"), - m_decrypted_opcodes(*this, "decrypted_opcodes") { } + m_decrypted_opcodes(*this, "decrypted_opcodes") + { } void no_nvram(machine_config &config); void friskytb(machine_config &config); @@ -77,3 +83,5 @@ private: void mcu_no_nvram_map(address_map &map); void mcu_nvram_map(address_map &map); }; + +#endif // MAME_INCLUDES_SEICROSS_H diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index f24ca968936..2d59c9401ce 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni +#ifndef MAME_INCLUDES_SENJYO_H +#define MAME_INCLUDES_SENJYO_H + +#pragma once + #include "sound/dac.h" #include "machine/z80daisy.h" #include "machine/z80pio.h" @@ -9,8 +14,8 @@ class senjyo_state : public driver_device { public: - senjyo_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + senjyo_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_pio(*this, "z80pio"), m_dac(*this, "dac"), @@ -32,7 +37,8 @@ public: m_bg3videoram(*this, "bg3videoram"), m_radarram(*this, "radarram"), m_bgstripesram(*this, "bgstripesram"), - m_decrypted_opcodes(*this, "decrypted_opcodes") { } + m_decrypted_opcodes(*this, "decrypted_opcodes") + { } void senjyox_e(machine_config &config); void senjyo(machine_config &config); @@ -125,3 +131,5 @@ private: /*----------- defined in audio/senjyo.c -----------*/ extern const z80_daisy_config senjyo_daisy_chain[]; + +#endif // MAME_INCLUDES_SENJYO_H diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index efd2913d2cc..55542a7c7ed 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -22,27 +22,26 @@ #include "video/seta001.h" #include "emupal.h" -#define __uPD71054_TIMER 1 - -struct uPD71054_state -{ - emu_timer *timer[3]; // Timer - uint16_t max[3]; // Max counter - uint16_t write_select; // Max counter write select - uint8_t reg[4]; // -}; - -struct game_offset -{ - /* 2 values, for normal and flipped */ - const char *gamename; - int sprite_offs[2]; - int tilemap_offs[2]; -}; class seta_state : public driver_device { public: + struct uPD71054_state + { + emu_timer *timer[3]; // Timer + uint16_t max[3]; // Max counter + uint16_t write_select; // Max counter write select + uint8_t reg[4]; // + }; + + struct game_offset + { + /* 2 values, for normal and flipped */ + const char *gamename; + int sprite_offs[2]; + int tilemap_offs[2]; + }; + seta_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index 0fa2254c788..10df501f759 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_SHANGHA3_H +#define MAME_INCLUDES_SHANGHA3_H + +#pragma once #include "machine/gen_latch.h" #include "sound/okim6295.h" @@ -30,6 +34,9 @@ public: void init_heberpop(); void init_blocken(); +protected: + virtual void video_start() override; + private: required_device m_maincpu; optional_device m_audiocpu; @@ -68,8 +75,6 @@ private: // blocken specific DECLARE_WRITE8_MEMBER(blocken_coinctrl_w); - virtual void video_start() override; - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void blocken_map(address_map &map); @@ -79,3 +84,5 @@ private: void heberpop_sound_map(address_map &map); void shangha3_map(address_map &map); }; + +#endif // MAME_INCLUDES_SHANGHA3_H diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index ad17681cc51..5106e77eb93 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Allard van der Bas +#ifndef MAME_INCLUDES_SHAOLINS_H +#define MAME_INCLUDES_SHAOLINS_H + +#pragma once #include "machine/timer.h" #include "emupal.h" @@ -7,14 +11,15 @@ class shaolins_state : public driver_device { public: - shaolins_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + shaolins_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), - m_videoram(*this, "videoram") { } + m_videoram(*this, "videoram") + { } void shaolins(machine_config &config); @@ -48,3 +53,5 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(interrupt); void shaolins_map(address_map &map); }; + +#endif // MAME_INCLUDES_SHAOLINS_H diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index e0396cb50ac..70b0b78934c 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi, Phil Stroffolino, Bryan McPhail +#ifndef MAME_INCLUDES_SHOOTOUT_H +#define MAME_INCLUDES_SHOOTOUT_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -7,8 +11,8 @@ class shootout_state : public driver_device { public: - shootout_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + shootout_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), @@ -16,7 +20,8 @@ public: m_soundlatch(*this, "soundlatch"), m_spriteram(*this, "spriteram"), m_textram(*this, "textram"), - m_videoram(*this, "videoram") { } + m_videoram(*this, "videoram") + { } void shootouj(machine_config &config); void shootouk(machine_config &config); @@ -66,3 +71,5 @@ private: void shootout_map(address_map &map); void shootout_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_SHOOTOUT_H diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index 8ae5323143b..ed9d18420d4 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -1,13 +1,18 @@ // license:BSD-3-Clause // copyright-holders:Paul Leaman, Curt Coder +#ifndef MAME_INCLUDES_SIDEARMS_H +#define MAME_INCLUDES_SIDEARMS_H + +#pragma once + #include "video/bufsprite.h" #include "emupal.h" class sidearms_state : public driver_device { public: - sidearms_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + sidearms_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), @@ -93,3 +98,5 @@ private: void whizz_map(address_map &map); void whizz_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_SIDEARMS_H diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index 4b3a25f71b7..c570b0bf56f 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -5,6 +5,10 @@ Data East Side Pocket hardware ******************************************************************************/ +#ifndef MAME_INCLUDES_SIDEPKT_H +#define MAME_INCLUDES_SIDEPKT_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -12,8 +16,8 @@ class sidepckt_state : public driver_device { public: - sidepckt_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + sidepckt_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), @@ -70,3 +74,5 @@ private: void sidepcktb_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_SIDEPKT_H diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index 65b2e6c93bb..ac613c9ce06 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi +#ifndef MAME_INCLUDES_SIMPSONS_H +#define MAME_INCLUDES_SIMPSONS_H + +#pragma once + #include "machine/bankdev.h" #include "video/k053246_k053247_k055673.h" #include "video/k052109.h" @@ -9,15 +14,16 @@ class simpsons_state : public driver_device { public: - simpsons_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + simpsons_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_bank0000(*this, "bank0000"), m_bank2000(*this, "bank2000"), m_k052109(*this, "k052109"), m_k053246(*this, "k053246"), - m_k053251(*this, "k053251") { } + m_k053251(*this, "k053251") + { } void simpsons(machine_config &config); @@ -74,3 +80,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_SIMPSONS_H diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index a24c20b711e..bc4dd6e4738 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -5,6 +5,10 @@ Skyfox *************************************************************************/ +#ifndef MAME_INCLUDES_SKYFOX_H +#define MAME_INCLUDES_SKYFOX_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -13,8 +17,8 @@ class skyfox_state : public driver_device { public: - skyfox_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + skyfox_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), @@ -55,3 +59,5 @@ private: void skyfox_map(address_map &map); void skyfox_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_SKYFOX_H diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index 0628d850a78..fcd38520435 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia +#ifndef MAME_INCLUDES_SKYKID_H +#define MAME_INCLUDES_SKYKID_H + +#pragma once + #include "cpu/m6800/m6801.h" #include "sound/namco.h" #include "emupal.h" @@ -70,3 +75,5 @@ private: uint8_t m_main_irq_mask; uint8_t m_mcu_irq_mask; }; + +#endif // MAME_INCLUDES_SKYKID_H diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index 9c635db6d9b..5f5e430c02d 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Roberto Fresca +#ifndef MAME_INCLUDES_SNOOKR10_H +#define MAME_INCLUDES_SNOOKR10_H + +#pragma once #include "emupal.h" @@ -58,3 +62,5 @@ private: required_device m_gfxdecode; output_finder<7> m_lamps; }; + +#endif // MAME_INCLUDES_SNOOKR10_H diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index 4656491d16d..26d9f7e64ab 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -5,21 +5,26 @@ Son Son *************************************************************************/ +#ifndef MAME_INCLUDES_SONSON_H +#define MAME_INCLUDES_SONSON_H + +#pragma once #include "emupal.h" class sonson_state : public driver_device { public: - sonson_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + sonson_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void sonson(machine_config &config); @@ -53,3 +58,5 @@ private: void main_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_SONSON_H diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h index 499075f578d..aaa07156943 100644 --- a/src/mame/includes/sorcerer.h +++ b/src/mame/includes/sorcerer.h @@ -5,10 +5,11 @@ * includes/sorcerer.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_SORCERER_H #define MAME_INCLUDES_SORCERER_H +#pragma once + #include "cpu/z80/z80.h" #include "sound/wave.h" #include "machine/ay31015.h" @@ -30,14 +31,14 @@ struct cass_data_t { struct { - int length; /* time cassette level is at input.level */ - int level; /* cassette level */ - int bit; /* bit being read */ + int length; // time cassette level is at input.level + int level; // cassette level + int bit; // bit being read } input; struct { - int length; /* time cassette level is at output.level */ - int level; /* cassette level */ - int bit; /* bit to output */ + int length; // time cassette level is at output.level + int level; // cassette level + int bit; // bit to output } output; }; diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index d0ab125e916..9432c6cb33c 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese, Pierpaolo Prazzoli +#ifndef MAME_INCLUDES_SPEEDATK_H +#define MAME_INCLUDES_SPEEDATK_H + +#pragma once #include "video/mc6845.h" #include "emupal.h" @@ -7,14 +11,15 @@ class speedatk_state : public driver_device { public: - speedatk_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + speedatk_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_crtc(*this, "crtc"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram") { } + m_colorram(*this, "colorram") + { } void speedatk(machine_config &config); @@ -53,3 +58,5 @@ private: void speedatk_io(address_map &map); void speedatk_mem(address_map &map); }; + +#endif // MAME_INCLUDES_SPEEDATK_H diff --git a/src/mame/includes/spiders.h b/src/mame/includes/spiders.h index 6dc8438a578..c955ff9c834 100644 --- a/src/mame/includes/spiders.h +++ b/src/mame/includes/spiders.h @@ -5,6 +5,10 @@ Sigma Spiders hardware ***************************************************************************/ +#ifndef MAME_INCLUDES_SPIDERS_H +#define MAME_INCLUDES_SPIDERS_H + +#pragma once #include "machine/6821pia.h" #include "sound/discrete.h" @@ -57,3 +61,5 @@ private: uint8_t m_gfx_rom_ctrl_latch; uint8_t m_gfx_rom_ctrl_data; }; + +#endif // MAME_INCLUDES_SPIDERS_H diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index 15ad43d5873..a081783e052 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -34,8 +34,8 @@ class sprint2_state : public driver_device { public: - sprint2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + sprint2_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), m_maincpu(*this, "maincpu"), m_watchdog(*this, "watchdog"), @@ -43,7 +43,8 @@ public: m_discrete(*this, "discrete"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void sprint1(machine_config &config); void sprint2(machine_config &config); diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index d5f8c754c64..3335eea48d3 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -5,6 +5,11 @@ S.P.Y. *************************************************************************/ +#ifndef MAME_INCLUDES_SPY_H +#define MAME_INCLUDES_SPY_H + +#pragma once + #include "sound/k007232.h" #include "video/k052109.h" #include "video/k051960.h" @@ -14,8 +19,8 @@ class spy_state : public driver_device { public: - spy_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + spy_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_ram(*this, "ram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -23,7 +28,8 @@ public: m_k007232_2(*this, "k007232_2"), m_k052109(*this, "k052109"), m_k051960(*this, "k051960"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void spy(machine_config &config); @@ -68,3 +74,5 @@ private: void spy_map(address_map &map); void spy_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_SPY_H diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 1ad9f968351..652a474989c 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -1,20 +1,25 @@ // license:BSD-3-Clause // copyright-holders:Yochizo, Takahiro Nogi +#ifndef MAME_INCLUDES_SRMP2_H +#define MAME_INCLUDES_SRMP2_H + +#pragma once + #include "sound/msm5205.h" #include "video/seta001.h" #include "emupal.h" -struct iox_t -{ - int reset,ff_event,ff_1,protcheck[4],protlatch[4]; - uint8_t data; - uint8_t mux; - uint8_t ff; -}; - class srmp2_state : public driver_device { public: + struct iox_t + { + int reset,ff_event,ff_1,protcheck[4],protlatch[4]; + uint8_t data; + uint8_t mux; + uint8_t ff; + }; + srmp2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), @@ -94,3 +99,5 @@ private: void srmp3_io_map(address_map &map); void srmp3_map(address_map &map); }; + +#endif // MAME_INCLUDES_SRMP2_H diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index 0bb7be28a2a..36acaccb5fa 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Pierpaolo Prazzoli, Quench +#ifndef MAME_INCLUDES_SSLAM_H +#define MAME_INCLUDES_SSLAM_H + +#pragma once #include "machine/gen_latch.h" #include "sound/okim6295.h" @@ -8,8 +12,8 @@ class sslam_state : public driver_device { public: - sslam_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + sslam_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), @@ -20,7 +24,8 @@ public: m_md_tileram(*this, "md_tileram"), m_tx_tileram(*this, "tx_tileram"), m_regs(*this, "regs"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") + { } void sslam(machine_config &config); void powerbls(machine_config &config); @@ -84,3 +89,5 @@ private: void powerbls_map(address_map &map); void sslam_program_map(address_map &map); }; + +#endif // MAME_INCLUDES_SSLAM_H diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index 7cb6bc05184..e80f4e565b6 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Stefan Jokisch +#ifndef MAME_INCLUDES_SSPEEDR_H +#define MAME_INCLUDES_SSPEEDR_H + +#pragma once #include "emupal.h" @@ -12,7 +16,7 @@ public: , m_gfxdecode(*this, "gfxdecode") , m_palette(*this, "palette") , m_digits(*this, "digit%u", 0U) - { } + { } void sspeedr(machine_config &config); @@ -62,3 +66,5 @@ private: required_device m_palette; output_finder<26> m_digits; }; + +#endif // MAME_INCLUDES_SSPEEDR_H diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index aeedc05b698..59f827c7a44 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia +#ifndef MAME_INCLUDES_SSV_H +#define MAME_INCLUDES_SSV_H + +#pragma once #include "cpu/upd7725/upd7725.h" #include "video/st0020.h" @@ -14,8 +18,8 @@ class ssv_state : public driver_device { public: - ssv_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + ssv_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_ensoniq(*this, "ensoniq"), m_eeprom(*this, "eeprom"), @@ -205,3 +209,5 @@ private: void ssv_map(address_map &map, u32 rom); }; + +#endif // MAME_INCLUDES_SSV_H diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index c6ed94e64fe..ac2826ca7c1 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -7,7 +7,10 @@ Frank Palazzolo (palazzol@home.com) ****************************************************************************/ +#ifndef MAME_INCLUDES_STACTICS_H +#define MAME_INCLUDES_STACTICS_H +#pragma once #include "machine/74259.h" #include "emupal.h" @@ -123,3 +126,5 @@ private: uint16_t m_beam_states_per_frame; uint8_t m_palette_bank; }; + +#endif // MAME_INCLUDES_STACTICS_H diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index ed5181c443f..88a343f6023 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -1,13 +1,18 @@ // license:BSD-3-Clause // copyright-holders:Frank Palazzolo +#ifndef MAME_INCLUDES_STARCRUS_H +#define MAME_INCLUDES_STARCRUS_H + +#pragma once + #include "sound/samples.h" #include "emupal.h" class starcrus_state : public driver_device { public: - starcrus_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) , + starcrus_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), m_gfxdecode(*this, "gfxdecode"), @@ -84,3 +89,5 @@ private: void starcrus_io_map(address_map &map); void starcrus_map(address_map &map); }; + +#endif // MAME_INCLUDES_STARCRUS_H diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index f67f715b091..2c83168f74b 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Mark McDougall +#ifndef MAME_INCLUDES_STFIGHT_H +#define MAME_INCLUDES_STFIGHT_H + +#pragma once + #include "sound/msm5205.h" #include "video/stfight_dev.h" #include "video/airraid_dev.h" @@ -101,3 +106,5 @@ private: emu_timer *m_int1_timer; }; + +#endif // MAME_INCLUDES_STFIGHT_H diff --git a/src/mame/includes/sub.h b/src/mame/includes/sub.h index 730597baa07..2dbc441c058 100644 --- a/src/mame/includes/sub.h +++ b/src/mame/includes/sub.h @@ -5,10 +5,11 @@ Submarine (c) 1985 Sigma *************************************************************************************/ - #ifndef MAME_INCLUDES_SUB_H #define MAME_INCLUDES_SUB_H +#pragma once + #include "cpu/z80/z80.h" #include "machine/74259.h" #include "machine/gen_latch.h" @@ -23,8 +24,8 @@ Submarine (c) 1985 Sigma class sub_state : public driver_device { public: - sub_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + sub_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_soundcpu(*this, "soundcpu"), m_gfxdecode(*this, "gfxdecode"), @@ -34,7 +35,8 @@ public: m_attr(*this, "attr"), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), - m_scrolly(*this, "scrolly") { } + m_scrolly(*this, "scrolly") + { } void sub(machine_config &config); @@ -80,4 +82,4 @@ private: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); }; -#endif +#endif // MAME_INCLUDES_SUB_H diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index f969077d381..52ce0cb8294 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -8,6 +8,8 @@ #ifndef MAME_INCLUDES_SUBS_H #define MAME_INCLUDES_SUBS_H +#pragma once + #include "sound/discrete.h" #include "emupal.h" diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 6b55fe81c88..9a6f0347dc0 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia +#ifndef MAME_INCLUDES_SUNA8_H +#define MAME_INCLUDES_SUNA8_H + +#pragma once #include "machine/gen_latch.h" #include "machine/timer.h" @@ -213,3 +217,5 @@ private: #endif output_finder<2> m_leds; }; + +#endif // MAME_INCLUDES_SUNA8_H diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index 3c93235c4f1..54198e65958 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni, Nicola Salmoria, Tomasz Slanina +#ifndef MAME_INCLUDES_SUPERQIX_H +#define MAME_INCLUDES_SUPERQIX_H + +#pragma once #include "sound/ay8910.h" #include "sound/samples.h" @@ -9,16 +13,17 @@ class superqix_state_base : public driver_device { public: superqix_state_base(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this,"maincpu"), - m_spriteram(*this, "spriteram"), - m_videoram(*this, "videoram"), - m_bitmapram(*this, "bitmapram"), - m_bitmapram2(*this, "bitmapram2"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette"), - m_ay1(*this, "ay1"), - m_mcu(*this, "mcu") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this,"maincpu") + , m_spriteram(*this, "spriteram") + , m_videoram(*this, "videoram") + , m_bitmapram(*this, "bitmapram") + , m_bitmapram2(*this, "bitmapram2") + , m_gfxdecode(*this, "gfxdecode") + , m_palette(*this, "palette") + , m_ay1(*this, "ay1") + , m_mcu(*this, "mcu") + { } void init_perestro(); void init_sqix(); @@ -75,8 +80,8 @@ class superqix_state : public superqix_state_base { public: superqix_state(const machine_config &mconfig, device_type type, const char *tag) - : superqix_state_base(mconfig, type, tag), - m_ay2(*this, "ay2") + : superqix_state_base(mconfig, type, tag) + , m_ay2(*this, "ay2") { } @@ -196,3 +201,5 @@ private: int m_dial_oldpos[2]; int m_dial_sign[2]; }; + +#endif // MAME_INCLUDES_SUPERQIX_H diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index dcd942830d4..8740812711e 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -5,6 +5,10 @@ Surprise Attack *************************************************************************/ +#ifndef MAME_INCLUDES_SURPRATK_H +#define MAME_INCLUDES_SURPRATK_H + +#pragma once #include "machine/bankdev.h" #include "video/k053244_k053245.h" @@ -16,14 +20,15 @@ class surpratk_state : public driver_device { public: - surpratk_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + surpratk_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_bank0000(*this, "bank0000"), m_k052109(*this, "k052109"), m_k053244(*this, "k053244"), m_k053251(*this, "k053251"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void surpratk(machine_config &config); @@ -54,3 +59,5 @@ private: void bank0000_map(address_map &map); void surpratk_map(address_map &map); }; + +#endif // MAME_INCLUDES_SURPRATK_H diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 0430bcd2587..033b1d14303 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Jarek Parchanski, Nicola Salmoria, Mirko Buffoni +#ifndef MAME_INCLUDES_SYSTEM1_H +#define MAME_INCLUDES_SYSTEM1_H + +#pragma once #include "cpu/z80/z80.h" #include "machine/z80pio.h" @@ -13,8 +17,8 @@ class system1_state : public driver_device { public: - system1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + system1_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_ppi8255(*this, "ppi8255"), m_pio(*this, "pio"), m_ram(*this, "ram"), @@ -35,7 +39,7 @@ public: m_bank0d(*this, "bank0d"), m_bank1d(*this, "bank1d"), m_banked_decrypted_opcodes(nullptr) - { } + { } void sys1ppix_315_5051(machine_config &config); void sys1ppisx_315_5064(machine_config &config); @@ -207,3 +211,5 @@ private: void system1_pio_io_map(address_map &map); void system1_ppi_io_map(address_map &map); }; + +#endif // MAME_INCLUDES_SYSTEM1_H diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index d757d5268e7..f6ca6404054 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria, Phil Stroffolino, Mirko Buffoni +#ifndef MAME_INCLUDES_SYSTEM16_H +#define MAME_INCLUDES_SYSTEM16_H + +#pragma once #include "video/sega16sp.h" #include "machine/74157.h" @@ -299,3 +303,5 @@ private: optional_shared_ptr m_decrypted_opcodes; output_finder<2> m_leds; }; + +#endif // MAME_INCLUDES_SYSTEM16_H diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 16feac15b79..ca948a4da70 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Brad Oliver +#ifndef MAME_INCLUDES_TANKBATT_H +#define MAME_INCLUDES_TANKBATT_H + +#pragma once #include "sound/samples.h" #include "emupal.h" @@ -7,14 +11,15 @@ class tankbatt_state : public driver_device { public: - tankbatt_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + tankbatt_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_samples(*this, "samples"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_bulletsram(*this, "bulletsram"), - m_videoram(*this, "videoram") { } + m_videoram(*this, "videoram") + { } void tankbatt(machine_config &config); @@ -58,3 +63,5 @@ private: void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect); void main_map(address_map &map); }; + +#endif // MAME_INCLUDES_TANKBATT_H diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index 762789cb9b1..0ede885a277 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:BUT +#ifndef MAME_INCLUDES_TCEPTOR_H +#define MAME_INCLUDES_TCEPTOR_H + +#pragma once + #include "sound/namco.h" #include "video/c45.h" #include "emupal.h" @@ -106,3 +111,5 @@ private: void mcu_io_map(address_map &map); void mcu_map(address_map &map); }; + +#endif // MAME_INCLUDES_TCEPTOR_H diff --git a/src/mame/includes/tdv2324.h b/src/mame/includes/tdv2324.h index 79bde97bacb..2c23a74afc6 100644 --- a/src/mame/includes/tdv2324.h +++ b/src/mame/includes/tdv2324.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder,Jonathan Gevaryahu -#pragma once - #ifndef MAME_INCLUDES_TDV2324_H #define MAME_INCLUDES_TDV2324_H +#pragma once + #include "cpu/i8085/i8085.h" #include "cpu/m6800/m6800.h" @@ -47,16 +47,16 @@ class tdv2324_state : public driver_device { public: tdv2324_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, P8085AH_0_TAG), - m_subcpu(*this, P8085AH_1_TAG), - m_fdccpu(*this, MC68B02P_TAG), - m_sio(*this, MK3887N4_TAG), - m_pic(*this, P8259A_TAG), - m_pit0(*this, P8253_5_0_TAG), - m_pit1(*this, P8253_5_1_TAG), - m_tms(*this, TMS9937NL_TAG), - m_video_ram(*this, "video_ram") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, P8085AH_0_TAG) + , m_subcpu(*this, P8085AH_1_TAG) + , m_fdccpu(*this, MC68B02P_TAG) + , m_sio(*this, MK3887N4_TAG) + , m_pic(*this, P8259A_TAG) + , m_pit0(*this, P8253_5_0_TAG) + , m_pit1(*this, P8253_5_1_TAG) + , m_tms(*this, TMS9937NL_TAG) + , m_video_ram(*this, "video_ram") { } void tdv2324(machine_config &config); diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index aad2da80a91..b1e30d2af77 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Hau, Nicola Salmoria +#ifndef MAME_INCLUDES_TECMO16_H +#define MAME_INCLUDES_TECMO16_H + +#pragma once #include "video/bufsprite.h" #include "video/tecmo_spr.h" @@ -92,3 +96,5 @@ private: void ginkun_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_TECMO16_H diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index e4f65be47a8..ecbc9241f53 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Carlos A. Lozano +#ifndef MAME_INCLUDES_TERRACRE_H +#define MAME_INCLUDES_TERRACRE_H + +#pragma once #include "machine/nb1412m2.h" #include "machine/gen_latch.h" @@ -9,15 +13,16 @@ class terracre_state : public driver_device { public: - terracre_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + terracre_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_spriteram(*this, "spriteram"), m_soundlatch(*this, "soundlatch"), m_bg_videoram(*this, "bg_videoram"), - m_fg_videoram(*this, "fg_videoram") { } + m_fg_videoram(*this, "fg_videoram") + { } void amazon_base(machine_config &config); void ym2203(machine_config &config); @@ -63,13 +68,15 @@ private: class amazon_state : public terracre_state { public: - amazon_state(const machine_config &mconfig, device_type type, const char *tag) - : terracre_state(mconfig, type, tag), + amazon_state(const machine_config &mconfig, device_type type, const char *tag) : + terracre_state(mconfig, type, tag), m_prot(*this, "prot_chip") - {} + { } void amazon_1412m2(machine_config &config); void amazon_1412m2_map(address_map &map); private: required_device m_prot; }; + +#endif // MAME_INCLUDES_TERRACRE_H diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index aab9dd6805e..f5649641f82 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -5,6 +5,11 @@ Super Contra / Thunder Cross *************************************************************************/ +#ifndef MAME_INCLUDES_THUNDERX_H +#define MAME_INCLUDES_THUNDERX_H + +#pragma ocne + #include "cpu/m6809/konami.h" #include "machine/bankdev.h" #include "sound/k007232.h" @@ -16,8 +21,8 @@ class thunderx_state : public driver_device { public: - thunderx_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + thunderx_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_bank5800(*this, "bank5800"), @@ -26,7 +31,8 @@ public: m_k051960(*this, "k051960"), m_palette(*this, "palette"), m_rombank(*this, "rombank"), - m_pmcram(*this, "pmcram") { } + m_pmcram(*this, "pmcram") + { } void scontra(machine_config &config); void gbusters(machine_config &config); @@ -95,3 +101,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_THUNDERX_H diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 9a0044d6a4d..47d8b1295f3 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -5,6 +5,10 @@ Time Pilot ***************************************************************************/ +#ifndef MAME_INCLUDES_TIMEPLT_H +#define MAME_INCLUDES_TIMEPLT_H + +#pragma once #include "machine/74259.h" #include "sound/tc8830f.h" @@ -14,8 +18,8 @@ class timeplt_state : public driver_device { public: - timeplt_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + timeplt_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_tc8830f(*this, "tc8830f"), m_mainlatch(*this, "mainlatch"), @@ -94,3 +98,5 @@ private: void psurge_main_map(address_map &map); void timeplt_main_map(address_map &map); }; + +#endif // MAME_INCLUDES_TIMEPLT_H diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 98e47c7d786..817ec7f8a35 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_TMNT_H +#define MAME_INCLUDES_TMNT_H + +#pragma once + #include "sound/samples.h" #include "sound/upd7759.h" #include "sound/k007232.h" @@ -17,8 +22,8 @@ class tmnt_state : public driver_device { public: - tmnt_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + tmnt_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_tmnt2_rom(*this, "tmnt2_rom"), m_sunset_104000(*this, "sunset_104000"), @@ -37,7 +42,8 @@ public: m_upd7759(*this, "upd"), m_samples(*this, "samples"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void cuebrick(machine_config &config); void blswhstl(machine_config &config); @@ -223,3 +229,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_TMNT_H diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index eb6601ae660..70d31eca3a0 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Jarek Parchanski +#ifndef MAME_INCLUDES_TOKI_H +#define MAME_INCLUDES_TOKI_H + +#pragma once #include "audio/seibu.h" #include "machine/gen_latch.h" @@ -11,8 +15,8 @@ class toki_state : public driver_device { public: - toki_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + toki_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_audiocpu_rom(*this, "audiocpu"), @@ -26,7 +30,8 @@ public: m_background1_videoram(*this, "bg1_vram"), m_background2_videoram(*this, "bg2_vram"), m_videoram(*this, "videoram"), - m_scrollram(*this, "scrollram") { } + m_scrollram(*this, "scrollram") + { } void toki(machine_config &config); void jujuba(machine_config &config); @@ -91,3 +96,5 @@ private: void tokib_audio_map(address_map &map); void tokib_map(address_map &map); }; + +#endif // MAME_INCLUDES_TOKI_H diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index bcc6a86d53e..80c930ccfd8 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -1,6 +1,5 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles - #ifndef MAME_INCLUDES_TP84 #define MAME_INCLUDES_TP84 @@ -13,8 +12,8 @@ class tp84_state : public driver_device { public: - tp84_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + tp84_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "cpu1"), m_subcpu(*this, "sub"), m_audiocpu(*this, "audiocpu"), @@ -29,7 +28,8 @@ public: m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), m_palette(*this, "palette"), - m_filter(*this, "filter%u", 1U) { } + m_filter(*this, "filter%u", 1U) + { } void tp84(machine_config &config); void tp84b(machine_config &config); diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index dc5f54827d2..5cd3c177228 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -22,8 +22,8 @@ class trackfld_state : public driver_device { public: - trackfld_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + trackfld_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram2(*this, "spriteram2"), m_scroll(*this, "scroll"), m_spriteram(*this, "spriteram"), @@ -39,7 +39,8 @@ public: m_dac(*this, "dac"), m_screen(*this, "screen"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void reaktor(machine_config &config); void atlantol(machine_config &config); diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index e30890af45d..d3c23b4ce6c 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -1,19 +1,24 @@ // license:BSD-3-Clause // copyright-holders:Lee Taylor // thanks-to:John Clegg,Tomasz Slanina +#ifndef MAME_INCLUDES_TRAVRUSA_H +#define MAME_INCLUDES_TRAVRUSA_H + +#pragma once #include "emupal.h" class travrusa_state : public driver_device { public: - travrusa_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + travrusa_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void shtrider(machine_config &config); void travrusa(machine_config &config); @@ -42,7 +47,7 @@ private: DECLARE_PALETTE_INIT(travrusa); DECLARE_PALETTE_INIT(shtrider); uint32_t screen_update_travrusa(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void set_scroll( ); + void set_scroll(); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; @@ -50,3 +55,5 @@ private: void main_map(address_map &map); }; + +#endif // MAME_INCLUDES_TRAVRUSA_H diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h index 8b1c0fe8ac6..23346cff7f5 100644 --- a/src/mame/includes/trs80.h +++ b/src/mame/includes/trs80.h @@ -53,7 +53,7 @@ public: , m_io_baud(*this, "BAUD") , m_io_config(*this, "CONFIG") , m_io_keyboard(*this, "LINE%u", 0) - { } + { } void sys80(machine_config &config); void trs80(machine_config &config); diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h index 8c44263f2f6..133ee0c2a8b 100644 --- a/src/mame/includes/trs80m2.h +++ b/src/mame/includes/trs80m2.h @@ -39,8 +39,8 @@ class trs80m2_state : public driver_device { public: - trs80m2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + trs80m2_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, Z80_TAG), m_ctc(*this, Z80CTC_TAG), m_dmac(*this, Z80DMA_TAG), diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index 27174052d02..f9d552c6789 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Pierpaolo Prazzoli, Bryan McPhail +#ifndef MAME_INCLUDES_TRYOUT_H +#define MAME_INCLUDES_TRYOUT_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -7,8 +11,8 @@ class tryout_state : public driver_device { public: - tryout_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + tryout_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), @@ -17,7 +21,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), - m_gfx_control(*this, "gfx_control") { } + m_gfx_control(*this, "gfx_control") + { } void tryout(machine_config &config); @@ -66,3 +71,5 @@ private: void main_cpu(address_map &map); void sound_cpu(address_map &map); }; + +#endif // MAME_INCLUDES_TRYOUT_H diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index d0164c3fffc..3cf2edd1bcc 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -1,5 +1,10 @@ // license:GPL-2.0+ // copyright-holders:Jarek Burczynski +#ifndef MAME_INCLUDES_TUBEP_H +#define MAME_INCLUDES_TUBEP_H + +#pragma once + #include "sound/msm5205.h" #include "emupal.h" #include "screen.h" @@ -7,8 +12,8 @@ class tubep_state : public driver_device { public: - tubep_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + tubep_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_textram(*this, "textram"), m_backgroundram(*this, "backgroundram"), m_sprite_colorsharedram(*this, "sprite_color"), @@ -18,7 +23,8 @@ public: m_slave(*this, "slave"), m_mcu(*this, "mcu"), m_msm(*this, "msm"), - m_screen(*this, "screen") { } + m_screen(*this, "screen") + { } void tubepb(machine_config &config); void tubep(machine_config &config); @@ -131,3 +137,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_TUBEP_H diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index 236ec783c44..90a1dd5300b 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood,Bryan McPhail +#ifndef MAME_INCLUDES_TUMBLEB_H +#define MAME_INCLUDES_TUMBLEB_H + +#pragma once #include "machine/gen_latch.h" #include "video/decospr.h" @@ -9,8 +13,8 @@ class tumbleb_state : public driver_device { public: - tumbleb_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + tumbleb_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), m_spriteram(*this, "spriteram"), m_pf1_data(*this, "pf1_data"), @@ -166,3 +170,5 @@ private: void tumblepopb_main_map(address_map &map); void tumblepopba_main_map(address_map &map); }; + +#endif // MAME_INCLUDES_TUMBLEB_H diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index 04ea44546a5..d7d10843b6c 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -5,6 +5,10 @@ Sega Z80-3D system *************************************************************************/ +#ifndef MAME_INCLUDES_TURBO_H +#define MAME_INCLUDES_TURBO_H + +#pragma once #include "cpu/z80/z80.h" #include "machine/i8255.h" @@ -214,3 +218,5 @@ private: void subroc3d_map(address_map &map); void turbo_map(address_map &map); }; + +#endif // MAME_INCLUDES_TURBO_H diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h index 2273e644837..10eddae2758 100644 --- a/src/mame/includes/turrett.h +++ b/src/mame/includes/turrett.h @@ -22,12 +22,14 @@ class turrett_state : public driver_device { public: turrett_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_ata(*this, "ata"), - m_bank_a(*this, "bank_a"), - m_bank_b(*this, "bank_b"), - m_screen(*this, "screen") {} + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_ata(*this, "ata") + , m_bank_a(*this, "bank_a") + , m_bank_b(*this, "bank_b") + , m_screen(*this, "screen") + { + } void turrett(machine_config &config); diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h index e73cb4f288d..2111d73a16f 100644 --- a/src/mame/includes/tutankhm.h +++ b/src/mame/includes/tutankhm.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni +#ifndef MAME_INCLUDES_TUTANKHM_H +#define MAME_INCLUDES_TUTANKHM_H + +#pragma once #include "audio/timeplt.h" #include "emupal.h" @@ -51,3 +55,5 @@ protected: required_device m_palette; optional_device m_timeplt_audio; }; + +#endif // MAME_INCLUDES_TUTANKHM_H diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index c986ff4c48f..0d85b6d89ba 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino +#ifndef MAME_INCLUDES_TWIN16_H +#define MAME_INCLUDES_TWIN16_H + +#pragma once + #include "video/bufsprite.h" #include "sound/upd7759.h" #include "sound/k007232.h" @@ -9,8 +14,8 @@ class twin16_state : public driver_device { public: - twin16_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + twin16_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_subcpu(*this, "sub"), m_audiocpu(*this, "audiocpu"), @@ -25,7 +30,8 @@ public: m_videoram(*this, "videoram.%u", 0), m_zipram(*this, "zipram"), m_sprite_gfx_ram(*this, "sprite_gfx_ram"), - m_gfxrom(*this, "gfxrom") { } + m_gfxrom(*this, "gfxrom") + { } void devilw(machine_config &config); void miaj(machine_config &config); @@ -143,3 +149,5 @@ private: uint16_t m_nvram[0x400 * 0x20 / 2]; }; + +#endif // MAME_INCLUDES_TWIN16_H diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index 62b093f8986..fac565f6997 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -5,6 +5,10 @@ Ultraman *************************************************************************/ +#ifndef MAME_INCLUDES_ULTRAMAN_H +#define MAME_INCLUDES_ULTRAMAN_H + +#pragma once #include "machine/gen_latch.h" #include "machine/input_merger.h" @@ -52,3 +56,5 @@ private: void sound_io_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_ULTRAMAN_H diff --git a/src/mame/includes/ut88.h b/src/mame/includes/ut88.h index dc62d3c18b8..358cf993daa 100644 --- a/src/mame/includes/ut88.h +++ b/src/mame/includes/ut88.h @@ -42,7 +42,7 @@ public: , m_gfxdecode(*this, "gfxdecode") , m_palette(*this, "palette") , m_digits(*this, "digit%u", 0U) - { } + { } void ut88(machine_config &config); void ut88mini(machine_config &config); diff --git a/src/mame/includes/v1050.h b/src/mame/includes/v1050.h index 87ef69b3119..0dc397a225b 100644 --- a/src/mame/includes/v1050.h +++ b/src/mame/includes/v1050.h @@ -5,8 +5,6 @@ #pragma once -#pragma once - #include "cpu/z80/z80.h" #include "cpu/m6502/m6502.h" #include "bus/centronics/ctronics.h" diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h index 85a6a8e8224..4917f9a6675 100644 --- a/src/mame/includes/vc4000.h +++ b/src/mame/includes/vc4000.h @@ -6,10 +6,11 @@ * includes/vc4000.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_VC4000_H #define MAME_INCLUDES_VC4000_H +#pragma once + #include "audio/vc4000.h" #include "cpu/s2650/s2650.h" #include "imagedev/snapquik.h" @@ -27,60 +28,11 @@ #define ANALOG_HACK -struct SPRITE_HELPER -{ - uint8_t bitmap[10],x1,x2,y1,y2, res1, res2; -}; - -struct SPRITE -{ - const SPRITE_HELPER *data; - int mask; - int state; - int delay; - int size; - int y; - uint8_t scolor; - int finished; - int finished_now; -}; - -struct vc4000_video_t -{ - SPRITE sprites[4]; - int line; - uint8_t sprite_collision; - uint8_t background_collision; - union - { - uint8_t data[0x100]; - struct - { - SPRITE_HELPER sprites[3]; - uint8_t res[0x10]; - SPRITE_HELPER sprite4; - uint8_t res2[0x30]; - uint8_t grid[20][2]; - uint8_t grid_control[5]; - uint8_t res3[0x13]; - uint8_t sprite_sizes; - uint8_t sprite_colors[2]; - uint8_t score_control; - uint8_t res4[2]; - uint8_t background; - uint8_t sound; - uint8_t bcd[2]; - uint8_t background_collision; - uint8_t sprite_collision; - } d; - } reg; -} ; - class vc4000_state : public driver_device { public: - vc4000_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + vc4000_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_screen(*this, "screen"), m_cassette(*this, "cassette"), @@ -113,6 +65,55 @@ public: void elektor(machine_config &config); private: + struct SPRITE_HELPER + { + uint8_t bitmap[10],x1,x2,y1,y2, res1, res2; + }; + + struct SPRITE + { + const SPRITE_HELPER *data; + int mask; + int state; + int delay; + int size; + int y; + uint8_t scolor; + int finished; + int finished_now; + }; + + struct vc4000_video_t + { + SPRITE sprites[4]; + int line; + uint8_t sprite_collision; + uint8_t background_collision; + union + { + uint8_t data[0x100]; + struct + { + SPRITE_HELPER sprites[3]; + uint8_t res[0x10]; + SPRITE_HELPER sprite4; + uint8_t res2[0x30]; + uint8_t grid[20][2]; + uint8_t grid_control[5]; + uint8_t res3[0x13]; + uint8_t sprite_sizes; + uint8_t sprite_colors[2]; + uint8_t score_control; + uint8_t res4[2]; + uint8_t background; + uint8_t sound; + uint8_t bcd[2]; + uint8_t background_collision; + uint8_t sprite_collision; + } d; + } reg; + } ; + DECLARE_WRITE8_MEMBER(vc4000_sound_ctl); DECLARE_READ8_MEMBER(vc4000_key_r); DECLARE_READ8_MEMBER(vc4000_video_r); diff --git a/src/mame/includes/vector06.h b/src/mame/includes/vector06.h index 2e0edd213c3..fe22ffc30e4 100644 --- a/src/mame/includes/vector06.h +++ b/src/mame/includes/vector06.h @@ -5,10 +5,11 @@ * includes/vector06.h * ****************************************************************************/ - #ifndef MAME_INCLUDES_VECTOR06_H #define MAME_INCLUDES_VECTOR06_H +#pragma once + #include "bus/generic/carts.h" #include "bus/generic/slot.h" @@ -31,8 +32,8 @@ class vector06_state : public driver_device { public: - vector06_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + vector06_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), m_cassette(*this, "cassette"), diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index a0a9957e498..4faa1a0d91c 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -5,6 +5,11 @@ Vendetta *************************************************************************/ +#ifndef MAME_INCLUDES_VENDETTA_H +#define MAME_INCLUDES_VENDETTA_H + +#pragma once + #include "machine/bankdev.h" #include "machine/k053252.h" #include "video/k053246_k053247_k055673.h" @@ -17,8 +22,8 @@ class vendetta_state : public driver_device { public: - vendetta_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + vendetta_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_k052109(*this, "k052109"), @@ -28,7 +33,8 @@ public: m_k054000(*this, "k054000"), m_palette(*this, "palette"), m_videobank0(*this, "videobank0"), - m_videobank1(*this, "videobank1") { } + m_videobank1(*this, "videobank1") + { } void esckids(machine_config &config); void vendetta(machine_config &config); @@ -39,15 +45,15 @@ private: TIMER_Z80_NMI }; - /* video-related */ + // video-related int m_layer_colorbase[3]; int m_sprite_colorbase; int m_layerpri[3]; - /* misc */ + // misc int m_irq_enabled; - /* devices */ + // devices required_device m_maincpu; required_device m_audiocpu; required_device m_k052109; @@ -88,3 +94,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_VENDETTA_H diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index 07049a55875..c55e5f6c5ac 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -5,14 +5,18 @@ Capcom Vulgus hardware ***************************************************************************/ +#ifndef MAME_INCLUDES_VULGUS_H +#define MAME_INCLUDES_VULGUS_H + +#pragma once #include "emupal.h" class vulgus_state : public driver_device { public: - vulgus_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + vulgus_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_gfxdecode(*this, "gfxdecode"), @@ -61,3 +65,5 @@ private: void main_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_VULGUS_H diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index 072c61dc81e..ec6239bf6a4 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Chris Hardy +#ifndef MAME_INCLUDES_WARPWARP_H +#define MAME_INCLUDES_WARPWARP_H + +#pragma once #include "machine/74259.h" #include "machine/watchdog.h" @@ -10,8 +14,8 @@ class warpwarp_state : public driver_device { public: - warpwarp_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + warpwarp_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_watchdog(*this, "watchdog"), m_gfxdecode(*this, "gfxdecode"), @@ -119,3 +123,5 @@ private: void geebee_port_map(address_map &map); void warpwarp_map(address_map &map); }; + +#endif // MAME_INCLUDES_WARPWARP_H diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 2502f00751a..38b1e231342 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -5,7 +5,10 @@ Driver for early Williams games **************************************************************************/ +#ifndef MAME_INCLUDES_WILLIAMS_H +#define MAME_INCLUDES_WILLIAMS_H +#pragma once #include "audio/williams.h" #include "cpu/m6800/m6800.h" @@ -40,7 +43,8 @@ public: m_screen(*this, "screen"), m_palette(*this, "palette"), m_paletteram(*this, "paletteram"), - m_pia(*this, "pia_%u", 0U) { } + m_pia(*this, "pia_%u", 0U) + { } void playball(machine_config &config); void defender(machine_config &config); @@ -155,7 +159,8 @@ class spdball_state : public williams_state { public: spdball_state(const machine_config &mconfig, device_type type, const char *tag) : - williams_state(mconfig, type, tag) { } + williams_state(mconfig, type, tag) + { } void spdball(machine_config &config); @@ -173,7 +178,8 @@ public: m_soundcpu_b(*this, "soundcpu_b"), m_blaster_palette_0(*this, "blaster_pal0"), m_blaster_scanline_control(*this, "blaster_scan"), - m_blaster_bankb(*this, "blaster_bankb") { } + m_blaster_bankb(*this, "blaster_bankb") + { } void blastkit(machine_config &config); void blaster(machine_config &config); @@ -212,11 +218,12 @@ private: class williams2_state : public williams_state { public: - williams2_state(const machine_config &mconfig, device_type type, const char *tag) - : williams_state(mconfig, type, tag), + williams2_state(const machine_config &mconfig, device_type type, const char *tag) : + williams_state(mconfig, type, tag), m_bank8000(*this, "bank8000"), m_gfxdecode(*this, "gfxdecode"), - m_williams2_tileram(*this, "williams2_tile") { } + m_williams2_tileram(*this, "williams2_tile") + { } void williams2(machine_config &config); void mysticm(machine_config &config); @@ -274,7 +281,8 @@ public: m_grenade_lamp(*this, "Grenade_lamp"), m_gun_lamp(*this, "Gun_lamp"), m_p1_gun_recoil(*this, "Player1_Gun_Recoil"), - m_feather_blower(*this, "Feather_Blower") { } + m_feather_blower(*this, "Feather_Blower") + { } void tshoot(machine_config &config); @@ -296,9 +304,10 @@ private: class joust2_state : public williams2_state { public: - joust2_state(const machine_config &mconfig, device_type type, const char *tag) - : williams2_state(mconfig, type, tag), - m_cvsd_sound(*this, "cvsd") { } + joust2_state(const machine_config &mconfig, device_type type, const char *tag) : + williams2_state(mconfig, type, tag), + m_cvsd_sound(*this, "cvsd") + { } void joust2(machine_config &config); @@ -324,3 +333,5 @@ private: #define WILLIAMS_TILEMAP_MYSTICM 0 /* IC79 is a 74LS85 comparator */ #define WILLIAMS_TILEMAP_TSHOOT 1 /* IC79 is a 74LS157 selector jumpered to be enabled */ #define WILLIAMS_TILEMAP_JOUST2 2 /* IC79 is a 74LS157 selector jumpered to be disabled */ + +#endif // MAME_INCLUDES_WILLIAMS_H diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index f9f7f73d2af..b8f30793d42 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -5,6 +5,10 @@ Seibu Stinger/Wiz hardware ***************************************************************************/ +#ifndef MAME_INCLUDES_WIZ_H +#define MAME_INCLUDES_WIZ_H + +#pragma once #include "sound/discrete.h" #include "emupal.h" @@ -12,8 +16,8 @@ class wiz_state : public driver_device { public: - wiz_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + wiz_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_discrete(*this, "discrete"), @@ -97,3 +101,5 @@ private: void stinger_sound_map(address_map &map); void wiz_main_map(address_map &map); }; + +#endif // MAME_INCLUDES_WIZ_H diff --git a/src/mame/includes/x07.h b/src/mame/includes/x07.h index b3da10b3134..030e693dfba 100644 --- a/src/mame/includes/x07.h +++ b/src/mame/includes/x07.h @@ -165,16 +165,16 @@ class x07_state : public driver_device { public: x07_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_printer(*this, "printer"), - m_beep(*this, "beeper"), - m_ram(*this, RAM_TAG), - m_nvram1(*this, "nvram1"), - m_nvram2(*this, "nvram2"), - m_cassette(*this, "cassette"), - m_card(*this, "cardslot"), - m_warm_start(1) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_printer(*this, "printer") + , m_beep(*this, "beeper") + , m_ram(*this, RAM_TAG) + , m_nvram1(*this, "nvram1") + , m_nvram2(*this, "nvram2") + , m_cassette(*this, "cassette") + , m_card(*this, "cardslot") + , m_warm_start(1) { } void x07(machine_config &config); diff --git a/src/mame/includes/xevious.h b/src/mame/includes/xevious.h index f105611fd72..b430ce8b484 100644 --- a/src/mame/includes/xevious.h +++ b/src/mame/includes/xevious.h @@ -11,8 +11,8 @@ class xevious_state : public galaga_state { public: - xevious_state(const machine_config &mconfig, device_type type, const char *tag) - : galaga_state(mconfig, type, tag), + xevious_state(const machine_config &mconfig, device_type type, const char *tag) : + galaga_state(mconfig, type, tag), m_xevious_sr1(*this, "xevious_sr1"), m_xevious_sr2(*this, "xevious_sr2"), m_xevious_sr3(*this, "xevious_sr3"), @@ -21,7 +21,8 @@ public: m_xevious_fg_videoram(*this, "fg_videoram"), m_xevious_bg_videoram(*this, "bg_videoram"), m_samples(*this, "samples"), - m_subcpu3(*this, "sub3") { } + m_subcpu3(*this, "sub3") + { } void xevious(machine_config &config); diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index 9c73f944ffa..ef47f49b492 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -5,6 +5,10 @@ Xexex *************************************************************************/ +#ifndef MAME_INCLUDES_XEXEX_H +#define MAME_INCLUDES_XEXEX_H + +#pragma once #include "video/k053250.h" #include "sound/flt_vol.h" @@ -102,8 +106,8 @@ private: TIMER_CALLBACK_MEMBER(dmaend_callback); TIMER_DEVICE_CALLBACK_MEMBER(xexex_interrupt); void xexex_postload(); - void xexex_objdma( int limiter ); - void parse_control2( ); + void xexex_objdma(int limiter); + void parse_control2(); K056832_CB_MEMBER(tile_callback); K053246_CB_MEMBER(sprite_callback); K054539_CB_MEMBER(ym_set_mixing); @@ -111,3 +115,5 @@ private: void main_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_XEXEX_H diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index baf26ca9cab..53700d05ee8 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_XMEN_H +#define MAME_INCLUDES_XMEN_H + +#pragma once #include "machine/gen_latch.h" #include "machine/timer.h" @@ -14,8 +18,8 @@ class xmen_state : public driver_device { public: - xmen_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + xmen_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_xmen6p_spriteramleft(*this, "spriteramleft"), m_xmen6p_spriteramright(*this, "spriteramright"), m_xmen6p_tilemapleft(*this, "tilemapleft"), @@ -28,7 +32,8 @@ public: m_k053251(*this, "k053251"), m_screen(*this, "screen"), m_k054321(*this, "k054321"), - m_z80bank(*this, "z80bank") { } + m_z80bank(*this, "z80bank") + { } void xmen(machine_config &config); void xmen6p(machine_config &config); @@ -83,3 +88,5 @@ private: void main_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_XMEN_H diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index b734f2d4765..b78c28e1a7b 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia +#ifndef MAME_INCLUDES_XORWORLD_H +#define MAME_INCLUDES_XORWORLD_H + +#pragma once #include "machine/eepromser.h" #include "emupal.h" @@ -7,14 +11,15 @@ class xorworld_state : public driver_device { public: - xorworld_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + xorworld_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_eeprom(*this, "eeprom"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_videoram(*this, "videoram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") + { } void xorworld(machine_config &config); @@ -45,3 +50,5 @@ private: void xorworld_map(address_map &map); }; + +#endif // MAME_INCLUDES_XORWORLD_H diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index 874fb9b0eab..75366e0aab3 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -5,6 +5,10 @@ Sega Zaxxon hardware ***************************************************************************/ +#ifndef MAME_INCLUDES_ZAXXON_H +#define MAME_INCLUDES_ZAXXON_H + +#pragma once #include "machine/74259.h" #include "machine/i8255.h" @@ -14,8 +18,8 @@ class zaxxon_state : public driver_device { public: - zaxxon_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + zaxxon_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_mainlatch(*this, "mainlatch%u", 1), m_ppi(*this, "ppi8255"), @@ -26,7 +30,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), - m_decrypted_opcodes(*this, "decrypted_opcodes") { } + m_decrypted_opcodes(*this, "decrypted_opcodes") + { } void root(machine_config &config); void ixion(machine_config &config); @@ -131,3 +136,4 @@ private: void zaxxon_map(address_map &map); }; +#endif // MAME_INCLUDES_ZAXXON_H diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index 799f43e8469..48c864fff85 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -5,6 +5,10 @@ Zero Zone *************************************************************************/ +#ifndef MAME_INCLUDES_ZEROZONE_H +#define MAME_INCLUDES_ZEROZONE_H + +#pragma once #include "machine/gen_latch.h" #include "cpu/z80/z80.h" @@ -59,3 +63,5 @@ private: virtual void video_start() override; TILE_GET_INFO_MEMBER(get_zerozone_tile_info); }; + +#endif // MAME_INCLUDES_ZEROZONE_H diff --git a/src/mame/video/advision.cpp b/src/mame/video/advision.cpp index 2cb6a3e2ba5..21df8ea0c1f 100644 --- a/src/mame/video/advision.cpp +++ b/src/mame/video/advision.cpp @@ -23,9 +23,9 @@ void advision_state::video_start() { m_video_hpos = 0; - m_display.resize(8 * 8 * 256); - memset(&m_display[0], 0, 8*8*256); - save_item(NAME(m_display)); + m_display = std::make_unique(8 * 8 * 256); + std::fill_n(m_display.get(), 8 * 8 * 256, 0); + save_pointer(NAME(m_display), 8 * 8 * 256); save_item(NAME(m_video_hpos)); } diff --git a/src/mame/video/bosco.cpp b/src/mame/video/bosco.cpp index 2936382386e..a4595cfb3d9 100644 --- a/src/mame/video/bosco.cpp +++ b/src/mame/video/bosco.cpp @@ -246,18 +246,18 @@ void bosco_state::draw_stars(bitmap_ind16 &bitmap, const rectangle &cliprect, in { int x,y; - if ( (set_a == m_star_seed_tab[star_cntr].set) || ( set_b == m_star_seed_tab[star_cntr].set) ) + if ((set_a == s_star_seed_tab[star_cntr].set) || (set_b == s_star_seed_tab[star_cntr].set)) { - x = (m_star_seed_tab[star_cntr].x + m_stars_scrollx) % 256; - y = (m_star_seed_tab[star_cntr].y + m_stars_scrolly) % 256; + x = (s_star_seed_tab[star_cntr].x + m_stars_scrollx) % 256; + y = (s_star_seed_tab[star_cntr].y + m_stars_scrolly) % 256; /* don't draw the stars that are off the screen */ - if ( x < 224 ) + if (x < 224) { if (flip) x += 64; if (cliprect.contains(x, y)) - bitmap.pix16(y, x) = STARS_COLOR_BASE + m_star_seed_tab[star_cntr].col; + bitmap.pix16(y, x) = STARS_COLOR_BASE + s_star_seed_tab[star_cntr].col; } } } diff --git a/src/mame/video/galaga.cpp b/src/mame/video/galaga.cpp index e86c2350e98..d3841af9ece 100644 --- a/src/mame/video/galaga.cpp +++ b/src/mame/video/galaga.cpp @@ -33,7 +33,7 @@ There are 63 stars in each set, 126 displayed at any one time */ -struct galaga_state::star galaga_state::m_star_seed_tab[252]= +struct galaga_state::star const galaga_state::s_star_seed_tab[252]= { /* also shared by Bosconian */ @@ -537,14 +537,14 @@ void galaga_state::draw_stars(bitmap_ind16 &bitmap, const rectangle &cliprect ) { int x,y; - if ( (set_a == m_star_seed_tab[star_cntr].set) || ( set_b == m_star_seed_tab[star_cntr].set) ) + if ((set_a == s_star_seed_tab[star_cntr].set) || (set_b == s_star_seed_tab[star_cntr].set)) { - x = (m_star_seed_tab[star_cntr].x + m_stars_scrollx) % 256 + 16; - y = (112 + m_star_seed_tab[star_cntr].y + m_stars_scrolly) % 256; + x = (s_star_seed_tab[star_cntr].x + m_stars_scrollx) % 256 + 16; + y = (112 + s_star_seed_tab[star_cntr].y + m_stars_scrolly) % 256; /* 112 is a tweak to get alignment about perfect */ if (cliprect.contains(x, y)) - bitmap.pix16(y, x) = STARS_COLOR_BASE + m_star_seed_tab[ star_cntr ].col; + bitmap.pix16(y, x) = STARS_COLOR_BASE + s_star_seed_tab[ star_cntr ].col; } } diff --git a/src/mame/video/pacland.cpp b/src/mame/video/pacland.cpp index 47100e83e06..c74b6904a79 100644 --- a/src/mame/video/pacland.cpp +++ b/src/mame/video/pacland.cpp @@ -59,55 +59,53 @@ sprite color 0x7f will erase the tilemap and force it to be transparent. void pacland_state::switch_palette() { - int i; const uint8_t *color_prom = m_color_prom + 256 * m_palette_bank; - for (i = 0;i < 256;i++) + for (int i = 0; i < 256; i++) { int bit0,bit1,bit2,bit3; - int r,g,b; - - bit0 = (color_prom[0] >> 0) & 0x01; - bit1 = (color_prom[0] >> 1) & 0x01; - bit2 = (color_prom[0] >> 2) & 0x01; - bit3 = (color_prom[0] >> 3) & 0x01; - r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; - bit0 = (color_prom[0] >> 4) & 0x01; - bit1 = (color_prom[0] >> 5) & 0x01; - bit2 = (color_prom[0] >> 6) & 0x01; - bit3 = (color_prom[0] >> 7) & 0x01; - g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; - bit0 = (color_prom[1024] >> 0) & 0x01; - bit1 = (color_prom[1024] >> 1) & 0x01; - bit2 = (color_prom[1024] >> 2) & 0x01; - bit3 = (color_prom[1024] >> 3) & 0x01; - b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; + + bit0 = BIT(color_prom[0], 0); + bit1 = BIT(color_prom[0], 1); + bit2 = BIT(color_prom[0], 2); + bit3 = BIT(color_prom[0], 3); + int const r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; + + bit0 = BIT(color_prom[0], 4); + bit1 = BIT(color_prom[0], 5); + bit2 = BIT(color_prom[0], 6); + bit3 = BIT(color_prom[0], 7); + int const g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; + + bit0 = BIT(color_prom[1024], 0); + bit1 = BIT(color_prom[1024], 1); + bit2 = BIT(color_prom[1024], 2); + bit3 = BIT(color_prom[1024], 3); + int const b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; color_prom++; - m_palette->set_indirect_color(i,rgb_t(r,g,b)); + m_palette->set_indirect_color(i, rgb_t(r, g, b)); } } PALETTE_INIT_MEMBER(pacland_state, pacland) { - const uint8_t *color_prom = memregion("proms")->base(); - int i; + uint8_t const *color_prom = &m_color_prom[0]; - m_color_prom = color_prom; /* we'll need this later */ - /* skip the palette data, it will be initialized later */ + // skip the palette data, it will be initialized later color_prom += 2 * 0x400; - /* color_prom now points to the beginning of the lookup table */ + // color_prom now points to the beginning of the lookup table - for (i = 0;i < 0x400;i++) + for (int i = 0; i < 0x400; i++) palette.set_pen_indirect(m_gfxdecode->gfx(0)->colorbase() + i, *color_prom++); - /* Background */ - for (i = 0;i < 0x400;i++) + // Background + for (int i = 0; i < 0x400; i++) palette.set_pen_indirect(m_gfxdecode->gfx(1)->colorbase() + i, *color_prom++); - /* Sprites */ - for (i = 0;i < 0x400;i++) + // Sprites + for (int i = 0; i < 0x400; i++) palette.set_pen_indirect(m_gfxdecode->gfx(2)->colorbase() + i, *color_prom++); m_palette_bank = 0; @@ -117,15 +115,13 @@ PALETTE_INIT_MEMBER(pacland_state, pacland) m_transmask[0] = std::make_unique(64); m_transmask[1] = std::make_unique(64); m_transmask[2] = std::make_unique(64); - for (i = 0; i < 64; i++) + for (int i = 0; i < 64; i++) { - int palentry; - /* start with no transparency */ m_transmask[0][i] = m_transmask[1][i] = m_transmask[2][i] = 0; /* iterate over all palette entries except the last one */ - for (palentry = 0; palentry < 0x100; palentry++) + for (int palentry = 0; palentry < 0x100; palentry++) { uint32_t mask = palette.transpen_mask(*m_gfxdecode->gfx(2), i, palentry); diff --git a/src/mame/video/pk8020.cpp b/src/mame/video/pk8020.cpp index 7ec04c35275..a863467bd24 100644 --- a/src/mame/video/pk8020.cpp +++ b/src/mame/video/pk8020.cpp @@ -13,30 +13,25 @@ #include "includes/pk8020.h" #include "machine/ram.h" -void pk8020_state::video_start() -{ -} - uint32_t pk8020_state::screen_update_pk8020(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int y, x, b, j; - uint8_t *gfx = m_region_gfx1->base(); uint8_t *ram = m_ram->pointer(); - for (y = 0; y < 16; y++) + for (int y = 0; y < 16; y++) { - for (x = 0; x < 64; x++) + for (int x = 0; x < 64; x++) { uint8_t chr = ram[x +(y*64) + 0x40000]; uint8_t attr= ram[x +(y*64) + 0x40400]; - for (j = 0; j < 16; j++) { + for (int j = 0; j < 16; j++) + { uint32_t addr = 0x10000 + x + ((y*16+j)*64) + (m_video_page * 0xC000); uint8_t code1 = ram[addr]; uint8_t code2 = ram[addr + 0x4000]; uint8_t code3 = ram[addr + 0x8000]; - uint8_t code4 = gfx[((chr<<4) + j) + (m_font*0x1000)]; + uint8_t code4 = m_region_gfx1[((chr<<4) + j) + (m_font*0x1000)]; if (attr) code4 ^= 0xff; - for (b = 0; b < 8; b++) + for (int b = 0; b < 8; b++) { uint8_t col = (((code4 >> b) & 0x01) ? 0x08 : 0x00); col |= (((code3 >> b) & 0x01) ? 0x04 : 0x00); diff --git a/src/mame/video/seta.cpp b/src/mame/video/seta.cpp index 7e863aabb09..d189b37b895 100644 --- a/src/mame/video/seta.cpp +++ b/src/mame/video/seta.cpp @@ -142,7 +142,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: #include "screen.h" /* note that drgnunit, stg and qzkklogy run on the same board, yet they need different alignment */ -static const game_offset game_offsets[] = +static const seta_state::game_offset game_offsets[] = { // x offsets // "game", {spr, spr_flip}, {tmap, tmap_flip} -- cgit v1.2.3