From e178fbd28127c526b212e5a4998058cebf530567 Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 25 Oct 2022 12:15:14 -0400 Subject: Remove #include from emu.h and move it into source files that still require it --- src/devices/cpu/es5510/es5510.cpp | 1 + src/devices/cpu/psx/dma.cpp | 2 ++ src/devices/cpu/psx/gte.cpp | 2 ++ src/devices/cpu/psx/irq.cpp | 2 ++ src/devices/cpu/psx/mdec.cpp | 2 ++ src/devices/cpu/psx/rcnt.cpp | 2 ++ src/devices/cpu/psx/sio.cpp | 2 ++ src/devices/machine/adc083x.cpp | 2 ++ src/devices/machine/ds1204.cpp | 1 + src/devices/machine/ds1205.cpp | 1 + src/devices/machine/ds2401.cpp | 2 ++ src/devices/machine/i2cmem.cpp | 2 ++ src/devices/machine/s3c44b0.cpp | 1 + src/devices/machine/x76f041.cpp | 2 ++ src/devices/machine/x76f100.cpp | 2 ++ src/devices/sound/discrete.cpp | 1 + src/devices/video/gba_lcd.cpp | 2 ++ src/devices/video/gf4500.cpp | 2 ++ src/emu/emu.h | 1 - src/mame/atari/atarifdc.cpp | 1 + src/mame/ensoniq/esq5505.cpp | 1 + src/mame/hp/hp49gp.cpp | 2 ++ src/mame/konami/zs01.cpp | 2 ++ src/mame/mattel/juicebox.cpp | 2 ++ src/mame/namco/namcos11.cpp | 2 ++ src/mame/namco/namcos12.cpp | 2 ++ src/mame/nintendo/gba.cpp | 2 ++ src/mame/nintendo/nds.cpp | 2 ++ src/mame/palm/palmz22.cpp | 2 ++ src/mame/skeleton/dm7000.cpp | 2 ++ src/mame/skeleton/mini2440.cpp | 2 ++ src/mame/tigertel/docg3.cpp | 2 ++ 32 files changed, 55 insertions(+), 1 deletion(-) diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp index 17b855c1b17..6614c03ab52 100644 --- a/src/devices/cpu/es5510/es5510.cpp +++ b/src/devices/cpu/es5510/es5510.cpp @@ -20,6 +20,7 @@ #include "corestr.h" +#include #include #include diff --git a/src/devices/cpu/psx/dma.cpp b/src/devices/cpu/psx/dma.cpp index 0af776e7fe3..0a901228944 100644 --- a/src/devices/cpu/psx/dma.cpp +++ b/src/devices/cpu/psx/dma.cpp @@ -10,6 +10,8 @@ #include "emu.h" #include "dma.h" +#include + #define VERBOSE_LEVEL ( 0 ) static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... ) diff --git a/src/devices/cpu/psx/gte.cpp b/src/devices/cpu/psx/gte.cpp index 6305b4d7412..562a3a995d7 100644 --- a/src/devices/cpu/psx/gte.cpp +++ b/src/devices/cpu/psx/gte.cpp @@ -11,6 +11,8 @@ #include "gte.h" #if 0 +#include + void ATTR_PRINTF(2,3) GTELOG( uint32_t pc, const char *a, ...) { va_list va; diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp index ace6d69d4e6..d14e8f7cdc0 100644 --- a/src/devices/cpu/psx/irq.cpp +++ b/src/devices/cpu/psx/irq.cpp @@ -11,6 +11,8 @@ #include "psx.h" #include "irq.h" +#include + #define VERBOSE_LEVEL ( 0 ) #define PSX_IRQ_MASK ( 0x7fd ) diff --git a/src/devices/cpu/psx/mdec.cpp b/src/devices/cpu/psx/mdec.cpp index 9822a61dd3d..8b4421e4062 100644 --- a/src/devices/cpu/psx/mdec.cpp +++ b/src/devices/cpu/psx/mdec.cpp @@ -13,6 +13,8 @@ #include "mdec.h" #include "dma.h" +#include + #define VERBOSE_LEVEL ( 0 ) static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... ) diff --git a/src/devices/cpu/psx/rcnt.cpp b/src/devices/cpu/psx/rcnt.cpp index 210c6359323..02e55dd5333 100644 --- a/src/devices/cpu/psx/rcnt.cpp +++ b/src/devices/cpu/psx/rcnt.cpp @@ -10,6 +10,8 @@ #include "emu.h" #include "rcnt.h" +#include + #define VERBOSE_LEVEL ( 0 ) static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... ) diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp index 0f6b2c39001..46b73d6b3a9 100644 --- a/src/devices/cpu/psx/sio.cpp +++ b/src/devices/cpu/psx/sio.cpp @@ -10,6 +10,8 @@ #include "emu.h" #include "sio.h" +#include + #define VERBOSE_LEVEL ( 0 ) static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, const char *s_fmt, ... ) diff --git a/src/devices/machine/adc083x.cpp b/src/devices/machine/adc083x.cpp index 1e0fd2dd7e7..c5c75655625 100644 --- a/src/devices/machine/adc083x.cpp +++ b/src/devices/machine/adc083x.cpp @@ -11,6 +11,8 @@ #include "emu.h" #include "adc083x.h" +#include + #define VERBOSE_LEVEL ( 0 ) static inline void ATTR_PRINTF( 3, 4 ) verboselog( int n_level, device_t &device, const char *s_fmt, ... ) diff --git a/src/devices/machine/ds1204.cpp b/src/devices/machine/ds1204.cpp index e1070113277..6d4fd46fc54 100644 --- a/src/devices/machine/ds1204.cpp +++ b/src/devices/machine/ds1204.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "ds1204.h" +#include #include diff --git a/src/devices/machine/ds1205.cpp b/src/devices/machine/ds1205.cpp index 5a723d5f259..7bafe3b6a88 100644 --- a/src/devices/machine/ds1205.cpp +++ b/src/devices/machine/ds1205.cpp @@ -10,6 +10,7 @@ #include "emu.h" #include "ds1205.h" +#include #include diff --git a/src/devices/machine/ds2401.cpp b/src/devices/machine/ds2401.cpp index 3ceabcb66f2..e2236eef5d2 100644 --- a/src/devices/machine/ds2401.cpp +++ b/src/devices/machine/ds2401.cpp @@ -11,6 +11,8 @@ #include "emu.h" #include "machine/ds2401.h" +#include + #define VERBOSE_LEVEL 0 inline void ds2401_device::verboselog(int n_level, const char *s_fmt, ...) diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp index 8c64c372358..2db16de0899 100644 --- a/src/devices/machine/i2cmem.cpp +++ b/src/devices/machine/i2cmem.cpp @@ -25,6 +25,8 @@ there are two standard values. #include "emu.h" #include "machine/i2cmem.h" +#include + constexpr int STATE_IDLE(0); constexpr int STATE_DEVSEL(1); constexpr int STATE_ADDRESSHIGH(2); diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp index 2f114f2a80c..dc5e52c31f0 100644 --- a/src/devices/machine/s3c44b0.cpp +++ b/src/devices/machine/s3c44b0.cpp @@ -16,6 +16,7 @@ #include "screen.h" #include +#include #define S3C44B0_INTCON (0x00 / 4) // Interrupt Control diff --git a/src/devices/machine/x76f041.cpp b/src/devices/machine/x76f041.cpp index 74b15449f3b..340cf224800 100644 --- a/src/devices/machine/x76f041.cpp +++ b/src/devices/machine/x76f041.cpp @@ -16,6 +16,8 @@ #include "emu.h" #include "machine/x76f041.h" +#include + #define VERBOSE_LEVEL ( 0 ) inline void ATTR_PRINTF( 3, 4 ) x76f041_device::verboselog( int n_level, const char *s_fmt, ... ) diff --git a/src/devices/machine/x76f100.cpp b/src/devices/machine/x76f100.cpp index 320ab833549..032020059d9 100644 --- a/src/devices/machine/x76f100.cpp +++ b/src/devices/machine/x76f100.cpp @@ -14,6 +14,8 @@ #include "emu.h" #include "machine/x76f100.h" +#include + #define VERBOSE_LEVEL ( 0 ) inline void ATTR_PRINTF( 3, 4 ) x76f100_device::verboselog( int n_level, const char *s_fmt, ... ) diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp index 0ad9f34562a..8568c647657 100644 --- a/src/devices/sound/discrete.cpp +++ b/src/devices/sound/discrete.cpp @@ -41,6 +41,7 @@ #include "wavwrite.h" #include +#include #include diff --git a/src/devices/video/gba_lcd.cpp b/src/devices/video/gba_lcd.cpp index 2d5f79306ef..1bc8a87e7fe 100644 --- a/src/devices/video/gba_lcd.cpp +++ b/src/devices/video/gba_lcd.cpp @@ -15,6 +15,8 @@ #include "screen.h" +#include + namespace { diff --git a/src/devices/video/gf4500.cpp b/src/devices/video/gf4500.cpp index b703e7cb8c3..e695404d938 100644 --- a/src/devices/video/gf4500.cpp +++ b/src/devices/video/gf4500.cpp @@ -11,6 +11,8 @@ #include "emu.h" #include "video/gf4500.h" +#include + #define VERBOSE_LEVEL ( 0 ) static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...) diff --git a/src/emu/emu.h b/src/emu/emu.h index 6f564f258ab..1d455bcfb15 100644 --- a/src/emu/emu.h +++ b/src/emu/emu.h @@ -28,7 +28,6 @@ #include #include #include -#include // core emulator headers -- must be first (profiler needs attotime, attotime needs xtal) #include "emucore.h" diff --git a/src/mame/atari/atarifdc.cpp b/src/mame/atari/atarifdc.cpp index b93a1c2e65e..83da87a0be3 100644 --- a/src/mame/atari/atarifdc.cpp +++ b/src/mame/atari/atarifdc.cpp @@ -16,6 +16,7 @@ #include "formats/atari_dsk.h" #include +#include #define VERBOSE_SERIAL 0 diff --git a/src/mame/ensoniq/esq5505.cpp b/src/mame/ensoniq/esq5505.cpp index b0afb3f603d..519ea695126 100644 --- a/src/mame/ensoniq/esq5505.cpp +++ b/src/mame/ensoniq/esq5505.cpp @@ -178,6 +178,7 @@ #include "emupal.h" #include "speaker.h" +#include #include diff --git a/src/mame/hp/hp49gp.cpp b/src/mame/hp/hp49gp.cpp index 6e69b2ab3bb..b19ea48ddaf 100644 --- a/src/mame/hp/hp49gp.cpp +++ b/src/mame/hp/hp49gp.cpp @@ -11,6 +11,8 @@ #include "machine/s3c2410.h" #include "screen.h" +#include + #define VERBOSE_LEVEL ( 0 ) struct lcd_spi_t diff --git a/src/mame/konami/zs01.cpp b/src/mame/konami/zs01.cpp index a587763db5b..0f5210d5ef6 100644 --- a/src/mame/konami/zs01.cpp +++ b/src/mame/konami/zs01.cpp @@ -14,6 +14,8 @@ #include "emu.h" #include "zs01.h" +#include + #define VERBOSE_LEVEL ( 0 ) inline void ATTR_PRINTF( 3, 4 ) zs01_device::verboselog( int n_level, const char *s_fmt, ... ) diff --git a/src/mame/mattel/juicebox.cpp b/src/mame/mattel/juicebox.cpp index 1396e7bafe7..baf3a86e25e 100644 --- a/src/mame/mattel/juicebox.cpp +++ b/src/mame/mattel/juicebox.cpp @@ -18,6 +18,8 @@ #include "softlist_dev.h" #include "speaker.h" +#include + namespace { diff --git a/src/mame/namco/namcos11.cpp b/src/mame/namco/namcos11.cpp index 468fd11bb40..efe3af41903 100644 --- a/src/mame/namco/namcos11.cpp +++ b/src/mame/namco/namcos11.cpp @@ -322,6 +322,8 @@ Pin 22 Solder Side - Gun 2 Trigger #include "screen.h" #include "speaker.h" +#include + #define C76_SPEEDUP ( 1 ) /* sound cpu idle skipping */ #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/namco/namcos12.cpp b/src/mame/namco/namcos12.cpp index ab9aa1146e1..a3e798b9721 100644 --- a/src/mame/namco/namcos12.cpp +++ b/src/mame/namco/namcos12.cpp @@ -1105,6 +1105,8 @@ The lever must be wired to analog port 0 (pin B22 parts side) of the Namco 48-wa #include "screen.h" #include "speaker.h" +#include + #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/nintendo/gba.cpp b/src/mame/nintendo/gba.cpp index d2f39d0dd2a..83d88df5237 100644 --- a/src/mame/nintendo/gba.cpp +++ b/src/mame/nintendo/gba.cpp @@ -20,6 +20,8 @@ #include "softlist_dev.h" #include "speaker.h" +#include + /* Sound Registers */ #define SOUNDCNT_L HWLO(0x080) /* 0x4000080 2 R/W Control Stereo/Volume/Enable */ diff --git a/src/mame/nintendo/nds.cpp b/src/mame/nintendo/nds.cpp index 24f6af3d811..84bf61c3e4f 100644 --- a/src/mame/nintendo/nds.cpp +++ b/src/mame/nintendo/nds.cpp @@ -17,6 +17,8 @@ #include "emu.h" #include "nds.h" +#include + #define VERBOSE_LEVEL (0) // Measured value from GBATEK. Actual crystal unknown. diff --git a/src/mame/palm/palmz22.cpp b/src/mame/palm/palmz22.cpp index 8a23fdbe6a9..5478fcd5807 100644 --- a/src/mame/palm/palmz22.cpp +++ b/src/mame/palm/palmz22.cpp @@ -69,6 +69,8 @@ end #include "machine/smartmed.h" #include "screen.h" +#include + #define PALM_Z22_BATTERY_LEVEL 75 #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/skeleton/dm7000.cpp b/src/mame/skeleton/dm7000.cpp index 82031785b58..62571f39265 100644 --- a/src/mame/skeleton/dm7000.cpp +++ b/src/mame/skeleton/dm7000.cpp @@ -42,6 +42,8 @@ #include "dm7000.h" #include "screen.h" +#include + #define VERBOSE_LEVEL ( 9 ) static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...) diff --git a/src/mame/skeleton/mini2440.cpp b/src/mame/skeleton/mini2440.cpp index a07ca5c571f..b25a80dc2bd 100644 --- a/src/mame/skeleton/mini2440.cpp +++ b/src/mame/skeleton/mini2440.cpp @@ -14,6 +14,8 @@ #include "screen.h" #include "speaker.h" +#include + #define VERBOSE_LEVEL ( 0 ) diff --git a/src/mame/tigertel/docg3.cpp b/src/mame/tigertel/docg3.cpp index 3f59ad5e83f..4d2464c19d3 100644 --- a/src/mame/tigertel/docg3.cpp +++ b/src/mame/tigertel/docg3.cpp @@ -11,6 +11,8 @@ #include "emu.h" #include "docg3.h" +#include + #define VERBOSE_LEVEL ( 0 ) static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ... ) -- cgit v1.2.3