diff options
author | Vas Crabb <vas@vastheman.com> | 2017-02-27 22:16:07 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2017-02-27 22:57:14 +1100 |
commit | 6c23897483a0201dd0b65b450253fd9bf8fb8723 (patch) | |
tree | 62a083b4801f63b09bed57ae0c9e8f646aaa3200 /src/mame/includes | |
parent | b07c572f709e95dcd1e2e4b9d4c696e122f67655 (diff) |
Self-registering devices prep:
* Make device_creator a variable template and get rid of the ampersands
* Remove screen.h and speaker.h from emu.h and add where necessary
* Centralise instantiations of screen and speaker finder templates
* Add/standardise #include guards in many hearers
* Remove many redundant #includes
* Order #includesr to help catch headers that can't be #included alone
(nw) This changes #include order to be prefix, unit header if applicable
then other stuff roughly in order from most dependent to least dependent
library. This helps catch headers that don't #include things that they
use.
Diffstat (limited to 'src/mame/includes')
316 files changed, 984 insertions, 455 deletions
diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h index bf9764dd819..3f6e1a4f760 100644 --- a/src/mame/includes/8080bw.h +++ b/src/mame/includes/8080bw.h @@ -6,11 +6,20 @@ 8080-based black and white hardware ****************************************************************************/ +#ifndef MAME_INCLUDES_8080BW_H +#define MAME_INCLUDES_8080BW_H + +#pragma once #include "includes/mw8080bw.h" -#include "sound/sn76477.h" -#include "sound/speaker.h" + #include "machine/eepromser.h" +#include "sound/sn76477.h" +#include "sound/spkrdev.h" + +#include "screen.h" + + /* for games in 8080bw.c */ #define CABINET_PORT_TAG "CAB" @@ -176,3 +185,5 @@ DISCRETE_SOUND_EXTERN( ballbomb ); DISCRETE_SOUND_EXTERN( indianbt ); DISCRETE_SOUND_EXTERN( polaris ); DISCRETE_SOUND_EXTERN( schaser ); + +#endif // MAME_INCLUDES_8080BW_H diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index abb96a868ed..d251c0c66ba 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -9,6 +9,7 @@ #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "video/kan_pand.h" +#include "screen.h" class airbustr_state : public driver_device { diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 67e153eeea4..30289f756d0 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -23,6 +23,7 @@ Ernesto Corvi & Mariusz Wojcieszek #include "machine/i2cmem.h" #include "machine/8364_paula.h" #include "video/amigaaga.h" +#include "screen.h" /************************************* diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 7ab95d63806..306fa2cebe1 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -8,6 +8,7 @@ #include "machine/gen_latch.h" #include "sound/ym2151.h" +#include "screen.h" class amspdwy_state : public driver_device { diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h index 4546c2c4a92..7e7d8474c7c 100644 --- a/src/mame/includes/amstrad.h +++ b/src/mame/includes/amstrad.h @@ -43,6 +43,7 @@ #include "bus/centronics/digiblst.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" /**************************** diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h index 2c3c64a573d..519845d20a1 100644 --- a/src/mame/includes/apple2.h +++ b/src/mame/includes/apple2.h @@ -8,21 +8,25 @@ ***************************************************************************/ -#ifndef APPLE2_H_ -#define APPLE2_H_ +#ifndef MAME_INCLUDES_APPLE2_H +#define MAME_INCLUDES_APPLE2_H #include "cpu/m6502/m6502.h" #include "cpu/m6502/m65c02.h" -#include "bus/a2bus/a2bus.h" -#include "bus/a2bus/a2eauxslot.h" -#include "machine/applefdc.h" -#include "machine/ram.h" + #include "imagedev/cassette.h" + +#include "machine/applefdc.h" #include "machine/kb3600.h" -#include "sound/speaker.h" +#include "machine/mos6551.h" #include "machine/ram.h" + +#include "sound/spkrdev.h" + +#include "bus/a2bus/a2bus.h" +#include "bus/a2bus/a2eauxslot.h" #include "bus/rs232/rs232.h" -#include "machine/mos6551.h" + #define AUXSLOT_TAG "auxbus" @@ -380,4 +384,4 @@ INPUT_PORTS_EXTERN( apple2ep ); /*----------- defined in machine/apple2.c -----------*/ extern const applefdc_interface apple2_fdc_interface; -#endif /* APPLE2_H_ */ +#endif // MAME_INCLUDES_APPLE2_H diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index 89dd5e2f0c8..84f6bbf8d63 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "video/excellent_spr.h" +#include "screen.h" class aquarium_state : public driver_device { diff --git a/src/mame/includes/aquarius.h b/src/mame/includes/aquarius.h index e4304aff451..b942ede4576 100644 --- a/src/mame/includes/aquarius.h +++ b/src/mame/includes/aquarius.h @@ -6,18 +6,24 @@ * ****************************************************************************/ -#ifndef __AQUARIUS__ -#define __AQUARIUS__ +#ifndef MAME_INCLUDES_AQUARIUS_H +#define MAME_INCLUDES_AQUARIUS_H + +#pragma once #include "cpu/z80/z80.h" -#include "video/tea1002.h" #include "imagedev/cassette.h" #include "machine/ram.h" #include "sound/ay8910.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "video/tea1002.h" + #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" + + class aquarius_state : public driver_device { public: @@ -85,4 +91,4 @@ public: uint32_t screen_update_aquarius(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_INPUT_CHANGED_MEMBER(aquarius_reset); }; -#endif /* AQUARIUS_H_ */ +#endif // MAME_INCLUDES_AQUARIUS_H diff --git a/src/mame/includes/arcadia.h b/src/mame/includes/arcadia.h index 4e8904748ff..21a1c5f3c50 100644 --- a/src/mame/includes/arcadia.h +++ b/src/mame/includes/arcadia.h @@ -15,6 +15,8 @@ #include "bus/arcadia/slot.h" #include "bus/arcadia/rom.h" +#include "screen.h" + // space vultures sprites above // combat below and invisible #define YPOS 0 diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h index 168d1b7330c..16c5782c78e 100644 --- a/src/mame/includes/archimds.h +++ b/src/mame/includes/archimds.h @@ -13,6 +13,7 @@ #include "sound/dac.h" #include "machine/i2cmem.h" #include "machine/wd_fdc.h" +#include "screen.h" // interrupt definitions. these are for the real Archimedes computer - arcade // and gambling knockoffs likely are a bit different. diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index c3956a5e3f0..9a81014f936 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Yochizo #include "video/jalblend.h" +#include "screen.h" class argus_state : public driver_device { diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h index 5a4332b3ae8..2dc6587773c 100644 --- a/src/mame/includes/artmagic.h +++ b/src/mame/includes/artmagic.h @@ -5,8 +5,9 @@ Art & Magic hardware **************************************************************************/ -#include "sound/okim6295.h" #include "cpu/tms34010/tms34010.h" +#include "sound/okim6295.h" +#include "video/tlc34076.h" class artmagic_state : public driver_device { @@ -17,15 +18,16 @@ public: }; artmagic_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_oki(*this, "oki"), - m_oki_region(*this, "oki"), - m_tms(*this, "tms"), - m_tlc34076(*this, "tlc34076"), - m_control(*this, "control"), - m_vram0(*this, "vram0"), - m_vram1(*this, "vram1") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_oki(*this, "oki") + , m_oki_region(*this, "oki") + , m_tms(*this, "tms") + , m_tlc34076(*this, "tlc34076") + , m_control(*this, "control") + , m_vram0(*this, "vram0") + , m_vram1(*this, "vram1") + { } required_device<cpu_device> m_maincpu; required_device<okim6295_device> m_oki; diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index 74cfd060422..4e5a8a48cb3 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -11,6 +11,7 @@ #include "sound/astrocde.h" #include "sound/samples.h" #include "sound/votrax.h" +#include "screen.h" #define ASTROCADE_CLOCK (XTAL_14_31818MHz/2) diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index cf2a5711bc9..a5c9a1c96a5 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -8,6 +8,7 @@ #include "sound/samples.h" #include "sound/sn76477.h" +#include "screen.h" class astrof_state : public driver_device { diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index 78a459c0847..3416739f23e 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index 5f5d32ec96c..d3ad4308695 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -6,8 +6,9 @@ *************************************************************************/ -#include "machine/atarigen.h" #include "audio/atarijsa.h" +#include "machine/atarigen.h" +#include "video/atarirle.h" #include "cpu/m68000/m68000.h" class atarig1_state : public atarigen_state diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index 94b39b7b788..95fe69e81a6 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -6,8 +6,9 @@ *************************************************************************/ -#include "machine/atarigen.h" #include "audio/atarijsa.h" +#include "machine/atarigen.h" +#include "video/atarirle.h" #include "cpu/m68000/m68000.h" #include "machine/asic65.h" diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index 97b587bb1e4..11618c9ea09 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -6,9 +6,10 @@ *************************************************************************/ +#include "audio/atarijsa.h" #include "machine/atarigen.h" #include "machine/atarixga.h" -#include "audio/atarijsa.h" +#include "video/atarirle.h" class atarigx2_state : public atarigen_state diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index cd2016288e1..e4bb9cc4b11 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "includes/slapstic.h" +#include "screen.h" class atetris_state : public driver_device { diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h index 450117ec53f..053b2447f3e 100644 --- a/src/mame/includes/atom.h +++ b/src/mame/includes/atom.h @@ -1,27 +1,30 @@ // license:BSD-3-Clause // copyright-holders:Nathan Woods -#pragma once +#ifndef MAME_INCLUDES_ATOM_H +#define MAME_INCLUDES_ATOM_H -#ifndef __ATOM__ -#define __ATOM__ +#pragma once #include "cpu/m6502/m6502.h" #include "imagedev/cassette.h" #include "imagedev/flopdrv.h" -#include "machine/ram.h" #include "imagedev/snapquik.h" -#include "formats/atom_tap.h" -#include "formats/atom_dsk.h" -#include "formats/uef_cas.h" -#include "bus/centronics/ctronics.h" #include "machine/6522via.h" #include "machine/i8255.h" #include "machine/i8271.h" -#include "sound/speaker.h" +#include "machine/ram.h" +#include "sound/spkrdev.h" #include "video/mc6847.h" -#include "bus/generic/slot.h" + +#include "bus/centronics/ctronics.h" #include "bus/generic/carts.h" +#include "bus/generic/slot.h" + +#include "formats/atom_dsk.h" +#include "formats/atom_tap.h" +#include "formats/uef_cas.h" + #define SY6502_TAG "ic22" #define INS8255_TAG "ic25" @@ -162,4 +165,4 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER(e1_load) { return load_cart(image, m_e1); } }; -#endif +#endif // MAME_INCLUDES_ATOM_H diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h index 6634357ae36..4fe530f4ed3 100644 --- a/src/mame/includes/aussiebyte.h +++ b/src/mame/includes/aussiebyte.h @@ -1,25 +1,33 @@ // license:BSD-3-Clause // copyright-holders:Robbbert +#ifndef MAME_INCLUDES_AUSSIEBYTE_H +#define MAME_INCLUDES_AUSSIEBYTE_H + +#pragma once /*********************************************************** Includes ************************************************************/ +#include "bus/centronics/ctronics.h" +#include "bus/rs232/rs232.h" + #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" + +#include "machine/clock.h" +#include "machine/msm5832.h" +#include "machine/wd_fdc.h" #include "machine/z80ctc.h" -#include "machine/z80pio.h" #include "machine/z80dart.h" #include "machine/z80dma.h" -#include "bus/centronics/ctronics.h" -#include "sound/speaker.h" +#include "machine/z80pio.h" + +#include "sound/spkrdev.h" #include "sound/votrax.h" + #include "video/mc6845.h" -#include "bus/rs232/rs232.h" -#include "machine/wd_fdc.h" -#include "machine/msm5832.h" -#include "machine/clock.h" /*********************************************************** @@ -131,3 +139,5 @@ private: required_device<votrax_sc01_device> m_votrax; required_device<msm5832_device> m_rtc; }; + +#endif // MAME_INCLUDES_AUSSIEBYTE_H diff --git a/src/mame/includes/avigo.h b/src/mame/includes/avigo.h index 970ba107378..d8692e09513 100644 --- a/src/mame/includes/avigo.h +++ b/src/mame/includes/avigo.h @@ -6,19 +6,21 @@ * ****************************************************************************/ -#ifndef AVIGO_H_ -#define AVIGO_H_ +#ifndef MAME_INCLUDES_AVIGO_H +#define MAME_INCLUDES_AVIGO_H + +#pragma once #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" -#include "machine/rp5c01.h" +#include "imagedev/snapquik.h" +#include "machine/bankdev.h" #include "machine/ins8250.h" #include "machine/intelfsh.h" -#include "machine/bankdev.h" #include "machine/nvram.h" -#include "sound/speaker.h" #include "machine/ram.h" -#include "imagedev/snapquik.h" +#include "machine/rp5c01.h" +#include "sound/spkrdev.h" #define AVIGO_NUM_COLOURS 2 @@ -109,4 +111,5 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER( avigo); }; -#endif /* AVIGO_H_ */ + +#endif // MAME_INCLUDES_AVIGO_H diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h index 6f4afecfe32..f34b5a94e60 100644 --- a/src/mame/includes/aztarac.h +++ b/src/mame/includes/aztarac.h @@ -8,6 +8,7 @@ #include "machine/gen_latch.h" #include "video/vector.h" +#include "screen.h" class aztarac_state : public driver_device { diff --git a/src/mame/includes/b2m.h b/src/mame/includes/b2m.h index 1b1378f97f8..156e2c7df9a 100644 --- a/src/mame/includes/b2m.h +++ b/src/mame/includes/b2m.h @@ -6,16 +6,16 @@ * ****************************************************************************/ -#ifndef B2M_H_ -#define B2M_H_ +#ifndef MAME_INCLUDES_B2M_H +#define MAME_INCLUDES_B2M_H #include "machine/i8255.h" -#include "machine/pit8253.h" #include "machine/pic8259.h" +#include "machine/pit8253.h" +#include "machine/ram.h" #include "machine/wd_fdc.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" -#include "machine/ram.h" class b2m_state : public driver_device { @@ -78,4 +78,4 @@ public: void b2m_set_bank(int bank); }; -#endif +#endif // MAME_INCLUDES_B2M_H diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index 3ddab9a1b76..3901436f71d 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -9,6 +9,7 @@ ***************************************************************************/ #include "sound/cem3394.h" +#include "screen.h" #define BALSENTE_MASTER_CLOCK (20000000) #define BALSENTE_CPU_CLOCK (BALSENTE_MASTER_CLOCK / 16) diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index 59cb48a40b7..c684bf3d119 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -5,6 +5,7 @@ #include "sound/msm5205.h" #include "video/huc6260.h" #include "video/huc6270.h" +#include "screen.h" #define MAIN_CLOCK 21477270 diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index 6ac2603f0c5..04b52e6158c 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -2,6 +2,7 @@ // copyright-holders:Jarek Burczynski, Tomasz Slanina #include "sound/msm5232.h" #include "machine/taito68705interface.h" +#include "screen.h" class bigevglf_state : public driver_device { diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index 57c921547fa..f944b17062e 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -11,6 +11,7 @@ #include "video/k055555.h" #include "video/k054338.h" #include "video/konami_helper.h" +#include "screen.h" #define CPU_CLOCK (XTAL_24MHz / 2) /* 68000 clock */ #define SOUND_CLOCK XTAL_16_9344MHz /* YMZ280 clock */ diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index 9ca32af9c71..ebc5c809c36 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -3,6 +3,7 @@ #include "machine/taito68705interface.h" #include "machine/gen_latch.h" +#include "screen.h" class bking_state : public driver_device { diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index a7aa2b9709e..92ad57b9a97 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -8,6 +8,7 @@ ***************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class blockout_state : public driver_device { diff --git a/src/mame/includes/bosco.h b/src/mame/includes/bosco.h index 3d95c4322d0..2ea566cb5ec 100644 --- a/src/mame/includes/bosco.h +++ b/src/mame/includes/bosco.h @@ -1,14 +1,22 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_BOSCO_H +#define MAME_INCLUDES_BOSCO_H + +#pragma once + +#include "galaga.h" class bosco_state : public galaga_state { public: bosco_state(const machine_config &mconfig, device_type type, const char *tag) - : galaga_state(mconfig, type, tag), - m_bosco_radarattr(*this, "bosco_radarattr"), - m_bosco_starcontrol(*this, "starcontrol"), - m_bosco_starblink(*this, "bosco_starblink") { } + : galaga_state(mconfig, type, tag) + , m_bosco_radarattr(*this, "bosco_radarattr") + , m_bosco_starcontrol(*this, "starcontrol") + , m_bosco_starblink(*this, "bosco_starblink") + { + } required_shared_ptr<uint8_t> m_bosco_radarattr; @@ -39,3 +47,5 @@ public: DECLARE_WRITE8_MEMBER( bosco_scrolly_w ); DECLARE_WRITE8_MEMBER( bosco_starclr_w ); }; + +#endif // MAME_INCLUDES_BOSCO_H diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 4d4cef6df61..05e3d7b8232 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -7,6 +7,7 @@ ***************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class btime_state : public driver_device { diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h index 1bddac79adf..7e4f2a55722 100644 --- a/src/mame/includes/btoads.h +++ b/src/mame/includes/btoads.h @@ -13,6 +13,7 @@ #include "video/tlc34076.h" #include "sound/bsmt2000.h" #include "machine/nvram.h" +#include "screen.h" class btoads_state : public driver_device { diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index 29384d653e5..4316a424d2f 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -7,6 +7,7 @@ #include "machine/taito68705interface.h" #include "machine/gen_latch.h" #include "sound/msm5232.h" +#include "screen.h" class buggychl_state : public driver_device { diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 633e089c7b9..2cffa30c5c7 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -10,6 +10,7 @@ #include "machine/nvram.h" #include "machine/watchdog.h" #include "video/tms34061.h" +#include "screen.h" class capbowl_state : public driver_device { diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 55c4e0c803e..d0191eff62c 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -11,6 +11,7 @@ #include "machine/gen_latch.h" #include "machine/nmk112.h" #include "sound/okim6295.h" +#include "screen.h" struct sprite_cave { diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index c1f2008935d..a5d15811c47 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -8,6 +8,7 @@ #include "cpu/m6502/m6502.h" #include "machine/x2212.h" +#include "screen.h" class ccastles_state : public driver_device { diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h index cbbc8ecd310..a34601cbd05 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -11,6 +11,7 @@ #include "machine/z80ctc.h" #include "sound/dac.h" #include "video/vector.h" +#include "screen.h" class cchasm_state : public driver_device { diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 066f66c8159..552e0354600 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -8,6 +8,7 @@ #include "machine/eepromser.h" #include "sound/ay8910.h" +#include "screen.h" class centiped_state : public driver_device { diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index 025a661153c..74928fe0e5a 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -2,6 +2,7 @@ // copyright-holders:Jarek Burczynski, Phil Stroffolino, Tomasz Slanina #include "cpu/m6805/m68705.h" +#include "screen.h" class changela_state : public driver_device diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index 260b3548562..02ddeeac82e 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/dac.h" +#include "screen.h" class cheekyms_state : public driver_device { diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index fa1e2680c72..b7d615a0c5a 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -6,23 +6,26 @@ *************************************************************************/ +#include "cpu/ccpu/ccpu.h" #include "sound/ay8910.h" #include "sound/samples.h" #include "video/vector.h" +#include "screen.h" class cinemat_state : public driver_device { public: cinemat_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_ay1(*this, "ay1"), - m_samples(*this, "samples"), - m_vector(*this, "vector"), - m_screen(*this, "screen"), - m_rambase(*this, "rambase"), - m_analog_x(*this, "ANALOGX"), - m_analog_y(*this, "ANALOGY") { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_ay1(*this, "ay1") + , m_samples(*this, "samples") + , m_vector(*this, "vector") + , m_screen(*this, "screen") + , m_rambase(*this, "rambase") + , m_analog_x(*this, "ANALOGX") + , m_analog_y(*this, "ANALOGY") + { } required_device<ccpu_cpu_device> m_maincpu; optional_device<ay8910_device> m_ay1; diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index 9473b8ed5de..a44eb5edaaf 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Coates #include "sound/discrete.h" +#include "sound/samples.h" class circus_state : public driver_device { diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index c30abf3864b..d000b648521 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -8,6 +8,7 @@ #include "machine/ticket.h" #include "machine/watchdog.h" #include "video/ms1_tmap.h" +#include "screen.h" class cischeat_state : public driver_device { diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 24c68e91257..f890300d75f 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -5,6 +5,7 @@ Atari Cloak & Dagger hardware *************************************************************************/ +#include "screen.h" class cloak_state : public driver_device { diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 2c9da3929ff..a1a4c6f60c4 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -8,6 +8,7 @@ #include "cpu/m6502/m6502.h" #include "machine/x2212.h" +#include "screen.h" class cloud9_state : public driver_device { diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index 0f460d290ac..affa7c3b395 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -14,6 +14,7 @@ #include "machine/deco146.h" #include "machine/deco104.h" #include "machine/gen_latch.h" +#include "screen.h" class cninja_state : public driver_device { diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index d762be420e2..225de7d2416 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -10,6 +10,7 @@ #include "sound/upd7759.h" #include "sound/msm5205.h" #include "video/k007121.h" +#include "screen.h" class combatsc_state : public driver_device { diff --git a/src/mame/includes/concept.h b/src/mame/includes/concept.h index 28fe888b02f..8a2ce42fc41 100644 --- a/src/mame/includes/concept.h +++ b/src/mame/includes/concept.h @@ -10,14 +10,14 @@ * ****************************************************************************/ -#ifndef CONCEPT_H_ -#define CONCEPT_H_ +#ifndef MAME_INCLUDES_CONCEPT_H +#define MAME_INCLUDES_CONCEPT_H #include "cpu/m68000/m68000.h" #include "machine/6522via.h" #include "machine/mos6551.h" #include "machine/mm58274c.h" /* mm58274 seems to be compatible with mm58174 */ -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "bus/a2bus/a2bus.h" #define ACIA_0_TAG "acia0" @@ -68,4 +68,4 @@ public: void concept_set_interrupt(int level, int state); }; -#endif /* CONCEPT_H_ */ +#endif // MAME_INCLUDES_CONCEPT_H diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index 569d8ac48a5..aa44759ebce 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "video/k007121.h" +#include "screen.h" class contra_state : public driver_device { diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index 3808233cbe4..97e09fbd391 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" class copsnrob_state : public driver_device diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 81b5bd93339..a8f91277fd2 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -8,6 +8,7 @@ #include "sound/samples.h" #include "sound/dac.h" +#include "screen.h" #define COSMICG_MASTER_CLOCK XTAL_9_828MHz #define Z80_MASTER_CLOCK XTAL_10_816MHz diff --git a/src/mame/includes/cosmicos.h b/src/mame/includes/cosmicos.h index ad558efc0f3..c6042ae8356 100644 --- a/src/mame/includes/cosmicos.h +++ b/src/mame/includes/cosmicos.h @@ -1,17 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once +#ifndef MAME_INCLUDES_COSMICOS_H +#define MAME_INCLUDES_COSMICOS_H -#ifndef __COSMICOS__ -#define __COSMICOS__ +#pragma once #include "cpu/cosmac/cosmac.h" #include "imagedev/cassette.h" -#include "machine/ram.h" #include "imagedev/snapquik.h" +#include "machine/ram.h" #include "machine/rescap.h" #include "sound/cdp1864.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/dm9368.h" #define CDP1802_TAG "ic19" @@ -136,4 +136,4 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(int_tick); }; -#endif +#endif // MAME_INCLUDES_COSMICOS_H diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 2c6b443f99b..7191b8815ee 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -15,6 +15,7 @@ #include "machine/gen_latch.h" #include "machine/timekpr.h" #include "cpu/m68000/m68000.h" +#include "screen.h" // Video raw params // measured clocks: diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 556687d746a..26910602969 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -10,6 +10,7 @@ #include "sound/tms5110.h" #include "machine/gen_latch.h" #include "machine/s2636.h" +#include "screen.h" #define CVS_S2636_Y_OFFSET (-5) #define CVS_S2636_X_OFFSET (-26) diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index 397b31f0e35..d02c60ae628 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -12,6 +12,7 @@ #include "cpu/m68000/m68000.h" #include "cpu/m6502/m6502.h" #include "sound/dac.h" +#include "screen.h" class cyberbal_state : public atarigen_state { diff --git a/src/mame/includes/cybiko.h b/src/mame/includes/cybiko.h index d1386f79233..0a92fadb658 100644 --- a/src/mame/includes/cybiko.h +++ b/src/mame/includes/cybiko.h @@ -14,22 +14,24 @@ * ****************************************************************************/ -#ifndef CYBIKO_H_ -#define CYBIKO_H_ +#ifndef MAME_INCLUDES_CYBIKO_H +#define MAME_INCLUDES_CYBIKO_H -/* Core includes */ -#include "sound/speaker.h" - -/* Components */ -#include "cpu/h8/h8s2320.h" #include "cpu/h8/h8s2245.h" -#include "video/hd66421.h" -#include "machine/pcf8593.h" +#include "cpu/h8/h8s2320.h" + +#include "imagedev/snapquik.h" + #include "machine/at45dbxx.h" #include "machine/intelfsh.h" -#include "machine/ram.h" -#include "imagedev/snapquik.h" #include "machine/nvram.h" +#include "machine/pcf8593.h" +#include "machine/ram.h" + +#include "sound/spkrdev.h" + +#include "video/hd66421.h" + class cybiko_state : public driver_device { @@ -80,4 +82,4 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER( cybikoxt ); }; -#endif /* CYBIKO_H_ */ +#endif // MAME_INCLUDES_CYBIKO_H diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 33eff4e49a9..2cfb54918e5 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Nicola Salmoria, Tomasz Slanina #include "audio/t5182.h" +#include "screen.h" class darkmist_state : public driver_device { diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index 37d9f304f50..b03738bebd7 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -5,9 +5,10 @@ dc.h - Sega Dreamcast includes */ +#ifndef MAME_INCLUDES_DC_H +#define MAME_INCLUDES_DC_H -#ifndef __DC_H__ -#define __DC_H__ +#pragma once #include "video/powervr2.h" #include "machine/naomig1.h" @@ -286,4 +287,4 @@ class dc_state : public driver_device void dc_maple_irq(running_machine &machine); -#endif +#endif // MAME_INCLUDES_DC_H diff --git a/src/mame/includes/dccons.h b/src/mame/includes/dccons.h index 90767a3219b..e8fd00ac0ea 100644 --- a/src/mame/includes/dccons.h +++ b/src/mame/includes/dccons.h @@ -1,5 +1,12 @@ // license:LGPL-2.1+ // copyright-holders:Angelo Salese, R. Belmont +#ifndef MAME_INCLUDES_DCCONS_H +#define MAME_INCLUDES_DCCONS_H + +#pragma once + +#include "dc.h" + #include "imagedev/chd_cd.h" #include "machine/gdrom.h" #include "machine/ataintf.h" @@ -9,10 +16,10 @@ class dc_cons_state : public dc_state { public: dc_cons_state(const machine_config &mconfig, device_type type, const char *tag) - : dc_state(mconfig, type, tag), - m_ata(*this, "ata") -// m_dcflash(*this, "dcflash") - { } + : dc_state(mconfig, type, tag) + , m_ata(*this, "ata") +// , m_dcflash(*this, "dcflash") + { } required_device<ata_interface_device> m_ata; // required_device<macronix_29lv160tmc_device> m_dcflash; @@ -45,3 +52,5 @@ private: emu_timer *atapi_timer; int atapi_xferlen, atapi_xferbase; }; + +#endif // MAME_INCLUDES_DCCONS_H diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index 853a3b46a83..56815c02fc1 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -9,6 +9,7 @@ #include "machine/gen_latch.h" #include "sound/bsmt2000.h" +#include "screen.h" class dcheese_state : public driver_device { diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index 78bc9c5e769..405a9db04a9 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -5,6 +5,7 @@ D-Day *************************************************************************/ +#include "screen.h" class dday_state : public driver_device diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index caf4cce2bd4..a0b1195b606 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -9,6 +9,7 @@ #include "cpu/m6805/m68705.h" #include "machine/gen_latch.h" #include "sound/msm5205.h" +#include "screen.h" class ddragon_state : public driver_device diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index a3015588a8e..994b2194d78 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -10,6 +10,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "video/bufsprite.h" +#include "screen.h" class ddragon3_state : public driver_device diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 07938191fdb..70e7a9d0efb 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -11,6 +11,7 @@ #include "machine/deco146.h" #include "machine/deco104.h" #include "video/deco_zoomspr.h" +#include "screen.h" class deco32_state : public driver_device { diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index 2299e477953..39147574b49 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -3,6 +3,7 @@ #include "machine/eepromser.h" #include "machine/deco146.h" #include "sound/ymz280b.h" +#include "screen.h" class deco_mlc_state : public driver_device diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index a4f15a59a7e..89f7e80b338 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -11,6 +11,7 @@ #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "cpu/mcs48/mcs48.h" +#include "screen.h" #define T1PROM 1 #define T1DIRECT 2 diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 0bb1b607c84..476ea44d13b 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -13,6 +13,7 @@ #include "machine/latch8.h" #include "machine/z80dma.h" #include "machine/i8257.h" +#include "screen.h" /* diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index 91f9213b953..5556dfa1115 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#include "screen.h" #define PIXMAP_COLOR_BASE (16 + 32) #define BITMAPRAM_SIZE 0x6000 diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index b1b30922fba..44da12b5215 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria,Vas Crabb #include "video/bufsprite.h" +#include "screen.h" #define MCFG_DOOYONG_ROM_TILEMAP_ADD(tag, gfx, num, rom, offset) \ MCFG_DEVICE_ADD(tag, DOOYONG_ROM_TILEMAP, 0) \ diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index 3ac2799f2f1..9e6bdd89434 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -8,6 +8,7 @@ #include "machine/watchdog.h" #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define DRAGRACE_SCREECH1_EN NODE_01 diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index a7f51f4c157..b3c2e13b5a4 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -9,6 +9,7 @@ #include "sound/ym2413.h" #include "sound/msm5205.h" #include "sound/okim6295.h" +#include "screen.h" class dynax_state : public driver_device { diff --git a/src/mame/includes/einstein.h b/src/mame/includes/einstein.h index 43b646f7eac..92f4d88220d 100644 --- a/src/mame/includes/einstein.h +++ b/src/mame/includes/einstein.h @@ -17,6 +17,7 @@ #include "machine/ram.h" #include "machine/i8251.h" #include "bus/centronics/ctronics.h" +#include "screen.h" /*************************************************************************** CONSTANTS diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index 5d2e859d8e6..d3c6e370ee6 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -3,6 +3,7 @@ #include "cpu/mcs51/mcs51.h" #include "sound/qs1000.h" +#include "screen.h" class eolith_state : public driver_device { diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 5de0b388de1..28e088e00fc 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -11,6 +11,7 @@ #include "sound/samples.h" #include "sound/msm5232.h" #include "sound/dac.h" +#include "screen.h" class equites_state : public driver_device diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index f9cae07081e..7730ea20306 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -14,6 +14,7 @@ #include "cpu/esrip/esrip.h" #include "sound/dac.h" #include "sound/tms5220.h" +#include "screen.h" /* TODO */ #define ESRIPSYS_PIXEL_CLOCK (XTAL_25MHz / 2) diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index aab5368576f..0973895ad93 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -5,6 +5,7 @@ Jaleco Exerion *************************************************************************/ +#include "screen.h" #define EXERION_MASTER_CLOCK (XTAL_19_968MHz) /* verified on pcb */ diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index fbc7037fb7b..a3a872b862f 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -8,6 +8,7 @@ #include "sound/dac.h" #include "sound/samples.h" +#include "screen.h" #define EXIDY_MASTER_CLOCK (XTAL_11_289MHz) #define EXIDY_CPU_CLOCK (EXIDY_MASTER_CLOCK / 16) diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index 2bc62bdfbc0..832c56512ac 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "audio/exidy440.h" +#include "screen.h" #define EXIDY440_MASTER_CLOCK (XTAL_12_9792MHz) diff --git a/src/mame/includes/exp85.h b/src/mame/includes/exp85.h index 3e53385eb25..f725df7f942 100644 --- a/src/mame/includes/exp85.h +++ b/src/mame/includes/exp85.h @@ -1,11 +1,11 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef __EXP85__ -#define __EXP85__ +#ifndef MAME_INCLUDES_EXP85_H +#define MAME_INCLUDES_EXP85_H #include "bus/rs232/rs232.h" #include "imagedev/cassette.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #define SCREEN_TAG "screen" #define I8085A_TAG "u100" @@ -44,4 +44,4 @@ public: int m_tape_control; }; -#endif +#endif // MAME_INCLUDES_EXP85_H diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index bab9f3dc0d0..64c308e94e8 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -3,6 +3,7 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" +#include "screen.h" class fantland_state : public driver_device { diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index ee381a61431..412e0480447 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -8,6 +8,7 @@ #include "sound/k007232.h" #include "video/k007121.h" #include "video/k051733.h" +#include "screen.h" class fastlane_state : public driver_device { diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index 427e281b05c..9001237de66 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Stefan Jokisch #include "machine/mb14241.h" +#include "screen.h" class fgoal_state : public driver_device { diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 27f6c20aaac..f41e376d16c 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -8,6 +8,7 @@ Atari Fire Truck + Super Bug + Monte Carlo driver #include "machine/watchdog.h" #include "sound/discrete.h" +#include "screen.h" #define FIRETRUCK_MOTOR_DATA NODE_01 #define FIRETRUCK_HORN_EN NODE_02 diff --git a/src/mame/includes/fmtowns.h b/src/mame/includes/fmtowns.h index cb85294f8a7..c7342c0bc86 100644 --- a/src/mame/includes/fmtowns.h +++ b/src/mame/includes/fmtowns.h @@ -1,27 +1,31 @@ // license:BSD-3-Clause // copyright-holders:Barry Rodewald -#ifndef FMTOWNS_H_ -#define FMTOWNS_H_ +#ifndef MAME_INCLUDES_FMTOWNS_H +#define MAME_INCLUDES_FMTOWNS_H +#pragma once #include "cpu/i386/i386.h" -#include "sound/2612intf.h" -#include "sound/rf5c68.h" -#include "sound/cdda.h" -#include "sound/speaker.h" #include "imagedev/chd_cd.h" -#include "machine/pit8253.h" -#include "machine/pic8259.h" -#include "machine/wd_fdc.h" #include "imagedev/floppy.h" -#include "formats/fmtowns_dsk.h" -#include "machine/upd71071.h" -#include "machine/ram.h" -#include "machine/nvram.h" #include "machine/fm_scsi.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" #include "machine/fmt_icmem.h" +#include "machine/nvram.h" +#include "machine/pic8259.h" +#include "machine/pit8253.h" +#include "machine/ram.h" +#include "machine/upd71071.h" +#include "machine/wd_fdc.h" +#include "sound/2612intf.h" +#include "sound/cdda.h" +#include "sound/rf5c68.h" +#include "sound/spkrdev.h" + +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" + +#include "formats/fmtowns_dsk.h" + #define IRQ_LOG 0 // set to 1 to log IRQ line activity @@ -376,4 +380,4 @@ class marty_state : public towns_state virtual void driver_start() override; }; -#endif /*FMTOWNS_H_*/ +#endif // MAME_INCLUDES_FMTOWNS_H diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 4f1256bbce3..3c129b8ac8b 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -10,6 +10,7 @@ ***************************************************************************/ #include "sound/msm5205.h" #include "video/vsystem_spr2.h" +#include "screen.h" class fromance_state : public driver_device { diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index 58bdc8469d5..0b26bd13862 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "video/fuukifg.h" +#include "screen.h" class fuuki16_state : public driver_device { diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 206c61596b8..e9f890b6689 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Paul Priest, David Haywood, Luca Elia #include "video/fuukifg.h" +#include "screen.h" /* Define clocks based on actual OSC on the PCB */ diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index a0ef4eb7a38..48ed08c6025 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -13,6 +13,7 @@ #include "machine/eepromser.h" #include "machine/gaelco3d.h" #include "cpu/adsp2100/adsp2100.h" +#include "screen.h" #define SOUND_CHANNELS 4 diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 42f21e31e3a..cac1ce9c0ca 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -10,6 +10,7 @@ #include "machine/gen_latch.h" #include "video/tecmo_spr.h" #include "video/tecmo_mix.h" +#include "screen.h" class gaiden_state : public driver_device { diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index c09789d229e..93abfddf3d5 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -1,8 +1,14 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#ifndef MAME_INCLUDES_GALAGA_H +#define MAME_INCLUDES_GALAGA_H + +#pragma once + #include "sound/discrete.h" #include "sound/namco.h" #include "sound/samples.h" +#include "screen.h" class galaga_state : public driver_device { @@ -92,3 +98,5 @@ public: DISCRETE_SOUND_EXTERN( galaga ); DISCRETE_SOUND_EXTERN( bosco ); + +#endif // MAME_INCLUDES_GALAGA_H diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index 2a19deee35b..28e39178006 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -7,6 +7,8 @@ #include "video/tc0100scn.h" #include "video/tc0480scp.h" +#include "screen.h" + class galastrm_state; diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index 2111dd44330..0fd658ed4a1 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -11,6 +11,7 @@ #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/digitalk.h" +#include "screen.h" /* we scale horizontally by 3 to render stars correctly */ #define GALAXIAN_XSCALE 3 diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 2443de6202b..ecc85ead4f9 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -16,6 +16,7 @@ #define __GALAXOLD_H__ #include "machine/7474.h" +#include "screen.h" /* star circuit */ #define STAR_COUNT 252 diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h index a89502da913..f14c0288f0f 100644 --- a/src/mame/includes/galpanic.h +++ b/src/mame/includes/galpanic.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria #include "includes/kaneko16.h" +#include "screen.h" class galpanic_state : public driver_device { diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 8ff4e9f9aad..37cb1e77b91 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -10,6 +10,7 @@ #include "machine/gen_latch.h" #include "video/tecmo_spr.h" +#include "screen.h" class galspnbl_state : public driver_device { diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index daa9386df31..18e1a353e36 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -11,6 +11,7 @@ driver by Chris Moore #include "machine/6522via.h" #include "machine/6532riot.h" #include "machine/gen_latch.h" +#include "screen.h" #define GAMEPLAN_MAIN_MASTER_CLOCK (XTAL_3_579545MHz) #define GAMEPLAN_AUDIO_MASTER_CLOCK (XTAL_3_579545MHz) diff --git a/src/mame/includes/gamepock.h b/src/mame/includes/gamepock.h index 77fe43e7924..067116f4f7d 100644 --- a/src/mame/includes/gamepock.h +++ b/src/mame/includes/gamepock.h @@ -1,9 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol -#ifndef _GAMEPOCK_H_ -#define _GAMEPOCK_H_ -#include "sound/speaker.h" +#ifndef MAME_INCLUDES_GAMEPOCK_H +#define MAME_INCLUDES_GAMEPOCK_H + +#pragma once + #include "bus/generic/slot.h" +#include "sound/spkrdev.h" struct HD44102CH { uint8_t enabled; @@ -21,7 +24,7 @@ public: m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker"), m_cart(*this, "cartslot") - { } + { } virtual void machine_reset() override; @@ -44,4 +47,4 @@ public: DECLARE_WRITE_LINE_MEMBER(gamepock_to_w); }; -#endif +#endif // MAME_INCLUDES_GAMEPOCK_H diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index ba2924775a9..46e510ad8e9 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -3,6 +3,7 @@ #include "sound/namco.h" #include "sound/samples.h" #include "machine/namcoio.h" +#include "screen.h" #define MAX_STARS 250 diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index 0bbf5020616..45d0f80040a 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi, David Haywood +#include "screen.h" class gomoku_state : public driver_device { diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index efb49c910f6..a122feb3f84 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -11,6 +11,7 @@ #include "cpu/m6502/m6502.h" #include "sound/samples.h" #include "machine/ldpr8210.h" +#include "screen.h" #define GOTTLIEB_VIDEO_HCOUNT 318 diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index 129a12abfe3..32790312286 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -9,6 +9,7 @@ #include "machine/gen_latch.h" #include "machine/watchdog.h" #include "sound/discrete.h" +#include "screen.h" class grchamp_state : public driver_device { diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index cfe35ad79f2..81c3dc3c1a5 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -9,17 +9,18 @@ ***************************************************************************/ #include "sound/samples.h" +#include "screen.h" #define GRIDLEE_MASTER_CLOCK (20000000) #define GRIDLEE_CPU_CLOCK (GRIDLEE_MASTER_CLOCK / 16) -#define GRIDLEE_PIXEL_CLOCK (GRIDLEE_MASTER_CLOCK / 4) +#define GRIDLEE_PIXEL_CLOCK (GRIDLEE_MASTER_CLOCK / 4) #define GRIDLEE_HTOTAL (0x140) #define GRIDLEE_HBEND (0x000) -#define GRIDLEE_HBSTART (0x100) +#define GRIDLEE_HBSTART (0x100) #define GRIDLEE_VTOTAL (0x108) #define GRIDLEE_VBEND (0x010) -#define GRIDLEE_VBSTART (0x100) +#define GRIDLEE_VBSTART (0x100) class gridlee_state : public driver_device diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index cbc07047908..83251a3d6c4 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -8,6 +8,7 @@ #include "video/vsystem_spr.h" #include "video/mb60553.h" #include "video/vs920a.h" +#include "screen.h" diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index d4b9e9dfc8f..acea4589292 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" class gyruss_state : public driver_device { diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index 1ed1894258a..0fc04b04faa 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -17,6 +17,7 @@ #include "machine/asic65.h" #include "machine/timekpr.h" #include "bus/rs232/rs232.h" +#include "screen.h" #define HARDDRIV_MASTER_CLOCK XTAL_32MHz #define HARDDRIV_GSP_CLOCK XTAL_48MHz diff --git a/src/mame/includes/hh_tms1k.h b/src/mame/includes/hh_tms1k.h index a6b3093f169..8b680278876 100644 --- a/src/mame/includes/hh_tms1k.h +++ b/src/mame/includes/hh_tms1k.h @@ -6,8 +6,10 @@ */ -#ifndef _HH_TMS1K_H_ -#define _HH_TMS1K_H_ +#ifndef MAME_INCLUDES_HH_TMS1K_H +#define MAME_INCLUDES_HH_TMS1K_H + +#pragma once #include "cpu/tms1000/tms1000.h" #include "cpu/tms1000/tms1100.h" @@ -16,7 +18,7 @@ #include "cpu/tms1000/tms0980.h" #include "cpu/tms1000/tms0270.h" #include "cpu/tms1000/tp0320.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" class hh_tms1k_state : public driver_device @@ -87,5 +89,4 @@ enum lDP = 0x80 }; - -#endif /* _HH_TMS1K_H_ */ +#endif // MAME_INCLUDES_HH_TMS1K_H diff --git a/src/mame/includes/hh_ucom4.h b/src/mame/includes/hh_ucom4.h index 9fe5346c1b3..3fbbdc3d63d 100644 --- a/src/mame/includes/hh_ucom4.h +++ b/src/mame/includes/hh_ucom4.h @@ -6,12 +6,13 @@ */ -#ifndef _HH_UCOM4_H_ -#define _HH_UCOM4_H_ +#ifndef MAME_INCLUDES_HH_UCOM4_H +#define MAME_INCLUDES_HH_UCOM4_H -#include "rendlay.h" #include "cpu/ucom4/ucom4.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" + +#include "rendlay.h" class hh_ucom4_state : public driver_device @@ -66,4 +67,4 @@ protected: }; -#endif /* _HH_UCOM4_H_ */ +#endif // MAME_INCLUDES_HH_UCOM4_H diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index f0da17cd826..b8dbe02a33b 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define HITME_DOWNCOUNT_VAL NODE_01 diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 212445d9035..84fb806ade4 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -6,6 +6,7 @@ #include "sound/l7a1045_l6028_dsp_a.h" #include "video/poly.h" #include "cpu/tlcs870/tlcs870.h" +#include "screen.h" enum { diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 17c5f193ed8..6d5492b7089 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -8,6 +8,7 @@ #include "sound/upd7759.h" #include "sound/samples.h" +#include "screen.h" class homerun_state : public driver_device { diff --git a/src/mame/includes/hp9845.h b/src/mame/includes/hp9845.h index 8dc44ca5f0c..43679131240 100644 --- a/src/mame/includes/hp9845.h +++ b/src/mame/includes/hp9845.h @@ -10,6 +10,7 @@ #include "machine/hp_taco.h" #include "sound/beep.h" #include "bus/hp9845_io/hp9845_io.h" +#include "screen.h" class hp9845b_state : public driver_device { diff --git a/src/mame/includes/hx20.h b/src/mame/includes/hx20.h index ed2c9908a15..5660bb4edf2 100644 --- a/src/mame/includes/hx20.h +++ b/src/mame/includes/hx20.h @@ -1,18 +1,20 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once +#ifndef MAME_INCLUDES_HX20_H +#define MAME_INCLUDES_HX20_H -#ifndef __HX20__ -#define __HX20__ +#pragma once -#include "bus/rs232/rs232.h" #include "cpu/m6800/m6800.h" #include "imagedev/cassette.h" -#include "bus/epson_sio/epson_sio.h" #include "machine/mc146818.h" #include "machine/ram.h" +#include "sound/spkrdev.h" #include "video/upd7227.h" -#include "sound/speaker.h" + +#include "bus/epson_sio/epson_sio.h" +#include "bus/rs232/rs232.h" + #include "rendlay.h" #define HD6301V1_MAIN_TAG "8g" @@ -136,4 +138,4 @@ public: int m_sio_pin; }; -#endif +#endif // MAME_INCLUDES_HX20_H diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index db90ecb3da5..062d4302843 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi #include "includes/nb1413m3.h" +#include "screen.h" class hyhoo_state : public driver_device { diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index cf12605adba..125d322f799 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia, Hau +#include "screen.h" + #define RASTER_LINES 262 #define FIRST_VISIBLE_LINE 0 #define LAST_VISIBLE_LINE 223 diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index 20736d3b901..334191bd1fd 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -5,6 +5,7 @@ Ikki *************************************************************************/ +#include "screen.h" class ikki_state : public driver_device { diff --git a/src/mame/includes/intv.h b/src/mame/includes/intv.h index 76331eb9929..f2fbc853b9f 100644 --- a/src/mame/includes/intv.h +++ b/src/mame/includes/intv.h @@ -6,14 +6,16 @@ * ****************************************************************************/ -#ifndef INTV_H_ -#define INTV_H_ +#ifndef MAME_INCLUDES_INTV_H +#define MAME_INCLUDES_INTV_H #include "sound/ay8910.h" #include "video/stic.h" +#include "video/tms9927.h" + +#include "bus/intv/ecs.h" #include "bus/intv/slot.h" #include "bus/intv/voice.h" -#include "bus/intv/ecs.h" //#include "bus/intv/keycomp.h" #include "bus/intv_ctrl/ctrl.h" @@ -133,4 +135,4 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; -#endif /* INTV_H_ */ +#endif // MAME_INCLUDES_INTV_H diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index 7be6de066a5..f648a5e3e78 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -1,6 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi +#ifndef MAME_INCLUDES_INUFUKU_H +#define MAME_INCLUDES_INUFUKU_H +#include "video/vsystem_spr.h" #include "machine/gen_latch.h" class inufuku_state : public driver_device @@ -69,3 +72,5 @@ public: uint32_t screen_update_inufuku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_inufuku(screen_device &screen, bool state); }; + +#endif // MAME_INCLUDES_INUFUKU_H diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 2c599547cea..24c53f820cd 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -5,6 +5,7 @@ Atari I, Robot hardware *************************************************************************/ +#include "screen.h" #define IR_TIMING 1 /* try to emulate MB and VG running time */ diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 9fc8ceca0a3..7256954e37f 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -8,6 +8,7 @@ **************************************************************************/ #include "machine/nvram.h" +#include "screen.h" #define VIDEO_CLOCK XTAL_8MHz /* video (pixel) clock */ #define CPU_CLOCK XTAL_12MHz /* clock for 68000-based systems */ diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index c0e687ae953..af41e454fbe 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -10,6 +10,7 @@ #include "machine/ticket.h" #include "video/tlc34076.h" #include "video/tms34061.h" +#include "screen.h" #define YBUFFER_COUNT 15 diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index d4f0df5b025..e6e3de94b0e 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -14,6 +14,7 @@ #include "imagedev/snapquik.h" #include "cdrom.h" #include "imagedev/chd_cd.h" +#include "screen.h" #ifndef ENABLE_SPEEDUP_HACKS #define ENABLE_SPEEDUP_HACKS 1 diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index 05f17acad2c..d4619c83778 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -6,6 +6,8 @@ *************************************************************************/ +#include "screen.h" + /* oscillators and clocks */ #define JEDI_MAIN_CPU_OSC (XTAL_10MHz) @@ -21,7 +23,7 @@ class jedi_state : public driver_device public: jedi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_nvram(*this, "nvram") , + m_nvram(*this, "nvram") , m_foreground_bank(*this, "foreground_bank"), m_video_off(*this, "video_off"), m_backgroundram(*this, "backgroundram"), @@ -33,7 +35,8 @@ public: m_speech_data(*this, "speech_data"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), - m_screen(*this, "screen") { } + m_screen(*this, "screen") + { } required_shared_ptr<uint8_t> m_nvram; diff --git a/src/mame/includes/kc.h b/src/mame/includes/kc.h index e994744ec89..25101aebbc6 100644 --- a/src/mame/includes/kc.h +++ b/src/mame/includes/kc.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef KC_H_ -#define KC_H_ +#ifndef MAME_INCLUDES_KC_H +#define MAME_INCLUDES_KC_H /* Devices */ #include "imagedev/cassette.h" @@ -22,16 +22,13 @@ #include "machine/kc_keyb.h" #include "machine/rescap.h" #include "cpu/z80/z80daisy.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" // Devices #include "imagedev/cassette.h" #include "imagedev/snapquik.h" -// Formats -#include "formats/kc_cas.h" - // Expansions #include "bus/kc/kc.h" #include "bus/kc/ram.h" @@ -39,6 +36,9 @@ #include "bus/kc/d002.h" #include "bus/kc/d004.h" +// Formats +#include "formats/kc_cas.h" + // from service manual #define KC85_3_CLOCK 1751938 #define KC85_4_CLOCK 1773447 @@ -185,4 +185,4 @@ public: uint8_t * m_display_video_ram; }; -#endif /* KC_H_ */ +#endif // MAME_INCLUDES_KC_H diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index 0e92c624323..c626d23fdbe 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -8,6 +8,7 @@ #include "machine/gen_latch.h" #include "sound/ay8910.h" +#include "screen.h" class kncljoe_state : public driver_device { diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 466c0a2e79a..5ba3bf1a2ee 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -1,5 +1,8 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont, Acho A. Tang, Phil Stroffolino, Olivier Galibert +#ifndef MAME_INCLUDES_KONAMIGX_H +#define MAME_INCLUDES_KONAMIGX_H + #include "sound/k056800.h" #include "sound/k054539.h" #include "cpu/tms57002/tms57002.h" @@ -10,6 +13,7 @@ #include "video/k055555.h" #include "video/k054338.h" #include "video/k053936.h" +#include "screen.h" class konamigx_state : public driver_device { @@ -300,3 +304,5 @@ public: #define GXSUB_4BPP 0x04 // 16 colors #define GXSUB_5BPP 0x05 // 32 colors #define GXSUB_8BPP 0x08 // 256 colors + +#endif // MAME_INCLUDES_KONAMIGX_H diff --git a/src/mame/includes/kyocera.h b/src/mame/includes/kyocera.h index 60c9180dbb3..bfbecb7ebfa 100644 --- a/src/mame/includes/kyocera.h +++ b/src/mame/includes/kyocera.h @@ -1,29 +1,31 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once +#ifndef MAME_INCLUDES_KYOCERA_H +#define MAME_INCLUDES_KYOCERA_H -#ifndef __KYOCERA__ -#define __KYOCERA__ +#pragma once -#include "bus/rs232/rs232.h" #include "cpu/i8085/i8085.h" #include "imagedev/cassette.h" #include "machine/buffer.h" -#include "bus/centronics/ctronics.h" #include "machine/i8155.h" #include "machine/i8251.h" #include "machine/im6402.h" #include "machine/ram.h" #include "machine/rp5c01.h" #include "machine/upd1990a.h" +#include "sound/spkrdev.h" #include "video/hd44102.h" #include "video/hd61830.h" -#include "sound/speaker.h" -#include "rendlay.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "bus/centronics/ctronics.h" +#include "bus/rs232/rs232.h" + +#include "rendlay.h" + #define SCREEN_TAG "screen" #define I8085_TAG "m19" @@ -256,4 +258,4 @@ public: MACHINE_CONFIG_EXTERN( kc85_video ); MACHINE_CONFIG_EXTERN( tandy200_video ); -#endif +#endif // MAME_INCLUDES_KYOCERA_H diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index ffeae360ac5..4ec9047a93c 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -8,6 +8,7 @@ #include "video/k007121.h" #include "video/k051733.h" +#include "screen.h" class labyrunr_state : public driver_device { diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index 25e72f080c3..84e1774c3f2 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -16,6 +16,8 @@ #include "sound/sn76477.h" #include "sound/tms3615.h" +#include "screen.h" + class laserbat_state_base : public driver_device { diff --git a/src/mame/includes/lc80.h b/src/mame/includes/lc80.h index 730ce855aca..33f03bed358 100644 --- a/src/mame/includes/lc80.h +++ b/src/mame/includes/lc80.h @@ -1,8 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef __LC80__ -#define __LC80__ +#ifndef MAME_INCLUDES_LC80_H +#define MAME_INCLUDES_LC80_H +#pragma once #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" @@ -10,7 +11,7 @@ #include "machine/ram.h" #include "machine/z80pio.h" #include "machine/z80ctc.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #define SCREEN_TAG "screen" #define Z80_TAG "d201" @@ -64,4 +65,4 @@ public: uint8_t m_segment; }; -#endif +#endif // MAME_INCLUDES_LC80_H diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index d7dc2107d3c..4662cda5e51 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -12,6 +12,7 @@ #include "sound/ay8910.h" #include "machine/pit8253.h" #include "cpu/i86/i186.h" +#include "screen.h" #define LELAND_BATTERY_RAM_SIZE 0x4000 #define ATAXX_EXTRA_TRAM_SIZE 0x800 diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index 38a1229ae1b..6cb1ae765a9 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -5,8 +5,14 @@ The Game Room Lethal Justice hardware **************************************************************************/ +#ifndef MAME_INCLUDES_LETHALJ_H +#define MAME_INCLUDES_LETHALJ_H +#pragma once + +#include "cpu/tms34010/tms34010.h" #include "machine/ticket.h" +#include "screen.h" class lethalj_state : public driver_device @@ -66,3 +72,5 @@ protected: /*----------- defined in video/lethalj.c -----------*/ void lethalj_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params); + +#endif // MAME_INCLUDES_LETHALJ_H diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h index 54b8d91f59b..f207b7ed8f8 100644 --- a/src/mame/includes/liberatr.h +++ b/src/mame/includes/liberatr.h @@ -10,6 +10,7 @@ #include "machine/er2055.h" #include "machine/watchdog.h" #include "sound/pokey.h" +#include "screen.h" class liberatr_state : public driver_device { diff --git a/src/mame/includes/lisa.h b/src/mame/includes/lisa.h index 2cdff88dc05..176164f4e38 100644 --- a/src/mame/includes/lisa.h +++ b/src/mame/includes/lisa.h @@ -8,17 +8,17 @@ * ****************************************************************************/ -#ifndef LISA_H_ -#define LISA_H_ +#ifndef MAME_INCLUDES_LISA_H +#define MAME_INCLUDES_LISA_H #include "cpu/m68000/m68000.h" #include "machine/6522via.h" -#include "machine/8530scc.h" #include "machine/6522via.h" -#include "machine/nvram.h" +#include "machine/8530scc.h" #include "machine/applefdc.h" +#include "machine/nvram.h" #include "machine/sonydriv.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #define COP421_TAG "u9f" #define KB_COP421_TAG "kbcop" @@ -228,4 +228,4 @@ public: void plug_keyboard(); }; -#endif /* LISA_H_ */ +#endif // MAME_INCLUDES_LISA_H diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h index 0fe339bc2e3..38317d538e4 100644 --- a/src/mame/includes/llc.h +++ b/src/mame/includes/llc.h @@ -6,16 +6,16 @@ * ****************************************************************************/ -#ifndef LLC_H_ -#define LLC_H_ +#ifndef MAME_INCLUDES_LLC_H +#define MAME_INCLUDES_LLC_H #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "machine/z80pio.h" -#include "machine/z80ctc.h" -#include "machine/ram.h" #include "machine/k7659kb.h" -#include "sound/speaker.h" +#include "machine/ram.h" +#include "machine/z80ctc.h" +#include "machine/z80pio.h" +#include "sound/spkrdev.h" class llc_state : public driver_device { @@ -27,7 +27,7 @@ public: , m_maincpu(*this, "maincpu") , m_ram(*this, RAM_TAG) , m_p_chargen(*this, "chargen") - { } + { } DECLARE_WRITE8_MEMBER(llc2_rom_disable_w); DECLARE_WRITE8_MEMBER(llc2_basic_enable_w); @@ -61,4 +61,4 @@ private: required_region_ptr<u8> m_p_chargen; }; -#endif +#endif // MAME_INCLUDES_LLC_H diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index 8bf5b5c3c6c..72ff10a5e9b 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -8,6 +8,7 @@ #include "machine/watchdog.h" #include "sound/flt_vol.h" +#include "screen.h" /* Calculated from CRT controller writes */ #define PIXEL_CLOCK (XTAL_21MHz / 3) diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index f6223bfb467..10c4f748b3a 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -8,6 +8,7 @@ #include "sound/okim6295.h" #include "machine/eepromser.h" #include "machine/gen_latch.h" +#include "screen.h" struct lordgun_gun_data { diff --git a/src/mame/includes/lviv.h b/src/mame/includes/lviv.h index d0df88e47e5..5f0a314d9d7 100644 --- a/src/mame/includes/lviv.h +++ b/src/mame/includes/lviv.h @@ -6,14 +6,14 @@ * ****************************************************************************/ -#ifndef LVIV_H_ -#define LVIV_H_ +#ifndef MAME_INCLUDES_LVIV_H +#define MAME_INCLUDES_LVIV_H +#include "imagedev/cassette.h" #include "imagedev/snapquik.h" #include "machine/i8255.h" -#include "sound/speaker.h" -#include "imagedev/cassette.h" #include "machine/ram.h" +#include "sound/spkrdev.h" class lviv_state : public driver_device { @@ -67,4 +67,4 @@ public: extern const unsigned char lviv_palette[8*3]; -#endif /* LVIV_H_ */ +#endif /* MAME_INCLUDES_LVIV_H */ diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 68947e65a22..adfad1d2840 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -8,6 +8,7 @@ #include "sound/samples.h" #include "machine/74123.h" +#include "screen.h" #define IREMM10_MASTER_CLOCK (12500000) diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index 300122bc7c1..55f2ef9b971 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -8,6 +8,7 @@ #include "machine/gen_latch.h" #include "machine/pic8259.h" +#include "screen.h" struct pf_layer_info { diff --git a/src/mame/includes/m5.h b/src/mame/includes/m5.h index d4671e14211..758020efa9d 100644 --- a/src/mame/includes/m5.h +++ b/src/mame/includes/m5.h @@ -1,11 +1,19 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder, Ales Dlabac -#ifndef __M5__ -#define __M5__ +#ifndef MAME_INCLUDES_M5_H +#define MAME_INCLUDES_M5_H +#include "imagedev/cassette.h" +#include "imagedev/snapquik.h" +#include "machine/i8255.h" +#include "machine/ram.h" +#include "machine/upd765.h" +#include "machine/wd_fdc.h" //brno mod #include "machine/z80ctc.h" -#include "imagedev/snapquik.h" + +#include "bus/centronics/ctronics.h" +#include "bus/m5/slot.h" #define Z80_TAG "ic17" @@ -27,20 +35,20 @@ class m5_state : public driver_device { public: m5_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_fd5cpu(*this, Z80_FD5_TAG), - m_ppi(*this, I8255A_TAG), - m_fdc(*this, UPD765_TAG), - m_floppy0(*this, UPD765_TAG ":0:525dd"), - m_cassette(*this, "cassette"), - m_cart1(*this, "cartslot1"), - m_cart2(*this, "cartslot2"), - m_centronics(*this, CENTRONICS_TAG), - m_ram(*this, RAM_TAG), - m_reset(*this, "RESET"), - m_DIPS(*this, "DIPS") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, Z80_TAG) + , m_ctc(*this, Z80CTC_TAG) + , m_fd5cpu(*this, Z80_FD5_TAG) + , m_ppi(*this, I8255A_TAG) + , m_fdc(*this, UPD765_TAG) + , m_floppy0(*this, UPD765_TAG ":0:525dd") + , m_cassette(*this, "cassette") + , m_cart1(*this, "cartslot1") + , m_cart2(*this, "cartslot2") + , m_centronics(*this, CENTRONICS_TAG) + , m_ram(*this, RAM_TAG) + , m_reset(*this, "RESET") + , m_DIPS(*this, "DIPS") { } required_device<cpu_device> m_maincpu; @@ -162,4 +170,4 @@ public: uint8_t m_rammap[16]; // memory map }; -#endif +#endif // MAME_INCLUDES_M5_H diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index 40fdc64441e..2e3dea662a7 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria +#include "screen.h" + class m52_state : public driver_device { public: diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index 9ee93e40a6d..0c33a1bdaf4 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -6,6 +6,7 @@ Irem M58 hardware ****************************************************************************/ +#include "screen.h" class m58_state : public driver_device { diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 7743a15c0ab..fcff4577bc6 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -8,6 +8,7 @@ #include "audio/m72.h" #include "sound/dac.h" #include "machine/pic8259.h" +#include "screen.h" #define M81_B_B_JUMPER_J3_S \ PORT_START("JumperJ3") \ diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index e2a07831ccd..1d83a93617b 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -10,6 +10,7 @@ #include "sound/okim6295.h" #include "machine/gen_latch.h" #include "machine/pic8259.h" +#include "screen.h" struct M92_pf_layer_info { diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h index f376e297e43..20ad7bf9a29 100644 --- a/src/mame/includes/mac.h +++ b/src/mame/includes/mac.h @@ -26,6 +26,7 @@ #include "sound/awacs.h" #include "sound/dac.h" #include "cpu/m68000/m68000.h" +#include "screen.h" #define MAC_SCREEN_NAME "screen" #define MAC_539X_1_TAG "539x_1" diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index e2979d5210e..5d5ccd5d2ba 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -8,6 +8,7 @@ *************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class macrossp_state : public driver_device { diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index fbc69168ace..d73e7398371 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi +#include "screen.h" + class magmax_state : public driver_device { public: diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index 2b3f2574865..a5493ef4472 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -8,6 +8,7 @@ #include "machine/s2636.h" #include "video/saa5050.h" +#include "screen.h" class malzak_state : public driver_device { diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index ea1b92f7f1d..e74bd66579a 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -3,6 +3,7 @@ #include "machine/namcoio.h" #include "sound/dac.h" #include "sound/namco.h" +#include "screen.h" class mappy_state : public driver_device { diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index fe2da57d832..20d51f0a958 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -4,6 +4,7 @@ #include "machine/taito68705interface.h" #include "machine/gen_latch.h" +#include "screen.h" class matmania_state : public driver_device { diff --git a/src/mame/includes/mbc55x.h b/src/mame/includes/mbc55x.h index 9bd469f27fb..34a8dda827f 100644 --- a/src/mame/includes/mbc55x.h +++ b/src/mame/includes/mbc55x.h @@ -7,21 +7,28 @@ Phill Harvey-Smith 2011-01-29. */ +#ifndef MAME_INCLUDES_MBC55X_H +#define MAME_INCLUDES_MBC55X_H + +#pragma once -#include "cpu/i86/i86.h" -#include "machine/ram.h" #include "bus/centronics/ctronics.h" +#include "cpu/i86/i86.h" +#include "imagedev/flopdrv.h" +#include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/pit8253.h" #include "machine/pic8259.h" +#include "machine/pit8253.h" +#include "machine/ram.h" #include "machine/wd_fdc.h" -#include "machine/i8251.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/mc6845.h" -#include "imagedev/flopdrv.h" -#include "formats/pc_dsk.h" -#include "debugger.h" + #include "debug/debugcon.h" +#include "debugger.h" + +#include "formats/pc_dsk.h" + #define MAINCPU_TAG "maincpu" @@ -220,3 +227,5 @@ extern const unsigned char mbc55x_palette[SCREEN_NO_COLOURS][3]; #define LINEAR_ADDR(seg,ofs) ((seg<<4)+ofs) #define OUTPUT_SEGOFS(mess,seg,ofs) logerror("%s=%04X:%04X [%08X]\n",mess,seg,ofs,((seg<<4)+ofs)) + +#endif // MAME_INCLUDES_MBC55X_H diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h index a509cb2bdec..fe91bd4cbf8 100644 --- a/src/mame/includes/mbee.h +++ b/src/mame/includes/mbee.h @@ -6,22 +6,29 @@ * ****************************************************************************/ -#ifndef MBEE_H_ -#define MBEE_H_ +#ifndef MAME_INCLUDES_MBEE_H +#define MAME_INCLUDES_MBEE_H +#include "bus/centronics/ctronics.h" + +#include "cpu/z80/z80.h" +#include "cpu/z80/z80daisy.h" + +#include "imagedev/cassette.h" #include "imagedev/snapquik.h" -#include "machine/z80pio.h" + #include "machine/8530scc.h" -#include "imagedev/cassette.h" #include "machine/buffer.h" -#include "bus/centronics/ctronics.h" #include "machine/mc146818.h" -#include "video/mc6845.h" -#include "sound/speaker.h" -#include "cpu/z80/z80.h" -#include "cpu/z80/z80daisy.h" -#include "sound/wave.h" #include "machine/wd_fdc.h" +#include "machine/z80pio.h" + +#include "sound/spkrdev.h" +#include "sound/wave.h" + +#include "video/mc6845.h" + +#include "screen.h" class mbee_state : public driver_device @@ -167,4 +174,4 @@ private: required_device<screen_device> m_screen; }; -#endif /* MBEE_H_ */ +#endif /* MAME_INCLUDES_MBEE_H */ diff --git a/src/mame/includes/mc1502.h b/src/mame/includes/mc1502.h index a177cd0f0e9..98dfc576d78 100644 --- a/src/mame/includes/mc1502.h +++ b/src/mame/includes/mc1502.h @@ -6,19 +6,23 @@ * ****************************************************************************/ -#ifndef MC1502_H_ -#define MC1502_H_ +#ifndef MAME_INCLUDES_MC1502_H +#define MAME_INCLUDES_MC1502_H + +#pragma once #include "imagedev/cassette.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "bus/isa/isa.h" #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/ram.h" -#include "bus/isa/xsu_cards.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" + #include "bus/centronics/ctronics.h" +#include "bus/isa/isa.h" +#include "bus/isa/xsu_cards.h" + class mc1502_state : public driver_device { @@ -81,4 +85,4 @@ private: int m_pit_out2; }; -#endif /* MC1502_H_ */ +#endif // MAME_INCLUDES_MC1502_H diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index c9b52a81b8f..70b349a53f5 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -5,6 +5,7 @@ Midway MCR-3 system **************************************************************************/ +#include "screen.h" class mcr3_state : public mcr_state { diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 87e5b1eb6e2..370708b2c5b 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -10,6 +10,7 @@ #include "audio/midway.h" #include "audio/williams.h" #include "machine/6840ptm.h" +#include "screen.h" class mcr68_state : public driver_device { diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index f5a583bc1c5..4d4347de7c1 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -8,6 +8,7 @@ #include "cpu/s2650/s2650.h" #include "sound/dac.h" #include "sound/samples.h" +#include "screen.h" class meadows_state : public driver_device { diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index b679d236c96..289f26ebd5f 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -11,6 +11,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" #include "video/ms1_tmap.h" +#include "screen.h" class megasys1_state : public driver_device diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index d0e56eb51e5..68d370c3f22 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/msm5205.h" #include "sound/ay8910.h" +#include "screen.h" class mermaid_state : public driver_device { diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h index ecb536bd5fa..10588d7f703 100644 --- a/src/mame/includes/metalmx.h +++ b/src/mame/includes/metalmx.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Philip Bennett +#include "audio/cage.h" + #include "cpu/adsp2100/adsp2100.h" #include "cpu/m68000/m68000.h" #include "cpu/tms34010/tms34010.h" diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 7df002cad28..1b66b4e6b2a 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -12,6 +12,7 @@ #include "video/k053936.h" #include "machine/eepromser.h" #include "machine/gen_latch.h" +#include "screen.h" class metro_state : public driver_device { diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h index 904a3ae887d..8da238e8b9f 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -7,8 +7,11 @@ **************************************************************************/ -#include "audio/williams.h" #include "audio/dcs.h" +#include "audio/williams.h" + +#include "cpu/tms34010/tms34010.h" + class midtunit_state : public driver_device { diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index 5a8432c1bc1..181dab4f0ca 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -10,6 +10,7 @@ #include "audio/dcs.h" #include "machine/midwayic.h" #include "machine/watchdog.h" +#include "screen.h" #define MIDVUNIT_VIDEO_CLOCK 33000000 diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index f4a92955fcf..7ff403062ae 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -7,9 +7,10 @@ **************************************************************************/ -#include "machine/gen_latch.h" -#include "cpu/tms34010/tms34010.h" #include "audio/williams.h" + +#include "cpu/tms34010/tms34010.h" +#include "machine/gen_latch.h" #include "machine/gen_latch.h" #include "machine/nvram.h" #include "sound/okim6295.h" diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index 50583defd08..4a66ad27f18 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -9,6 +9,7 @@ #define MIDZEUS_VIDEO_CLOCK XTAL_66_6667MHz #include "machine/timekpr.h" +#include "screen.h" class midzeus_state : public driver_device { diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index ce82135e169..6df79c3974a 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -1,15 +1,25 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert -#include <functional> +#ifndef MAME_INCLUDES_MODEL1_H +#define MAME_INCLUDES_MODEL1_H -#include <glm/glm/vec3.hpp> +#pragma once #include "audio/dsbz80.h" #include "audio/segam1audio.h" + +#include "cpu/mb86233/mb86233.h" #include "cpu/v60/v60.h" #include "machine/m1comm.h" #include "video/segaic24.h" +#include "screen.h" + +#include <glm/glm/vec3.hpp> + +#include <functional> + + #define DECLARE_TGP_FUNCTION(name) void name() enum {FIFO_SIZE = 256}; @@ -476,3 +486,5 @@ private: /*----------- defined in machine/model1.c -----------*/ ADDRESS_MAP_EXTERN( model1_vr_tgp_map, 32 ); + +#endif // MAME_INCLUDES_MODEL1_H diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h index 8fc3829aa4d..f19d204a793 100644 --- a/src/mame/includes/model2.h +++ b/src/mame/includes/model2.h @@ -10,6 +10,7 @@ #include "machine/315-5881_crypt.h" #include "machine/315-5838_317-0229_comp.h" #include "machine/m2comm.h" +#include "screen.h" class model2_renderer; struct raster_state; diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index 61bcceaefc1..8f27cdbf903 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -9,6 +9,7 @@ #include "sound/scsp.h" #include "machine/315-5881_crypt.h" #include "machine/msm6242.h" +#include "screen.h" typedef float MATRIX[4][4]; typedef float VECTOR[4]; diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index 9e18e5abcc1..3a856f77205 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -15,6 +15,7 @@ #include "video/k054000.h" #include "video/k054338.h" #include "video/konami_helper.h" +#include "screen.h" class moo_state : public driver_device { diff --git a/src/mame/includes/mpf1.h b/src/mame/includes/mpf1.h index 71de176aab5..e0277ff4d8f 100644 --- a/src/mame/includes/mpf1.h +++ b/src/mame/includes/mpf1.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol, Curt Coder -#pragma once +#ifndef MAME_INCLUDES_MPF1_H +#define MAME_INCLUDES_MPF1_H -#ifndef __MPF1__ -#define __MPF1__ +#pragma once #include "machine/spchrom.h" @@ -13,7 +13,7 @@ #include "machine/i8255.h" #include "machine/z80ctc.h" #include "machine/z80pio.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/tms5220.h" #define Z80_TAG "u1" @@ -74,4 +74,4 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(check_halt_callback); }; -#endif +#endif // MAME_INCLUDES_MPF1_H diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index 99868cfa785..ddc4732f5fa 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -5,6 +5,7 @@ Mr. Flea *************************************************************************/ +#include "screen.h" class mrflea_state : public driver_device { diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index 3a83a9f1a6c..a4bdc9bea7f 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -2,6 +2,7 @@ // copyright-holders:David Haywood,Paul Priest #include "machine/gen_latch.h" +#include "screen.h" class ms32_state : public driver_device { diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h index c6be80c49d7..a3225084856 100644 --- a/src/mame/includes/multfish.h +++ b/src/mame/includes/multfish.h @@ -7,6 +7,7 @@ #include "cpu/z80/z80.h" #include "machine/timekpr.h" #include "machine/watchdog.h" +#include "screen.h" #define igrosoft_gamble_ROM_SIZE 0x80000 #define igrosoft_gamble_VIDRAM_SIZE (0x2000*0x04) diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index f0f13bd64c1..340d8fbe026 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Tomasz Slanina #include "audio/seibu.h" // for seibu_sound_decrypt on the MAIN cpu (not sound) +#include "screen.h" class mustache_state : public driver_device { diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index 53fbdbc5190..aa27e8f8634 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -12,6 +12,7 @@ #include "sound/discrete.h" #include "sound/sn76477.h" #include "sound/samples.h" +#include "screen.h" #define MW8080BW_MASTER_CLOCK (19968000.0) diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 53b38aca1bb..50fc4be234c 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -8,6 +8,8 @@ ***************************************************************************/ +#include "screen.h" + #define MYSTSTON_MASTER_CLOCK (XTAL_12MHz) diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index 8a8b2b83d60..3a59e3850f3 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -1,12 +1,14 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont, Phil Stroffolino, Acho A. Tang, Nicola Salmoria +#include "includes/konamigx.h" +#include "video/k053246_k053247_k055673.h" + #include "machine/gen_latch.h" #include "sound/k054539.h" #include "machine/k053252.h" #include "video/k055555.h" #include "video/k054000.h" -#include "video/k053246_k053247_k055673.h" class mystwarr_state : public konamigx_state { diff --git a/src/mame/includes/mz700.h b/src/mame/includes/mz700.h index e4bfa2425fc..e338524083c 100644 --- a/src/mame/includes/mz700.h +++ b/src/mame/includes/mz700.h @@ -7,17 +7,17 @@ * ******************************************************************************/ -#ifndef MZ700_H_ -#define MZ700_H_ +#ifndef MAME_INCLUDES_MZ700_H +#define MAME_INCLUDES_MZ700_H -#include "machine/i8255.h" -#include "machine/pit8253.h" -#include "machine/z80pio.h" -#include "sound/speaker.h" -#include "imagedev/cassette.h" #include "bus/centronics/ctronics.h" +#include "imagedev/cassette.h" #include "machine/bankdev.h" +#include "machine/i8255.h" +#include "machine/pit8253.h" #include "machine/ram.h" +#include "machine/z80pio.h" +#include "sound/spkrdev.h" class mz_state : public driver_device { @@ -34,7 +34,7 @@ public: , m_palette(*this, "palette") , m_banke(*this, "banke") , m_bankf(*this, "bankf") - { } + { } DECLARE_READ8_MEMBER(mz700_e008_r); DECLARE_WRITE8_MEMBER(mz700_e008_w); @@ -124,4 +124,4 @@ private: optional_device<address_map_bank_device> m_bankf; }; -#endif /* MZ700_H_ */ +#endif // MAME_INCLUDES_MZ700_H diff --git a/src/mame/includes/mz80.h b/src/mame/includes/mz80.h index ba0540580d8..beca6caaecd 100644 --- a/src/mame/includes/mz80.h +++ b/src/mame/includes/mz80.h @@ -6,14 +6,14 @@ * ****************************************************************************/ -#ifndef MZ80_H_ -#define MZ80_H_ +#ifndef MAME_INCLUDES_MZ80_H +#define MAME_INCLUDES_MZ80_H #include "cpu/z80/z80.h" #include "machine/i8255.h" #include "machine/pit8253.h" #include "imagedev/cassette.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" class mz80_state : public driver_device @@ -69,4 +69,4 @@ private: extern const gfx_layout mz80k_charlayout; extern const gfx_layout mz80kj_charlayout; -#endif /* MZ80_H_ */ +#endif // MAME_INCLUDES_MZ80_H diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index c2c9c4469a2..25e6749426d 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -3,6 +3,7 @@ #include "cpu/mcs48/mcs48.h" #include "sound/dac.h" #include "sound/sn76477.h" +#include "screen.h" class n8080_state : public driver_device { diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index 3b7ab520d3f..ea2881d36d3 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -8,6 +8,7 @@ #include "machine/eeprompar.h" #include "sound/c140.h" +#include "screen.h" enum { diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 459bd749e29..13393afe5f7 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -13,6 +13,7 @@ #include "video/c45.h" #include "machine/namco_c148.h" #include "machine/namco_c139.h" +#include "screen.h" /* CPU reference numbers */ diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index 3e9c8fc7ea6..26f694d8273 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -9,6 +9,7 @@ #include "machine/eeprompar.h" #include "video/rgbutil.h" #include "video/poly.h" +#include "screen.h" enum { diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index 8f5cee055d3..93fa39a63a5 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Brad Oliver,Sal and John Bugliarisi,Paul Priest #include "audio/pleiads.h" +#include "screen.h" class naughtyb_state : public driver_device { diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index ea5c5fd1f6d..3ad15b28478 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -2,6 +2,7 @@ // copyright-holders:Takahiro Nogi #include "includes/nb1413m3.h" +#include "screen.h" class nbmj8891_state : public driver_device { diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index d907a078475..1a8861524d5 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi #include "includes/nb1413m3.h" +#include "screen.h" class nbmj8900_state : public driver_device { diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index aa173f13e78..3a610d0776c 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -3,6 +3,7 @@ #include "includes/nb1413m3.h" #include "machine/gen_latch.h" +#include "screen.h" class nbmj8991_state : public driver_device { diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index c1c1b925714..cdbbe0f07a2 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -8,6 +8,7 @@ #include "cpu/z80/tmpz84c011.h" #include "machine/gen_latch.h" +#include "screen.h" #define VRAM_MAX 2 diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index 9a9b2f51aa5..5da3b2c15f7 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -5,6 +5,9 @@ #include "sound/k005289.h" #include "sound/vlm5030.h" +#include "screen.h" + + class nemesis_state : public driver_device { public: diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index cc64d8105d1..7243bcd8e13 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -19,6 +19,8 @@ #include "bus/neogeo/carts.h" #include "bus/neogeo_ctrl/ctrl.h" +#include "screen.h" + // On scanline 224, /VBLANK goes low 56 mclks (14 pixels) from the rising edge of /HSYNC. // Two mclks after /VBLANK goes low, the hardware sets a pending IRQ1 flip-flop. diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index 0bea69afaf3..c0ad204704a 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -7,6 +7,7 @@ ******************************************************************************/ #include "sound/samples.h" +#include "screen.h" class ninjakd2_state : public driver_device { diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 8284f247264..827d21fcab4 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -3,6 +3,7 @@ #include "machine/gen_latch.h" #include "machine/tmp68301.h" +#include "screen.h" #define VRAM_MAX 3 diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index b9b516b0982..080eb369707 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -6,6 +6,7 @@ *************************************************************************/ #include "sound/msm5205.h" +#include "screen.h" class ojankohs_state : public driver_device { diff --git a/src/mame/includes/orao.h b/src/mame/includes/orao.h index 32162df0a4f..64dc53d2b47 100644 --- a/src/mame/includes/orao.h +++ b/src/mame/includes/orao.h @@ -6,9 +6,10 @@ * ****************************************************************************/ -#ifndef ORAO_H_ -#define ORAO_H_ -#include "sound/speaker.h" +#ifndef MAME_INCLUDES_ORAO_H +#define MAME_INCLUDES_ORAO_H + +#include "sound/spkrdev.h" #include "imagedev/cassette.h" class orao_state : public driver_device @@ -43,4 +44,4 @@ private: uint8_t m_beep; }; -#endif /* ORAO_H_ */ +#endif // MAME_INCLUDES_ORAO_H diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index 603f7cfdee9..5e4b9457637 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define ORBIT_NOTE_FREQ NODE_01 diff --git a/src/mame/includes/orion.h b/src/mame/includes/orion.h index 6dbd390b2b1..b025736dadb 100644 --- a/src/mame/includes/orion.h +++ b/src/mame/includes/orion.h @@ -6,18 +6,23 @@ * ****************************************************************************/ -#ifndef ORION_H_ -#define ORION_H_ +#ifndef MAME_INCLUDES_ORION_H +#define MAME_INCLUDES_ORION_H + +#pragma once -#include "machine/wd_fdc.h" #include "includes/radio86.h" -#include "cpu/z80/z80.h" + #include "cpu/i8085/i8085.h" +#include "cpu/z80/z80.h" + #include "machine/i8255.h" -#include "machine/ram.h" #include "machine/mc146818.h" -#include "sound/speaker.h" +#include "machine/ram.h" +#include "machine/wd_fdc.h" + #include "sound/ay8910.h" +#include "sound/spkrdev.h" #include "sound/wave.h" @@ -122,4 +127,4 @@ protected: void orionpro_bank_switch(); }; -#endif /* ORION_H_ */ +#endif // MAME_INCLUDES_ORION_H diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h index ae6cb2e010d..33da903005a 100644 --- a/src/mame/includes/osborne1.h +++ b/src/mame/includes/osborne1.h @@ -6,20 +6,22 @@ * ****************************************************************************/ -#ifndef OSBORNE1_H_ -#define OSBORNE1_H_ +#ifndef MAME_INCLUDES_OSBORNE1_H +#define MAME_INCLUDES_OSBORNE1_H -#include "cpu/z80/z80.h" - -#include "sound/speaker.h" +#pragma once #include "bus/ieee488/ieee488.h" +#include "cpu/z80/z80.h" + #include "machine/6821pia.h" #include "machine/6850acia.h" #include "machine/ram.h" #include "machine/wd_fdc.h" +#include "sound/spkrdev.h" + #include "video/mc6845.h" @@ -187,4 +189,4 @@ protected: required_region_ptr<u8> m_p_nuevo; }; -#endif /* OSBORNE1_H_ */ +#endif // MAME_INCLUDES_OSBORNE1_H diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index df834582529..64bc0010b16 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -10,6 +10,7 @@ #include "video/k053246_k053247_k055673.h" #include "video/k053251.h" #include "video/konami_helper.h" +#include "screen.h" class overdriv_state : public driver_device { diff --git a/src/mame/includes/p2000t.h b/src/mame/includes/p2000t.h index 7264b1087ee..5b23fc4bf99 100644 --- a/src/mame/includes/p2000t.h +++ b/src/mame/includes/p2000t.h @@ -6,11 +6,13 @@ * ****************************************************************************/ -#ifndef P2000T_H_ -#define P2000T_H_ +#ifndef MAME_INCLUDES_P2000T_H +#define MAME_INCLUDES_P2000T_H + +#pragma once #include "cpu/z80/z80.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/saa5050.h" @@ -55,4 +57,4 @@ public: INTERRUPT_GEN_MEMBER(p2000_interrupt); }; -#endif /* P2000T_H_ */ +#endif // MAME_INCLUDES_P2000T_H diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 5748c13a002..d71cd094226 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi #include "sound/namco.h" +#include "screen.h" class pacland_state : public driver_device { diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index 8558f817ebd..1d57d6e73c1 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia #include "sound/okim6295.h" +#include "screen.h" class paradise_state : public driver_device { diff --git a/src/mame/includes/partner.h b/src/mame/includes/partner.h index fbe703bac26..ba204d4646b 100644 --- a/src/mame/includes/partner.h +++ b/src/mame/includes/partner.h @@ -6,8 +6,12 @@ * ****************************************************************************/ -#ifndef partner_H_ -#define partner_H_ +#ifndef MAME_INCLUDES_PARTNER_H +#define MAME_INCLUDES_PARTNER_H + +#pragma once + +#include "includes/radio86.h" #include "machine/i8255.h" #include "machine/wd_fdc.h" @@ -17,9 +21,11 @@ class partner_state : public radio86_state { public: partner_state(const machine_config &mconfig, device_type type, const char *tag) - : radio86_state(mconfig, type, tag), - m_ram(*this, RAM_TAG), - m_fdc(*this, "wd1793") { } + : radio86_state(mconfig, type, tag) + , m_ram(*this, RAM_TAG) + , m_fdc(*this, "wd1793") + { + } uint8_t m_mem_page; uint8_t m_win_mem_page; @@ -42,4 +48,4 @@ public: }; -#endif /* partner_H_ */ +#endif // MAME_INCLUDES_PARTNER_H diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index 149ec503d99..12afb5d1944 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi #include "includes/nb1413m3.h" +#include "screen.h" class pastelg_state : public driver_device { diff --git a/src/mame/includes/pc1512.h b/src/mame/includes/pc1512.h index 9105325a790..0c36f09a66a 100644 --- a/src/mame/includes/pc1512.h +++ b/src/mame/includes/pc1512.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#pragma once +#ifndef MAME_INCLUDES_PC1512_H +#define MAME_INCLUDES_PC1512_H -#ifndef __PC1512__ -#define __PC1512__ +#pragma once #include "bus/centronics/ctronics.h" #include "bus/isa/isa.h" @@ -12,7 +12,6 @@ #include "bus/pc1512/mouse.h" #include "cpu/i86/i86.h" #include "cpu/mcs48/mcs48.h" -#include "formats/pc_dsk.h" #include "machine/am9517a.h" #include "machine/buffer.h" #include "machine/ins8250.h" @@ -22,9 +21,11 @@ #include "machine/pc1512kb.h" #include "machine/pc_fdc.h" #include "machine/ram.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/mc6845.h" +#include "formats/pc_dsk.h" + #define I8086_TAG "ic120" #define I8087_TAG "ic119" #define I8048_TAG "i8048" @@ -251,4 +252,4 @@ public: MACHINE_CONFIG_EXTERN( pc1512_video ); -#endif +#endif // MAME_INCLUDES_PC1512_H diff --git a/src/mame/includes/pc8401a.h b/src/mame/includes/pc8401a.h index a1058e4d641..d0053891473 100644 --- a/src/mame/includes/pc8401a.h +++ b/src/mame/includes/pc8401a.h @@ -17,6 +17,8 @@ #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "screen.h" + #define SCREEN_TAG "screen" #define CRT_SCREEN_TAG "screen2" diff --git a/src/mame/includes/pcw.h b/src/mame/includes/pcw.h index 96b235c4260..084d4d38cb8 100644 --- a/src/mame/includes/pcw.h +++ b/src/mame/includes/pcw.h @@ -12,6 +12,7 @@ #include "machine/upd765.h" #include "machine/ram.h" #include "sound/beep.h" +#include "screen.h" #define PCW_BORDER_HEIGHT 8 #define PCW_BORDER_WIDTH 8 diff --git a/src/mame/includes/pecom.h b/src/mame/includes/pecom.h index 8320079d2e1..c97216ac77c 100644 --- a/src/mame/includes/pecom.h +++ b/src/mame/includes/pecom.h @@ -1,11 +1,12 @@ // license:BSD-3-Clause // copyright-holders:Miodrag Milanovic -#ifndef __PECOM__ -#define __PECOM__ +#ifndef MAME_INCLUDES_PECOM_H +#define MAME_INCLUDES_PECOM_H #include "cpu/cosmac/cosmac.h" #include "imagedev/cassette.h" #include "machine/ram.h" +#include "sound/cdp1869.h" #define SCREEN_TAG "screen" #define CDP1802_TAG "cdp1802" @@ -73,4 +74,4 @@ protected: MACHINE_CONFIG_EXTERN( pecom_video ); -#endif +#endif // MAME_INCLUDES_PECOM_H diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 9ae5e0ba24c..d26e1693c09 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -1,18 +1,21 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, ElSemi +#ifndef MAME_INCLUDES_PGM_H +#define MAME_INCLUDES_PGM_H -#include "machine/v3021.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" -#include "cpu/arm7/arm7.h" -#include "sound/ics2115.h" -#include "cpu/arm7/arm7core.h" -#include "machine/nvram.h" -#include "machine/pgmcrypt.h" -#include "machine/gen_latch.h" #include "machine/igs025.h" #include "machine/igs022.h" #include "machine/igs028.h" +#include "machine/pgmcrypt.h" + +#include "cpu/arm7/arm7.h" +#include "cpu/arm7/arm7core.h" +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "machine/gen_latch.h" +#include "machine/nvram.h" +#include "machine/v3021.h" +#include "sound/ics2115.h" #define PGMARM7LOGERROR 0 @@ -130,3 +133,5 @@ ADDRESS_MAP_EXTERN( pgm_z80_io, 8 ); ADDRESS_MAP_EXTERN( pgm_mem, 16 ); ADDRESS_MAP_EXTERN( pgm_basic_mem, 16 ); ADDRESS_MAP_EXTERN( pgm_base_mem, 16 ); + +#endif // MAME_INCLUDES_PGM_H diff --git a/src/mame/includes/pk8020.h b/src/mame/includes/pk8020.h index c9f296e0dca..ffa47827dc8 100644 --- a/src/mame/includes/pk8020.h +++ b/src/mame/includes/pk8020.h @@ -6,18 +6,18 @@ * ****************************************************************************/ -#ifndef PK8020_H_ -#define PK8020_H_ +#ifndef MAME_INCLUDES_PK8020_H +#define MAME_INCLUDES_PK8020_H +#include "imagedev/cassette.h" +#include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/pit8253.h" #include "machine/pic8259.h" -#include "machine/i8251.h" +#include "machine/pit8253.h" +#include "machine/ram.h" #include "machine/wd_fdc.h" -#include "imagedev/cassette.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/wave.h" -#include "machine/ram.h" class pk8020_state : public driver_device @@ -103,4 +103,4 @@ protected: void pk8020_set_bank(uint8_t data); }; -#endif /* pk8020_H_ */ +#endif // MAME_INCLUDES_PK8020_H diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index c6c4f0dc5e3..a2900e4ffbd 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -9,6 +9,7 @@ #include "machine/gen_latch.h" #include "sound/namco.h" #include "sound/discrete.h" +#include "screen.h" struct filter2_context { diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index 986ebfba0f5..3d578794db5 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -6,6 +6,8 @@ **************************************************************************/ #include "machine/eepromser.h" +#include "screen.h" + class policetr_state : public driver_device { public: diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 4f66519b51d..55e54a7ce08 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -1,11 +1,13 @@ // license:BSD-3-Clause // copyright-holders:Martin Buchholz // thanks-to:James Wallace, Martin Buchholz, Juergen Oppermann, Volker Hann, Jan-Ole Christian +#ifndef MAME_INCLUDES_POLYPLAY_H +#define MAME_INCLUDES_POLYPLAY_H #include "machine/z80ctc.h" #include "machine/z80pio.h" #include "machine/z80sio.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #define POLYPLAY_MAIN_CLOCK XTAL_9_8304MHz @@ -68,3 +70,5 @@ public: DECLARE_PALETTE_INIT(polyplay); uint32_t screen_update_polyplay(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; + +#endif // MAME_INCLUDES_POLYPLAY_H diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 37e36c29099..55e93b62866 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia #include "machine/nmk112.h" +#include "screen.h" class powerins_state : public driver_device { diff --git a/src/mame/includes/pp01.h b/src/mame/includes/pp01.h index c7d0e44466d..6b3dd876d36 100644 --- a/src/mame/includes/pp01.h +++ b/src/mame/includes/pp01.h @@ -6,15 +6,17 @@ * ****************************************************************************/ -#ifndef PP01_H_ -#define PP01_H_ +#ifndef MAME_INCLUDES_PP01_H +#define MAME_INCLUDES_PP01_H + +#pragma once #include "cpu/i8085/i8085.h" #include "machine/ram.h" #include "machine/i8251.h" #include "machine/pit8253.h" #include "machine/i8255.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" //#include "sound/wave.h" //#include "imagedev/cassette.h" @@ -62,4 +64,4 @@ public: void pp01_set_memory(uint8_t block, uint8_t data); }; -#endif +#endif // MAME_INCLUDES_PP01_H diff --git a/src/mame/includes/primo.h b/src/mame/includes/primo.h index 6714cb77130..86faa87ad60 100644 --- a/src/mame/includes/primo.h +++ b/src/mame/includes/primo.h @@ -6,14 +6,16 @@ * ****************************************************************************/ -#ifndef PRIMO_H_ -#define PRIMO_H_ +#ifndef MAME_INCLUDES_PRIMO_H +#define MAME_INCLUDES_PRIMO_H + +#pragma once #include "imagedev/snapquik.h" #include "imagedev/cassette.h" -#include "bus/cbmiec/cbmiec.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" +#include "bus/cbmiec/cbmiec.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" @@ -67,4 +69,4 @@ public: }; -#endif /* PRIMO_H_ */ +#endif // MAME_INCLUDES_PRIMO_H diff --git a/src/mame/includes/prof180x.h b/src/mame/includes/prof180x.h index 5b60c13e536..e8af51790e9 100644 --- a/src/mame/includes/prof180x.h +++ b/src/mame/includes/prof180x.h @@ -1,9 +1,11 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder +#ifndef MAME_INCLUDES_PROF180X_H +#define MAME_INCLUDES_PROF180X_H + #pragma once -#ifndef __PROF180X__ -#define __PROF180X__ +#include "bus/centronics/ctronics.h" #define HD64180_TAG "hd64180" #define FDC9268_TAG "fdc9268" @@ -16,8 +18,8 @@ class prof180x_state : public driver_device { public: prof180x_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_centronics(*this, CENTRONICS_TAG) + : driver_device(mconfig, type, tag) + , m_centronics(*this, CENTRONICS_TAG) { } @@ -45,4 +47,4 @@ public: int m_mm1; }; -#endif +#endif // MAME_INCLUDES_PROF180X_H diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 7e7ff2a47f8..76b993c8ec9 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -6,6 +6,7 @@ *************************************************************************/ #include "sound/okim6295.h" +#include "screen.h" class psikyo_state : public driver_device { diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 2913b9560da..3801d81225f 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -6,11 +6,12 @@ *************************************************************************/ -#define MASTER_CLOCK 57272700 // main oscillator frequency - #include "cpu/sh2/sh2.h" #include "sound/ymf278b.h" #include "machine/eepromser.h" +#include "screen.h" + +#define MASTER_CLOCK 57272700 // main oscillator frequency class psikyo4_state : public driver_device { diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index c40b37ec0ad..1daaa618d96 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -3,6 +3,7 @@ #include "video/bufsprite.h" #include "machine/eepromser.h" #include "cpu/sh2/sh2.h" +#include "screen.h" #define MASTER_CLOCK 57272700 // main oscillator frequency @@ -27,7 +28,7 @@ class psikyosh_state : public driver_device public: psikyosh_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_spriteram(*this, "spriteram") , + m_spriteram(*this, "spriteram") , m_bgram(*this, "bgram"), m_zoomram(*this, "zoomram"), m_vidregs(*this, "vidregs"), diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index 33e3492c06d..92af91ed04b 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -17,6 +17,8 @@ #include "video/mc6845.h" +#include "screen.h" + #define MAIN_CLOCK_OSC 20000000 /* 20 MHz */ #define SLITHER_CLOCK_OSC 21300000 /* 21.3 MHz */ diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index 941649e7f4d..5349a00dc2f 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia #include "machine/tmp68301.h" +#include "screen.h" class realbrk_state : public driver_device { diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index 51cf5974ac4..2e9c8779b93 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -11,6 +11,7 @@ #include "machine/gen_latch.h" #include "sound/hc55516.h" +#include "screen.h" class redalert_state : public driver_device { diff --git a/src/mame/includes/rmnimbus.h b/src/mame/includes/rmnimbus.h index e5b4e479a49..c6d3595a81f 100644 --- a/src/mame/includes/rmnimbus.h +++ b/src/mame/includes/rmnimbus.h @@ -17,6 +17,7 @@ #include "sound/ay8910.h" #include "sound/msm5205.h" #include "bus/centronics/ctronics.h" +#include "screen.h" #define MAINCPU_TAG "maincpu" #define IOCPU_TAG "iocpu" diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index 80f90f2a6c4..c51ba148294 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles #include "sound/upd7759.h" +#include "screen.h" class rpunch_state : public driver_device { diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 57184c63074..adcbdebab3a 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Balfour +#include "screen.h" + class runaway_state : public driver_device { public: diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index 36f25737279..99d92b7e77c 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -12,6 +12,7 @@ #include "video/k053246_k053247_k055673.h" #include "video/k053936.h" #include "video/konami_helper.h" +#include "screen.h" class rungun_state : public driver_device { diff --git a/src/mame/includes/samcoupe.h b/src/mame/includes/samcoupe.h index 7f038413e61..76e873f194e 100644 --- a/src/mame/includes/samcoupe.h +++ b/src/mame/includes/samcoupe.h @@ -10,15 +10,15 @@ * ****************************************************************************/ -#ifndef SAMCOUPE_H_ -#define SAMCOUPE_H_ +#ifndef MAME_INCLUDES_SAMCOUPE_H +#define MAME_INCLUDES_SAMCOUPE_H -#include "machine/wd_fdc.h" -#include "sound/speaker.h" -#include "imagedev/cassette.h" #include "bus/centronics/ctronics.h" -#include "machine/ram.h" +#include "imagedev/cassette.h" #include "machine/msm6242.h" +#include "machine/ram.h" +#include "machine/wd_fdc.h" +#include "sound/spkrdev.h" /* screen dimensions */ #define SAM_BLOCK 8 @@ -200,4 +200,4 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; -#endif /* SAMCOUPE_H_ */ +#endif // MAME_INCLUDES_SAMCOUPE_H diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index 0fbf3732e09..55943ead060 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -10,6 +10,7 @@ #include "sound/sn76496.h" #include "audio/segasnd.h" #include "machine/gen_latch.h" +#include "screen.h" class sega005_sound_device; diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index b9836a02489..9ac55eaf465 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -9,6 +9,7 @@ #include "machine/segag80.h" #include "audio/segasnd.h" #include "video/vector.h" +#include "screen.h" class segag80v_state : public driver_device { diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index 4857cfa7504..7ef6df2dfe3 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -7,6 +7,7 @@ #include "video/segaic24.h" #include "sound/dac.h" +#include "screen.h" class segas24_state : public driver_device { diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index afbda1fb0ad..432659c50d6 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -9,6 +9,7 @@ #include "machine/eepromser.h" #include "sound/multipcm.h" #include "machine/s32comm.h" +#include "screen.h" diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h index 915143c0f35..73139e38954 100644 --- a/src/mame/includes/segaxbd.h +++ b/src/mame/includes/segaxbd.h @@ -16,6 +16,7 @@ #include "video/segaic16_road.h" #include "video/sega16sp.h" #include "video/resnet.h" +#include "screen.h" // ======================> segaxbd_state diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 43c3fc4f4b1..a734c279e8b 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -7,6 +7,7 @@ #include "machine/upd4992.h" #include "sound/okim9810.h" #include "sound/x1_010.h" +#include "screen.h" class seta2_state : public driver_device { diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index f13e135b948..e8e20ef46e3 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -3,6 +3,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" +#include "screen.h" class shadfrce_state : public driver_device { diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index 98239f9d2ab..fe446603c24 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -3,6 +3,7 @@ #include "machine/gen_latch.h" #include "sound/okim6295.h" +#include "screen.h" class shangha3_state : public driver_device { diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h index 51675377f55..098a17d52b5 100644 --- a/src/mame/includes/simple_st0016.h +++ b/src/mame/includes/simple_st0016.h @@ -2,6 +2,7 @@ // copyright-holders:Tomasz Slanina #include "machine/st0016.h" +#include "screen.h" class st0016_state : public driver_device { diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 807f353f71b..9bd248d368f 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class skyfox_state : public driver_device { diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index a370a5e6186..3f21f29491e 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -9,6 +9,7 @@ #include "cpu/z80/z80.h" #include "video/bufsprite.h" #include "machine/taito68705interface.h" +#include "screen.h" class slapfght_state : public driver_device { diff --git a/src/mame/includes/sms.h b/src/mame/includes/sms.h index e0ba503ebaa..99c82563f7e 100644 --- a/src/mame/includes/sms.h +++ b/src/mame/includes/sms.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef SMS_H_ -#define SMS_H_ +#ifndef MAME_INCLUDES_SMS_H +#define MAME_INCLUDES_SMS_H #define LOG_REG #define LOG_PAGING @@ -21,11 +21,16 @@ #define CONTROL1_TAG "ctrl1" #define CONTROL2_TAG "ctrl2" +#include "bus/gamegear/ggext.h" #include "bus/sega8/sega8_slot.h" #include "bus/sg1000_exp/sg1000exp.h" -#include "bus/sms_exp/smsexp.h" #include "bus/sms_ctrl/smsctrl.h" -#include "bus/gamegear/ggext.h" +#include "bus/sms_exp/smsexp.h" +#include "sound/sn76496.h" +#include "sound/ym2413.h" +#include "video/315_5124.h" + +#include "screen.h" class sms_state : public driver_device @@ -260,4 +265,4 @@ public: #define IO_BIOS_ROM (0x08) /* BIOS ROM disabled (1= disabled, 0= enabled) */ #define IO_CHIP (0x04) /* I/O chip disabled (1= disabled, 0= enabled) */ -#endif /* SMS_H_ */ +#endif // MAME_INCLUDES_SMS_H diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index 6bd8c95872a..476ed479ea7 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -7,6 +7,7 @@ #include "cpu/g65816/g65816.h" #include "audio/snes_snd.h" #include "video/snes_ppu.h" +#include "screen.h" /* SNES timing theory: diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index 4d358f2e52e..71a21294138 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -9,6 +9,7 @@ *************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class snk_state : public driver_device { diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index 4d87fd0e0ef..cd68fe12fe6 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "sound/upd7759.h" #include "video/snk68_spr.h" +#include "screen.h" class snk68_state : public driver_device { diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 68bc3255dce..ccf5a7d29b9 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -6,6 +6,7 @@ ****************************************************************************/ #include "sound/samples.h" +#include "screen.h" /* * SPACEFB_PIXEL_CLOCK clocks the star generator circuit. The rest of * the graphics use a clock half of SPACEFB_PIXEL_CLOCK, thus creating diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 8f259e48279..e594665dca5 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "video/tecmo_spr.h" #include "video/tecmo_mix.h" +#include "screen.h" class spbactn_state : public driver_device { diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index 5fcc53a4d33..3139e0f428e 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -8,6 +8,7 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" +#include "screen.h" class spdodgeb_state : public driver_device { diff --git a/src/mame/includes/spec128.h b/src/mame/includes/spec128.h index 75747182f79..29ad2639a7e 100644 --- a/src/mame/includes/spec128.h +++ b/src/mame/includes/spec128.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef __SPEC128H__ -#define __SPEC128H__ +#ifndef MAME_INCLUDES_SPEC128_H +#define MAME_INCLUDES_SPEC128_H /* 128K machines take an extra 4 cycles per scan line - add this to retrace */ #define SPEC128_UNSEEN_LINES 15 @@ -16,4 +16,4 @@ MACHINE_CONFIG_EXTERN( spectrum_128 ); -#endif /* __SPEC128H__ */ +#endif // MAME_INCLUDES_SPEC128_H diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h index 892a6800e37..11672822f03 100644 --- a/src/mame/includes/spectrum.h +++ b/src/mame/includes/spectrum.h @@ -6,18 +6,21 @@ * ****************************************************************************/ -#ifndef __SPECTRUM_H__ -#define __SPECTRUM_H__ +#ifndef MAME_INCLUDES_SPECTRUM_H +#define MAME_INCLUDES_SPECTRUM_H + +#pragma once -#include "machine/upd765.h" -#include "sound/speaker.h" -#include "machine/ram.h" -#include "imagedev/snapquik.h" -#include "imagedev/cassette.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" #include "machine/spec_snqk.h" +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "imagedev/cassette.h" +#include "imagedev/snapquik.h" +#include "machine/ram.h" +#include "machine/upd765.h" +#include "sound/spkrdev.h" + /* Spectrum crystals */ #define X1 XTAL_14MHz // Main clock (48k Spectrum) @@ -254,4 +257,4 @@ INPUT_PORTS_EXTERN( spec_plus ); MACHINE_CONFIG_EXTERN( spectrum ); -#endif /* __SPECTRUM_H__ */ +#endif // MAME_INCLUDES_SPECTRUM_H diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index 83e4634643b..28a46765168 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -8,6 +8,7 @@ #include "machine/watchdog.h" #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define SPRINT2_SKIDSND1_EN NODE_01 diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index a7e725e474c..41080c35236 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -2,6 +2,8 @@ // copyright-holders:Stefan Jokisch #include "machine/watchdog.h" +#include "sound/discrete.h" +#include "screen.h" class sprint4_state : public driver_device { diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index d70052f6200..437e39a9743 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Stefan Jokisch #include "sound/discrete.h" +#include "screen.h" class sprint8_state : public driver_device { diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 12aea45bff8..19f7d75b68a 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -4,6 +4,7 @@ #include "video/st0020.h" #include "machine/eepromser.h" #include "sound/es5506.h" +#include "screen.h" class ssv_state : public driver_device { diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index 6208c768720..bff3ca3b531 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -7,6 +7,7 @@ ***************************************************************************/ #include "sound/samples.h" +#include "screen.h" #define STARFIRE_MASTER_CLOCK (XTAL_20MHz) diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index 812f86ba242..d3ec471c6e8 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -19,6 +19,7 @@ */ #include "sound/discrete.h" +#include "screen.h" #define STARSHP1_MASTER_CLOCK (12096000) diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index e3fb7be1561..ebab20075d6 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -2,6 +2,7 @@ // copyright-holders:Luca Elia #include "machine/gen_latch.h" +#include "screen.h" class suna16_state : public driver_device { diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index ab6954c4602..f618254f899 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -3,6 +3,7 @@ #include "machine/gen_latch.h" #include "sound/samples.h" +#include "screen.h" #define TILEMAPS 0 diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h index 541b4c2f5bb..6e29dc76e80 100644 --- a/src/mame/includes/super80.h +++ b/src/mame/includes/super80.h @@ -1,18 +1,23 @@ // license:BSD-3-Clause // copyright-holders:Robbbert +#ifndef MAME_INCLUDES_SUPER80_H +#define MAME_INCLUDES_SUPER80_H + +#pragma once + +#include "bus/centronics/ctronics.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "sound/wave.h" -#include "imagedev/snapquik.h" #include "imagedev/cassette.h" -#include "sound/speaker.h" -#include "sound/samples.h" +#include "imagedev/snapquik.h" #include "machine/buffer.h" -#include "bus/centronics/ctronics.h" -#include "video/mc6845.h" -#include "machine/z80pio.h" -#include "machine/z80dma.h" #include "machine/wd_fdc.h" +#include "machine/z80dma.h" +#include "machine/z80pio.h" +#include "sound/samples.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" +#include "video/mc6845.h" /* Bits in m_portf0 variable: @@ -125,3 +130,5 @@ private: optional_device<floppy_connector> m_floppy0; optional_device<floppy_connector> m_floppy1; }; + +#endif // MAME_INCLUDES_SUPER80_H diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index 625f1888ea8..73733f83bd4 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -1,6 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Sylvain Glaize, Paul Priest, Olivier Galibert +#include "video/sknsspr.h" + #include "cpu/sh2/sh2.h" diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 8f9a664ffcc..7089fbecf59 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -5,7 +5,10 @@ Super Slams *************************************************************************/ +#ifndef MAME_INCLUDES_SUPRSLAM_H +#define MAME_INCLUDES_SUPRSLAM_H +#include "video/vsystem_spr.h" #include "machine/gen_latch.h" #include "video/k053936.h" @@ -68,3 +71,5 @@ public: virtual void video_start() override; uint32_t screen_update_suprslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; + +#endif // MAME_INCLUDES_SUPRSLAM_H diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 14326294c91..f9975dbe464 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -5,6 +5,7 @@ #include "machine/gen_latch.h" #include "machine/i8255.h" #include "machine/segacrp2_device.h" +#include "screen.h" class system1_state : public driver_device { diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 84c424886fc..e8ac3c333a7 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -4,6 +4,7 @@ #include "machine/taitoio.h" #include "video/hd63484.h" #include "video/tc0180vcu.h" +#include "screen.h" class taitob_state : public driver_device { diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 77150f6aaeb..ee8faf04cf3 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -2,6 +2,7 @@ // copyright-holders:Bryan McPhail #include "machine/watchdog.h" #include "sound/okim6295.h" +#include "screen.h" /* This it the best way to allow game specific kludges until the system is fully understood */ enum { diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 13277cf57cf..792ff814ee6 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -8,6 +8,7 @@ #include "machine/taitoio.h" #include "video/tc0080vco.h" +#include "screen.h" enum { TAITOAIR_FRAC_SHIFT = 16, TAITOAIR_POLY_MAX_PT = 16 }; diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index 5c43f2174e3..5f1adadc30f 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -8,6 +8,7 @@ #include "video/tc0780fpa.h" #include "machine/taitoio.h" +#include "screen.h" class taitojc_state : public driver_device { diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index 7d366e8b55a..57a85fd2163 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -9,6 +9,8 @@ #include "sound/discrete.h" #include "sound/ay8910.h" +#include "screen.h" + class taitosj_state : public driver_device { diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h index 25f480eaa20..a5affb130a2 100644 --- a/src/mame/includes/tandy2k.h +++ b/src/mame/includes/tandy2k.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef __TANDY2K__ -#define __TANDY2K__ +#ifndef MAME_INCLUDES_TANDY2K_H +#define MAME_INCLUDES_TANDY2K_H #include "bus/centronics/ctronics.h" #include "bus/rs232/rs232.h" @@ -16,7 +16,7 @@ #include "machine/ram.h" #include "machine/tandy2kb.h" #include "machine/upd765.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "video/crt9007.h" #include "video/crt9021.h" #include "video/crt9212.h" @@ -225,4 +225,4 @@ public: int m_centronics_busy; }; -#endif +#endif // MAME_INCLUDES_TANDY2K_H diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index 1598b308e8e..16deea7df78 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define TANK8_CRASH_EN NODE_01 diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index 7a8bc27df55..b254f757bab 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -1,6 +1,9 @@ // license:BSD-3-Clause // copyright-holders:David Haywood +#ifndef MAME_INCLUDES_TAOTAIDO_H +#define MAME_INCLUDES_TAOTAIDO_H +#include "video/vsystem_spr.h" #include "machine/gen_latch.h" class taotaido_state : public driver_device @@ -56,3 +59,5 @@ public: void screen_eof(screen_device &screen, bool state); uint32_t tile_callback( uint32_t code ); }; + +#endif // MAME_INCLUDES_TAOTAIDO_H diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index d88ffc34e6c..c2b5b92deea 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -2,6 +2,7 @@ // copyright-holders:BUT #include "sound/namco.h" #include "video/c45.h" +#include "screen.h" class tceptor_state : public driver_device { diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index 7ba16367294..34be89d0eb2 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" #include "video/tecmo_spr.h" +#include "screen.h" class tecmo_state : public driver_device { diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index f15916ebd38..a24108d4cf5 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "video/tecmo_spr.h" #include "video/tecmo_mix.h" +#include "screen.h" class tecmo16_state : public driver_device { diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index 96548cc076f..1343b48a63d 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -9,6 +9,7 @@ #include "machine/eepromser.h" #include "machine/gen_latch.h" #include "machine/watchdog.h" +#include "screen.h" class tecmosys_state : public driver_device { diff --git a/src/mame/includes/tek405x.h b/src/mame/includes/tek405x.h index 175d2f090c5..cf4c3341c08 100644 --- a/src/mame/includes/tek405x.h +++ b/src/mame/includes/tek405x.h @@ -1,21 +1,26 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder +#ifndef MAME_INCLUDES_TEK405X_H +#define MAME_INCLUDES_TEK405X_H + #pragma once -#ifndef __TEK405X__ -#define __TEK405X__ +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "bus/ieee488/ieee488.h" #include "cpu/m6800/m6800.h" -#include "machine/ram.h" + #include "machine/6821pia.h" #include "machine/6850acia.h" #include "machine/clock.h" -#include "bus/ieee488/ieee488.h" #include "machine/ram.h" -#include "sound/speaker.h" +#include "machine/ram.h" + +#include "sound/spkrdev.h" + #include "video/vector.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" + #define MC6800_TAG "u61" #define MC6820_Y_TAG "u561" @@ -158,4 +163,4 @@ public: virtual void video_start() override; }; -#endif +#endif // MAME_INCLUDES_TEK405X_H diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h index 72c95620e48..5587c47835d 100644 --- a/src/mame/includes/thomson.h +++ b/src/mame/includes/thomson.h @@ -11,27 +11,29 @@ #ifndef _THOMSON_H_ #define _THOMSON_H_ -#include "bus/rs232/rs232.h" #include "cpu/m6809/m6809.h" +#include "formats/thom_cas.h" +#include "formats/thom_dsk.h" +#include "imagedev/cassette.h" +#include "imagedev/floppy.h" #include "machine/6821pia.h" -#include "machine/mc6846.h" #include "machine/6850acia.h" -#include "machine/mos6551.h" -#include "sound/dac.h" -#include "sound/mea8000.h" -#include "bus/centronics/ctronics.h" -#include "imagedev/cassette.h" #include "machine/mc6843.h" #include "machine/mc6846.h" +#include "machine/mc6846.h" #include "machine/mc6854.h" -#include "formats/thom_cas.h" -#include "formats/thom_dsk.h" -#include "machine/thomflop.h" -#include "imagedev/floppy.h" +#include "machine/mos6551.h" #include "machine/ram.h" +#include "machine/thomflop.h" +#include "sound/dac.h" +#include "sound/mea8000.h" +#include "bus/centronics/ctronics.h" #include "bus/generic/slot.h" #include "bus/generic/carts.h" +#include "bus/rs232/rs232.h" + +#include "screen.h" /* 6821 PIAs */ diff --git a/src/mame/includes/ti85.h b/src/mame/includes/ti85.h index f7347f98610..0e8a62e9b80 100644 --- a/src/mame/includes/ti85.h +++ b/src/mame/includes/ti85.h @@ -6,15 +6,17 @@ * ****************************************************************************/ -#ifndef TI85_H_ -#define TI85_H_ +#ifndef MAME_INCLUDES_TI85_H +#define MAME_INCLUDES_TI85_H + +#pragma once #include "imagedev/snapquik.h" -#include "video/t6a04.h" #include "machine/bankdev.h" -#include "sound/speaker.h" -#include "machine/nvram.h" #include "machine/intelfsh.h" +#include "machine/nvram.h" +#include "sound/spkrdev.h" +#include "video/t6a04.h" /* model */ @@ -227,4 +229,4 @@ public: //address_space &asic; }; -#endif /* TI85_H_ */ +#endif // MAME_INCLUDES_TI85_H diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 6252caced5b..44ae26dafea 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -1,19 +1,23 @@ // license:BSD-3-Clause // copyright-holders:Eugene Sandulenko +#ifndef MAME_INCLUDES_TIAMC1_H +#define MAME_INCLUDES_TIAMC1_H + +#pragma once #include "machine/pit8253.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" class tiamc1_state : public driver_device { public: tiamc1_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_speaker(*this, "speaker") - { } + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_gfxdecode(*this, "gfxdecode") + , m_palette(*this, "palette") + , m_speaker(*this, "speaker") + { } std::unique_ptr<uint8_t[]> m_videoram; uint8_t *m_tileram; @@ -137,3 +141,5 @@ private: }; extern const device_type TIAMC1; + +#endif // MAME_INCLUDES_TIAMC1_H diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 5574f4b23ce..b15ea3610ce 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -7,6 +7,7 @@ ***************************************************************************/ #include "sound/tc8830f.h" +#include "screen.h" class timeplt_state : public driver_device { diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 26020a949d1..dca3fa03cdc 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -7,6 +7,7 @@ #include "cpu/m68000/m68000.h" #include "video/toaplan_scu.h" +#include "screen.h" class toaplan1_state : public driver_device { diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index a01691ca013..1cc9ec190fa 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -5,9 +5,6 @@ //#define USE_HD64x180 /* Define if CPU support is available */ //#define TRUXTON2_STEREO /* Uncomment to hear truxton2 music in stereo */ -// We encode priority with colour in the tilemaps, so need a larger palette -#define T2PALETTE_LENGTH 0x10000 - #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "machine/gen_latch.h" @@ -16,6 +13,10 @@ #include "machine/upd4992.h" #include "video/gp9001.h" #include "sound/okim6295.h" +#include "screen.h" + +// We encode priority with colour in the tilemaps, so need a larger palette +#define T2PALETTE_LENGTH 0x10000 class toaplan2_state : public driver_device { diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index 7e47ed632f8..6994ecb0602 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -5,6 +5,7 @@ #include "machine/gen_latch.h" #include "sound/msm5205.h" #include "video/bufsprite.h" +#include "screen.h" class toki_state : public driver_device { diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index 625aac625d8..4ccd006730b 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles +#include "screen.h" + class tp84_state : public driver_device { public: diff --git a/src/mame/includes/tranz330.h b/src/mame/includes/tranz330.h index 8555b5a2237..fa60cd09b85 100644 --- a/src/mame/includes/tranz330.h +++ b/src/mame/includes/tranz330.h @@ -1,11 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#pragma once - #ifndef VERIFONE_TRANZ330_H #define VERIFONE_TRANZ330_H -// single-driver build must have emu.h here +#pragma once #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" @@ -15,7 +13,7 @@ #include "machine/msm6242.h" #include "machine/roc10937.h" #include "bus/rs232/rs232.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "machine/clock.h" #define CPU_TAG "cpu" diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index c8d99f3962d..4057ab3452f 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -9,6 +9,7 @@ #include "machine/watchdog.h" #include "sound/discrete.h" #include "sound/samples.h" +#include "screen.h" /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h index 580f1dd7719..02f3408d0f9 100644 --- a/src/mame/includes/trs80.h +++ b/src/mame/includes/trs80.h @@ -6,19 +6,22 @@ * ****************************************************************************/ -#ifndef TRS80_H_ -#define TRS80_H_ +#ifndef MAME_INCLUDES_TRS80_H +#define MAME_INCLUDES_TRS80_H + +#pragma once -#include "cpu/z80/z80.h" -#include "sound/speaker.h" -#include "sound/wave.h" -#include "machine/ay31015.h" -#include "machine/buffer.h" #include "bus/centronics/ctronics.h" -#include "machine/wd_fdc.h" +#include "cpu/z80/z80.h" #include "imagedev/cassette.h" #include "imagedev/flopdrv.h" #include "imagedev/snapquik.h" +#include "machine/ay31015.h" +#include "machine/buffer.h" +#include "machine/wd_fdc.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" + #include "formats/trs_cas.h" @@ -188,4 +191,4 @@ private: memory_bank *m_bank19; }; -#endif /* TRS80_H_ */ +#endif // MAME_INCLUDES_TRS80_H diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index ddf2c2c4c7e..43138505bd3 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -1,6 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Jarek Burczynski #include "sound/msm5205.h" +#include "screen.h" class tubep_state : public driver_device { diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index 3fb59553d6e..53d73cb4c28 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -1,5 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino, David Haywood +#include "screen.h" + class tunhunt_state : public driver_device { public: diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index c22ae420c36..e82084a1e30 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -10,6 +10,8 @@ #include "machine/i8255.h" #include "sound/discrete.h" #include "sound/samples.h" +#include "screen.h" + /* sprites are scaled in the analog domain; to give a better */ /* rendition of this, we scale in the X direction by this factor */ #define TURBO_X_SCALE 2 diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h index 9ad1c3596af..cf540a6e8ef 100644 --- a/src/mame/includes/turrett.h +++ b/src/mame/includes/turrett.h @@ -7,6 +7,7 @@ ****************************************************************************/ #include "machine/ataintf.h" +#include "screen.h" class turrett_state : public driver_device @@ -127,4 +128,4 @@ private: }; // device type definition -const device_type TURRETT = &device_creator<turrett_device>; +extern const device_type TURRETT; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index c150f291711..299187d1851 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -3,6 +3,7 @@ #include "video/bufsprite.h" #include "sound/upd7759.h" #include "sound/k007232.h" +#include "screen.h" class twin16_state : public driver_device { diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index 4d3a5024cc2..d8c15b8dac6 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -8,6 +8,7 @@ #include "video/mc6845.h" #include "video/bufsprite.h" #include "video/toaplan_scu.h" +#include "screen.h" class twincobr_state : public driver_device { diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index 4f73d04e434..75858e9c2ec 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -6,6 +6,8 @@ *************************************************************************/ +#include "screen.h" + #define TX1_PIXEL_CLOCK (XTAL_18MHz / 3) #define TX1_HBSTART 256 diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index f93ecbfc5f0..b1c924e6861 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -8,6 +8,7 @@ #include "machine/watchdog.h" #include "sound/discrete.h" +#include "screen.h" class ultratnk_state : public driver_device { diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index c050abd3706..fd7be8ffa66 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -2,6 +2,7 @@ // copyright-holders:Luca Elia #include "sound/okim6295.h" #include "machine/eepromser.h" +#include "screen.h" class unico_state : public driver_device { diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index b9a1faaa6b4..f75a2179a00 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -2,6 +2,7 @@ // copyright-holders:Paul Hampson #include "machine/gen_latch.h" +#include "screen.h" class vball_state : public driver_device { diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h index 1c8605db3e0..fd972d9da6f 100644 --- a/src/mame/includes/vc4000.h +++ b/src/mame/includes/vc4000.h @@ -19,6 +19,8 @@ #include "bus/vc4000/slot.h" #include "bus/vc4000/rom.h" +#include "screen.h" + // define this to use digital inputs instead of the slow // autocentering analog mame joys #define ANALOG_HACK diff --git a/src/mame/includes/vector06.h b/src/mame/includes/vector06.h index dc0b320ac92..88df82c5a55 100644 --- a/src/mame/includes/vector06.h +++ b/src/mame/includes/vector06.h @@ -6,22 +6,26 @@ * ****************************************************************************/ -#ifndef VECTOR06_H_ -#define VECTOR06_H_ +#ifndef MAME_INCLUDES_VECTOR06_H +#define MAME_INCLUDES_VECTOR06_H + +#include "bus/generic/carts.h" +#include "bus/generic/slot.h" -#include "cpu/z80/z80.h" #include "cpu/i8085/i8085.h" -#include "sound/speaker.h" -#include "sound/wave.h" -#include "sound/ay8910.h" +#include "cpu/z80/z80.h" + +#include "imagedev/cassette.h" +#include "imagedev/flopdrv.h" + #include "machine/i8255.h" #include "machine/pit8253.h" #include "machine/ram.h" #include "machine/wd_fdc.h" -#include "imagedev/cassette.h" -#include "imagedev/flopdrv.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" + +#include "sound/ay8910.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" class vector06_state : public driver_device @@ -116,4 +120,4 @@ private: void update_mem(); }; -#endif /* VECTOR06_H_ */ +#endif // MAME_INCLUDES_VECTOR06_H diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h index 61ceaa45c51..024c8d74226 100644 --- a/src/mame/includes/vectrex.h +++ b/src/mame/includes/vectrex.h @@ -17,6 +17,8 @@ #include "bus/vectrex/slot.h" #include "bus/vectrex/rom.h" +#include "screen.h" + #define NVECT 10000 struct vectrex_point diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 75062f2886b..d13b3befec8 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -10,6 +10,7 @@ #include "sound/ay8910.h" #include "sound/discrete.h" #include "sound/samples.h" +#include "screen.h" class vicdual_state : public driver_device { diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index 2255c7b38a6..31c775819b5 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -6,6 +6,8 @@ ****************************************************************************/ +#include "screen.h" + #define VICTORY_MAIN_CPU_CLOCK (XTAL_8MHz / 2) diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 083d094e227..2feb75a9c90 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "sound/discrete.h" +#include "screen.h" /* Discrete Sound Input Nodes */ #define VIDEOPIN_OCTAVE_DATA NODE_01 diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index 711f643ef34..fcd3f4ef6e0 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -7,6 +7,7 @@ *************************************************************************/ #include "video/pc090oj.h" +#include "screen.h" class volfied_state : public driver_device { diff --git a/src/mame/includes/vtech2.h b/src/mame/includes/vtech2.h index 498d0560bf1..4353118021c 100644 --- a/src/mame/includes/vtech2.h +++ b/src/mame/includes/vtech2.h @@ -6,12 +6,13 @@ * ****************************************************************************/ -#ifndef VTECH2_H_ -#define VTECH2_H_ -#include "sound/speaker.h" -#include "imagedev/cassette.h" -#include "bus/generic/slot.h" +#ifndef MAME_INCLUDES_VTECH2_H +#define MAME_INCLUDES_VTECH2_H + #include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "imagedev/cassette.h" +#include "sound/spkrdev.h" #define TRKSIZE_FM 3172 /* size of a standard FM mode track */ @@ -93,4 +94,4 @@ public: }; -#endif /* VTECH2_H_ */ +#endif // MAME_INCLUDES_VTECH2_H diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 45535f70885..901bf63b791 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -4,6 +4,7 @@ #include "machine/gen_latch.h" #include "sound/k007232.h" #include "video/k051316.h" +#include "screen.h" class wecleman_state : public driver_device { diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 60526017e3c..e881db20a91 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -15,6 +15,7 @@ #include "machine/6821pia.h" #include "machine/bankdev.h" #include "audio/williams.h" +#include "screen.h" class williams_state : public driver_device { diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 1f7e8ac7baa..24264f09a17 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -7,6 +7,7 @@ ***************************************************************************/ #include "sound/s14001a.h" +#include "screen.h" class wolfpack_state : public driver_device { diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 5337dac34d4..78c1c5a3161 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -2,6 +2,7 @@ // copyright-holders:David Haywood #include "machine/gen_latch.h" +#include "screen.h" class wwfsstar_state : public driver_device { diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h index 1450d3694f5..852ffcb26d7 100644 --- a/src/mame/includes/x68k.h +++ b/src/mame/includes/x68k.h @@ -8,18 +8,21 @@ * ****************************************************************************/ -#ifndef X68K_H_ -#define X68K_H_ +#ifndef MAME_INCLUDES_X68K_H +#define MAME_INCLUDES_X68K_H #include "cpu/m68000/m68000.h" +#include "machine/8530scc.h" #include "machine/hd63450.h" +#include "machine/i8255.h" +#include "machine/mc68901.h" +#include "machine/ram.h" #include "machine/rp5c15.h" #include "machine/upd765.h" #include "sound/okim6258.h" -#include "machine/ram.h" -#include "machine/8530scc.h" #include "sound/ym2151.h" -#include "machine/i8255.h" + +#include "screen.h" #define MC68901_TAG "mc68901" #define RP5C15_TAG "rp5c15" @@ -354,4 +357,4 @@ protected: -#endif /* X68K_H_ */ +#endif // MAME_INCLUDES_X68K_H diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index bb9c980ed14..5c7f6db2fa2 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -4,6 +4,7 @@ #include "machine/taito68705interface.h" #include "machine/gen_latch.h" +#include "screen.h" class xain_state : public driver_device { diff --git a/src/mame/includes/xbox.h b/src/mame/includes/xbox.h index 38748c224bd..b28504d7306 100644 --- a/src/mame/includes/xbox.h +++ b/src/mame/includes/xbox.h @@ -1,10 +1,17 @@ // license:BSD-3-Clause // copyright-holders:Samuele Zannoli +#ifndef MAME_INCLUDES_XBOX_H +#define MAME_INCLUDES_XBOX_H #pragma once +#include "xbox_nv2a.h" #include "xbox_usb.h" +#include "machine/idectrl.h" +#include "machine/pic8259.h" + + class xbox_base_state : public driver_device { public: @@ -147,3 +154,5 @@ private: ADDRESS_MAP_EXTERN(xbox_base_map, 32); ADDRESS_MAP_EXTERN(xbox_base_map_io, 32); MACHINE_CONFIG_EXTERN(xbox_base); + +#endif // MAME_INCLUDES_XBOX_H diff --git a/src/mame/includes/xbox_nv2a.h b/src/mame/includes/xbox_nv2a.h index e56e586f495..f090f0b373f 100644 --- a/src/mame/includes/xbox_nv2a.h +++ b/src/mame/includes/xbox_nv2a.h @@ -3,6 +3,14 @@ /* * geforce 3d (NV2A) vertex program disassembler */ +#ifndef MAME_INCLUDES_XBOX_NV2A_H +#define MAME_INCLUDES_XBOX_NV2A_H + +#pragma once + +#include "machine/pic8259.h" +#include "video/poly.h" + #include <mutex> class vertex_program_disassembler { @@ -757,3 +765,5 @@ public: bool enable_waitvblank; bool enable_clipping_w; }; + +#endif // MAME_INCLUDES_XBOX_NV2A_H diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h index a34116816de..2969f58712c 100644 --- a/src/mame/includes/xerox820.h +++ b/src/mame/includes/xerox820.h @@ -1,7 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef __XEROX820__ -#define __XEROX820__ +#ifndef MAME_INCLUDES_XEROX820_H +#define MAME_INCLUDES_XEROX820_H + +#pragma once #include "bus/scsi/sa1403d.h" #include "bus/rs232/rs232.h" @@ -17,7 +19,7 @@ #include "machine/z80pio.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" -#include "sound/speaker.h" +#include "sound/spkrdev.h" #include "sound/beep.h" #define SCREEN_TAG "screen" @@ -160,4 +162,4 @@ public: void bankswitch(int bank) override; }; -#endif +#endif // MAME_INCLUDES_XEROX820_H diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index 31a97364a31..a77801fe8e8 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -16,6 +16,7 @@ #include "video/k054338.h" #include "video/k053251.h" #include "video/konami_helper.h" +#include "screen.h" class xexex_state : public driver_device { diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index ddce4d15aa2..2e88cba6b2f 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -7,6 +7,7 @@ #include "video/k053251.h" #include "video/k052109.h" #include "video/konami_helper.h" +#include "screen.h" class xmen_state : public driver_device { diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index a1208108cf1..6086df5705e 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -8,6 +8,7 @@ *************************************************************************/ #include "machine/gen_latch.h" +#include "screen.h" class yunsun16_state : public driver_device { diff --git a/src/mame/includes/z88.h b/src/mame/includes/z88.h index 33333086f06..beae4c38fa2 100644 --- a/src/mame/includes/z88.h +++ b/src/mame/includes/z88.h @@ -6,19 +6,22 @@ * ****************************************************************************/ -#ifndef Z88_H_ -#define Z88_H_ +#ifndef MAME_INCLUDES_Z88_H +#define MAME_INCLUDES_Z88_H #include "cpu/z80/z80.h" -#include "machine/upd65031.h" #include "machine/ram.h" -#include "bus/z88/z88.h" +#include "machine/upd65031.h" +#include "sound/spkrdev.h" + #include "bus/z88/flash.h" #include "bus/z88/ram.h" #include "bus/z88/rom.h" -#include "sound/speaker.h" +#include "bus/z88/z88.h" + #include "rendlay.h" + #define Z88_NUM_COLOURS 3 #define Z88_SCREEN_WIDTH 640 @@ -91,4 +94,4 @@ public: DECLARE_PALETTE_INIT(z88); }; -#endif /* Z88_H_ */ +#endif /* MAME_INCLUDES_Z88_H */ diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 8f3338ff4ee..4d1cef16719 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -1,6 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Coates #include "machine/s2636.h" +#include "screen.h" class zac2650_state : public driver_device { diff --git a/src/mame/includes/zx.h b/src/mame/includes/zx.h index 4f88bf23f25..46a18196e4b 100644 --- a/src/mame/includes/zx.h +++ b/src/mame/includes/zx.h @@ -6,16 +6,21 @@ * ****************************************************************************/ -#ifndef ZX_H_ -#define ZX_H_ +#ifndef MAME_INCLUDES_ZX_H +#define MAME_INCLUDES_ZX_H + +#pragma once #include "cpu/z80/z80.h" -#include "sound/speaker.h" -#include "sound/wave.h" #include "imagedev/cassette.h" -#include "formats/zx81_p.h" -#include "formats/tzx_cas.h" #include "machine/ram.h" +#include "sound/spkrdev.h" +#include "sound/wave.h" + +#include "screen.h" + +#include "formats/tzx_cas.h" +#include "formats/zx81_p.h" class zx_state : public driver_device @@ -105,4 +110,4 @@ protected: void recalc_hsync(); }; -#endif /* ZX_H_ */ +#endif // MAME_INCLUDES_ZX_H |