From 5ba14be3b9828753be0e88113fcc0dd2ccfa9bfd Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 4 Jul 2018 21:17:38 +1000 Subject: [PATCH] misc cleanup (nw) --- src/mame/drivers/2mindril.cpp | 7 +++--- src/mame/drivers/groundfx.cpp | 4 ++-- src/mame/drivers/qix.cpp | 4 ++-- src/mame/includes/bombjack.h | 13 ++++++++--- src/mame/includes/gaiden.h | 12 +++++++--- src/mame/includes/galastrm.h | 14 +++++++++--- src/mame/includes/groundfx.h | 17 +++++++++----- src/mame/includes/gsword.h | 6 +++++ src/mame/includes/gunbustr.h | 11 +++++++-- src/mame/includes/holeland.h | 13 ++++++++--- src/mame/includes/ninjaw.h | 13 ++++++++--- src/mame/includes/othunder.h | 13 ++++++++--- src/mame/includes/retofinv.h | 6 +++++ src/mame/includes/superchs.h | 13 ++++++++--- src/mame/includes/taito_f2.h | 42 +++++++++++++++++------------------ src/mame/includes/taito_h.h | 14 +++++++++--- src/mame/includes/taito_l.h | 7 ++++++ src/mame/includes/taito_z.h | 6 +++++ src/mame/includes/timelimt.h | 13 ++++++++--- src/mame/includes/tsamurai.h | 13 ++++++++--- src/mame/includes/undrfire.h | 13 ++++++++--- 21 files changed, 186 insertions(+), 68 deletions(-) diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp index 615fb3a1a75..e66bd8c98b7 100644 --- a/src/mame/drivers/2mindril.cpp +++ b/src/mame/drivers/2mindril.cpp @@ -46,9 +46,10 @@ DAC -26.6860Mhz class _2mindril_state : public taito_f3_state { public: - _2mindril_state(const machine_config &mconfig, device_type type, const char *tag) - : taito_f3_state(mconfig, type, tag), - m_in0(*this, "IN0") { } + _2mindril_state(const machine_config &mconfig, device_type type, const char *tag) : + taito_f3_state(mconfig, type, tag), + m_in0(*this, "IN0") + { } void drill(machine_config &config); diff --git a/src/mame/drivers/groundfx.cpp b/src/mame/drivers/groundfx.cpp index 7a43f78930b..a9d95e2a663 100644 --- a/src/mame/drivers/groundfx.cpp +++ b/src/mame/drivers/groundfx.cpp @@ -246,8 +246,8 @@ MACHINE_CONFIG_START(groundfx_state::groundfx) MCFG_DEVICE_ADD("adc", ADC0809, 500000) // unknown clock MCFG_ADC0808_EOC_FF_CB(INPUTLINE("maincpu", 5)) - MCFG_ADC0808_IN0_CB(NOOP) // unknown - MCFG_ADC0808_IN1_CB(NOOP) // unknown (used to be labeled 'volume' - but doesn't seem to affect it + MCFG_ADC0808_IN0_CB(CONSTANT(0)) // unknown + MCFG_ADC0808_IN1_CB(CONSTANT(0)) // unknown (used to be labeled 'volume' - but doesn't seem to affect it MCFG_ADC0808_IN2_CB(IOPORT("WHEEL")) MCFG_ADC0808_IN3_CB(IOPORT("ACCEL")) diff --git a/src/mame/drivers/qix.cpp b/src/mame/drivers/qix.cpp index 8ea858683a4..53deca48408 100644 --- a/src/mame/drivers/qix.cpp +++ b/src/mame/drivers/qix.cpp @@ -705,12 +705,12 @@ MACHINE_CONFIG_START(qix_state::slither) MCFG_DEVICE_MODIFY("pia1") MCFG_PIA_READPA_HANDLER(READ8(*this, qix_state, slither_trak_lr_r)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state, slither_76489_0_w)) - MCFG_PIA_READPB_HANDLER(NOOP) + MCFG_PIA_READPB_HANDLER(CONSTANT(0)) MCFG_DEVICE_MODIFY("pia2") MCFG_PIA_READPA_HANDLER(READ8(*this, qix_state, slither_trak_ud_r)) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state, slither_76489_1_w)) - MCFG_PIA_READPB_HANDLER(NOOP) + MCFG_PIA_READPB_HANDLER(CONSTANT(0)) /* video hardware */ slither_video(config); diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index 74e67b9fb60..ae3d055d617 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -5,6 +5,10 @@ Bomb Jack *************************************************************************/ +#ifndef MAME_INCLUDES_BOMBJACK_H +#define MAME_INCLUDES_BOMBJACK_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -12,15 +16,16 @@ class bombjack_state : public driver_device { public: - bombjack_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + bombjack_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_soundlatch(*this, "soundlatch") { } + m_soundlatch(*this, "soundlatch") + { } DECLARE_READ8_MEMBER(soundlatch_read_and_clear); DECLARE_WRITE8_MEMBER(irq_mask_w); @@ -60,3 +65,5 @@ private: required_device m_palette; required_device m_soundlatch; }; + +#endif // MAME_INCLUDES_BOMBJACK_H diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 5a57c352948..90da74e9b24 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -6,6 +6,10 @@ Ninja Gaiden ***************************************************************************/ +#ifndef MAME_INCLUDES_GAIDEN_H +#define MAME_INCLUDES_GAIDEN_H + +#pragma once #include "machine/gen_latch.h" #include "machine/74157.h" @@ -18,8 +22,8 @@ class gaiden_state : public driver_device { public: - gaiden_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + gaiden_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_videoram(*this, "videoram%u", 1), m_spriteram(*this, "spriteram"), m_adpcm_bank(*this, "adpcm_bank"), @@ -32,7 +36,7 @@ public: m_mixer(*this, "mixer"), m_msm(*this, "msm%u", 1), m_adpcm_select(*this, "adpcm_select%u", 1) - { } + { } void raiga(machine_config &config); void drgnbowl(machine_config &config); @@ -142,3 +146,5 @@ protected: virtual void machine_start() override; virtual void machine_reset() override; }; + +#endif // MAME_INCLUDES_GAIDEN_H diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index 73beb2dc90a..29d25ecb4f2 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Hau +#ifndef MAME_INCLUDES_GALASTRM_H +#define MAME_INCLUDES_GALASTRM_H + +#pragma once + #include "machine/eepromser.h" #include "video/poly.h" @@ -47,8 +52,8 @@ class galastrm_state : public driver_device { friend class galastrm_renderer; public: - galastrm_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + galastrm_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_ram(*this,"ram"), m_spriteram(*this,"spriteram") , m_maincpu(*this, "maincpu"), @@ -57,7 +62,8 @@ public: m_tc0480scp(*this, "tc0480scp"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void galastrm(machine_config &config); DECLARE_CUSTOM_INPUT_MEMBER(frame_counter_r); @@ -104,3 +110,5 @@ private: void galastrm_map(address_map &map); }; + +#endif // MAME_INCLUDES_GALASTRM_H diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index a0d1a10d201..d0a3288f08c 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Graves +#ifndef MAME_INCLUDES_GROUNDFX_H +#define MAME_INCLUDES_GROUNDFX_H + +#pragma once #include "video/tc0100scn.h" #include "video/tc0480scp.h" @@ -18,15 +22,16 @@ struct gfx_tempsprite class groundfx_state : public driver_device { public: - groundfx_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_ram(*this,"ram"), - m_spriteram(*this,"spriteram") , + groundfx_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_ram(*this, "ram"), + m_spriteram(*this, "spriteram"), m_maincpu(*this, "maincpu"), m_tc0100scn(*this, "tc0100scn"), m_tc0480scp(*this, "tc0480scp"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void groundfx(machine_config &config); void init_groundfx(); @@ -61,3 +66,5 @@ private: void groundfx_map(address_map &map); }; + +#endif // MAME_INCLUDES_GROUNDFX_H diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index 69c0b673014..9d1b2ee6a77 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Steve Ellenoff,Jarek Parchanski +#ifndef MAME_INCLUDES_GSWORD_H +#define MAME_INCLUDES_GSWORD_H + +#pragma once #include "machine/gen_latch.h" #include "sound/ay8910.h" @@ -151,3 +155,5 @@ private: u8 m_mcu1_p2; u8 m_mcu2_p1; }; + +#endif // MAME_INCLUDES_GSWORD_H diff --git a/src/mame/includes/gunbustr.h b/src/mame/includes/gunbustr.h index 9b6c764cc0a..cf3570aa04b 100644 --- a/src/mame/includes/gunbustr.h +++ b/src/mame/includes/gunbustr.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Graves +#ifndef MAME_INCLUDES_GUNBUSTR_H +#define MAME_INCLUDES_GUNBUSTR_H + +#pragma once + #include "machine/eepromser.h" #include "video/tc0480scp.h" #include "emupal.h" @@ -17,8 +22,8 @@ struct gb_tempsprite class gunbustr_state : public driver_device { public: - gunbustr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + gunbustr_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this,"maincpu"), m_tc0480scp(*this, "tc0480scp"), m_ram(*this,"ram"), @@ -68,3 +73,5 @@ private: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; + +#endif // MAME_INCLUDES_GUNBUSTR_H diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index 2c4897bd223..40e3b0644b9 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -5,6 +5,10 @@ Hole Land *************************************************************************/ +#ifndef MAME_INCLUDES_HOLELAND_H +#define MAME_INCLUDES_HOLELAND_H + +#pragma once #include "machine/74259.h" #include "emupal.h" @@ -12,15 +16,16 @@ class holeland_state : public driver_device { public: - holeland_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + holeland_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_latch(*this, "latch"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") + { } void crzrally(machine_config &config); void holeland(machine_config &config); @@ -64,3 +69,5 @@ private: void holeland_map(address_map &map); void io_map(address_map &map); }; + +#endif // MAME_INCLUDES_HOLELAND_H diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index 018b597ec04..a714d2fd4cf 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -5,6 +5,10 @@ Taito Triple Screen Games *************************************************************************/ +#ifndef MAME_INCLUDES_NINJAW_H +#define MAME_INCLUDES_NINJAW_H + +#pragma once #include "audio/taitosnd.h" #include "machine/taitoio.h" @@ -17,8 +21,8 @@ class ninjaw_state : public driver_device { public: - ninjaw_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + ninjaw_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_tc0140syt(*this, "tc0140syt"), @@ -29,7 +33,8 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_spriteram(*this, "spriteram"), - m_z80bank(*this, "z80bank") { } + m_z80bank(*this, "z80bank") + { } void darius2(machine_config &config); void ninjaw(machine_config &config); @@ -80,3 +85,5 @@ private: void ninjaw_slave_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_NINJAW_H diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index b121783ee3c..6bf6d266604 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -5,6 +5,10 @@ Operation Thunderbolt *************************************************************************/ +#ifndef MAME_INCLUDES_OTHUNDER_H +#define MAME_INCLUDES_OTHUNDER_H + +#pragma once #include "audio/taitosnd.h" #include "machine/eepromser.h" @@ -18,8 +22,8 @@ class othunder_state : public driver_device { public: - othunder_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + othunder_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_spriteram(*this,"spriteram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), @@ -35,7 +39,8 @@ public: m_2610_2l(*this, "2610.2l"), m_2610_2r(*this, "2610.2r"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void othunder(machine_config &config); @@ -96,3 +101,5 @@ private: required_device m_gfxdecode; required_device m_palette; }; + +#endif // MAME_INCLUDES_OTHUNDER_H diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index 8ec444170f2..784a918e803 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Jarek Parchanski, Andrea Mazzoleni +#ifndef MAME_INCLUDES_RETOFINV_H +#define MAME_INCLUDES_RETOFINV_H + +#pragma once #include "machine/taito68705interface.h" @@ -84,3 +88,5 @@ private: tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; }; + +#endif // MAME_INCLUDES_RETOFINV_H diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 75289581659..52ad06e6161 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Graves +#ifndef MAME_INCLUDES_SUPERCHS_H +#define MAME_INCLUDES_SUPERCHS_H + +#pragma once + #include "machine/eepromser.h" #include "video/tc0480scp.h" #include "emupal.h" @@ -17,8 +22,8 @@ struct schs_tempsprite class superchs_state : public driver_device { public: - superchs_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + superchs_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_ram(*this,"ram"), m_spriteram(*this,"spriteram"), m_shared_ram(*this,"shared_ram"), @@ -29,7 +34,7 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette"), m_volume(*this, "SOUND") - { } + { } void superchs(machine_config &config); void chase3(machine_config &config); @@ -66,3 +71,5 @@ private: void superchs_cpub_map(address_map &map); void superchs_map(address_map &map); }; + +#endif // MAME_INCLUDES_SUPERCHS_H diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index d8dece6aef6..4a83149e3d1 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -23,27 +23,27 @@ class taitof2_state : public driver_device { public: taitof2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_sprite_extension(*this, "sprite_ext"), - m_spriteram(*this, "spriteram"), - m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), - m_cchip(*this, "cchip"), - m_cchip_irq_clear(*this, "cchip_irq_clear"), - m_oki(*this, "oki"), - m_tc0100scn(*this, "tc0100scn"), - m_tc0100scn_1(*this, "tc0100scn_1"), - m_tc0100scn_2(*this, "tc0100scn_2"), - m_tc0110pcr(*this, "tc0110pcr"), - m_tc0360pri(*this, "tc0360pri"), - m_tc0280grd(*this, "tc0280grd"), - m_tc0430grw(*this, "tc0430grw"), - m_tc0480scp(*this, "tc0480scp"), - m_tc0220ioc(*this, "tc0220ioc"), - m_tc0510nio(*this, "tc0510nio"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") - { } + : driver_device(mconfig, type, tag) + , m_sprite_extension(*this, "sprite_ext") + , m_spriteram(*this, "spriteram") + , m_maincpu(*this, "maincpu") + , m_audiocpu(*this, "audiocpu") + , m_cchip(*this, "cchip") + , m_cchip_irq_clear(*this, "cchip_irq_clear") + , m_oki(*this, "oki") + , m_tc0100scn(*this, "tc0100scn") + , m_tc0100scn_1(*this, "tc0100scn_1") + , m_tc0100scn_2(*this, "tc0100scn_2") + , m_tc0110pcr(*this, "tc0110pcr") + , m_tc0360pri(*this, "tc0360pri") + , m_tc0280grd(*this, "tc0280grd") + , m_tc0430grw(*this, "tc0430grw") + , m_tc0480scp(*this, "tc0480scp") + , m_tc0220ioc(*this, "tc0220ioc") + , m_tc0510nio(*this, "tc0510nio") + , m_gfxdecode(*this, "gfxdecode") + , m_palette(*this, "palette") + { } void taito_f2_tc0220ioc(machine_config &config); diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index a776fd3cd3d..d98c912cfc0 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -5,6 +5,11 @@ Taito H system *************************************************************************/ +#ifndef MAME_INCLUDES_TAITO_H_H +#define MAME_INCLUDES_TAITO_H_H + +#pragma once + #include "machine/taitoio.h" #include "video/tc0080vco.h" #include "emupal.h" @@ -13,15 +18,16 @@ class taitoh_state : public driver_device { public: - taitoh_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + taitoh_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_m68000_mainram(*this, "m68000_mainram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_tc0080vco(*this, "tc0080vco"), m_tc0040ioc(*this, "tc0040ioc"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void recordbr(machine_config &config); void syvalion(machine_config &config); @@ -58,3 +64,5 @@ private: void syvalion_map(address_map &map); void tetristh_map(address_map &map); }; + +#endif // MAME_INCLUDES_TAITO_H_H diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 7f9f65498a9..c5b0df46027 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -1,5 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert +#ifndef MAME_INCLUDES_TAITO_L_H +#define MAME_INCLUDES_TAITO_L_H + +#pragma once + #include "machine/74157.h" #include "machine/bankdev.h" #include "machine/timer.h" @@ -251,3 +256,5 @@ public: void horshoes(machine_config &config); void horshoes_map(address_map &map); }; + +#endif // MAME_INCLUDES_TAITO_L_H diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 74f5d10dfea..1fb63fdedf9 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -6,6 +6,10 @@ Taito Z system *************************************************************************/ +#ifndef MAME_INCLUDES_TAITO_Z_H +#define MAME_INCLUDES_TAITO_Z_H + +#pragma once #include "audio/taitosnd.h" #include "machine/eepromser.h" @@ -165,3 +169,5 @@ private: void spacegun_map(address_map &map); void z80_sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_TAITO_Z_H diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index ce85c84b76b..28bab011a61 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -1,20 +1,25 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi +#ifndef MAME_INCLUDES_TIMELIMT_H +#define MAME_INCLUDES_TIMELIMT_H + +#pragma once #include "emupal.h" class timelimt_state : public driver_device { public: - timelimt_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + timelimt_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"), m_palette(*this, "palette"), m_videoram(*this, "videoram"), m_bg_videoram(*this, "bg_videoram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") + { } void timelimt(machine_config &config); @@ -60,3 +65,5 @@ protected: void sound_io_map(address_map &map); void sound_map(address_map &map); }; + +#endif // MAME_INCLUDES_TIMELIMT_H diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index 812663d8d55..fc7a10dcae9 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino +#ifndef MAME_INCLUDES_TSAMURAI_H +#define MAME_INCLUDES_TSAMURAI_H + +#pragma once #include "machine/gen_latch.h" #include "emupal.h" @@ -7,8 +11,8 @@ class tsamurai_state : public driver_device { public: - tsamurai_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + tsamurai_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_audio2(*this, "audio2"), @@ -19,7 +23,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_bg_videoram(*this, "bg_videoram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") + { } void tsamurai(machine_config &config); void m660(machine_config &config); @@ -136,3 +141,5 @@ private: TILE_GET_INFO_MEMBER(get_vsgongf_tile_info); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); }; + +#endif // MAME_INCLUDES_TSAMURAI_H diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index 3ba716a0a30..344a870b419 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -1,5 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Graves +#ifndef MAME_INCLUDES_UNDRFIRE_H +#define MAME_INCLUDES_UNDRFIRE_H + +#pragma #include "machine/eepromser.h" #include "video/tc0100scn.h" @@ -19,8 +23,8 @@ struct uf_tempsprite class undrfire_state : public driver_device { public: - undrfire_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + undrfire_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_tc0100scn(*this, "tc0100scn"), @@ -30,7 +34,8 @@ public: m_shared_ram(*this, "shared_ram"), m_spriteram(*this, "spriteram"), m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette") { } + m_palette(*this, "palette") + { } void undrfire(machine_config &config); void cbombers(machine_config &config); @@ -81,3 +86,5 @@ private: void cbombers_cpub_map(address_map &map); void undrfire_map(address_map &map); }; + +#endif // MAME_INCLUDES_UNDRFIRE_H