summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2022-06-25 12:29:51 +1000
committer Vas Crabb <vas@vastheman.com>2022-06-25 12:29:51 +1000
commit3309f14bc4889701459d96e1f1600d9d1da78cca (patch)
treebad54890d47446dbda9ca4bd5a91909bc9ba23c2 /src/mame/drivers
parent6c7679ec33e584c1b095db28fd145a5feb5eb0a5 (diff)
Fix up includes
Diffstat (limited to 'src/mame/drivers')
-rw-r--r--src/mame/drivers/apple2.cpp18
-rw-r--r--src/mame/drivers/apple2gs.cpp35
2 files changed, 28 insertions, 25 deletions
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index cd6f796b566..84a7a10bff0 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -41,27 +41,29 @@ II Plus: RAM options reduced to 16/32/48 KB.
#include "emu.h"
#include "video/apple2.h"
-#include "cpu/m6502/m6502.h"
+#include "machine/apple2common.h"
+#include "bus/a2bus/a2bus.h"
+#include "bus/a2bus/cards.h"
+#include "bus/a2gameio/gameio.h"
+#include "cpu/m6502/m6502.h"
#include "imagedev/cassette.h"
-
#include "machine/74259.h"
#include "machine/kb3600.h"
#include "machine/ram.h"
#include "machine/timer.h"
-#include "machine/apple2common.h"
#include "sound/spkrdev.h"
-#include "bus/a2bus/cards.h"
-#include "bus/a2gameio/gameio.h"
-
#include "screen.h"
#include "softlist_dev.h"
#include "speaker.h"
#include "formats/ap2_dsk.h"
+
+namespace {
+
#define A2_CPU_TAG "maincpu"
#define A2_KBDC_TAG "ay3600"
#define A2_SPEAKER_TAG "speaker"
@@ -162,7 +164,7 @@ public:
void apple2jp(machine_config &config);
void apple2(machine_config &config);
void space84(machine_config &config);
- void dodo(machine_config &config);
+ [[maybe_unused]] void dodo(machine_config &config);
void albert(machine_config &config);
void ivelultr(machine_config &config);
void apple2p(machine_config &config);
@@ -1713,6 +1715,8 @@ ROM_START(dodo)
ROM_LOAD( "dodo2732.bin", 0x3000, 0x1000, CRC(405cdb0c) SHA1(3ed133eb94ee33194c668c4ee3f67885dd489d13) )
ROM_END
+} // anonymous namespace
+
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME
COMP( 1977, apple2, 0, 0, apple2, apple2, apple2_state, empty_init, "Apple Computer", "Apple ][", MACHINE_SUPPORTS_SAVE )
COMP( 1979, apple2p, apple2, 0, apple2p, apple2p, apple2_state, empty_init, "Apple Computer", "Apple ][+", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp
index 5665e3aa772..5eccee8e7a1 100644
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@@ -55,36 +55,35 @@
#define ADB_HLE (0) // connect the ADB microcontroller to the macadb.cpp ADB bit-serial keyboard+mouse
#define LOG_ADB (0) // log ADB activity in the old-style HLE simulation of the microcontroller and GLU
-#include "screen.h"
-#include "softlist_dev.h"
-#include "speaker.h"
+#include "machine/apple2common.h"
+//#include "machine/apple2host.h"
+#include "machine/macadb.h"
+#include "bus/a2bus/a2bus.h"
+#include "bus/a2bus/cards.h"
+#include "bus/a2gameio/gameio.h"
+#include "bus/rs232/rs232.h"
#include "cpu/g65816/g65816.h"
#include "cpu/m6502/m5074x.h"
-#include "sound/spkrdev.h"
-#include "sound/es5503.h"
#include "machine/bankdev.h"
-#include "machine/timer.h"
-#include "machine/z80scc.h"
-#include "machine/ram.h"
#include "machine/kb3600.h"
#include "machine/nvram.h"
-#include "machine/macadb.h"
+#include "machine/ram.h"
+#include "machine/timer.h"
+#include "machine/z80scc.h"
+#include "sound/es5503.h"
+#include "sound/spkrdev.h"
#include "machine/applefdintf.h"
#include "machine/iwm.h"
-#include "formats/ap2_dsk.h"
-#include "formats/ap_dsk35.h"
-#include "bus/rs232/rs232.h"
+#include "screen.h"
+#include "softlist_dev.h"
+#include "speaker.h"
-#include "emu.h"
-#include "video/apple2.h"
-#include "machine/apple2common.h"
-//#include "machine/apple2host.h"
+#include "formats/ap_dsk35.h"
+#include "formats/ap2_dsk.h"
-#include "bus/a2bus/cards.h"
-#include "bus/a2gameio/gameio.h"
namespace {