summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Curt Coder <curtcoder@mail.com>2013-10-22 15:44:27 +0000
committer Curt Coder <curtcoder@mail.com>2013-10-22 15:44:27 +0000
commit0b91c21b366be4d0c1bcabdbe74e6b9d82a62271 (patch)
tree1804ed0b9de916825d5fc7e1387d33aac256f4c0 /src
parent47c548e760b6c4447f7b15e7d403060d0051b994 (diff)
(MESS) Moved a bunch of buses under emu/bus. (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/bus/abc1600/abc1600.c (renamed from src/mess/machine/abc1600_bus.c)13
-rw-r--r--src/emu/bus/abc1600/abc1600.h (renamed from src/mess/machine/abc1600_bus.h)6
-rw-r--r--src/emu/bus/abc1600/lux4105.c (renamed from src/mess/machine/lux4105.c)0
-rw-r--r--src/emu/bus/abc1600/lux4105.h (renamed from src/mess/machine/lux4105.h)2
-rw-r--r--src/emu/bus/adam/adamlink.c (renamed from src/mess/machine/adamlink.c)0
-rw-r--r--src/emu/bus/adam/adamlink.h (renamed from src/mess/machine/adamlink.h)2
-rw-r--r--src/emu/bus/adam/exp.c (renamed from src/mess/machine/adamexp.c)2
-rw-r--r--src/emu/bus/adam/exp.h (renamed from src/mess/machine/adamexp.h)6
-rw-r--r--src/emu/bus/adam/ide.c (renamed from src/mess/machine/adam_ide.c)2
-rw-r--r--src/emu/bus/adam/ide.h (renamed from src/mess/machine/adam_ide.h)2
-rw-r--r--src/emu/bus/adam/ram.c (renamed from src/mess/machine/adam_ram.c)2
-rw-r--r--src/emu/bus/adam/ram.h (renamed from src/mess/machine/adam_ram.h)2
-rw-r--r--src/emu/bus/bus.mak177
-rw-r--r--src/emu/bus/bw2/exp.c (renamed from src/mess/machine/bw2exp.c)2
-rw-r--r--src/emu/bus/bw2/exp.h (renamed from src/mess/machine/bw2exp.h)2
-rw-r--r--src/emu/bus/bw2/ramcard.c (renamed from src/mess/machine/bw2_ramcard.c)2
-rw-r--r--src/emu/bus/bw2/ramcard.h (renamed from src/mess/machine/bw2_ramcard.h)2
-rw-r--r--src/emu/bus/c64/cbm_crt.c (renamed from src/mess/machine/cbm_crt.c)6
-rw-r--r--src/emu/bus/c64/exp.h2
-rw-r--r--src/emu/bus/cbm2/24k.c (renamed from src/mess/machine/cbm2_24k.c)2
-rw-r--r--src/emu/bus/cbm2/24k.h (renamed from src/mess/machine/cbm2_24k.h)3
-rw-r--r--src/emu/bus/cbm2/exp.c (renamed from src/mess/machine/cbm2exp.c)2
-rw-r--r--src/emu/bus/cbm2/exp.h (renamed from src/mess/machine/cbm2exp.h)6
-rw-r--r--src/emu/bus/cbm2/hrg.c (renamed from src/mess/machine/cbm2_graphic.c)2
-rw-r--r--src/emu/bus/cbm2/hrg.h (renamed from src/mess/machine/cbm2_graphic.h)3
-rw-r--r--src/emu/bus/cbm2/std.c (renamed from src/mess/machine/cbm2_std.c)2
-rw-r--r--src/emu/bus/cbm2/std.h (renamed from src/mess/machine/cbm2_std.h)3
-rw-r--r--src/emu/bus/cbm2/user.c (renamed from src/mess/machine/cbm2user.c)2
-rw-r--r--src/emu/bus/cbm2/user.h (renamed from src/mess/machine/cbm2user.h)0
-rw-r--r--src/emu/bus/ecbbus/ecbbus.c (renamed from src/mess/machine/ecbbus.c)14
-rw-r--r--src/emu/bus/ecbbus/ecbbus.h (renamed from src/mess/machine/ecbbus.h)8
-rw-r--r--src/emu/bus/ecbbus/grip.c (renamed from src/mess/machine/ecb_grip.c)2
-rw-r--r--src/emu/bus/ecbbus/grip.h (renamed from src/mess/machine/ecb_grip.h)3
-rw-r--r--src/emu/bus/econet/e01.c (renamed from src/mess/machine/e01.c)0
-rw-r--r--src/emu/bus/econet/e01.h (renamed from src/mess/machine/e01.h)2
-rw-r--r--src/emu/bus/econet/econet.c (renamed from src/mess/machine/econet.c)10
-rw-r--r--src/emu/bus/econet/econet.h (renamed from src/mess/machine/econet.h)6
-rw-r--r--src/emu/bus/ep64/exdos.c (renamed from src/mess/machine/ep64_exdos.c)2
-rw-r--r--src/emu/bus/ep64/exdos.h (renamed from src/mess/machine/ep64_exdos.h)2
-rw-r--r--src/emu/bus/ep64/exp.c (renamed from src/mess/machine/ep64exp.c)2
-rw-r--r--src/emu/bus/ep64/exp.h (renamed from src/mess/machine/ep64exp.h)2
-rw-r--r--src/emu/bus/pet/64k.c (renamed from src/mess/machine/pet_64k.c)2
-rw-r--r--src/emu/bus/pet/64k.h (renamed from src/mess/machine/pet_64k.h)2
-rw-r--r--src/emu/bus/pet/c2n.c (renamed from src/mess/machine/c2n.c)0
-rw-r--r--src/emu/bus/pet/c2n.h (renamed from src/mess/machine/c2n.h)2
-rw-r--r--src/emu/bus/pet/cass.c (renamed from src/mess/machine/petcass.c)2
-rw-r--r--src/emu/bus/pet/cass.h (renamed from src/mess/machine/petcass.h)4
-rw-r--r--src/emu/bus/pet/diag264_lb_tape.c (renamed from src/mess/machine/diag264_lb_tape.c)0
-rw-r--r--src/emu/bus/pet/diag264_lb_tape.h (renamed from src/mess/machine/diag264_lb_tape.h)3
-rw-r--r--src/emu/bus/pet/exp.c (renamed from src/mess/machine/petexp.c)2
-rw-r--r--src/emu/bus/pet/exp.h (renamed from src/mess/machine/petexp.h)4
-rw-r--r--src/emu/bus/pet/superpet.c (renamed from src/mess/machine/superpet.c)0
-rw-r--r--src/emu/bus/pet/superpet.h (renamed from src/mess/machine/superpet.h)3
-rw-r--r--src/emu/bus/pet/user.c (renamed from src/mess/machine/petuser.c)2
-rw-r--r--src/emu/bus/pet/user.h (renamed from src/mess/machine/petuser.h)0
-rw-r--r--src/emu/bus/plus4/c1551.c (renamed from src/mess/machine/c1551.c)0
-rw-r--r--src/emu/bus/plus4/c1551.h (renamed from src/mess/machine/c1551.h)2
-rw-r--r--src/emu/bus/plus4/diag264_lb_user.c (renamed from src/mess/machine/diag264_lb_user.c)0
-rw-r--r--src/emu/bus/plus4/diag264_lb_user.h (renamed from src/mess/machine/diag264_lb_user.h)3
-rw-r--r--src/emu/bus/plus4/exp.c (renamed from src/mess/machine/plus4exp.c)2
-rw-r--r--src/emu/bus/plus4/exp.h (renamed from src/mess/machine/plus4exp.h)6
-rw-r--r--src/emu/bus/plus4/sid.c (renamed from src/mess/machine/plus4_sid.c)2
-rw-r--r--src/emu/bus/plus4/sid.h (renamed from src/mess/machine/plus4_sid.h)5
-rw-r--r--src/emu/bus/plus4/std.c (renamed from src/mess/machine/plus4_std.c)2
-rw-r--r--src/emu/bus/plus4/std.h (renamed from src/mess/machine/plus4_std.h)3
-rw-r--r--src/emu/bus/plus4/user.c (renamed from src/mess/machine/plus4user.c)2
-rw-r--r--src/emu/bus/plus4/user.h (renamed from src/mess/machine/plus4user.h)2
-rw-r--r--src/emu/bus/vcs/ctrl.c (renamed from src/mess/machine/vcsctrl.c)2
-rw-r--r--src/emu/bus/vcs/ctrl.h (renamed from src/mess/machine/vcsctrl.h)12
-rw-r--r--src/emu/bus/vcs/joybooster.c (renamed from src/mess/machine/vcs_joybooster.c)2
-rw-r--r--src/emu/bus/vcs/joybooster.h (renamed from src/mess/machine/vcs_joybooster.h)3
-rw-r--r--src/emu/bus/vcs/joystick.c (renamed from src/mess/machine/vcs_joy.c)2
-rw-r--r--src/emu/bus/vcs/joystick.h (renamed from src/mess/machine/vcs_joy.h)3
-rw-r--r--src/emu/bus/vcs/keypad.c (renamed from src/mess/machine/vcs_keypad.c)2
-rw-r--r--src/emu/bus/vcs/keypad.h (renamed from src/mess/machine/vcs_keypad.h)3
-rw-r--r--src/emu/bus/vcs/lightpen.c (renamed from src/mess/machine/vcs_lightpen.c)2
-rw-r--r--src/emu/bus/vcs/lightpen.h (renamed from src/mess/machine/vcs_lightpen.h)3
-rw-r--r--src/emu/bus/vcs/paddles.c (renamed from src/mess/machine/vcs_paddles.c)2
-rw-r--r--src/emu/bus/vcs/paddles.h (renamed from src/mess/machine/vcs_paddles.h)3
-rw-r--r--src/emu/bus/vcs/wheel.c (renamed from src/mess/machine/vcs_wheel.c)2
-rw-r--r--src/emu/bus/vcs/wheel.h (renamed from src/mess/machine/vcs_wheel.h)3
-rw-r--r--src/emu/bus/vic10/exp.c (renamed from src/mess/machine/vic10exp.c)4
-rw-r--r--src/emu/bus/vic10/exp.h (renamed from src/mess/machine/vic10exp.h)4
-rw-r--r--src/emu/bus/vic10/std.c (renamed from src/mess/machine/vic10std.c)2
-rw-r--r--src/emu/bus/vic10/std.h (renamed from src/mess/machine/vic10std.h)3
-rw-r--r--src/emu/bus/vic20/exp.c (renamed from src/mess/machine/vic20exp.c)4
-rw-r--r--src/emu/bus/vic20/exp.h (renamed from src/mess/machine/vic20exp.h)14
-rw-r--r--src/emu/bus/vic20/megacart.c (renamed from src/mess/machine/vic20_megacart.c)2
-rw-r--r--src/emu/bus/vic20/megacart.h (renamed from src/mess/machine/vic20_megacart.h)3
-rw-r--r--src/emu/bus/vic20/std.c (renamed from src/mess/machine/vic20std.c)2
-rw-r--r--src/emu/bus/vic20/std.h (renamed from src/mess/machine/vic20std.h)3
-rw-r--r--src/emu/bus/vic20/user.c (renamed from src/mess/machine/vic20user.c)2
-rw-r--r--src/emu/bus/vic20/user.h (renamed from src/mess/machine/vic20user.h)2
-rw-r--r--src/emu/bus/vic20/vic1010.c (renamed from src/mess/machine/vic1010.c)0
-rw-r--r--src/emu/bus/vic20/vic1010.h (renamed from src/mess/machine/vic1010.h)3
-rw-r--r--src/emu/bus/vic20/vic1011.c (renamed from src/mess/machine/vic1011.c)0
-rw-r--r--src/emu/bus/vic20/vic1011.h (renamed from src/mess/machine/vic1011.h)2
-rw-r--r--src/emu/bus/vic20/vic1110.c (renamed from src/mess/machine/vic1110.c)0
-rw-r--r--src/emu/bus/vic20/vic1110.h (renamed from src/mess/machine/vic1110.h)3
-rw-r--r--src/emu/bus/vic20/vic1111.c (renamed from src/mess/machine/vic1111.c)0
-rw-r--r--src/emu/bus/vic20/vic1111.h (renamed from src/mess/machine/vic1111.h)3
-rw-r--r--src/emu/bus/vic20/vic1112.c (renamed from src/mess/machine/vic1112.c)0
-rw-r--r--src/emu/bus/vic20/vic1112.h (renamed from src/mess/machine/vic1112.h)2
-rw-r--r--src/emu/bus/vic20/vic1210.c (renamed from src/mess/machine/vic1210.c)0
-rw-r--r--src/emu/bus/vic20/vic1210.h (renamed from src/mess/machine/vic1210.h)3
-rw-r--r--src/emu/bus/vidbrain/exp.c (renamed from src/mess/machine/vidbrain_exp.c)13
-rw-r--r--src/emu/bus/vidbrain/exp.h (renamed from src/mess/machine/vidbrain_exp.h)8
-rw-r--r--src/emu/bus/vidbrain/money_minder.c (renamed from src/mess/machine/vb_money_minder.c)2
-rw-r--r--src/emu/bus/vidbrain/money_minder.h (renamed from src/mess/machine/vb_money_minder.h)3
-rw-r--r--src/emu/bus/vidbrain/std.c (renamed from src/mess/machine/vb_std.c)2
-rw-r--r--src/emu/bus/vidbrain/std.h (renamed from src/mess/machine/vb_std.h)3
-rw-r--r--src/emu/bus/vidbrain/timeshare.c (renamed from src/mess/machine/vb_timeshare.c)2
-rw-r--r--src/emu/bus/vidbrain/timeshare.h (renamed from src/mess/machine/vb_timeshare.h)3
-rw-r--r--src/emu/emu.mak13
-rw-r--r--src/emu/machine/64h156.c (renamed from src/mess/machine/64h156.c)0
-rw-r--r--src/emu/machine/64h156.h (renamed from src/mess/machine/64h156.h)0
-rw-r--r--src/emu/machine/machine.mak36
-rw-r--r--src/emu/machine/mos6702.c (renamed from src/mess/machine/mos6702.c)0
-rw-r--r--src/emu/machine/mos6702.h (renamed from src/mess/machine/mos6702.h)0
-rw-r--r--src/emu/machine/mos8706.c (renamed from src/mess/machine/mos8706.c)0
-rw-r--r--src/emu/machine/mos8706.h (renamed from src/mess/machine/mos8706.h)0
-rw-r--r--src/emu/machine/mos8722.c (renamed from src/mess/machine/mos8722.c)0
-rw-r--r--src/emu/machine/mos8722.h (renamed from src/mess/machine/mos8722.h)0
-rw-r--r--src/lib/formats/cbm_crt.c196
-rw-r--r--src/lib/formats/cbm_crt.h (renamed from src/mess/machine/cbm_crt.h)15
-rw-r--r--src/lib/lib.mak1
-rw-r--r--src/mess/drivers/a2600.c2
-rw-r--r--src/mess/drivers/abc1600.c6
-rw-r--r--src/mess/drivers/bbc.c8
-rw-r--r--src/mess/drivers/prof80.c19
-rw-r--r--src/mess/drivers/vidbrain.c8
-rw-r--r--src/mess/includes/abc1600.h3
-rw-r--r--src/mess/includes/adam.h2
-rw-r--r--src/mess/includes/bw2.h2
-rw-r--r--src/mess/includes/c128.h4
-rw-r--r--src/mess/includes/c64.h4
-rw-r--r--src/mess/includes/cbm2.h8
-rw-r--r--src/mess/includes/ep64.h2
-rw-r--r--src/mess/includes/pet.h6
-rw-r--r--src/mess/includes/plus4.h9
-rw-r--r--src/mess/includes/prof80.h4
-rw-r--r--src/mess/includes/vic10.h6
-rw-r--r--src/mess/includes/vic20.h8
-rw-r--r--src/mess/includes/vidbrain.h5
-rw-r--r--src/mess/mess.mak119
145 files changed, 687 insertions, 305 deletions
diff --git a/src/mess/machine/abc1600_bus.c b/src/emu/bus/abc1600/abc1600.c
index 3248a885252..585402548de 100644
--- a/src/mess/machine/abc1600_bus.c
+++ b/src/emu/bus/abc1600/abc1600.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "abc1600_bus.h"
+#include "abc1600.h"
@@ -564,3 +564,14 @@ READ_LINE_MEMBER( abc1600bus_slot_device::xint5_r )
{
return m_xint5;
}
+
+
+//-------------------------------------------------
+// SLOT_INTERFAC( abc1600bus_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( abc1600bus_cards )
+ SLOT_INTERFACE("4105", LUXOR_4105) // SASI interface
+// SLOT_INTERFACE("4077", LUXOR_4077) // Winchester controller
+// SLOT_INTERFACE("4004", LUXOR_4004) // ICOM I/O (Z80, Z80PIO, Z80SIO/2, Z80CTC, 2 Z80DMAs, 2 PROMs, 64KB RAM)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/abc1600_bus.h b/src/emu/bus/abc1600/abc1600.h
index 803a5534924..df73977ea4b 100644
--- a/src/mess/machine/abc1600_bus.h
+++ b/src/emu/bus/abc1600/abc1600.h
@@ -218,5 +218,11 @@ private:
extern const device_type ABC1600BUS_SLOT;
+// slot devices
+#include "lux4105.h"
+
+SLOT_INTERFACE_EXTERN( abc1600bus_cards );
+
+
#endif
diff --git a/src/mess/machine/lux4105.c b/src/emu/bus/abc1600/lux4105.c
index f145f1de806..f145f1de806 100644
--- a/src/mess/machine/lux4105.c
+++ b/src/emu/bus/abc1600/lux4105.c
diff --git a/src/mess/machine/lux4105.h b/src/emu/bus/abc1600/lux4105.h
index 45241636f6b..61a945525f1 100644
--- a/src/mess/machine/lux4105.h
+++ b/src/emu/bus/abc1600/lux4105.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "abc1600_bus.h"
+#include "abc1600.h"
#include "machine/scsicb.h"
diff --git a/src/mess/machine/adamlink.c b/src/emu/bus/adam/adamlink.c
index a3fd6e1407b..a3fd6e1407b 100644
--- a/src/mess/machine/adamlink.c
+++ b/src/emu/bus/adam/adamlink.c
diff --git a/src/mess/machine/adamlink.h b/src/emu/bus/adam/adamlink.h
index 14372fc8ec9..c06fcb82e57 100644
--- a/src/mess/machine/adamlink.h
+++ b/src/emu/bus/adam/adamlink.h
@@ -15,7 +15,7 @@
#define __ADAMLINK__
#include "emu.h"
-#include "machine/adamexp.h"
+#include "exp.h"
diff --git a/src/mess/machine/adamexp.c b/src/emu/bus/adam/exp.c
index 946f4aa570e..a092c30edc4 100644
--- a/src/mess/machine/adamexp.c
+++ b/src/emu/bus/adam/exp.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/adamexp.h"
+#include "exp.h"
diff --git a/src/mess/machine/adamexp.h b/src/emu/bus/adam/exp.h
index 3bb18c72aea..42bb1f230a5 100644
--- a/src/mess/machine/adamexp.h
+++ b/src/emu/bus/adam/exp.h
@@ -141,9 +141,9 @@ extern const device_type ADAM_EXPANSION_SLOT;
// slot devices
-#include "machine/adamlink.h"
-#include "machine/adam_ide.h"
-#include "machine/adam_ram.h"
+#include "adamlink.h"
+#include "ide.h"
+#include "ram.h"
SLOT_INTERFACE_EXTERN( adam_slot1_devices );
SLOT_INTERFACE_EXTERN( adam_slot2_devices );
diff --git a/src/mess/machine/adam_ide.c b/src/emu/bus/adam/ide.c
index 83cc1fb6596..bc15a7bbc3c 100644
--- a/src/mess/machine/adam_ide.c
+++ b/src/emu/bus/adam/ide.c
@@ -19,7 +19,7 @@
*/
-#include "adam_ide.h"
+#include "ide.h"
diff --git a/src/mess/machine/adam_ide.h b/src/emu/bus/adam/ide.h
index 7d32df483b4..11950249301 100644
--- a/src/mess/machine/adam_ide.h
+++ b/src/emu/bus/adam/ide.h
@@ -15,7 +15,7 @@
#define __ADAM_IDE__
#include "emu.h"
-#include "machine/adamexp.h"
+#include "exp.h"
#include "machine/ctronics.h"
#include "machine/ataintf.h"
diff --git a/src/mess/machine/adam_ram.c b/src/emu/bus/adam/ram.c
index 536478c8a9b..8c51fb2f7ac 100644
--- a/src/mess/machine/adam_ram.c
+++ b/src/emu/bus/adam/ram.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "adam_ram.h"
+#include "ram.h"
diff --git a/src/mess/machine/adam_ram.h b/src/emu/bus/adam/ram.h
index 3f359cb6740..96c8d53d941 100644
--- a/src/mess/machine/adam_ram.h
+++ b/src/emu/bus/adam/ram.h
@@ -15,7 +15,7 @@
#define __ADAM_RAM__
#include "emu.h"
-#include "machine/adamexp.h"
+#include "exp.h"
diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak
index 192a0685def..eb28955810a 100644
--- a/src/emu/bus/bus.mak
+++ b/src/emu/bus/bus.mak
@@ -16,6 +16,17 @@ BUSOBJ = $(EMUOBJ)/bus
#-------------------------------------------------
#
+#@src/emu/bus/abc1600/abc1600.h,BUSES += ABC1600
+#-------------------------------------------------
+
+ifneq ($(filter ABC1600,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/abc1600/abc1600.o
+BUSOBJS += $(BUSOBJ)/abc1600/lux4105.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/abcbus/abcbus.h,BUSES += ABCBUS
#-------------------------------------------------
@@ -37,6 +48,19 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/adam/exp.h,BUSES += ADAM
+#-------------------------------------------------
+
+ifneq ($(filter ADAM,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/adam/exp.o
+BUSOBJS += $(BUSOBJ)/adam/adamlink.o
+BUSOBJS += $(BUSOBJ)/adam/ide.o
+BUSOBJS += $(BUSOBJ)/adam/ram.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/adamnet/adamnet.h,BUSES += ADAMNET
#-------------------------------------------------
@@ -52,6 +76,17 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/bw2/exp.h,BUSES += BW2
+#-------------------------------------------------
+
+ifneq ($(filter BW2,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/bw2/exp.o
+BUSOBJS += $(BUSOBJ)/bw2/ramcard.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/c64/exp.h,BUSES += C64
#@src/emu/bus/c64/user.h,BUSES += C64
#-------------------------------------------------
@@ -135,6 +170,21 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/cbm2/exp.h,BUSES += CBM2
+#@src/emu/bus/cbm2/user.h,BUSES += CBM2
+#-------------------------------------------------
+
+ifneq ($(filter CBM2,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/cbm2/exp.o
+BUSOBJS += $(BUSOBJ)/cbm2/24k.o
+BUSOBJS += $(BUSOBJ)/cbm2/hrg.o
+BUSOBJS += $(BUSOBJ)/cbm2/std.o
+BUSOBJS += $(BUSOBJ)/cbm2/user.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/cbmiec/cbmiec.h,BUSES += CBMIEC
#-------------------------------------------------
@@ -172,6 +222,39 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/ecbbus/ecbbus.h,BUSES += ECBBUS
+#-------------------------------------------------
+
+ifneq ($(filter ECBBUS,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/ecbbus/ecbbus.o
+BUSOBJS += $(BUSOBJ)/ecbbus/grip.o
+endif
+
+
+#-------------------------------------------------
+#
+#@src/emu/bus/econet/econet.h,BUSES += ECONET
+#-------------------------------------------------
+
+ifneq ($(filter ECONET,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/econet/econet.o
+BUSOBJS += $(BUSOBJ)/econet/e01.o
+endif
+
+
+#-------------------------------------------------
+#
+#@src/emu/bus/ep64/exp.h,BUSES += EP64
+#-------------------------------------------------
+
+ifneq ($(filter EP64,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/ep64/exp.o
+BUSOBJS += $(BUSOBJ)/ep64/exdos.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/ieee488/ieee488.h,BUSES += IEEE488
#-------------------------------------------------
@@ -201,6 +284,40 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/pet/cass.h,BUSES += PET
+#@src/emu/bus/pet/exp.h,BUSES += PET
+#@src/emu/bus/pet/user.h,BUSES += PET
+#-------------------------------------------------
+
+ifneq ($(filter PET,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/pet/cass.o
+BUSOBJS += $(BUSOBJ)/pet/c2n.o
+BUSOBJS += $(BUSOBJ)/pet/diag264_lb_tape.o
+BUSOBJS += $(BUSOBJ)/pet/exp.o
+BUSOBJS += $(BUSOBJ)/pet/64k.o
+BUSOBJS += $(BUSOBJ)/pet/superpet.o
+BUSOBJS += $(BUSOBJ)/pet/user.o
+endif
+
+
+#-------------------------------------------------
+#
+#@src/emu/bus/plus4/exp.h,BUSES += PLUS4
+#@src/emu/bus/plus4/user.h,BUSES += PLUS4
+#-------------------------------------------------
+
+ifneq ($(filter PLUS4,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/plus4/exp.o
+BUSOBJS += $(BUSOBJ)/plus4/c1551.o
+BUSOBJS += $(BUSOBJ)/plus4/sid.o
+BUSOBJS += $(BUSOBJ)/plus4/std.o
+BUSOBJS += $(BUSOBJ)/plus4/user.o
+BUSOBJS += $(BUSOBJ)/plus4/diag264_lb_user.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/s100/s100.h,BUSES += S100
#-------------------------------------------------
@@ -217,6 +334,66 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/vcs/ctrl.h,BUSES += VCS
+#-------------------------------------------------
+
+ifneq ($(filter VCS,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/vcs/ctrl.o
+BUSOBJS += $(BUSOBJ)/vcs/joystick.o
+BUSOBJS += $(BUSOBJ)/vcs/joybooster.o
+BUSOBJS += $(BUSOBJ)/vcs/keypad.o
+BUSOBJS += $(BUSOBJ)/vcs/lightpen.o
+BUSOBJS += $(BUSOBJ)/vcs/paddles.o
+BUSOBJS += $(BUSOBJ)/vcs/wheel.o
+endif
+
+
+#-------------------------------------------------
+#
+#@src/emu/bus/vic10/exp.h,BUSES += VIC10
+#-------------------------------------------------
+
+ifneq ($(filter VIC10,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/vic10/exp.o
+BUSOBJS += $(BUSOBJ)/vic10/std.o
+endif
+
+
+#-------------------------------------------------
+#
+#@src/emu/bus/vic20/exp.h,BUSES += VIC20
+#@src/emu/bus/vic20/user.h,BUSES += VIC20
+#-------------------------------------------------
+
+ifneq ($(filter VIC20,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/vic20/exp.o
+BUSOBJS += $(BUSOBJ)/vic20/megacart.o
+BUSOBJS += $(BUSOBJ)/vic20/std.o
+BUSOBJS += $(BUSOBJ)/vic20/vic1010.o
+BUSOBJS += $(BUSOBJ)/vic20/vic1110.o
+BUSOBJS += $(BUSOBJ)/vic20/vic1111.o
+BUSOBJS += $(BUSOBJ)/vic20/vic1112.o
+BUSOBJS += $(BUSOBJ)/vic20/vic1210.o
+BUSOBJS += $(BUSOBJ)/vic20/user.o
+BUSOBJS += $(BUSOBJ)/vic20/vic1011.o
+endif
+
+
+#-------------------------------------------------
+#
+#@src/emu/bus/vidbrain/exp.h,BUSES += VIDBRAIN
+#-------------------------------------------------
+
+ifneq ($(filter VIDBRAIN,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/vidbrain/exp.o
+BUSOBJS += $(BUSOBJ)/vidbrain/std.o
+BUSOBJS += $(BUSOBJ)/vidbrain/money_minder.o
+BUSOBJS += $(BUSOBJ)/vidbrain/timeshare.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/vip/byteio.h,BUSES += VIP
#@src/emu/bus/vip/exp.h,BUSES += VIP
#-------------------------------------------------
diff --git a/src/mess/machine/bw2exp.c b/src/emu/bus/bw2/exp.c
index a683cbb6678..505322cfcb9 100644
--- a/src/mess/machine/bw2exp.c
+++ b/src/emu/bus/bw2/exp.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/bw2exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/bw2exp.h b/src/emu/bus/bw2/exp.h
index 28896dbc180..af1f58be548 100644
--- a/src/mess/machine/bw2exp.h
+++ b/src/emu/bus/bw2/exp.h
@@ -128,7 +128,7 @@ extern const device_type BW2_EXPANSION_SLOT;
// slot devices
-#include "machine/bw2_ramcard.h"
+#include "ramcard.h"
SLOT_INTERFACE_EXTERN( bw2_expansion_cards );
diff --git a/src/mess/machine/bw2_ramcard.c b/src/emu/bus/bw2/ramcard.c
index 485e385b28f..94d53dc0dae 100644
--- a/src/mess/machine/bw2_ramcard.c
+++ b/src/emu/bus/bw2/ramcard.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "bw2_ramcard.h"
+#include "ramcard.h"
diff --git a/src/mess/machine/bw2_ramcard.h b/src/emu/bus/bw2/ramcard.h
index 131ea8bd7a6..47c93403628 100644
--- a/src/mess/machine/bw2_ramcard.h
+++ b/src/emu/bus/bw2/ramcard.h
@@ -15,7 +15,7 @@
#define __BW2_RAMCARD__
#include "emu.h"
-#include "machine/bw2exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/cbm_crt.c b/src/emu/bus/c64/cbm_crt.c
index 274752c4037..54b127c5af5 100644
--- a/src/mess/machine/cbm_crt.c
+++ b/src/emu/bus/c64/cbm_crt.c
@@ -2,13 +2,13 @@
// copyright-holders:Curt Coder
/*********************************************************************
- machine/cbm_crt.c
+ cbm_crt.c
- Commodore VIC-20/C64 cartridge images
+ Commodore C64 cartridge images
*********************************************************************/
-#include "machine/cbm_crt.h"
+#include "cbm_crt.h"
diff --git a/src/emu/bus/c64/exp.h b/src/emu/bus/c64/exp.h
index 551dab97fb7..265a7b725a5 100644
--- a/src/emu/bus/c64/exp.h
+++ b/src/emu/bus/c64/exp.h
@@ -40,7 +40,7 @@
#define __C64_EXPANSION_SLOT__
#include "emu.h"
-#include "machine/cbm_crt.h"
+#include "formats/cbm_crt.h"
diff --git a/src/mess/machine/cbm2_24k.c b/src/emu/bus/cbm2/24k.c
index 413c04d0303..7cb34a96c31 100644
--- a/src/mess/machine/cbm2_24k.c
+++ b/src/emu/bus/cbm2/24k.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "cbm2_24k.h"
+#include "24k.h"
diff --git a/src/mess/machine/cbm2_24k.h b/src/emu/bus/cbm2/24k.h
index c7a069de0fd..bff7e2b7398 100644
--- a/src/mess/machine/cbm2_24k.h
+++ b/src/emu/bus/cbm2/24k.h
@@ -14,9 +14,8 @@
#ifndef __CBM2_24K_CARTRIDGE__
#define __CBM2_24K_CARTRIDGE__
-
#include "emu.h"
-#include "machine/cbm2exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/cbm2exp.c b/src/emu/bus/cbm2/exp.c
index 989dadfe2c7..315fa7cbe78 100644
--- a/src/mess/machine/cbm2exp.c
+++ b/src/emu/bus/cbm2/exp.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/cbm2exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/cbm2exp.h b/src/emu/bus/cbm2/exp.h
index f09ec9b19a5..be541a0df4b 100644
--- a/src/mess/machine/cbm2exp.h
+++ b/src/emu/bus/cbm2/exp.h
@@ -151,9 +151,9 @@ extern const device_type CBM2_EXPANSION_SLOT;
// slot devices
-#include "machine/cbm2_std.h"
-#include "machine/cbm2_24k.h"
-#include "machine/cbm2_graphic.h"
+#include "24k.h"
+#include "hrg.h"
+#include "std.h"
SLOT_INTERFACE_EXTERN( cbm2_expansion_cards );
diff --git a/src/mess/machine/cbm2_graphic.c b/src/emu/bus/cbm2/hrg.c
index 6fea2465796..d320262462d 100644
--- a/src/mess/machine/cbm2_graphic.c
+++ b/src/emu/bus/cbm2/hrg.c
@@ -18,7 +18,7 @@
*/
-#include "cbm2_graphic.h"
+#include "hrg.h"
diff --git a/src/mess/machine/cbm2_graphic.h b/src/emu/bus/cbm2/hrg.h
index ed4371d2211..f77528e95a6 100644
--- a/src/mess/machine/cbm2_graphic.h
+++ b/src/emu/bus/cbm2/hrg.h
@@ -14,9 +14,8 @@
#ifndef __CBM2_GRAPHIC__
#define __CBM2_GRAPHIC__
-
#include "emu.h"
-#include "machine/cbm2exp.h"
+#include "exp.h"
#include "video/ef9345.h"
diff --git a/src/mess/machine/cbm2_std.c b/src/emu/bus/cbm2/std.c
index c1d9becdb62..a872201b968 100644
--- a/src/mess/machine/cbm2_std.c
+++ b/src/emu/bus/cbm2/std.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "cbm2_std.h"
+#include "std.h"
diff --git a/src/mess/machine/cbm2_std.h b/src/emu/bus/cbm2/std.h
index b956b06ef09..45534b54530 100644
--- a/src/mess/machine/cbm2_std.h
+++ b/src/emu/bus/cbm2/std.h
@@ -14,10 +14,9 @@
#ifndef __CBM2_STANDARD_CARTRIDGE__
#define __CBM2_STANDARD_CARTRIDGE__
-
#include "emu.h"
+#include "exp.h"
#include "imagedev/cartslot.h"
-#include "machine/cbm2exp.h"
diff --git a/src/mess/machine/cbm2user.c b/src/emu/bus/cbm2/user.c
index 213c315ce0b..cf428f39edf 100644
--- a/src/mess/machine/cbm2user.c
+++ b/src/emu/bus/cbm2/user.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/cbm2user.h"
+#include "user.h"
diff --git a/src/mess/machine/cbm2user.h b/src/emu/bus/cbm2/user.h
index eda44e21a88..eda44e21a88 100644
--- a/src/mess/machine/cbm2user.h
+++ b/src/emu/bus/cbm2/user.h
diff --git a/src/mess/machine/ecbbus.c b/src/emu/bus/ecbbus/ecbbus.c
index d687f248699..efe3beb3153 100644
--- a/src/mess/machine/ecbbus.c
+++ b/src/emu/bus/ecbbus/ecbbus.c
@@ -264,3 +264,17 @@ WRITE_LINE_MEMBER( ecbbus_device::nmi_w )
{
m_out_nmi_func(state);
}
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( ecbbus_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( ecbbus_cards )
+ SLOT_INTERFACE("grip21", ECB_GRIP21)
+/* SLOT_INTERFACE("grip25", ECB_GRIP25)
+ SLOT_INTERFACE("grip26", ECB_GRIP26)
+ SLOT_INTERFACE("grip31", ECB_GRIP31)
+ SLOT_INTERFACE("grip562", ECB_GRIP562)
+ SLOT_INTERFACE("grips115", ECB_GRIPS115)*/
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/ecbbus.h b/src/emu/bus/ecbbus/ecbbus.h
index 7d83f709416..7be19a40b91 100644
--- a/src/mess/machine/ecbbus.h
+++ b/src/emu/bus/ecbbus/ecbbus.h
@@ -159,4 +159,12 @@ public:
ecbbus_slot_device *m_slot;
};
+
+// slot devices
+#include "grip.h"
+
+SLOT_INTERFACE_EXTERN( ecbbus_cards );
+
+
+
#endif
diff --git a/src/mess/machine/ecb_grip.c b/src/emu/bus/ecbbus/grip.c
index c476d12163e..1eddb6dede0 100644
--- a/src/mess/machine/ecb_grip.c
+++ b/src/emu/bus/ecbbus/grip.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "ecb_grip.h"
+#include "grip.h"
diff --git a/src/mess/machine/ecb_grip.h b/src/emu/bus/ecbbus/grip.h
index 1ef9d90da91..269cade9752 100644
--- a/src/mess/machine/ecb_grip.h
+++ b/src/emu/bus/ecbbus/grip.h
@@ -14,12 +14,11 @@
#ifndef __GRIP__
#define __GRIP__
-
#include "emu.h"
+#include "ecbbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/ctronics.h"
-#include "machine/ecbbus.h"
#include "machine/i8255.h"
#include "machine/keyboard.h"
#include "machine/z80sti.h"
diff --git a/src/mess/machine/e01.c b/src/emu/bus/econet/e01.c
index 86ea9b532cc..86ea9b532cc 100644
--- a/src/mess/machine/e01.c
+++ b/src/emu/bus/econet/e01.c
diff --git a/src/mess/machine/e01.h b/src/emu/bus/econet/e01.h
index 27b8c88e121..bea01f4768c 100644
--- a/src/mess/machine/e01.h
+++ b/src/emu/bus/econet/e01.h
@@ -15,10 +15,10 @@
#define __E01__
#include "emu.h"
+#include "econet.h"
#include "cpu/m6502/m65c02.h"
#include "machine/6522via.h"
#include "machine/ctronics.h"
-#include "machine/econet.h"
#include "machine/mc146818.h"
#include "machine/mc6854.h"
#include "machine/ram.h"
diff --git a/src/mess/machine/econet.c b/src/emu/bus/econet/econet.c
index 97128987388..0e901795d4b 100644
--- a/src/mess/machine/econet.c
+++ b/src/emu/bus/econet/econet.c
@@ -355,3 +355,13 @@ void econet_device::data_w(device_t *device, int state)
{
set_signal(device, DATA, state);
}
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE( econet_devices )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( econet_devices )
+ SLOT_INTERFACE("e01", E01)
+ SLOT_INTERFACE("e01s", E01S)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/econet.h b/src/emu/bus/econet/econet.h
index 2e2e3386b2c..d851acdb1d7 100644
--- a/src/mess/machine/econet.h
+++ b/src/emu/bus/econet/econet.h
@@ -173,5 +173,11 @@ extern const device_type ECONET;
extern const device_type ECONET_SLOT;
+// slot devices
+#include "e01.h"
+
+SLOT_INTERFACE_EXTERN( econet_devices );
+
+
#endif
diff --git a/src/mess/machine/ep64_exdos.c b/src/emu/bus/ep64/exdos.c
index 2819c6af366..893e46fc71b 100644
--- a/src/mess/machine/ep64_exdos.c
+++ b/src/emu/bus/ep64/exdos.c
@@ -48,7 +48,7 @@ This PCB plugs into the external expansion connector on the right side of the ma
*/
-#include "ep64_exdos.h"
+#include "exdos.h"
diff --git a/src/mess/machine/ep64_exdos.h b/src/emu/bus/ep64/exdos.h
index eee691f309e..c7fa267710b 100644
--- a/src/mess/machine/ep64_exdos.h
+++ b/src/emu/bus/ep64/exdos.h
@@ -15,8 +15,8 @@
#define __EP64_EXDOS__
#include "emu.h"
+#include "exp.h"
#include "formats/ep64_dsk.h"
-#include "machine/ep64exp.h"
#include "machine/wd_fdc.h"
diff --git a/src/mess/machine/ep64exp.c b/src/emu/bus/ep64/exp.c
index 7021dcca8be..c5e0cfb175f 100644
--- a/src/mess/machine/ep64exp.c
+++ b/src/emu/bus/ep64/exp.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "ep64exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/ep64exp.h b/src/emu/bus/ep64/exp.h
index 0a18f0202e0..7f20fbe71db 100644
--- a/src/mess/machine/ep64exp.h
+++ b/src/emu/bus/ep64/exp.h
@@ -143,7 +143,7 @@ extern const device_type EP64_EXPANSION_BUS_SLOT;
// slot devices
-#include "machine/ep64_exdos.h"
+#include "exdos.h"
SLOT_INTERFACE_EXTERN( ep64_expansion_bus_cards );
diff --git a/src/mess/machine/pet_64k.c b/src/emu/bus/pet/64k.c
index b58b8e5c20b..f0057cf6b36 100644
--- a/src/mess/machine/pet_64k.c
+++ b/src/emu/bus/pet/64k.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "pet_64k.h"
+#include "64k.h"
diff --git a/src/mess/machine/pet_64k.h b/src/emu/bus/pet/64k.h
index c0f6bfbd3f4..96971fd83ba 100644
--- a/src/mess/machine/pet_64k.h
+++ b/src/emu/bus/pet/64k.h
@@ -15,7 +15,7 @@
#define __PET_64K__
#include "emu.h"
-#include "machine/petexp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c2n.c b/src/emu/bus/pet/c2n.c
index ad139e7730d..ad139e7730d 100644
--- a/src/mess/machine/c2n.c
+++ b/src/emu/bus/pet/c2n.c
diff --git a/src/mess/machine/c2n.h b/src/emu/bus/pet/c2n.h
index f4d9a7b9fbc..5d2edc746c9 100644
--- a/src/mess/machine/c2n.h
+++ b/src/emu/bus/pet/c2n.h
@@ -15,9 +15,9 @@
#define __C2N__
#include "emu.h"
+#include "cass.h"
#include "formats/cbm_tap.h"
#include "imagedev/cassette.h"
-#include "machine/petcass.h"
diff --git a/src/mess/machine/petcass.c b/src/emu/bus/pet/cass.c
index 7181392f329..8ceb01d7c54 100644
--- a/src/mess/machine/petcass.c
+++ b/src/emu/bus/pet/cass.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/petcass.h"
+#include "cass.h"
diff --git a/src/mess/machine/petcass.h b/src/emu/bus/pet/cass.h
index 30b396291b0..495ed31d195 100644
--- a/src/mess/machine/petcass.h
+++ b/src/emu/bus/pet/cass.h
@@ -110,8 +110,8 @@ extern const device_type PET_DATASSETTE_PORT;
// slot devices
-#include "machine/c2n.h"
-#include "machine/diag264_lb_tape.h"
+#include "c2n.h"
+#include "diag264_lb_tape.h"
SLOT_INTERFACE_EXTERN( cbm_datassette_devices );
diff --git a/src/mess/machine/diag264_lb_tape.c b/src/emu/bus/pet/diag264_lb_tape.c
index 110fc937a70..110fc937a70 100644
--- a/src/mess/machine/diag264_lb_tape.c
+++ b/src/emu/bus/pet/diag264_lb_tape.c
diff --git a/src/mess/machine/diag264_lb_tape.h b/src/emu/bus/pet/diag264_lb_tape.h
index 9aae0aee66c..8fc749e66fc 100644
--- a/src/mess/machine/diag264_lb_tape.h
+++ b/src/emu/bus/pet/diag264_lb_tape.h
@@ -14,9 +14,8 @@
#ifndef __DIAG264_CASSETTE_LOOPBACK__
#define __DIAG264_CASSETTE_LOOPBACK__
-
#include "emu.h"
-#include "machine/petcass.h"
+#include "cass.h"
diff --git a/src/mess/machine/petexp.c b/src/emu/bus/pet/exp.c
index 2708c2d9b1f..33f2ccef16a 100644
--- a/src/mess/machine/petexp.c
+++ b/src/emu/bus/pet/exp.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/petexp.h"
+#include "exp.h"
diff --git a/src/mess/machine/petexp.h b/src/emu/bus/pet/exp.h
index 3e7d25b3283..a871a53c8a2 100644
--- a/src/mess/machine/petexp.h
+++ b/src/emu/bus/pet/exp.h
@@ -136,8 +136,8 @@ extern const device_type PET_EXPANSION_SLOT;
// slot devices
-#include "machine/pet_64k.h"
-#include "machine/superpet.h"
+#include "64k.h"
+#include "superpet.h"
SLOT_INTERFACE_EXTERN( pet_expansion_cards );
diff --git a/src/mess/machine/superpet.c b/src/emu/bus/pet/superpet.c
index cf8f5f7b3bf..cf8f5f7b3bf 100644
--- a/src/mess/machine/superpet.c
+++ b/src/emu/bus/pet/superpet.c
diff --git a/src/mess/machine/superpet.h b/src/emu/bus/pet/superpet.h
index 0db6a6a4734..3aa21a6d33b 100644
--- a/src/mess/machine/superpet.h
+++ b/src/emu/bus/pet/superpet.h
@@ -14,12 +14,11 @@
#ifndef __SUPERPET__
#define __SUPERPET__
-
#include "emu.h"
+#include "exp.h"
#include "cpu/m6809/m6809.h"
#include "machine/mos6551.h"
#include "machine/mos6702.h"
-#include "machine/petexp.h"
#include "machine/serial.h"
diff --git a/src/mess/machine/petuser.c b/src/emu/bus/pet/user.c
index 23c9a325b8c..14a87ea9e21 100644
--- a/src/mess/machine/petuser.c
+++ b/src/emu/bus/pet/user.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/petuser.h"
+#include "user.h"
diff --git a/src/mess/machine/petuser.h b/src/emu/bus/pet/user.h
index 585268eb913..585268eb913 100644
--- a/src/mess/machine/petuser.h
+++ b/src/emu/bus/pet/user.h
diff --git a/src/mess/machine/c1551.c b/src/emu/bus/plus4/c1551.c
index 56cb71d2adf..56cb71d2adf 100644
--- a/src/mess/machine/c1551.c
+++ b/src/emu/bus/plus4/c1551.c
diff --git a/src/mess/machine/c1551.h b/src/emu/bus/plus4/c1551.h
index 9e7b6f5bc22..7090b962a68 100644
--- a/src/mess/machine/c1551.h
+++ b/src/emu/bus/plus4/c1551.h
@@ -16,6 +16,7 @@
#include "emu.h"
+#include "exp.h"
#include "cpu/m6502/m6510t.h"
#include "imagedev/flopdrv.h"
#include "formats/d64_dsk.h"
@@ -23,7 +24,6 @@
#include "machine/64h156.h"
#include "machine/6525tpi.h"
#include "machine/pla.h"
-#include "machine/plus4exp.h"
diff --git a/src/mess/machine/diag264_lb_user.c b/src/emu/bus/plus4/diag264_lb_user.c
index 747ce877082..747ce877082 100644
--- a/src/mess/machine/diag264_lb_user.c
+++ b/src/emu/bus/plus4/diag264_lb_user.c
diff --git a/src/mess/machine/diag264_lb_user.h b/src/emu/bus/plus4/diag264_lb_user.h
index 88c5fad08fd..70e86634369 100644
--- a/src/mess/machine/diag264_lb_user.h
+++ b/src/emu/bus/plus4/diag264_lb_user.h
@@ -14,9 +14,8 @@
#ifndef __DIAG264_USER_PORT_LOOPBACK__
#define __DIAG264_USER_PORT_LOOPBACK__
-
#include "emu.h"
-#include "machine/plus4user.h"
+#include "user.h"
diff --git a/src/mess/machine/plus4exp.c b/src/emu/bus/plus4/exp.c
index 5256366b977..5be58be399e 100644
--- a/src/mess/machine/plus4exp.c
+++ b/src/emu/bus/plus4/exp.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/plus4exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/plus4exp.h b/src/emu/bus/plus4/exp.h
index 41771120914..153d1d57331 100644
--- a/src/mess/machine/plus4exp.h
+++ b/src/emu/bus/plus4/exp.h
@@ -190,9 +190,9 @@ extern const device_type PLUS4_EXPANSION_SLOT;
// slot devices
-#include "machine/c1551.h"
-#include "machine/plus4_sid.h"
-#include "machine/plus4_std.h"
+#include "c1551.h"
+#include "sid.h"
+#include "std.h"
SLOT_INTERFACE_EXTERN( plus4_expansion_cards );
diff --git a/src/mess/machine/plus4_sid.c b/src/emu/bus/plus4/sid.c
index 6fb115ed8b0..a5e0a7a6ac9 100644
--- a/src/mess/machine/plus4_sid.c
+++ b/src/emu/bus/plus4/sid.c
@@ -20,7 +20,7 @@
*/
-#include "plus4_sid.h"
+#include "sid.h"
diff --git a/src/mess/machine/plus4_sid.h b/src/emu/bus/plus4/sid.h
index e90ae32d3d1..830a2fe0f42 100644
--- a/src/mess/machine/plus4_sid.h
+++ b/src/emu/bus/plus4/sid.h
@@ -14,12 +14,11 @@
#ifndef __PLUS4_SID_CARTRIDGE__
#define __PLUS4_SID_CARTRIDGE__
-
#include "emu.h"
-#include "machine/plus4exp.h"
+#include "exp.h"
+#include "bus/vcs/ctrl.h"
#include "sound/dac.h"
#include "sound/mos6581.h"
-#include "machine/vcsctrl.h"
diff --git a/src/mess/machine/plus4_std.c b/src/emu/bus/plus4/std.c
index 74805a428cc..39174d183d1 100644
--- a/src/mess/machine/plus4_std.c
+++ b/src/emu/bus/plus4/std.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "plus4_std.h"
+#include "std.h"
diff --git a/src/mess/machine/plus4_std.h b/src/emu/bus/plus4/std.h
index 776cea92670..6a50a762ce2 100644
--- a/src/mess/machine/plus4_std.h
+++ b/src/emu/bus/plus4/std.h
@@ -14,10 +14,9 @@
#ifndef __PLUS4_STANDARD_CARTRIDGE__
#define __PLUS4_STANDARD_CARTRIDGE__
-
#include "emu.h"
+#include "exp.h"
#include "imagedev/cartslot.h"
-#include "machine/plus4exp.h"
diff --git a/src/mess/machine/plus4user.c b/src/emu/bus/plus4/user.c
index 12dd6aa0548..89dedda4dab 100644
--- a/src/mess/machine/plus4user.c
+++ b/src/emu/bus/plus4/user.c
@@ -7,7 +7,7 @@
**********************************************************************/
-#include "machine/plus4user.h"
+#include "user.h"
diff --git a/src/mess/machine/plus4user.h b/src/emu/bus/plus4/user.h
index 987b9d4e9e7..0f948356cd6 100644
--- a/src/mess/machine/plus4user.h
+++ b/src/emu/bus/plus4/user.h
@@ -120,7 +120,7 @@ extern const device_type PLUS4_USER_PORT;
// slot devices
-#include "machine/diag264_lb_user.h"
+#include "diag264_lb_user.h"
SLOT_INTERFACE_EXTERN( plus4_user_port_cards );
diff --git a/src/mess/machine/vcsctrl.c b/src/emu/bus/vcs/ctrl.c
index 54cdd4543b0..6effedc9512 100644
--- a/src/mess/machine/vcsctrl.c
+++ b/src/emu/bus/vcs/ctrl.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/vcsctrl.h"
+#include "ctrl.h"
diff --git a/src/mess/machine/vcsctrl.h b/src/emu/bus/vcs/ctrl.h
index 0cd865b354f..cbf80f609a7 100644
--- a/src/mess/machine/vcsctrl.h
+++ b/src/emu/bus/vcs/ctrl.h
@@ -122,12 +122,12 @@ extern const device_type VCS_CONTROL_PORT;
// slot devices
-#include "machine/vcs_joy.h"
-#include "machine/vcs_lightpen.h"
-#include "machine/vcs_paddles.h"
-#include "machine/vcs_joybooster.h"
-#include "machine/vcs_wheel.h"
-#include "machine/vcs_keypad.h"
+#include "joybooster.h"
+#include "joystick.h"
+#include "keypad.h"
+#include "lightpen.h"
+#include "paddles.h"
+#include "wheel.h"
SLOT_INTERFACE_EXTERN( vcs_control_port_devices );
diff --git a/src/mess/machine/vcs_joybooster.c b/src/emu/bus/vcs/joybooster.c
index 6b048f33ce2..e2654968dc8 100644
--- a/src/mess/machine/vcs_joybooster.c
+++ b/src/emu/bus/vcs/joybooster.c
@@ -8,7 +8,7 @@
**********************************************************************/
-#include "vcs_joybooster.h"
+#include "joybooster.h"
diff --git a/src/mess/machine/vcs_joybooster.h b/src/emu/bus/vcs/joybooster.h
index 40b61fcf493..8f4c3bf9ca2 100644
--- a/src/mess/machine/vcs_joybooster.h
+++ b/src/emu/bus/vcs/joybooster.h
@@ -13,9 +13,8 @@
#ifndef __VCS_JOYSTICKBOOSTER__
#define __VCS_JOYSTICKBOOSTER__
-
#include "emu.h"
-#include "machine/vcsctrl.h"
+#include "ctrl.h"
diff --git a/src/mess/machine/vcs_joy.c b/src/emu/bus/vcs/joystick.c
index c12dacb816d..3ef46b0246c 100644
--- a/src/mess/machine/vcs_joy.c
+++ b/src/emu/bus/vcs/joystick.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "vcs_joy.h"
+#include "joystick.h"
diff --git a/src/mess/machine/vcs_joy.h b/src/emu/bus/vcs/joystick.h
index 5b5df5884bc..7de13ff3c36 100644
--- a/src/mess/machine/vcs_joy.h
+++ b/src/emu/bus/vcs/joystick.h
@@ -14,9 +14,8 @@
#ifndef __VCS_JOYSTICK__
#define __VCS_JOYSTICK__
-
#include "emu.h"
-#include "machine/vcsctrl.h"
+#include "ctrl.h"
diff --git a/src/mess/machine/vcs_keypad.c b/src/emu/bus/vcs/keypad.c
index 7965e38f4da..a41db6d400a 100644
--- a/src/mess/machine/vcs_keypad.c
+++ b/src/emu/bus/vcs/keypad.c
@@ -7,7 +7,7 @@
**********************************************************************/
-#include "vcs_keypad.h"
+#include "keypad.h"
diff --git a/src/mess/machine/vcs_keypad.h b/src/emu/bus/vcs/keypad.h
index 03b8779e132..628731b2350 100644
--- a/src/mess/machine/vcs_keypad.h
+++ b/src/emu/bus/vcs/keypad.h
@@ -12,9 +12,8 @@
#ifndef __VCS_KEYPAD__
#define __VCS_KEYPAD__
-
#include "emu.h"
-#include "machine/vcsctrl.h"
+#include "ctrl.h"
diff --git a/src/mess/machine/vcs_lightpen.c b/src/emu/bus/vcs/lightpen.c
index ae560cd555d..bf5a82997c0 100644
--- a/src/mess/machine/vcs_lightpen.c
+++ b/src/emu/bus/vcs/lightpen.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "vcs_lightpen.h"
+#include "lightpen.h"
diff --git a/src/mess/machine/vcs_lightpen.h b/src/emu/bus/vcs/lightpen.h
index cded443ffab..c18a2a4a368 100644
--- a/src/mess/machine/vcs_lightpen.h
+++ b/src/emu/bus/vcs/lightpen.h
@@ -14,9 +14,8 @@
#ifndef __VCS_LIGHTPEN__
#define __VCS_LIGHTPEN__
-
#include "emu.h"
-#include "machine/vcsctrl.h"
+#include "ctrl.h"
diff --git a/src/mess/machine/vcs_paddles.c b/src/emu/bus/vcs/paddles.c
index 46641f72b79..61bc71c8bdf 100644
--- a/src/mess/machine/vcs_paddles.c
+++ b/src/emu/bus/vcs/paddles.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "vcs_paddles.h"
+#include "paddles.h"
diff --git a/src/mess/machine/vcs_paddles.h b/src/emu/bus/vcs/paddles.h
index 9916946b96c..7363d05bf25 100644
--- a/src/mess/machine/vcs_paddles.h
+++ b/src/emu/bus/vcs/paddles.h
@@ -14,9 +14,8 @@
#ifndef __VCS_PADDLES__
#define __VCS_PADDLES__
-
#include "emu.h"
-#include "machine/vcsctrl.h"
+#include "ctrl.h"
diff --git a/src/mess/machine/vcs_wheel.c b/src/emu/bus/vcs/wheel.c
index 2fca6467c0f..ee8b6cb2987 100644
--- a/src/mess/machine/vcs_wheel.c
+++ b/src/emu/bus/vcs/wheel.c
@@ -7,7 +7,7 @@
**********************************************************************/
-#include "vcs_wheel.h"
+#include "wheel.h"
diff --git a/src/mess/machine/vcs_wheel.h b/src/emu/bus/vcs/wheel.h
index ab567de87f3..07bcafd0534 100644
--- a/src/mess/machine/vcs_wheel.h
+++ b/src/emu/bus/vcs/wheel.h
@@ -12,9 +12,8 @@
#ifndef __VCS_WHEEL__
#define __VCS_WHEEL__
-
#include "emu.h"
-#include "machine/vcsctrl.h"
+#include "ctrl.h"
diff --git a/src/mess/machine/vic10exp.c b/src/emu/bus/vic10/exp.c
index cb70ad303d3..67f4b39b195 100644
--- a/src/mess/machine/vic10exp.c
+++ b/src/emu/bus/vic10/exp.c
@@ -11,9 +11,7 @@
#include "emu.h"
#include "emuopts.h"
-#include "machine/cbm_crt.h"
-#include "formats/imageutl.h"
-#include "machine/vic10exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/vic10exp.h b/src/emu/bus/vic10/exp.h
index a1612902cd1..68236430fea 100644
--- a/src/mess/machine/vic10exp.h
+++ b/src/emu/bus/vic10/exp.h
@@ -40,7 +40,7 @@
#define __VIC10_EXPANSION_SLOT__
#include "emu.h"
-#include "machine/cbm_crt.h"
+#include "formats/cbm_crt.h"
@@ -179,7 +179,7 @@ extern const device_type VIC10_EXPANSION_SLOT;
// slot devices
-#include "machine/vic10std.h"
+#include "std.h"
SLOT_INTERFACE_EXTERN( vic10_expansion_cards );
diff --git a/src/mess/machine/vic10std.c b/src/emu/bus/vic10/std.c
index e431fa57373..f7afdcf7c3c 100644
--- a/src/mess/machine/vic10std.c
+++ b/src/emu/bus/vic10/std.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "vic10std.h"
+#include "std.h"
diff --git a/src/mess/machine/vic10std.h b/src/emu/bus/vic10/std.h
index 2cbb9ed0740..ca5fc55f593 100644
--- a/src/mess/machine/vic10std.h
+++ b/src/emu/bus/vic10/std.h
@@ -14,9 +14,8 @@
#ifndef __VIC10_STD__
#define __VIC10_STD__
-
#include "emu.h"
-#include "machine/vic10exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/vic20exp.c b/src/emu/bus/vic20/exp.c
index 87dcfe0bbfe..4dcd2de9e56 100644
--- a/src/mess/machine/vic20exp.c
+++ b/src/emu/bus/vic20/exp.c
@@ -10,10 +10,8 @@
**********************************************************************/
#include "emu.h"
+#include "exp.h"
#include "emuopts.h"
-#include "machine/cbm_crt.h"
-#include "machine/vic20exp.h"
-#include "formats/imageutl.h"
diff --git a/src/mess/machine/vic20exp.h b/src/emu/bus/vic20/exp.h
index b309a81783f..099af84dfd1 100644
--- a/src/mess/machine/vic20exp.h
+++ b/src/emu/bus/vic20/exp.h
@@ -177,13 +177,13 @@ extern const device_type VIC20_EXPANSION_SLOT;
// slot devices
-#include "machine/vic1010.h"
-#include "machine/vic1110.h"
-#include "machine/vic1111.h"
-#include "machine/vic1112.h"
-#include "machine/vic1210.h"
-#include "machine/vic20std.h"
-#include "machine/vic20_megacart.h"
+#include "megacart.h"
+#include "std.h"
+#include "vic1010.h"
+#include "vic1110.h"
+#include "vic1111.h"
+#include "vic1112.h"
+#include "vic1210.h"
SLOT_INTERFACE_EXTERN( vic20_expansion_cards );
diff --git a/src/mess/machine/vic20_megacart.c b/src/emu/bus/vic20/megacart.c
index 79c518e36ce..32b562a053c 100644
--- a/src/mess/machine/vic20_megacart.c
+++ b/src/emu/bus/vic20/megacart.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "vic20_megacart.h"
+#include "megacart.h"
diff --git a/src/mess/machine/vic20_megacart.h b/src/emu/bus/vic20/megacart.h
index 9563a5e896c..021ae0f56a9 100644
--- a/src/mess/machine/vic20_megacart.h
+++ b/src/emu/bus/vic20/megacart.h
@@ -14,9 +14,8 @@
#ifndef __VIC20_MEGACART__
#define __VIC20_MEGACART__
-
#include "emu.h"
-#include "machine/vic20exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/vic20std.c b/src/emu/bus/vic20/std.c
index 0c5ea971f4c..f7729c41b0b 100644
--- a/src/mess/machine/vic20std.c
+++ b/src/emu/bus/vic20/std.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "vic20std.h"
+#include "std.h"
diff --git a/src/mess/machine/vic20std.h b/src/emu/bus/vic20/std.h
index d2c741e362f..0b74be61779 100644
--- a/src/mess/machine/vic20std.h
+++ b/src/emu/bus/vic20/std.h
@@ -14,9 +14,8 @@
#ifndef __VIC20_STD__
#define __VIC20_STD__
-
#include "emu.h"
-#include "machine/vic20exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/vic20user.c b/src/emu/bus/vic20/user.c
index a6e8425f5d8..4bff531c08c 100644
--- a/src/mess/machine/vic20user.c
+++ b/src/emu/bus/vic20/user.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/vic20user.h"
+#include "user.h"
diff --git a/src/mess/machine/vic20user.h b/src/emu/bus/vic20/user.h
index ae13aa19f94..501b1511282 100644
--- a/src/mess/machine/vic20user.h
+++ b/src/emu/bus/vic20/user.h
@@ -149,7 +149,7 @@ extern const device_type VIC20_USER_PORT;
// slot devices
-#include "machine/vic1011.h"
+#include "vic1011.h"
SLOT_INTERFACE_EXTERN( vic20_user_port_cards );
diff --git a/src/mess/machine/vic1010.c b/src/emu/bus/vic20/vic1010.c
index 4dc380d29ab..4dc380d29ab 100644
--- a/src/mess/machine/vic1010.c
+++ b/src/emu/bus/vic20/vic1010.c
diff --git a/src/mess/machine/vic1010.h b/src/emu/bus/vic20/vic1010.h
index 3efbf04450b..ea6e3dae9dd 100644
--- a/src/mess/machine/vic1010.h
+++ b/src/emu/bus/vic20/vic1010.h
@@ -14,9 +14,8 @@
#ifndef __VIC1010__
#define __VIC1010__
-
#include "emu.h"
-#include "machine/vic20exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/vic1011.c b/src/emu/bus/vic20/vic1011.c
index 312b50a5b6b..312b50a5b6b 100644
--- a/src/mess/machine/vic1011.c
+++ b/src/emu/bus/vic20/vic1011.c
diff --git a/src/mess/machine/vic1011.h b/src/emu/bus/vic20/vic1011.h
index a91219d6bf0..ed034a33900 100644
--- a/src/mess/machine/vic1011.h
+++ b/src/emu/bus/vic20/vic1011.h
@@ -15,7 +15,7 @@
#define __VIC1011__
#include "emu.h"
-#include "machine/vic20user.h"
+#include "user.h"
#include "machine/serial.h"
diff --git a/src/mess/machine/vic1110.c b/src/emu/bus/vic20/vic1110.c
index b387489667d..b387489667d 100644
--- a/src/mess/machine/vic1110.c
+++ b/src/emu/bus/vic20/vic1110.c
diff --git a/src/mess/machine/vic1110.h b/src/emu/bus/vic20/vic1110.h
index df5e723218c..9758115283a 100644
--- a/src/mess/machine/vic1110.h
+++ b/src/emu/bus/vic20/vic1110.h
@@ -14,9 +14,8 @@
#ifndef __VIC1110__
#define __VIC1110__
-
#include "emu.h"
-#include "machine/vic20exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/vic1111.c b/src/emu/bus/vic20/vic1111.c
index 29e4ff6f16c..29e4ff6f16c 100644
--- a/src/mess/machine/vic1111.c
+++ b/src/emu/bus/vic20/vic1111.c
diff --git a/src/mess/machine/vic1111.h b/src/emu/bus/vic20/vic1111.h
index fe57bb2499b..4ed922e254d 100644
--- a/src/mess/machine/vic1111.h
+++ b/src/emu/bus/vic20/vic1111.h
@@ -14,9 +14,8 @@
#ifndef __VIC1111__
#define __VIC1111__
-
#include "emu.h"
-#include "machine/vic20exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/vic1112.c b/src/emu/bus/vic20/vic1112.c
index b75d561f2fd..b75d561f2fd 100644
--- a/src/mess/machine/vic1112.c
+++ b/src/emu/bus/vic20/vic1112.c
diff --git a/src/mess/machine/vic1112.h b/src/emu/bus/vic20/vic1112.h
index a0db154df27..60544edee1e 100644
--- a/src/mess/machine/vic1112.h
+++ b/src/emu/bus/vic20/vic1112.h
@@ -17,10 +17,10 @@
#define __VIC1112__
#include "emu.h"
+#include "exp.h"
#include "bus/ieee488/ieee488.h"
#include "cpu/m6502/m6502.h"
#include "machine/6522via.h"
-#include "machine/vic20exp.h"
diff --git a/src/mess/machine/vic1210.c b/src/emu/bus/vic20/vic1210.c
index c843bb75e90..c843bb75e90 100644
--- a/src/mess/machine/vic1210.c
+++ b/src/emu/bus/vic20/vic1210.c
diff --git a/src/mess/machine/vic1210.h b/src/emu/bus/vic20/vic1210.h
index 6b105adf11c..6a38852b3d6 100644
--- a/src/mess/machine/vic1210.h
+++ b/src/emu/bus/vic20/vic1210.h
@@ -15,9 +15,8 @@
#ifndef __VIC1210__
#define __VIC1210__
-
#include "emu.h"
-#include "machine/vic20exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/vidbrain_exp.c b/src/emu/bus/vidbrain/exp.c
index 3644e8d45fe..e1259ba52d2 100644
--- a/src/mess/machine/vidbrain_exp.c
+++ b/src/emu/bus/vidbrain/exp.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/vidbrain_exp.h"
+#include "exp.h"
@@ -247,3 +247,14 @@ WRITE8_MEMBER( videobrain_expansion_slot_device::unmap_w ) { bo_w(space, offset
WRITE_LINE_MEMBER( videobrain_expansion_slot_device::extres_w ) { m_out_extres_func(state); }
+
+
+//-------------------------------------------------
+// SLOT_INTERFACE_START( vidbrain_expansion_cards )
+//-------------------------------------------------
+
+SLOT_INTERFACE_START( vidbrain_expansion_cards )
+ SLOT_INTERFACE_INTERNAL("standard", VB_STD)
+ SLOT_INTERFACE_INTERNAL("moneyminder", VB_MONEY_MINDER)
+ SLOT_INTERFACE_INTERNAL("timeshare", VB_TIMESHARE)
+SLOT_INTERFACE_END
diff --git a/src/mess/machine/vidbrain_exp.h b/src/emu/bus/vidbrain/exp.h
index 3455f1e5ea8..db856a5ad56 100644
--- a/src/mess/machine/vidbrain_exp.h
+++ b/src/emu/bus/vidbrain/exp.h
@@ -173,5 +173,13 @@ protected:
extern const device_type VIDEOBRAIN_EXPANSION_SLOT;
+// slot devices
+#include "std.h"
+#include "money_minder.h"
+#include "timeshare.h"
+
+SLOT_INTERFACE_EXTERN( vidbrain_expansion_cards );
+
+
#endif
diff --git a/src/mess/machine/vb_money_minder.c b/src/emu/bus/vidbrain/money_minder.c
index acf66cd9ca7..98df3830963 100644
--- a/src/mess/machine/vb_money_minder.c
+++ b/src/emu/bus/vidbrain/money_minder.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "vb_money_minder.h"
+#include "money_minder.h"
diff --git a/src/mess/machine/vb_money_minder.h b/src/emu/bus/vidbrain/money_minder.h
index 764138e224d..20bdaf1f1e5 100644
--- a/src/mess/machine/vb_money_minder.h
+++ b/src/emu/bus/vidbrain/money_minder.h
@@ -14,9 +14,8 @@
#ifndef __VIDEOBRAIN_MONEY_MINDER_CARTRIDGE__
#define __VIDEOBRAIN_MONEY_MINDER_CARTRIDGE__
-
#include "emu.h"
-#include "machine/vidbrain_exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/vb_std.c b/src/emu/bus/vidbrain/std.c
index b5a95747eb3..cbfbf6e20d3 100644
--- a/src/mess/machine/vb_std.c
+++ b/src/emu/bus/vidbrain/std.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "vb_std.h"
+#include "std.h"
diff --git a/src/mess/machine/vb_std.h b/src/emu/bus/vidbrain/std.h
index 2b6da483972..a0baea9e3a7 100644
--- a/src/mess/machine/vb_std.h
+++ b/src/emu/bus/vidbrain/std.h
@@ -14,9 +14,8 @@
#ifndef __VIDEOBRAIN_STANDARD_CARTRIDGE__
#define __VIDEOBRAIN_STANDARD_CARTRIDGE__
-
#include "emu.h"
-#include "machine/vidbrain_exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/vb_timeshare.c b/src/emu/bus/vidbrain/timeshare.c
index d454db50a7c..ccb3f8781ad 100644
--- a/src/mess/machine/vb_timeshare.c
+++ b/src/emu/bus/vidbrain/timeshare.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "vb_timeshare.h"
+#include "timeshare.h"
diff --git a/src/mess/machine/vb_timeshare.h b/src/emu/bus/vidbrain/timeshare.h
index 4441636b455..d4c10b4821e 100644
--- a/src/mess/machine/vb_timeshare.h
+++ b/src/emu/bus/vidbrain/timeshare.h
@@ -14,9 +14,8 @@
#ifndef __VIDEOBRAIN_TIMESHARE_CARTRIDGE__
#define __VIDEOBRAIN_TIMESHARE_CARTRIDGE__
-
#include "emu.h"
-#include "machine/vidbrain_exp.h"
+#include "exp.h"
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index e935833c8d6..095ef08a981 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -28,14 +28,27 @@ OBJDIRS += \
$(EMUOBJ)/debugint \
$(EMUOBJ)/audio \
$(EMUOBJ)/bus \
+ $(EMUOBJ)/bus/abc1600 \
$(EMUOBJ)/bus/abcbus \
+ $(EMUOBJ)/bus/adam \
$(EMUOBJ)/bus/adamnet \
+ $(EMUOBJ)/bus/bw2 \
$(EMUOBJ)/bus/c64 \
+ $(EMUOBJ)/bus/cbm2 \
$(EMUOBJ)/bus/cbmiec \
$(EMUOBJ)/bus/comx35 \
+ $(EMUOBJ)/bus/ecbbus \
+ $(EMUOBJ)/bus/econet \
+ $(EMUOBJ)/bus/ep64 \
$(EMUOBJ)/bus/ieee488 \
$(EMUOBJ)/bus/isbx \
+ $(EMUOBJ)/bus/pet \
+ $(EMUOBJ)/bus/plus4 \
$(EMUOBJ)/bus/s100 \
+ $(EMUOBJ)/bus/vcs \
+ $(EMUOBJ)/bus/vic10 \
+ $(EMUOBJ)/bus/vic20 \
+ $(EMUOBJ)/bus/vidbrain \
$(EMUOBJ)/bus/vip \
$(EMUOBJ)/bus/wangpc \
$(EMUOBJ)/drivers \
diff --git a/src/mess/machine/64h156.c b/src/emu/machine/64h156.c
index 8a32a9cca29..8a32a9cca29 100644
--- a/src/mess/machine/64h156.c
+++ b/src/emu/machine/64h156.c
diff --git a/src/mess/machine/64h156.h b/src/emu/machine/64h156.h
index bd1bd327c0c..bd1bd327c0c 100644
--- a/src/mess/machine/64h156.h
+++ b/src/emu/machine/64h156.h
diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak
index 94e1ffb9fab..00ddeace905 100644
--- a/src/emu/machine/machine.mak
+++ b/src/emu/machine/machine.mak
@@ -921,6 +921,33 @@ endif
#-------------------------------------------------
#
+#@src/emu/machine/mos6702.h,MACHINES += MOS6702
+#-------------------------------------------------
+
+ifneq ($(filter MOS6702,$(MACHINES)),)
+MACHINEOBJS += $(MACHINEOBJ)/mos6702.o
+endif
+
+#-------------------------------------------------
+#
+#@src/emu/machine/mos8706.h,MACHINES += MOS8706
+#-------------------------------------------------
+
+ifneq ($(filter MOS8706,$(MACHINES)),)
+MACHINEOBJS += $(MACHINEOBJ)/mos8706.o
+endif
+
+#-------------------------------------------------
+#
+#@src/emu/machine/mos8722.h,MACHINES += MOS8722
+#-------------------------------------------------
+
+ifneq ($(filter MOS8722,$(MACHINES)),)
+MACHINEOBJS += $(MACHINEOBJ)/mos8722.o
+endif
+
+#-------------------------------------------------
+#
#@src/emu/machine/mos8726.h,MACHINES += MOS8726
#-------------------------------------------------
@@ -1116,6 +1143,15 @@ endif
#-------------------------------------------------
#
+#@src/emu/machine/64h156.h,MACHINES += RP5C15
+#-------------------------------------------------
+
+ifneq ($(filter R64H156,$(MACHINES)),)
+MACHINEOBJS += $(MACHINEOBJ)/64h156.o
+endif
+
+#-------------------------------------------------
+#
#@src/emu/machine/rtc4543.h,MACHINES += RTC4543
#-------------------------------------------------
diff --git a/src/mess/machine/mos6702.c b/src/emu/machine/mos6702.c
index b6e1aeb1f20..b6e1aeb1f20 100644
--- a/src/mess/machine/mos6702.c
+++ b/src/emu/machine/mos6702.c
diff --git a/src/mess/machine/mos6702.h b/src/emu/machine/mos6702.h
index 879f90df2bf..879f90df2bf 100644
--- a/src/mess/machine/mos6702.h
+++ b/src/emu/machine/mos6702.h
diff --git a/src/mess/machine/mos8706.c b/src/emu/machine/mos8706.c
index 699aa6e7bc7..699aa6e7bc7 100644
--- a/src/mess/machine/mos8706.c
+++ b/src/emu/machine/mos8706.c
diff --git a/src/mess/machine/mos8706.h b/src/emu/machine/mos8706.h
index 1138dab0f8b..1138dab0f8b 100644
--- a/src/mess/machine/mos8706.h
+++ b/src/emu/machine/mos8706.h
diff --git a/src/mess/machine/mos8722.c b/src/emu/machine/mos8722.c
index b74f0e0815c..b74f0e0815c 100644
--- a/src/mess/machine/mos8722.c
+++ b/src/emu/machine/mos8722.c
diff --git a/src/mess/machine/mos8722.h b/src/emu/machine/mos8722.h
index b4dc13c8c9b..b4dc13c8c9b 100644
--- a/src/mess/machine/mos8722.h
+++ b/src/emu/machine/mos8722.h
diff --git a/src/lib/formats/cbm_crt.c b/src/lib/formats/cbm_crt.c
new file mode 100644
index 00000000000..54b127c5af5
--- /dev/null
+++ b/src/lib/formats/cbm_crt.c
@@ -0,0 +1,196 @@
+// license:BSD-3-Clause
+// copyright-holders:Curt Coder
+/*********************************************************************
+
+ cbm_crt.c
+
+ Commodore C64 cartridge images
+
+*********************************************************************/
+
+#include "cbm_crt.h"
+
+
+
+//**************************************************************************
+// MACROS/CONSTANTS
+//**************************************************************************
+
+#define LOG 0
+
+
+// slot names for the C64 cartridge types
+static const char * CRT_C64_SLOT_NAMES[_CRT_C64_COUNT] =
+{
+ "standard",
+ UNSUPPORTED,
+ UNSUPPORTED,
+ UNSUPPORTED,
+ "simons_basic",
+ "ocean",
+ UNSUPPORTED,
+ "fun_play",
+ "super_games",
+ UNSUPPORTED,
+ "epyxfastload",
+ "westermann",
+ "rex",
+ UNSUPPORTED,
+ "magic_formel",
+ "system3",
+ "warp_speed",
+ "dinamic",
+ "zaxxon",
+ "magic_desk",
+ UNSUPPORTED,
+ "comal80",
+ "struct_basic",
+ "ross",
+ "ep64",
+ "ep7x8",
+ "dela_ep256",
+ "rex_ep256",
+ "mikroasm",
+ UNSUPPORTED,
+ UNSUPPORTED,
+ "stardos",
+ UNSUPPORTED,
+ UNSUPPORTED,
+ UNSUPPORTED,
+ UNSUPPORTED,
+ UNSUPPORTED,
+ UNSUPPORTED,
+ UNSUPPORTED,
+ UNSUPPORTED,
+ UNSUPPORTED,
+ "ieee488",
+ UNSUPPORTED,
+ UNSUPPORTED,
+ "exos",
+ UNSUPPORTED,
+ UNSUPPORTED,
+ UNSUPPORTED,
+ "super_explode",
+ UNSUPPORTED,
+ UNSUPPORTED,
+ "mach5",
+ UNSUPPORTED,
+ "pagefox",
+ UNSUPPORTED,
+ "silverrock"
+};
+
+
+
+//**************************************************************************
+// IMPLEMENTATION
+//**************************************************************************
+
+//-------------------------------------------------
+// cbm_crt_get_card - get slot interface card
+//-------------------------------------------------
+
+const char * cbm_crt_get_card(core_file *file)
+{
+ // read the header
+ cbm_crt_header header;
+ core_fread(file, &header, CRT_HEADER_LENGTH);
+
+ if (memcmp(header.signature, CRT_SIGNATURE, 16) == 0)
+ {
+ UINT16 hardware = pick_integer_be(header.hardware, 0, 2);
+
+ return CRT_C64_SLOT_NAMES[hardware];
+ }
+
+ return NULL;
+}
+
+
+//-------------------------------------------------
+// cbm_crt_read_header - read cartridge header
+//-------------------------------------------------
+
+bool cbm_crt_read_header(core_file* file, size_t *roml_size, size_t *romh_size, int *exrom, int *game)
+{
+ // read the header
+ cbm_crt_header header;
+ core_fread(file, &header, CRT_HEADER_LENGTH);
+
+ if (memcmp(header.signature, CRT_SIGNATURE, 16) != 0)
+ return false;
+
+ UINT16 hardware = pick_integer_be(header.hardware, 0, 2);
+ *exrom = header.exrom;
+ *game = header.game;
+
+ if (LOG)
+ {
+ logerror("Name: %s\n", header.name);
+ logerror("Hardware: %04x\n", hardware);
+ logerror("Slot device: %s\n", CRT_C64_SLOT_NAMES[hardware]);
+ logerror("EXROM: %u\n", header.exrom);
+ logerror("GAME: %u\n", header.game);
+ }
+
+ // determine ROM region lengths
+ while (!core_feof(file))
+ {
+ cbm_crt_chip chip;
+ core_fread(file, &chip, CRT_CHIP_LENGTH);
+
+ UINT16 address = pick_integer_be(chip.start_address, 0, 2);
+ UINT16 size = pick_integer_be(chip.image_size, 0, 2);
+ UINT16 type = pick_integer_be(chip.chip_type, 0, 2);
+
+ if (LOG)
+ {
+ logerror("CHIP Address: %04x\n", address);
+ logerror("CHIP Size: %04x\n", size);
+ logerror("CHIP Type: %04x\n", type);
+ }
+
+ switch (address)
+ {
+ case 0x8000: *roml_size += size; break;
+ case 0xa000: *romh_size += size; break;
+ case 0xe000: *romh_size += size; break;
+ default: logerror("Invalid CHIP loading address!\n"); break;
+ }
+
+ core_fseek(file, size, SEEK_CUR);
+ }
+
+ return true;
+}
+
+
+//-------------------------------------------------
+// cbm_crt_read_data - read cartridge data
+//-------------------------------------------------
+
+bool cbm_crt_read_data(core_file* file, UINT8 *roml, UINT8 *romh)
+{
+ offs_t roml_offset = 0;
+ offs_t romh_offset = 0;
+
+ core_fseek(file, CRT_HEADER_LENGTH, SEEK_SET);
+
+ while (!core_feof(file))
+ {
+ cbm_crt_chip chip;
+ core_fread(file, &chip, CRT_CHIP_LENGTH);
+
+ UINT16 address = pick_integer_be(chip.start_address, 0, 2);
+ UINT16 size = pick_integer_be(chip.image_size, 0, 2);
+
+ switch (address)
+ {
+ case 0x8000: core_fread(file, roml + roml_offset, size); roml_offset += size; break;
+ case 0xa000: core_fread(file, romh + romh_offset, size); romh_offset += size; break;
+ case 0xe000: core_fread(file, romh + romh_offset, size); romh_offset += size; break;
+ }
+ }
+
+ return true;
+}
diff --git a/src/mess/machine/cbm_crt.h b/src/lib/formats/cbm_crt.h
index 38f895509b8..f099daaf818 100644
--- a/src/mess/machine/cbm_crt.h
+++ b/src/lib/formats/cbm_crt.h
@@ -2,9 +2,9 @@
// copyright-holders:Curt Coder
/*********************************************************************
- machine/cbm_crt.h
+ cbm_crt.h
- Commodore VIC-20/C64 cartridge images
+ Commodore C64 cartridge images
*********************************************************************/
@@ -30,17 +30,6 @@
#define UNSUPPORTED "standard"
-// VIC-20 cartridge types
-enum
-{
- CRT_VIC20_STANDARD = 1,
- CRT_VIC20_MEGACART,
- CRT_VIC20_FINAL_EXPANSION,
- CRT_VIC20_FP,
- _CRT_VIC20_COUNT
-};
-
-
// C64 cartridge types
enum
{
diff --git a/src/lib/lib.mak b/src/lib/lib.mak
index a7c6ab3d449..8f4b5b5d4d8 100644
--- a/src/lib/lib.mak
+++ b/src/lib/lib.mak
@@ -113,6 +113,7 @@ FORMATSOBJS = \
$(LIBOBJ)/formats/atom_tap.o \
$(LIBOBJ)/formats/bw2_dsk.o \
$(LIBOBJ)/formats/bw12_dsk.o \
+ $(LIBOBJ)/formats/cbm_crt.o \
$(LIBOBJ)/formats/cbm_tap.o \
$(LIBOBJ)/formats/cgen_cas.o \
$(LIBOBJ)/formats/coco_cas.o \
diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c
index e07cf408c9d..e157314c5bb 100644
--- a/src/mess/drivers/a2600.c
+++ b/src/mess/drivers/a2600.c
@@ -17,7 +17,7 @@ TODO:
#include "imagedev/cassette.h"
#include "formats/a26_cas.h"
#include "video/tia.h"
-#include "machine/vcsctrl.h"
+#include "bus/vcs/ctrl.h"
#include "hashfile.h"
#define CONTROL1_TAG "joyport1"
diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c
index f65bbd7f7c4..acc7a116fa0 100644
--- a/src/mess/drivers/abc1600.c
+++ b/src/mess/drivers/abc1600.c
@@ -836,12 +836,6 @@ void abc1600_state::fdc_drq_w(bool state)
// ABC1600BUS_INTERFACE( abcbus_intf )
//-------------------------------------------------
-static SLOT_INTERFACE_START( abc1600bus_cards )
- SLOT_INTERFACE("4105", LUXOR_4105) // SASI interface
-// SLOT_INTERFACE("4077", LUXOR_4077) // Winchester controller
-// SLOT_INTERFACE("4004", LUXOR_4004) // ICOM I/O (Z80, Z80PIO, Z80SIO/2, Z80CTC, 2 Z80DMAs, 2 PROMs, 64KB RAM)
-SLOT_INTERFACE_END
-
static ABC1600BUS_INTERFACE( bus0i_intf )
{
DEVCB_DEVICE_LINE_MEMBER(Z8536B1_TAG, z8536_device, pa7_w), // really inverted but ASSERT_LINE takes care of that
diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c
index 5bfe3b0bc98..b479f22b7f9 100644
--- a/src/mess/drivers/bbc.c
+++ b/src/mess/drivers/bbc.c
@@ -11,11 +11,10 @@
******************************************************************************/
#include "emu.h"
+#include "bus/econet/econet.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m65sc02.h"
#include "machine/6522via.h"
-#include "machine/econet.h"
-#include "machine/e01.h"
#include "machine/mc146818.h"
#include "machine/mc6854.h"
#include "machine/upd7002.h"
@@ -811,11 +810,6 @@ static ECONET_INTERFACE( econet_intf )
DEVCB_NULL
};
-static SLOT_INTERFACE_START( econet_devices )
- SLOT_INTERFACE("e01", E01)
- SLOT_INTERFACE("e01s", E01S)
-SLOT_INTERFACE_END
-
static const rs232_port_interface rs232_intf =
{
DEVCB_NULL,
diff --git a/src/mess/drivers/prof80.c b/src/mess/drivers/prof80.c
index eb24882d8fb..8cff29f9a66 100644
--- a/src/mess/drivers/prof80.c
+++ b/src/mess/drivers/prof80.c
@@ -509,15 +509,6 @@ static ECBBUS_INTERFACE( ecb_intf )
DEVCB_NULL
};
-static SLOT_INTERFACE_START( prof80_ecb_cards )
- SLOT_INTERFACE("grip21", ECB_GRIP21)
-/* SLOT_INTERFACE("grip25", ECB_GRIP25)
- SLOT_INTERFACE("grip26", ECB_GRIP26)
- SLOT_INTERFACE("grip31", ECB_GRIP31)
- SLOT_INTERFACE("grip562", ECB_GRIP562)
- SLOT_INTERFACE("grips115", ECB_GRIPS115)*/
-SLOT_INTERFACE_END
-
//-------------------------------------------------
// rs232_port_interface rs232_intf
@@ -610,11 +601,11 @@ static MACHINE_CONFIG_START( prof80, prof80_state )
// ECB bus
MCFG_ECBBUS_ADD(Z80_TAG, ecb_intf)
- MCFG_ECBBUS_SLOT_ADD(1, "ecb_1", prof80_ecb_cards, "grip21")
- MCFG_ECBBUS_SLOT_ADD(2, "ecb_2", prof80_ecb_cards, NULL)
- MCFG_ECBBUS_SLOT_ADD(3, "ecb_3", prof80_ecb_cards, NULL)
- MCFG_ECBBUS_SLOT_ADD(4, "ecb_4", prof80_ecb_cards, NULL)
- MCFG_ECBBUS_SLOT_ADD(5, "ecb_5", prof80_ecb_cards, NULL)
+ MCFG_ECBBUS_SLOT_ADD(1, "ecb_1", ecbbus_cards, "grip21")
+ MCFG_ECBBUS_SLOT_ADD(2, "ecb_2", ecbbus_cards, NULL)
+ MCFG_ECBBUS_SLOT_ADD(3, "ecb_3", ecbbus_cards, NULL)
+ MCFG_ECBBUS_SLOT_ADD(4, "ecb_4", ecbbus_cards, NULL)
+ MCFG_ECBBUS_SLOT_ADD(5, "ecb_5", ecbbus_cards, NULL)
// V24
MCFG_RS232_PORT_ADD(RS232_A_TAG, rs232_intf, default_rs232_devices, NULL)
diff --git a/src/mess/drivers/vidbrain.c b/src/mess/drivers/vidbrain.c
index d2334b2151c..93554ab43c4 100644
--- a/src/mess/drivers/vidbrain.c
+++ b/src/mess/drivers/vidbrain.c
@@ -470,12 +470,6 @@ static UV201_INTERFACE( uv_intf )
// VIDEOBRAIN_EXPANSION_INTERFACE( expansion_intf )
//-------------------------------------------------
-SLOT_INTERFACE_START( expansion_cards )
- SLOT_INTERFACE_INTERNAL("standard", VB_STD)
- SLOT_INTERFACE_INTERNAL("moneyminder", VB_MONEY_MINDER)
- SLOT_INTERFACE_INTERNAL("timeshare", VB_TIMESHARE)
-SLOT_INTERFACE_END
-
static VIDEOBRAIN_EXPANSION_INTERFACE( expansion_intf )
{
DEVCB_NULL
@@ -589,7 +583,7 @@ static MACHINE_CONFIG_START( vidbrain, vidbrain_state )
MCFG_F3853_ADD(F3853_TAG, XTAL_4MHz/2, smi_intf)
// cartridge
- MCFG_VIDEOBRAIN_EXPANSION_SLOT_ADD(VIDEOBRAIN_EXPANSION_SLOT_TAG, expansion_intf, expansion_cards, NULL)
+ MCFG_VIDEOBRAIN_EXPANSION_SLOT_ADD(VIDEOBRAIN_EXPANSION_SLOT_TAG, expansion_intf, vidbrain_expansion_cards, NULL)
// software lists
MCFG_SOFTWARE_LIST_ADD("cart_list", "vidbrain")
diff --git a/src/mess/includes/abc1600.h b/src/mess/includes/abc1600.h
index 9f29b94657b..2663b87d376 100644
--- a/src/mess/includes/abc1600.h
+++ b/src/mess/includes/abc1600.h
@@ -6,13 +6,12 @@
#define __ABC1600__
#include "emu.h"
+#include "bus/abc1600/abc1600.h"
#include "cpu/m68000/m68000.h"
#include "machine/8530scc.h"
#include "machine/abckb.h"
-#include "machine/abc1600_bus.h"
#include "machine/abc1600mac.h"
#include "machine/e0516.h"
-#include "machine/lux4105.h"
#include "machine/nmc9306.h"
#include "machine/ram.h"
#include "machine/serial.h"
diff --git a/src/mess/includes/adam.h b/src/mess/includes/adam.h
index 40429c89500..0bce821bfff 100644
--- a/src/mess/includes/adam.h
+++ b/src/mess/includes/adam.h
@@ -6,11 +6,11 @@
#define ADAM_H_
#include "emu.h"
+#include "bus/adam/exp.h"
#include "bus/adamnet/adamnet.h"
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "imagedev/cartslot.h"
-#include "machine/adamexp.h"
#include "machine/coleco.h"
#include "machine/ram.h"
#include "sound/sn76496.h"
diff --git a/src/mess/includes/bw2.h b/src/mess/includes/bw2.h
index b7e16b1a9cb..d6f1ef682c3 100644
--- a/src/mess/includes/bw2.h
+++ b/src/mess/includes/bw2.h
@@ -6,9 +6,9 @@
#define __BW2__
#include "emu.h"
+#include "bus/bw2/exp.h"
#include "cpu/z80/z80.h"
#include "formats/bw2_dsk.h"
-#include "machine/bw2exp.h"
#include "machine/ctronics.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
diff --git a/src/mess/includes/c128.h b/src/mess/includes/c128.h
index f0c775e3382..d4bf28533d2 100644
--- a/src/mess/includes/c128.h
+++ b/src/mess/includes/c128.h
@@ -9,14 +9,14 @@
#include "bus/cbmiec/cbmiec.h"
#include "bus/c64/exp.h"
#include "bus/c64/user.h"
+#include "bus/pet/cass.h"
+#include "bus/vcs/ctrl.h"
#include "machine/cbm_snqk.h"
#include "cpu/m6502/m8502.h"
#include "machine/mos6526.h"
#include "machine/mos8722.h"
-#include "machine/petcass.h"
#include "machine/pla.h"
#include "machine/ram.h"
-#include "machine/vcsctrl.h"
#include "sound/dac.h"
#include "sound/mos6581.h"
#include "video/mos6566.h"
diff --git a/src/mess/includes/c64.h b/src/mess/includes/c64.h
index dcf8dafd197..17595ba85a6 100644
--- a/src/mess/includes/c64.h
+++ b/src/mess/includes/c64.h
@@ -9,13 +9,13 @@
#include "bus/cbmiec/cbmiec.h"
#include "bus/c64/exp.h"
#include "bus/c64/user.h"
+#include "bus/pet/cass.h"
+#include "bus/vcs/ctrl.h"
#include "cpu/m6502/m6510.h"
#include "machine/cbm_snqk.h"
#include "machine/mos6526.h"
-#include "machine/petcass.h"
#include "machine/pla.h"
#include "machine/ram.h"
-#include "machine/vcsctrl.h"
#include "sound/dac.h"
#include "sound/mos6581.h"
#include "video/mos6566.h"
diff --git a/src/mess/includes/cbm2.h b/src/mess/includes/cbm2.h
index 263baf7e5f0..5f3cd7182ac 100644
--- a/src/mess/includes/cbm2.h
+++ b/src/mess/includes/cbm2.h
@@ -6,23 +6,23 @@
#define __P500__
#include "emu.h"
+#include "bus/cbm2/exp.h"
+#include "bus/cbm2/user.h"
#include "bus/ieee488/ieee488.h"
+#include "bus/pet/cass.h"
+#include "bus/vcs/ctrl.h"
#include "cpu/m6502/m6509.h"
#include "cpu/i86/i86.h"
#include "machine/cbm_snqk.h"
#include "machine/6525tpi.h"
-#include "machine/cbm2exp.h"
-#include "machine/cbm2user.h"
#include "machine/ds75160a.h"
#include "machine/ds75161a.h"
#include "machine/mos6526.h"
#include "machine/mos6551.h"
-#include "machine/petcass.h"
#include "machine/pic8259.h"
#include "machine/pla.h"
#include "machine/ram.h"
#include "machine/serial.h"
-#include "machine/vcsctrl.h"
#include "sound/dac.h"
#include "sound/mos6581.h"
#include "video/mc6845.h"
diff --git a/src/mess/includes/ep64.h b/src/mess/includes/ep64.h
index 4860e5773f1..e827e28d834 100644
--- a/src/mess/includes/ep64.h
+++ b/src/mess/includes/ep64.h
@@ -16,11 +16,11 @@
#include "emu.h"
#include "audio/dave.h"
+#include "bus/ep64/exp.h"
#include "cpu/z80/z80.h"
#include "imagedev/cartslot.h"
#include "imagedev/cassette.h"
#include "machine/ctronics.h"
-#include "machine/ep64exp.h"
#include "machine/ram.h"
#include "machine/serial.h"
#include "video/nick.h"
diff --git a/src/mess/includes/pet.h b/src/mess/includes/pet.h
index 818b70eeb35..2ecb642b29a 100644
--- a/src/mess/includes/pet.h
+++ b/src/mess/includes/pet.h
@@ -7,14 +7,14 @@
#include "emu.h"
#include "bus/ieee488/ieee488.h"
+#include "bus/pet/cass.h"
+#include "bus/pet/exp.h"
+#include "bus/pet/user.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/cartslot.h"
#include "machine/6522via.h"
#include "machine/6821pia.h"
#include "machine/cbm_snqk.h"
-#include "machine/petcass.h"
-#include "machine/petexp.h"
-#include "machine/petuser.h"
#include "machine/pla.h"
#include "machine/ram.h"
#include "sound/speaker.h"
diff --git a/src/mess/includes/plus4.h b/src/mess/includes/plus4.h
index 2290e59fa45..2e3e4e7ce5f 100644
--- a/src/mess/includes/plus4.h
+++ b/src/mess/includes/plus4.h
@@ -6,16 +6,17 @@
#define __PLUS4__
#include "emu.h"
+#include "bus/cbmiec/cbmiec.h"
+#include "bus/pet/cass.h"
+#include "bus/plus4/exp.h"
+#include "bus/plus4/user.h"
+#include "bus/vcs/ctrl.h"
#include "cpu/m6502/m7501.h"
#include "machine/cbm_snqk.h"
-#include "bus/cbmiec/cbmiec.h"
#include "machine/mos6529.h"
#include "machine/mos6551.h"
#include "machine/mos8706.h"
-#include "machine/petcass.h"
#include "machine/pla.h"
-#include "machine/plus4exp.h"
-#include "machine/plus4user.h"
#include "machine/ram.h"
#include "sound/mos7360.h"
#include "sound/t6721a.h"
diff --git a/src/mess/includes/prof80.h b/src/mess/includes/prof80.h
index 935f7bed4a3..5dd0c36ba8f 100644
--- a/src/mess/includes/prof80.h
+++ b/src/mess/includes/prof80.h
@@ -5,12 +5,10 @@
#ifndef __PROF80__
#define __PROF80__
-
#include "emu.h"
+#include "bus/ecbbus/ecbbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "machine/ecbbus.h"
-#include "machine/ecb_grip.h"
#include "machine/ram.h"
#include "machine/rescap.h"
#include "machine/serial.h"
diff --git a/src/mess/includes/vic10.h b/src/mess/includes/vic10.h
index 4622a9635f0..847b499fdbc 100644
--- a/src/mess/includes/vic10.h
+++ b/src/mess/includes/vic10.h
@@ -6,12 +6,12 @@
#define __VIC10__
#include "emu.h"
+#include "bus/pet/cass.h"
+#include "bus/vic10/exp.h"
+#include "bus/vcs/ctrl.h"
#include "cpu/m6502/m6510.h"
#include "machine/mos6526.h"
-#include "machine/petcass.h"
#include "machine/ram.h"
-#include "machine/vic10exp.h"
-#include "machine/vcsctrl.h"
#include "sound/dac.h"
#include "sound/mos6581.h"
#include "video/mos6566.h"
diff --git a/src/mess/includes/vic20.h b/src/mess/includes/vic20.h
index eefb334eb87..11adf40fd1d 100644
--- a/src/mess/includes/vic20.h
+++ b/src/mess/includes/vic20.h
@@ -7,15 +7,15 @@
#include "emu.h"
#include "bus/cbmiec/cbmiec.h"
+#include "bus/pet/cass.h"
+#include "bus/vcs/ctrl.h"
+#include "bus/vic20/exp.h"
+#include "bus/vic20/user.h"
#include "cpu/m6502/m6510.h"
#include "imagedev/cartslot.h"
#include "machine/6522via.h"
#include "machine/cbm_snqk.h"
-#include "machine/petcass.h"
#include "machine/ram.h"
-#include "machine/vcsctrl.h"
-#include "machine/vic20exp.h"
-#include "machine/vic20user.h"
#include "sound/dac.h"
#include "sound/mos6560.h"
diff --git a/src/mess/includes/vidbrain.h b/src/mess/includes/vidbrain.h
index 048c38147a4..536d3d1beaf 100644
--- a/src/mess/includes/vidbrain.h
+++ b/src/mess/includes/vidbrain.h
@@ -6,14 +6,11 @@
#define __VIDBRAIN__
#include "emu.h"
+#include "bus/vidbrain/exp.h"
#include "cpu/f8/f8.h"
#include "imagedev/cartslot.h"
#include "machine/f3853.h"
#include "machine/ram.h"
-#include "machine/vidbrain_exp.h"
-#include "machine/vb_std.h"
-#include "machine/vb_money_minder.h"
-#include "machine/vb_timeshare.h"
#include "sound/dac.h"
#include "sound/discrete.h"
#include "video/uv201.h"
diff --git a/src/mess/mess.mak b/src/mess/mess.mak
index f523f809a1a..cab959451ad 100644
--- a/src/mess/mess.mak
+++ b/src/mess/mess.mak
@@ -311,27 +311,14 @@ VIDEOS += V9938
# specify available machine cores
#-------------------------------------------------
-MACHINES += CMOS40105
-MACHINES += NCR53C7XX
-MACHINES += LSI53C810
MACHINES += 6522VIA
-MACHINES += TPI6525
MACHINES += 6526CIA
-MACHINES += RIOT6532
MACHINES += 6821PIA
MACHINES += 6840PTM
-MACHINES += ACIA6850
MACHINES += 68681
MACHINES += 7200FIFO
-MACHINES += TTL74123
-MACHINES += TTL74145
-MACHINES += TTL74148
-MACHINES += TTL74153
-MACHINES += TTL74181
-MACHINES += TTL7474
-MACHINES += KBDC8042
-MACHINES += I8257
MACHINES += AAKARTDEV
+MACHINES += ACIA6850
MACHINES += ADC0808
MACHINES += ADC083X
MACHINES += ADC1038
@@ -348,6 +335,7 @@ MACHINES += AY31015
MACHINES += BANKDEV
MACHINES += CDP1852
MACHINES += CDP1871
+MACHINES += CMOS40105
MACHINES += COM8116
MACHINES += CR589
MACHINES += CTRONICS
@@ -369,6 +357,7 @@ MACHINES += I8214
MACHINES += I8243
MACHINES += I8251
MACHINES += I8255
+MACHINES += I8257
MACHINES += I8279
MACHINES += I8355
MACHINES += IDE
@@ -380,6 +369,7 @@ MACHINES += JVS
MACHINES += K033906
MACHINES += K053252
MACHINES += K056230
+MACHINES += KBDC8042
MACHINES += LATCH8
MACHINES += LC89510
MACHINES += LDPR8210
@@ -387,9 +377,10 @@ MACHINES += LDSTUB
MACHINES += LDV1000
MACHINES += LDVP931
MACHINES += LINFLASH
-MACHINES += M6M80011AP
+MACHINES += LSI53C810
MACHINES += M68307
MACHINES += M68340
+MACHINES += M6M80011AP
MACHINES += MATSUCD
MACHINES += MB14241
MACHINES += MB3773
@@ -405,18 +396,24 @@ MACHINES += MC68901
MACHINES += MCCS1850
MACHINES += MCF5206E
MACHINES += MICROTOUCH
+MACHINES += MIOT6530
MACHINES += MM58274C
MACHINES += MM74C922
MACHINES += MOS6526
MACHINES += MOS6529
-MACHINES += MIOT6530
MACHINES += MOS6551
+MACHINES += MOS6702
+MACHINES += MOS8706
+MACHINES += MOS8722
+MACHINES += MOS8726
MACHINES += MSM5832
MACHINES += MSM58321
MACHINES += MSM6242
MACHINES += NCR539x
+MACHINES += NCR53C7XX
MACHINES += NMC9306
MACHINES += NSCSI
+MACHINES += PCCARD
MACHINES += PCF8593
MACHINES += PCI
MACHINES += PCKEYBRD
@@ -424,7 +421,9 @@ MACHINES += PD4990A_OLD
MACHINES += PIC8259
MACHINES += PIT8253
MACHINES += PLA
+MACHINES += R64H156
MACHINES += RF5C296
+MACHINES += RIOT6532
MACHINES += ROC10937
MACHINES += RP5C01
MACHINES += RP5C15
@@ -439,6 +438,7 @@ MACHINES += S3C2440
MACHINES += SATURN
MACHINES += SCSI
MACHINES += SCUDSP
+MACHINES += SECFLASH
MACHINES += SEIBU_COP
MACHINES += SMC91C9X
MACHINES += SMPC
@@ -449,6 +449,13 @@ MACHINES += TMP68301
MACHINES += TMS6100
MACHINES += TMS9901
MACHINES += TMS9902
+MACHINES += TPI6525
+MACHINES += TTL74123
+MACHINES += TTL74145
+MACHINES += TTL74148
+MACHINES += TTL74153
+MACHINES += TTL74181
+MACHINES += TTL7474
MACHINES += UPD1990A
MACHINES += UPD4701
MACHINES += UPD7002
@@ -469,22 +476,32 @@ MACHINES += Z80PIO
MACHINES += Z80SIO
MACHINES += Z80STI
MACHINES += Z8536
-MACHINES += SECFLASH
-MACHINES += PCCARD
-MACHINES += MOS8726
#-------------------------------------------------
# specify available bus cores
#-------------------------------------------------
+BUSES += ABC1600
BUSES += ABCBUS
+BUSES += ADAM
BUSES += ADAMNET
+BUSES += BW2
BUSES += C64
+BUSES += CBM2
BUSES += CBMIEC
BUSES += COMX35
+BUSES += ECBBUS
+BUSES += ECONET
+BUSES += EP64
BUSES += IEEE488
BUSES += ISBX
+BUSES += PET
+BUSES += PLUS4
BUSES += S100
+BUSES += VIC10
+BUSES += VIC20
+BUSES += VIDBRAIN
+BUSES += VCS
BUSES += VIP
BUSES += WANGPC
@@ -781,6 +798,7 @@ $(MESSOBJ)/shared.a: \
$(MESS_MACHINE)/null_modem.o\
$(MESS_MACHINE)/pc_kbdc.o \
$(MESS_MACHINE)/pc_lpt.o \
+ $(MESS_MACHINE)/s1410.o \
$(MESS_MACHINE)/sa1403d.o \
$(MESS_MACHINE)/sed1200.o \
$(MESS_MACHINE)/serial.o \
@@ -789,13 +807,6 @@ $(MESSOBJ)/shared.a: \
$(MESS_MACHINE)/sonydriv.o \
$(MESS_MACHINE)/teleprinter.o \
$(MESS_MACHINE)/terminal.o \
- $(MESS_MACHINE)/vcs_joy.o \
- $(MESS_MACHINE)/vcs_joybooster.o\
- $(MESS_MACHINE)/vcs_keypad.o \
- $(MESS_MACHINE)/vcs_lightpen.o \
- $(MESS_MACHINE)/vcs_paddles.o \
- $(MESS_MACHINE)/vcs_wheel.o \
- $(MESS_MACHINE)/vcsctrl.o \
$(MESS_MACHINE)/z80bin.o \
$(MESSOBJ)/isa.a: \
@@ -844,8 +855,6 @@ $(MESSOBJ)/acorn.a: \
$(MESS_MACHINE)/bbc.o \
$(MESS_DRIVERS)/bbc.o \
$(MESS_DRIVERS)/bbcbc.o \
- $(MESS_MACHINE)/econet.o \
- $(MESS_MACHINE)/e01.o \
$(MESS_VIDEO)/electron.o \
$(MESS_MACHINE)/electron.o \
$(MESS_DRIVERS)/electron.o \
@@ -1055,8 +1064,6 @@ $(MESSOBJ)/bnpo.a: \
$(MESSOBJ)/bondwell.a: \
$(MESS_DRIVERS)/bw2.o \
- $(MESS_MACHINE)/bw2exp.o \
- $(MESS_MACHINE)/bw2_ramcard.o \
$(MESS_DRIVERS)/bw12.o \
$(MESSOBJ)/booth.a: \
@@ -1084,55 +1091,20 @@ $(MESSOBJ)/casio.a: \
$(MESSOBJ)/cbm.a: \
$(MESS_DRIVERS)/pet.o \
- $(MESS_MACHINE)/petcass.o \
- $(MESS_MACHINE)/petexp.o \
- $(MESS_MACHINE)/petuser.o \
- $(MESS_MACHINE)/pet_64k.o \
- $(MESS_MACHINE)/superpet.o \
- $(MESS_MACHINE)/mos6702.o \
$(MESS_DRIVERS)/c64.o \
$(MESS_DRIVERS)/c64dtv.o \
$(MESS_DRIVERS)/vic10.o \
- $(MESS_MACHINE)/vic10exp.o \
- $(MESS_MACHINE)/vic10std.o \
$(MESS_DRIVERS)/vic20.o \
- $(MESS_MACHINE)/vic20exp.o \
- $(MESS_MACHINE)/vic20std.o \
- $(MESS_MACHINE)/vic20user.o \
- $(MESS_MACHINE)/vic20_megacart.o \
- $(MESS_MACHINE)/vic1010.o \
- $(MESS_MACHINE)/vic1011.o \
- $(MESS_MACHINE)/vic1110.o \
- $(MESS_MACHINE)/vic1111.o \
- $(MESS_MACHINE)/vic1112.o \
- $(MESS_MACHINE)/vic1210.o \
$(MESS_DRIVERS)/plus4.o \
- $(MESS_MACHINE)/plus4exp.o \
- $(MESS_MACHINE)/plus4user.o \
- $(MESS_MACHINE)/plus4_sid.o \
- $(MESS_MACHINE)/plus4_std.o \
- $(MESS_MACHINE)/mos8706.o \
- $(MESS_MACHINE)/diag264_lb_tape.o \
- $(MESS_MACHINE)/diag264_lb_user.o \
$(MESS_DRIVERS)/cbm2.o \
- $(MESS_MACHINE)/cbm2exp.o \
- $(MESS_MACHINE)/cbm2_std.o \
- $(MESS_MACHINE)/cbm2_24k.o \
- $(MESS_MACHINE)/cbm2_graphic.o \
- $(MESS_MACHINE)/cbm2user.o \
$(MESS_DRIVERS)/c65.o \
$(MESS_MACHINE)/c65.o \
$(MESS_DRIVERS)/c128.o \
- $(MESS_MACHINE)/c1551.o \
$(MESS_DRIVERS)/clcd.o \
- $(MESS_MACHINE)/64h156.o \
- $(MESS_MACHINE)/mos8722.o \
- $(MESS_MACHINE)/c2n.o \
$(MESS_VIDEO)/vic4567.o \
$(MESS_VIDEO)/mos6566.o \
$(MESS_DRIVERS)/c900.o \
$(MESS_MACHINE)/cbm_snqk.o \
- $(MESS_MACHINE)/cbm_crt.o \
$(MESSOBJ)/cccp.a: \
$(MESS_DRIVERS)/argo.o \
@@ -1172,10 +1144,6 @@ $(MESSOBJ)/coleco.a: \
$(MESS_DRIVERS)/coleco.o \
$(MESS_MACHINE)/coleco.o \
$(MESS_DRIVERS)/adam.o \
- $(MESS_MACHINE)/adamexp.o \
- $(MESS_MACHINE)/adamlink.o \
- $(MESS_MACHINE)/adam_ide.o \
- $(MESS_MACHINE)/adam_ram.o \
$(MESSOBJ)/cromemco.a: \
$(MESS_DRIVERS)/c10.o \
@@ -1193,8 +1161,6 @@ $(MESSOBJ)/concept.a: \
$(MESSOBJ)/conitec.a: \
$(MESS_DRIVERS)/prof80.o \
- $(MESS_MACHINE)/ecbbus.o \
- $(MESS_MACHINE)/ecb_grip.o \
$(MESS_DRIVERS)/prof180x.o \
$(MESSOBJ)/cybiko.a: \
@@ -1425,8 +1391,6 @@ $(MESSOBJ)/intelgnt.a: \
$(MESS_DRIVERS)/ep64.o \
$(MESS_AUDIO)/dave.o \
$(MESS_VIDEO)/nick.o \
- $(MESS_MACHINE)/ep64exp.o \
- $(MESS_MACHINE)/ep64_exdos.o\
$(MESSOBJ)/interton.a: \
$(MESS_AUDIO)/vc4000.o \
@@ -1465,11 +1429,8 @@ $(MESSOBJ)/luxor.a: \
$(MESS_MACHINE)/abc77.o \
$(MESS_MACHINE)/abc99.o \
$(MESS_DRIVERS)/abc1600.o \
- $(MESS_MACHINE)/abc1600_bus.o \
- $(MESS_MACHINE)/abc1600mac.o \
- $(MESS_MACHINE)/lux4105.o \
+ $(MESS_MACHINE)/abc1600mac.o\
$(MESS_VIDEO)/abc1600.o \
- $(MESS_MACHINE)/s1410.o \
$(MESSOBJ)/magnavox.a: \
$(MESS_DRIVERS)/odyssey2.o \
@@ -2153,10 +2114,6 @@ $(MESSOBJ)/veb.a: \
$(MESSOBJ)/vidbrain.a: \
$(MESS_DRIVERS)/vidbrain.o \
- $(MESS_MACHINE)/vidbrain_exp.o \
- $(MESS_MACHINE)/vb_std.o \
- $(MESS_MACHINE)/vb_money_minder.o \
- $(MESS_MACHINE)/vb_timeshare.o \
$(MESS_VIDEO)/uv201.o \
$(MESSOBJ)/videoton.a: \