summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2013-12-23 11:19:54 +0000
committer smf- <smf-@users.noreply.github.com>2013-12-23 11:19:54 +0000
commit144fcca53525d1692dac160f796c073fd3092f22 (patch)
tree8acf75e626928e9a2b1392b26d7b625de4aac001
parent384846d81c4d0f014523063ce662373daef9a988 (diff)
reduced dependency clutter in c64 expansion port & c128 driver. [smf]
-rw-r--r--src/emu/bus/c64/exp.c67
-rw-r--r--src/emu/bus/c64/exp.h67
-rw-r--r--src/mess/drivers/c128.c3
-rw-r--r--src/mess/includes/c128.h4
4 files changed, 72 insertions, 69 deletions
diff --git a/src/emu/bus/c64/exp.c b/src/emu/bus/c64/exp.c
index 01ca45beba1..ecafa19c361 100644
--- a/src/emu/bus/c64/exp.c
+++ b/src/emu/bus/c64/exp.c
@@ -306,6 +306,73 @@ int c64_expansion_slot_device::exrom_r(offs_t offset, int sphi2, int ba, int rw,
// SLOT_INTERFACE( c64_expansion_cards )
//-------------------------------------------------
+
+// slot devices
+#include "16kb.h"
+#include "c128_comal80.h"
+#include "comal80.h"
+#include "cpm.h"
+#include "currah_speech.h"
+#include "dela_ep256.h"
+#include "dela_ep64.h"
+#include "dela_ep7x8.h"
+#include "dinamic.h"
+#include "dqbb.h"
+#include "easy_calc_result.h"
+#include "easyflash.h"
+#include "epyx_fast_load.h"
+#include "exos.h"
+#include "fcc.h"
+#include "final.h"
+#include "final3.h"
+#include "fun_play.h"
+#include "georam.h"
+#include "ide64.h"
+#include "ieee488.h"
+#include "kingsoft.h"
+#include "mach5.h"
+#include "magic_desk.h"
+#include "magic_formel.h"
+#include "magic_voice.h"
+#include "midi_maplin.h"
+#include "midi_namesoft.h"
+#include "midi_passport.h"
+#include "midi_sci.h"
+#include "midi_siel.h"
+#include "mikro_assembler.h"
+#include "multiscreen.h"
+#include "music64.h"
+#include "neoram.h"
+#include "ocean.h"
+#include "pagefox.h"
+#include "partner.h"
+#include "prophet64.h"
+#include "ps64.h"
+#include "reu.h"
+#include "rex.h"
+#include "rex_ep256.h"
+#include "ross.h"
+#include "sfx_sound_expander.h"
+#include "silverrock.h"
+#include "simons_basic.h"
+#include "stardos.h"
+#include "std.h"
+#include "structured_basic.h"
+#include "super_explode.h"
+#include "super_games.h"
+#include "supercpu.h"
+#include "sw8k.h"
+#include "swiftlink.h"
+#include "system3.h"
+#include "tdos.h"
+#include "turbo232.h"
+#include "vizastar.h"
+#include "vw64.h"
+#include "warp_speed.h"
+#include "westermann.h"
+#include "xl80.h"
+#include "zaxxon.h"
+
SLOT_INTERFACE_START( c64_expansion_cards )
SLOT_INTERFACE("16k", C64_16KB)
SLOT_INTERFACE("cpm", C64_CPM)
diff --git a/src/emu/bus/c64/exp.h b/src/emu/bus/c64/exp.h
index d1cb258fa55..6f2c199c3be 100644
--- a/src/emu/bus/c64/exp.h
+++ b/src/emu/bus/c64/exp.h
@@ -187,73 +187,6 @@ protected:
// device type definition
extern const device_type C64_EXPANSION_SLOT;
-
-// slot devices
-#include "16kb.h"
-#include "c128_comal80.h"
-#include "comal80.h"
-#include "cpm.h"
-#include "currah_speech.h"
-#include "dela_ep256.h"
-#include "dela_ep64.h"
-#include "dela_ep7x8.h"
-#include "dinamic.h"
-#include "dqbb.h"
-#include "easy_calc_result.h"
-#include "easyflash.h"
-#include "epyx_fast_load.h"
-#include "exos.h"
-#include "fcc.h"
-#include "final.h"
-#include "final3.h"
-#include "fun_play.h"
-#include "georam.h"
-#include "ide64.h"
-#include "ieee488.h"
-#include "kingsoft.h"
-#include "mach5.h"
-#include "magic_desk.h"
-#include "magic_formel.h"
-#include "magic_voice.h"
-#include "midi_maplin.h"
-#include "midi_namesoft.h"
-#include "midi_passport.h"
-#include "midi_sci.h"
-#include "midi_siel.h"
-#include "mikro_assembler.h"
-#include "multiscreen.h"
-#include "music64.h"
-#include "neoram.h"
-#include "ocean.h"
-#include "pagefox.h"
-#include "partner.h"
-#include "prophet64.h"
-#include "ps64.h"
-#include "reu.h"
-#include "rex.h"
-#include "rex_ep256.h"
-#include "ross.h"
-#include "sfx_sound_expander.h"
-#include "silverrock.h"
-#include "simons_basic.h"
-#include "stardos.h"
-#include "std.h"
-#include "structured_basic.h"
-#include "super_explode.h"
-#include "super_games.h"
-#include "supercpu.h"
-#include "sw8k.h"
-#include "swiftlink.h"
-#include "system3.h"
-#include "tdos.h"
-#include "turbo232.h"
-#include "vizastar.h"
-#include "vw64.h"
-#include "warp_speed.h"
-#include "westermann.h"
-#include "xl80.h"
-#include "zaxxon.h"
-
SLOT_INTERFACE_EXTERN( c64_expansion_cards );
diff --git a/src/mess/drivers/c128.c b/src/mess/drivers/c128.c
index d894dfd8958..0bc7d9f4760 100644
--- a/src/mess/drivers/c128.c
+++ b/src/mess/drivers/c128.c
@@ -9,6 +9,9 @@
*/
#include "includes/c128.h"
+#include "machine/cbm_snqk.h"
+#include "imagedev/cartslot.h"
+#include "sound/dac.h"
diff --git a/src/mess/includes/c128.h b/src/mess/includes/c128.h
index d4bf28533d2..ed3456bc8e6 100644
--- a/src/mess/includes/c128.h
+++ b/src/mess/includes/c128.h
@@ -11,14 +11,14 @@
#include "bus/c64/user.h"
#include "bus/pet/cass.h"
#include "bus/vcs/ctrl.h"
-#include "machine/cbm_snqk.h"
+#include "imagedev/snapquik.h"
#include "cpu/m6502/m8502.h"
#include "machine/mos6526.h"
#include "machine/mos8722.h"
#include "machine/pla.h"
#include "machine/ram.h"
-#include "sound/dac.h"
#include "sound/mos6581.h"
+#include "video/mc6845.h"
#include "video/mos6566.h"
#define Z80A_TAG "u10"