diff options
| author | 2023-10-12 20:43:47 -0400 | |
|---|---|---|
| committer | 2023-10-12 20:43:47 -0400 | |
| commit | 3dcf3d756921cf1a1a089d5e77b864b75073b9f6 (patch) | |
| tree | f6030dfe92ac090497c444b83d0dfcd734626d96 /src | |
| parent | 91b1b03003c8fb568c8bf55be638e46020cd1624 (diff) | |
Move format #includes out of header files
Diffstat (limited to 'src')
85 files changed, 104 insertions, 85 deletions
diff --git a/src/devices/bus/acorn/atom/discpack.cpp b/src/devices/bus/acorn/atom/discpack.cpp index 6c8687bbe29..ec0505d2da8 100644 --- a/src/devices/bus/acorn/atom/discpack.cpp +++ b/src/devices/bus/acorn/atom/discpack.cpp @@ -6,10 +6,11 @@ **********************************************************************/ - #include "emu.h" #include "discpack.h" +#include "formats/acorn_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/acorn/atom/discpack.h b/src/devices/bus/acorn/atom/discpack.h index 8da1194ee78..ffe2fc5bb89 100644 --- a/src/devices/bus/acorn/atom/discpack.h +++ b/src/devices/bus/acorn/atom/discpack.h @@ -15,7 +15,6 @@ #include "bus/acorn/bus.h" #include "imagedev/floppy.h" #include "machine/i8271.h" -#include "formats/acorn_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/acorn/cms/fdc.cpp b/src/devices/bus/acorn/cms/fdc.cpp index f918309bb76..b476bf11912 100644 --- a/src/devices/bus/acorn/cms/fdc.cpp +++ b/src/devices/bus/acorn/cms/fdc.cpp @@ -8,10 +8,11 @@ **********************************************************************/ - #include "emu.h" #include "fdc.h" +#include "formats/acorn_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/acorn/cms/fdc.h b/src/devices/bus/acorn/cms/fdc.h index 99a92c34dc7..d1cfcf72891 100644 --- a/src/devices/bus/acorn/cms/fdc.h +++ b/src/devices/bus/acorn/cms/fdc.h @@ -6,7 +6,6 @@ **********************************************************************/ - #ifndef MAME_BUS_ACORN_CMS_FDC_H #define MAME_BUS_ACORN_CMS_FDC_H @@ -15,7 +14,6 @@ #include "bus/acorn/bus.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/acorn/system/fdc.cpp b/src/devices/bus/acorn/system/fdc.cpp index f4ec3dd48b5..489b645054e 100644 --- a/src/devices/bus/acorn/system/fdc.cpp +++ b/src/devices/bus/acorn/system/fdc.cpp @@ -10,10 +10,11 @@ **********************************************************************/ - #include "emu.h" #include "fdc.h" +#include "formats/acorn_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/acorn/system/fdc.h b/src/devices/bus/acorn/system/fdc.h index bd2d4e7f041..c4008eaff27 100644 --- a/src/devices/bus/acorn/system/fdc.h +++ b/src/devices/bus/acorn/system/fdc.h @@ -8,7 +8,6 @@ **********************************************************************/ - #ifndef MAME_BUS_ACORN_SYSTEM_FDC_H #define MAME_BUS_ACORN_SYSTEM_FDC_H @@ -17,7 +16,6 @@ #include "bus/acorn/bus.h" #include "imagedev/floppy.h" #include "machine/i8271.h" -#include "formats/acorn_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp index 1b7753cfe17..587084dd172 100644 --- a/src/devices/bus/adamnet/fdc.cpp +++ b/src/devices/bus/adamnet/fdc.cpp @@ -19,6 +19,8 @@ #include "emu.h" #include "fdc.h" +#include "formats/adam_dsk.h" + //************************************************************************** diff --git a/src/devices/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h index d4d1cc33a01..3324f84fce5 100644 --- a/src/devices/bus/adamnet/fdc.h +++ b/src/devices/bus/adamnet/fdc.h @@ -13,7 +13,6 @@ #include "adamnet.h" #include "cpu/m6800/m6801.h" -#include "formats/adam_dsk.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp index f537eb88b54..bbf76509403 100644 --- a/src/devices/bus/bbc/1mhzbus/opus3.cpp +++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp @@ -40,6 +40,9 @@ #include "emu.h" #include "opus3.h" +#include "formats/acorn_dsk.h" +#include "formats/fsd_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/bbc/1mhzbus/opus3.h b/src/devices/bus/bbc/1mhzbus/opus3.h index 2fd06b4015f..2d14e041b0a 100644 --- a/src/devices/bus/bbc/1mhzbus/opus3.h +++ b/src/devices/bus/bbc/1mhzbus/opus3.h @@ -14,8 +14,6 @@ #include "imagedev/floppy.h" #include "machine/ram.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" -#include "formats/fsd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/ams.cpp b/src/devices/bus/bbc/fdc/ams.cpp index 3a6463f0cdc..41f4c5a771c 100644 --- a/src/devices/bus/bbc/fdc/ams.cpp +++ b/src/devices/bus/bbc/fdc/ams.cpp @@ -6,10 +6,11 @@ **********************************************************************/ - #include "emu.h" #include "ams.h" +#include "formats/acorn_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/ams.h b/src/devices/bus/bbc/fdc/ams.h index 8a92fc266b5..8add01e2257 100644 --- a/src/devices/bus/bbc/fdc/ams.h +++ b/src/devices/bus/bbc/fdc/ams.h @@ -6,7 +6,6 @@ **********************************************************************/ - #ifndef MAME_BUS_BBC_FDC_AMS_H #define MAME_BUS_BBC_FDC_AMS_H @@ -15,7 +14,6 @@ #include "fdc.h" #include "imagedev/floppy.h" #include "machine/i8271.h" -#include "formats/acorn_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp index 006fb904192..edcd90d7fa5 100644 --- a/src/devices/bus/bbc/fdc/cumana.cpp +++ b/src/devices/bus/bbc/fdc/cumana.cpp @@ -8,10 +8,12 @@ **********************************************************************/ - #include "emu.h" #include "cumana.h" +#include "formats/acorn_dsk.h" +#include "formats/fsd_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/cumana.h b/src/devices/bus/bbc/fdc/cumana.h index 128900d0dd4..06ad3ca4da0 100644 --- a/src/devices/bus/bbc/fdc/cumana.h +++ b/src/devices/bus/bbc/fdc/cumana.h @@ -14,8 +14,6 @@ #include "fdc.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" -#include "formats/fsd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/cv1797.cpp b/src/devices/bus/bbc/fdc/cv1797.cpp index 5407d2f9613..8c51463bbf6 100644 --- a/src/devices/bus/bbc/fdc/cv1797.cpp +++ b/src/devices/bus/bbc/fdc/cv1797.cpp @@ -12,10 +12,12 @@ **********************************************************************/ - #include "emu.h" #include "cv1797.h" +#include "formats/acorn_dsk.h" +#include "formats/fsd_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/cv1797.h b/src/devices/bus/bbc/fdc/cv1797.h index 23894267a2f..40223fd14b6 100644 --- a/src/devices/bus/bbc/fdc/cv1797.h +++ b/src/devices/bus/bbc/fdc/cv1797.h @@ -6,7 +6,6 @@ **********************************************************************/ - #ifndef MAME_BUS_BBC_FDC_CV1797_H #define MAME_BUS_BBC_FDC_CV1797_H @@ -15,8 +14,6 @@ #include "fdc.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" -#include "formats/fsd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/kenda.cpp b/src/devices/bus/bbc/fdc/kenda.cpp index 1e41f1bfe18..fc71fa88cae 100644 --- a/src/devices/bus/bbc/fdc/kenda.cpp +++ b/src/devices/bus/bbc/fdc/kenda.cpp @@ -20,10 +20,11 @@ **********************************************************************/ - #include "emu.h" #include "kenda.h" +#include "formats/acorn_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/kenda.h b/src/devices/bus/bbc/fdc/kenda.h index f3e9951a67f..bea1bd7c3c7 100644 --- a/src/devices/bus/bbc/fdc/kenda.h +++ b/src/devices/bus/bbc/fdc/kenda.h @@ -6,7 +6,6 @@ **********************************************************************/ - #ifndef MAME_BUS_BBC_FDC_KENDA_H #define MAME_BUS_BBC_FDC_KENDA_H @@ -15,7 +14,6 @@ #include "fdc.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp index 6b7266ba631..2eaa599fc97 100644 --- a/src/devices/bus/bbc/fdc/opus.cpp +++ b/src/devices/bus/bbc/fdc/opus.cpp @@ -12,10 +12,12 @@ **********************************************************************/ - #include "emu.h" #include "opus.h" +#include "formats/acorn_dsk.h" +#include "formats/fsd_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/opus.h b/src/devices/bus/bbc/fdc/opus.h index 24ac082ba5d..675fc37f815 100644 --- a/src/devices/bus/bbc/fdc/opus.h +++ b/src/devices/bus/bbc/fdc/opus.h @@ -13,8 +13,6 @@ #include "imagedev/floppy.h" #include "machine/upd765.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" -#include "formats/fsd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/solidisk.cpp b/src/devices/bus/bbc/fdc/solidisk.cpp index a9b0b403217..dee6e4360ba 100644 --- a/src/devices/bus/bbc/fdc/solidisk.cpp +++ b/src/devices/bus/bbc/fdc/solidisk.cpp @@ -11,10 +11,12 @@ **********************************************************************/ - #include "emu.h" #include "solidisk.h" +#include "formats/acorn_dsk.h" +#include "formats/fsd_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/solidisk.h b/src/devices/bus/bbc/fdc/solidisk.h index 67723f91975..4e372ff758b 100644 --- a/src/devices/bus/bbc/fdc/solidisk.h +++ b/src/devices/bus/bbc/fdc/solidisk.h @@ -6,7 +6,6 @@ **********************************************************************/ - #ifndef MAME_BUS_BBC_FDC_SOLIDISK_H #define MAME_BUS_BBC_FDC_SOLIDISK_H @@ -16,8 +15,6 @@ #include "machine/i8271.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" -#include "formats/fsd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/udm.cpp b/src/devices/bus/bbc/fdc/udm.cpp index da9b10e6556..3c913721909 100644 --- a/src/devices/bus/bbc/fdc/udm.cpp +++ b/src/devices/bus/bbc/fdc/udm.cpp @@ -6,10 +6,12 @@ **********************************************************************/ - #include "emu.h" #include "udm.h" +#include "formats/acorn_dsk.h" +#include "formats/fsd_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/udm.h b/src/devices/bus/bbc/fdc/udm.h index a5212a66cf5..51a360f3729 100644 --- a/src/devices/bus/bbc/fdc/udm.h +++ b/src/devices/bus/bbc/fdc/udm.h @@ -6,7 +6,6 @@ **********************************************************************/ - #ifndef MAME_BUS_BBC_FDC_UDM_H #define MAME_BUS_BBC_FDC_UDM_H @@ -15,8 +14,6 @@ #include "fdc.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" -#include "formats/fsd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp index 7f058c41838..cfc23e2dee7 100644 --- a/src/devices/bus/bbc/fdc/watford.cpp +++ b/src/devices/bus/bbc/fdc/watford.cpp @@ -10,10 +10,12 @@ **********************************************************************/ - #include "emu.h" #include "watford.h" +#include "formats/acorn_dsk.h" +#include "formats/fsd_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/bbc/fdc/watford.h b/src/devices/bus/bbc/fdc/watford.h index 37a635d2afb..9129260f494 100644 --- a/src/devices/bus/bbc/fdc/watford.h +++ b/src/devices/bus/bbc/fdc/watford.h @@ -14,8 +14,6 @@ #include "fdc.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" -#include "formats/fsd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/bbc/internal/cumana68k.cpp b/src/devices/bus/bbc/internal/cumana68k.cpp index 0523622115c..4a2d7c71e2e 100644 --- a/src/devices/bus/bbc/internal/cumana68k.cpp +++ b/src/devices/bus/bbc/internal/cumana68k.cpp @@ -16,13 +16,14 @@ **********************************************************************/ - #include "emu.h" #include "cumana68k.h" #include "machine/nscsi_bus.h" #include "bus/nscsi/devices.h" #include "softlist_dev.h" +#include "formats/os9_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/bbc/internal/cumana68k.h b/src/devices/bus/bbc/internal/cumana68k.h index 1fbdd8aee04..04e76ab20cc 100644 --- a/src/devices/bus/bbc/internal/cumana68k.h +++ b/src/devices/bus/bbc/internal/cumana68k.h @@ -8,7 +8,6 @@ **********************************************************************/ - #ifndef MAME_BUS_BBC_INTERNAL_CUMANA68K_H #define MAME_BUS_BBC_INTERNAL_CUMANA68K_H @@ -20,7 +19,6 @@ #include "machine/nscsi_cb.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/os9_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/c64/exp.cpp b/src/devices/bus/c64/exp.cpp index 0113d9f86ee..93d664e8517 100644 --- a/src/devices/bus/c64/exp.cpp +++ b/src/devices/bus/c64/exp.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "exp.h" +#include "formats/cbm_crt.h" + //************************************************************************** diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h index a63f73d14ce..68974431d56 100644 --- a/src/devices/bus/c64/exp.h +++ b/src/devices/bus/c64/exp.h @@ -37,7 +37,6 @@ #pragma once #include "imagedev/cartrom.h" -#include "formats/cbm_crt.h" diff --git a/src/devices/bus/c64/tibdd001.cpp b/src/devices/bus/c64/tibdd001.cpp index 5f3d670df37..d5646ccc72b 100644 --- a/src/devices/bus/c64/tibdd001.cpp +++ b/src/devices/bus/c64/tibdd001.cpp @@ -31,6 +31,8 @@ Notes: (All ICs shown) #include "emu.h" #include "tibdd001.h" +#include "formats/tibdd001_dsk.h" + //************************************************************************** diff --git a/src/devices/bus/c64/tibdd001.h b/src/devices/bus/c64/tibdd001.h index 712013644be..12705c436bd 100644 --- a/src/devices/bus/c64/tibdd001.h +++ b/src/devices/bus/c64/tibdd001.h @@ -13,7 +13,6 @@ #include "exp.h" -#include "formats/tibdd001_dsk.h" #include "imagedev/floppy.h" #include "machine/upd765.h" diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp index 91dfb298ed1..961fe5c76db 100644 --- a/src/devices/bus/cbmiec/c1541.cpp +++ b/src/devices/bus/cbmiec/c1541.cpp @@ -139,6 +139,8 @@ #include "bus/centronics/ctronics.h" +#include "formats/d64_dsk.h" +#include "formats/g64_dsk.h" #include "formats/fs_cbmdos.h" diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp index b69bc1f709d..19ff695828b 100644 --- a/src/devices/bus/cbmiec/c1571.cpp +++ b/src/devices/bus/cbmiec/c1571.cpp @@ -22,6 +22,9 @@ #include "emu.h" #include "c1571.h" +#include "formats/d64_dsk.h" +#include "formats/g64_dsk.h" +#include "formats/d71_dsk.h" //************************************************************************** diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp index bcf937e2b99..21c70937eb3 100644 --- a/src/devices/bus/cbmiec/c1581.cpp +++ b/src/devices/bus/cbmiec/c1581.cpp @@ -17,6 +17,9 @@ #include "emu.h" #include "c1581.h" +#include "cpu/m6502/m6502.h" +#include "formats/d81_dsk.h" + //************************************************************************** diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h index c75259fdc86..299e735844a 100644 --- a/src/devices/bus/cbmiec/c1581.h +++ b/src/devices/bus/cbmiec/c1581.h @@ -12,8 +12,6 @@ #pragma once #include "cbmiec.h" -#include "cpu/m6502/m6502.h" -#include "formats/d81_dsk.h" #include "imagedev/floppy.h" #include "machine/mos6526.h" #include "machine/wd_fdc.h" diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp index 34e06d70dbf..4b4834271a1 100644 --- a/src/devices/bus/cbmiec/fd2000.cpp +++ b/src/devices/bus/cbmiec/fd2000.cpp @@ -20,6 +20,8 @@ #include "emu.h" #include "fd2000.h" +#include "formats/d81_dsk.h" + //************************************************************************** diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h index 0b247405e7e..7ffe3192b79 100644 --- a/src/devices/bus/cbmiec/fd2000.h +++ b/src/devices/bus/cbmiec/fd2000.h @@ -13,7 +13,6 @@ #include "cbmiec.h" #include "cpu/m6502/m65c02.h" -#include "formats/d81_dsk.h" #include "imagedev/floppy.h" #include "machine/6522via.h" #include "machine/upd765.h" diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp index 9c8a33870c1..1c599115db4 100644 --- a/src/devices/bus/compucolor/floppy.cpp +++ b/src/devices/bus/compucolor/floppy.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "floppy.h" +#include "formats/ccvf_dsk.h" + //************************************************************************** diff --git a/src/devices/bus/compucolor/floppy.h b/src/devices/bus/compucolor/floppy.h index 2ac39a3629c..96d1d9841fa 100644 --- a/src/devices/bus/compucolor/floppy.h +++ b/src/devices/bus/compucolor/floppy.h @@ -12,7 +12,6 @@ #pragma once #include "bus/rs232/rs232.h" -#include "formats/ccvf_dsk.h" #include "imagedev/floppy.h" diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp index 077de3e2c4d..e277d5003a9 100644 --- a/src/devices/bus/comx35/fdc.cpp +++ b/src/devices/bus/comx35/fdc.cpp @@ -44,6 +44,8 @@ Notes: #include "emu.h" #include "fdc.h" +#include "formats/comx35_dsk.h" + //************************************************************************** diff --git a/src/devices/bus/comx35/fdc.h b/src/devices/bus/comx35/fdc.h index 6f2b5ea60bd..24847194004 100644 --- a/src/devices/bus/comx35/fdc.h +++ b/src/devices/bus/comx35/fdc.h @@ -12,7 +12,6 @@ #pragma once #include "exp.h" -#include "formats/comx35_dsk.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp index 3a30f6b5449..68c7a51899e 100644 --- a/src/devices/bus/cpc/doubler.cpp +++ b/src/devices/bus/cpc/doubler.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "doubler.h" +#include "formats/tzx_cas.h" + //************************************************************************** // DEVICE DEFINITIONS //************************************************************************** diff --git a/src/devices/bus/cpc/doubler.h b/src/devices/bus/cpc/doubler.h index 13e3370dd99..051f5ec5e62 100644 --- a/src/devices/bus/cpc/doubler.h +++ b/src/devices/bus/cpc/doubler.h @@ -15,7 +15,6 @@ #include "cpcexp.h" #include "imagedev/cassette.h" -#include "formats/tzx_cas.h" class cpc_doubler_device : public device_t, public device_cpc_expansion_card_interface diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index b056783242d..0e2d723d4a2 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -53,8 +53,11 @@ #include "emu.h" #include "e01.h" + #include "bus/scsi/scsihd.h" -#include "softlist.h" +#include "softlist_dev.h" + +#include "formats/afs_dsk.h" //************************************************************************** diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h index 07b39908155..9a83fd0568c 100644 --- a/src/devices/bus/econet/e01.h +++ b/src/devices/bus/econet/e01.h @@ -23,7 +23,6 @@ #include "machine/mc6854.h" #include "machine/ram.h" #include "machine/wd_fdc.h" -#include "formats/afs_dsk.h" class econet_e01_device : public device_t, public device_econet_interface diff --git a/src/devices/bus/electron/cart/ap34.cpp b/src/devices/bus/electron/cart/ap34.cpp index ecb3b9da30c..ac1188b8f54 100644 --- a/src/devices/bus/electron/cart/ap34.cpp +++ b/src/devices/bus/electron/cart/ap34.cpp @@ -11,10 +11,11 @@ **********************************************************************/ - #include "emu.h" #include "ap34.h" +#include "formats/acorn_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/electron/cart/ap34.h b/src/devices/bus/electron/cart/ap34.h index ac84e7cd58f..4ae651a7e74 100644 --- a/src/devices/bus/electron/cart/ap34.h +++ b/src/devices/bus/electron/cart/ap34.h @@ -14,7 +14,6 @@ #include "slot.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/electron/cart/cumana.cpp b/src/devices/bus/electron/cart/cumana.cpp index 9a81383697d..2452feffc6b 100644 --- a/src/devices/bus/electron/cart/cumana.cpp +++ b/src/devices/bus/electron/cart/cumana.cpp @@ -12,10 +12,11 @@ **********************************************************************/ - #include "emu.h" #include "cumana.h" +#include "formats/acorn_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/electron/cart/cumana.h b/src/devices/bus/electron/cart/cumana.h index daefe938dd4..4717cb57d7b 100644 --- a/src/devices/bus/electron/cart/cumana.h +++ b/src/devices/bus/electron/cart/cumana.h @@ -15,7 +15,6 @@ #include "imagedev/floppy.h" #include "machine/wd_fdc.h" #include "machine/mc146818.h" -#include "formats/acorn_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/electron/cart/peg400.cpp b/src/devices/bus/electron/cart/peg400.cpp index 6e2b27b9d11..82c348cf2f8 100644 --- a/src/devices/bus/electron/cart/peg400.cpp +++ b/src/devices/bus/electron/cart/peg400.cpp @@ -9,10 +9,11 @@ **********************************************************************/ - #include "emu.h" #include "peg400.h" +#include "formats/acorn_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/electron/cart/peg400.h b/src/devices/bus/electron/cart/peg400.h index 0d7542a19df..c2920dc08d7 100644 --- a/src/devices/bus/electron/cart/peg400.h +++ b/src/devices/bus/electron/cart/peg400.h @@ -12,7 +12,6 @@ #include "slot.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/electron/cart/stlefs.cpp b/src/devices/bus/electron/cart/stlefs.cpp index 462ead401d1..3aeb1ddac04 100644 --- a/src/devices/bus/electron/cart/stlefs.cpp +++ b/src/devices/bus/electron/cart/stlefs.cpp @@ -11,10 +11,11 @@ **********************************************************************/ - #include "emu.h" #include "stlefs.h" +#include "formats/acorn_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/electron/cart/stlefs.h b/src/devices/bus/electron/cart/stlefs.h index 2ff8e53ea87..ba99b0f5d62 100644 --- a/src/devices/bus/electron/cart/stlefs.h +++ b/src/devices/bus/electron/cart/stlefs.h @@ -16,7 +16,6 @@ #include "machine/input_merger.h" #include "machine/wd_fdc.h" #include "imagedev/floppy.h" -#include "formats/acorn_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp index 1589bc722b9..2e656fa6ed5 100644 --- a/src/devices/bus/electron/plus3.cpp +++ b/src/devices/bus/electron/plus3.cpp @@ -14,10 +14,11 @@ **********************************************************************/ - #include "emu.h" #include "plus3.h" +#include "formats/acorn_dsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/electron/plus3.h b/src/devices/bus/electron/plus3.h index 2854557675b..88180c6e964 100644 --- a/src/devices/bus/electron/plus3.h +++ b/src/devices/bus/electron/plus3.h @@ -12,7 +12,6 @@ #include "exp.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/acorn_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index cc00db2bbf5..fa96ba01266 100644 --- a/src/devices/bus/ieee488/c2031.cpp +++ b/src/devices/bus/ieee488/c2031.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "c2031.h" +#include "formats/d64_dsk.h" +#include "formats/g64_dsk.h" //************************************************************************** diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp index 8cf6ca58d57..06779fe8ee0 100644 --- a/src/devices/bus/ieee488/c2040.cpp +++ b/src/devices/bus/ieee488/c2040.cpp @@ -50,6 +50,11 @@ #include "emu.h" #include "c2040.h" +#include "formats/c3040_dsk.h" +#include "formats/c4040_dsk.h" +#include "formats/d64_dsk.h" +#include "formats/g64_dsk.h" + //************************************************************************** diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h index bc7d18961bf..cd3b277c82b 100644 --- a/src/devices/bus/ieee488/c2040fdc.h +++ b/src/devices/bus/ieee488/c2040fdc.h @@ -11,10 +11,6 @@ #pragma once -#include "formats/c3040_dsk.h" -#include "formats/c4040_dsk.h" -#include "formats/d64_dsk.h" -#include "formats/g64_dsk.h" #include "imagedev/floppy.h" diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index 08d55f2cbdc..d6ed177c356 100644 --- a/src/devices/bus/ieee488/c8050.cpp +++ b/src/devices/bus/ieee488/c8050.cpp @@ -25,6 +25,9 @@ #include "emu.h" #include "c8050.h" +#include "formats/d80_dsk.h" +#include "formats/d82_dsk.h" + //************************************************************************** diff --git a/src/devices/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h index 2c58bbe55bc..0f1ecfc4918 100644 --- a/src/devices/bus/ieee488/c8050fdc.h +++ b/src/devices/bus/ieee488/c8050fdc.h @@ -11,8 +11,6 @@ #pragma once -#include "formats/d80_dsk.h" -#include "formats/d82_dsk.h" #include "imagedev/floppy.h" #include "machine/fdc_pll.h" diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp index 94f0dc4dca3..4365f15671d 100644 --- a/src/devices/bus/pet/c2n.cpp +++ b/src/devices/bus/pet/c2n.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "c2n.h" +#include "formats/cbm_tap.h" + //************************************************************************** diff --git a/src/devices/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h index 86d8e5df288..d8c741c6b4f 100644 --- a/src/devices/bus/pet/c2n.h +++ b/src/devices/bus/pet/c2n.h @@ -12,7 +12,6 @@ #pragma once #include "cass.h" -#include "formats/cbm_tap.h" #include "imagedev/cassette.h" diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index d3328fbee6c..999faed9108 100644 --- a/src/devices/bus/plus4/c1551.cpp +++ b/src/devices/bus/plus4/c1551.cpp @@ -9,6 +9,9 @@ #include "emu.h" #include "c1551.h" +#include "formats/d64_dsk.h" +#include "formats/g64_dsk.h" + //************************************************************************** diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp index e5a2ae238c9..34b9bb3ac23 100644 --- a/src/devices/bus/sg1000_exp/sk1100.cpp +++ b/src/devices/bus/sg1000_exp/sk1100.cpp @@ -19,6 +19,8 @@ TODO: #include "emu.h" #include "sk1100.h" #include "softlist_dev.h" + +#include "formats/sc3000_bit.h" #include "utf8.h" diff --git a/src/devices/bus/sg1000_exp/sk1100.h b/src/devices/bus/sg1000_exp/sk1100.h index f2e94920e22..edaea0a706d 100644 --- a/src/devices/bus/sg1000_exp/sk1100.h +++ b/src/devices/bus/sg1000_exp/sk1100.h @@ -14,7 +14,6 @@ #include "sg1000exp.h" #include "sk1100prn.h" -#include "formats/sc3000_bit.h" #include "imagedev/cassette.h" #include "machine/i8255.h" diff --git a/src/devices/bus/spectrum/beta.cpp b/src/devices/bus/spectrum/beta.cpp index 00ac6921429..539b1e38161 100644 --- a/src/devices/bus/spectrum/beta.cpp +++ b/src/devices/bus/spectrum/beta.cpp @@ -96,6 +96,8 @@ #include "emu.h" #include "beta.h" +#include "formats/trd_dsk.h" + /*************************************************************************** DEVICE DEFINITIONS diff --git a/src/devices/bus/spectrum/beta.h b/src/devices/bus/spectrum/beta.h index 3f2b21e6c58..3118ab81874 100644 --- a/src/devices/bus/spectrum/beta.h +++ b/src/devices/bus/spectrum/beta.h @@ -15,7 +15,6 @@ #include "machine/wd_fdc.h" #include "machine/i8255.h" #include "machine/6850acia.h" -#include "formats/trd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/spectrum/beta128.cpp b/src/devices/bus/spectrum/beta128.cpp index 5494b2a2fb1..de6726e260f 100644 --- a/src/devices/bus/spectrum/beta128.cpp +++ b/src/devices/bus/spectrum/beta128.cpp @@ -21,6 +21,8 @@ #include "emu.h" #include "beta128.h" +#include "formats/trd_dsk.h" + /*************************************************************************** DEVICE DEFINITIONS diff --git a/src/devices/bus/spectrum/beta128.h b/src/devices/bus/spectrum/beta128.h index 72fa4160d06..ab870aefc35 100644 --- a/src/devices/bus/spectrum/beta128.h +++ b/src/devices/bus/spectrum/beta128.h @@ -12,7 +12,6 @@ #include "softlist.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/trd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/spectrum/floppyone.cpp b/src/devices/bus/spectrum/floppyone.cpp index ee3b49a4e05..9da83fcb015 100644 --- a/src/devices/bus/spectrum/floppyone.cpp +++ b/src/devices/bus/spectrum/floppyone.cpp @@ -33,6 +33,8 @@ #include "emu.h" #include "floppyone.h" +#include "formats/fl1_dsk.h" + /*************************************************************************** DEVICE DEFINITIONS diff --git a/src/devices/bus/spectrum/floppyone.h b/src/devices/bus/spectrum/floppyone.h index c0817a2c457..98820bc2973 100644 --- a/src/devices/bus/spectrum/floppyone.h +++ b/src/devices/bus/spectrum/floppyone.h @@ -10,12 +10,10 @@ #define MAME_BUS_SPECTRUM_FLPONE_H #include "exp.h" -#include "softlist.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" #include "bus/centronics/ctronics.h" #include "bus/rs232/rs232.h" -#include "formats/fl1_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/spectrum/kempdisc.h b/src/devices/bus/spectrum/kempdisc.h index 1df722828dd..5c92c77b818 100644 --- a/src/devices/bus/spectrum/kempdisc.h +++ b/src/devices/bus/spectrum/kempdisc.h @@ -12,7 +12,6 @@ #include "softlist.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/dsk_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/spectrum/mgt.cpp b/src/devices/bus/spectrum/mgt.cpp index 854f711e440..035f82de2b0 100644 --- a/src/devices/bus/spectrum/mgt.cpp +++ b/src/devices/bus/spectrum/mgt.cpp @@ -151,11 +151,12 @@ **********************************************************************/ - #include "emu.h" #include "mgt.h" #include "softlist_dev.h" +#include "formats/coupedsk.h" + //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/bus/spectrum/mgt.h b/src/devices/bus/spectrum/mgt.h index 1bcb3bb8ff9..96227ec240c 100644 --- a/src/devices/bus/spectrum/mgt.h +++ b/src/devices/bus/spectrum/mgt.h @@ -19,7 +19,6 @@ #include "imagedev/floppy.h" #include "machine/wd_fdc.h" #include "bus/centronics/ctronics.h" -#include "formats/coupedsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/spectrum/sixword.cpp b/src/devices/bus/spectrum/sixword.cpp index 5c59d666181..5686f61b1e5 100644 --- a/src/devices/bus/spectrum/sixword.cpp +++ b/src/devices/bus/spectrum/sixword.cpp @@ -45,6 +45,8 @@ #include "emu.h" #include "sixword.h" +#include "formats/swd_dsk.h" + /*************************************************************************** DEVICE DEFINITIONS diff --git a/src/devices/bus/spectrum/sixword.h b/src/devices/bus/spectrum/sixword.h index e842ec25704..e21bcd75e82 100644 --- a/src/devices/bus/spectrum/sixword.h +++ b/src/devices/bus/spectrum/sixword.h @@ -14,7 +14,6 @@ #include "machine/wd_fdc.h" #include "bus/centronics/ctronics.h" #include "bus/rs232/rs232.h" -#include "formats/swd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/spectrum/speccydos.cpp b/src/devices/bus/spectrum/speccydos.cpp index b1ca7d17b40..08440c76f78 100644 --- a/src/devices/bus/spectrum/speccydos.cpp +++ b/src/devices/bus/spectrum/speccydos.cpp @@ -30,6 +30,8 @@ #include "emu.h" #include "speccydos.h" +#include "formats/sdd_dsk.h" + /*************************************************************************** DEVICE DEFINITIONS diff --git a/src/devices/bus/spectrum/speccydos.h b/src/devices/bus/spectrum/speccydos.h index 907c5d776bf..a09d61144c2 100644 --- a/src/devices/bus/spectrum/speccydos.h +++ b/src/devices/bus/spectrum/speccydos.h @@ -12,7 +12,6 @@ #include "softlist.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/sdd_dsk.h" //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/ti99/gromport/cartridges.h b/src/devices/bus/ti99/gromport/cartridges.h index 4b5de4c0be1..952288a7d59 100644 --- a/src/devices/bus/ti99/gromport/cartridges.h +++ b/src/devices/bus/ti99/gromport/cartridges.h @@ -12,13 +12,15 @@ #include "imagedev/cartrom.h" #include "machine/tmc0430.h" -#include "formats/rpk.h" #include "emuopts.h" #include "utilfwd.h" +// declared in formats/rpk.h +class rpk_socket; + namespace bus::ti99::gromport { class ti99_cartridge_pcb; diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp index c12b4ab90cc..43d95a753a3 100644 --- a/src/devices/bus/tvc/hbf.cpp +++ b/src/devices/bus/tvc/hbf.cpp @@ -9,6 +9,8 @@ #include "emu.h" #include "hbf.h" +#include "formats/tvc_dsk.h" + /*************************************************************************** IMPLEMENTATION diff --git a/src/devices/bus/tvc/hbf.h b/src/devices/bus/tvc/hbf.h index b53a3b7520d..463a5209309 100644 --- a/src/devices/bus/tvc/hbf.h +++ b/src/devices/bus/tvc/hbf.h @@ -8,7 +8,6 @@ #include "tvc.h" #include "imagedev/floppy.h" #include "machine/wd_fdc.h" -#include "formats/tvc_dsk.h" //************************************************************************** diff --git a/src/devices/bus/vic10/exp.cpp b/src/devices/bus/vic10/exp.cpp index 2b1f1ecea82..8ad3d88d8ca 100644 --- a/src/devices/bus/vic10/exp.cpp +++ b/src/devices/bus/vic10/exp.cpp @@ -7,9 +7,9 @@ **********************************************************************/ #include "emu.h" -#include "emuopts.h" #include "exp.h" +#include "formats/cbm_crt.h" //************************************************************************** diff --git a/src/devices/bus/vic10/exp.h b/src/devices/bus/vic10/exp.h index d1ae951bbe2..58b6d555718 100644 --- a/src/devices/bus/vic10/exp.h +++ b/src/devices/bus/vic10/exp.h @@ -37,7 +37,6 @@ #pragma once #include "imagedev/cartrom.h" -#include "formats/cbm_crt.h" //************************************************************************** diff --git a/src/devices/machine/64h156.h b/src/devices/machine/64h156.h index 610dd180b80..ed607885db7 100644 --- a/src/devices/machine/64h156.h +++ b/src/devices/machine/64h156.h @@ -60,9 +60,6 @@ #pragma once #include "imagedev/floppy.h" -#include "formats/d64_dsk.h" -#include "formats/g64_dsk.h" -#include "formats/d71_dsk.h" |
