summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/apple2e.cpp
diff options
context:
space:
mode:
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
commit6c23897483a0201dd0b65b450253fd9bf8fb8723 (patch)
tree62a083b4801f63b09bed57ae0c9e8f646aaa3200 /src/mame/drivers/apple2e.cpp
parentb07c572f709e95dcd1e2e4b9d4c696e122f67655 (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/drivers/apple2e.cpp')
-rw-r--r--src/mame/drivers/apple2e.cpp29
1 files changed, 17 insertions, 12 deletions
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index 80d3cc41f95..b00021c6f61 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -97,23 +97,20 @@ Address bus A0-A11 is Y0-Y11
***************************************************************************/
#include "emu.h"
-#include "machine/bankdev.h"
-#include "machine/ram.h"
-#include "machine/kb3600.h"
-#include "sound/speaker.h"
-#include "imagedev/flopdrv.h"
-#include "imagedev/cassette.h"
-#include "formats/ap2_dsk.h"
+#include "video/apple2.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m65c02.h"
-#include "cpu/z80/z80.h"
#include "cpu/mcs48/mcs48.h"
-#include "formats/ap_dsk35.h"
-#include "machine/sonydriv.h"
+#include "cpu/z80/z80.h"
+#include "imagedev/cassette.h"
+#include "imagedev/flopdrv.h"
#include "machine/appldriv.h"
-#include "bus/rs232/rs232.h"
+#include "machine/bankdev.h"
+#include "machine/kb3600.h"
#include "machine/mos6551.h"
-#include "video/apple2.h"
+#include "machine/ram.h"
+#include "machine/sonydriv.h"
#include "bus/a2bus/a2bus.h"
#include "bus/a2bus/a2diskii.h"
@@ -150,7 +147,15 @@ Address bus A0-A11 is Y0-Y11
#include "bus/a2bus/a2eext80col.h"
#include "bus/a2bus/a2eramworks3.h"
+#include "bus/rs232/rs232.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/ap2_dsk.h"
+#include "formats/ap_dsk35.h"
+
#define A2_CPU_TAG "maincpu"
#define A2_KBDC_TAG "ay3600"