summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Sandro Ronco <sronco@users.noreply.github.com>2013-10-26 19:17:51 +0000
committer Sandro Ronco <sronco@users.noreply.github.com>2013-10-26 19:17:51 +0000
commitbcd2b2ae7733d661e5cf2531bb91cac15eca1b19 (patch)
tree8ae5cac8662cd68fe23f1c187f030cca08dce13d
parent88cd9b09b7750d2679934f70da96870df28ae961 (diff)
Moved iq151, kc, tvc and z88 expansions into emu/bus. (nw)
-rw-r--r--.gitattributes80
-rw-r--r--src/emu/bus/bus.mak56
-rw-r--r--src/emu/bus/iq151/disc2.c (renamed from src/mess/machine/iq151_disc2.c)2
-rw-r--r--src/emu/bus/iq151/disc2.h (renamed from src/mess/machine/iq151_disc2.h)2
-rw-r--r--src/emu/bus/iq151/grafik.c (renamed from src/mess/video/iq151_grafik.c)2
-rw-r--r--src/emu/bus/iq151/grafik.h (renamed from src/mess/video/iq151_grafik.h)2
-rw-r--r--src/emu/bus/iq151/iq151.c (renamed from src/mess/machine/iq151cart.c)2
-rw-r--r--src/emu/bus/iq151/iq151.h (renamed from src/mess/machine/iq151cart.h)0
-rw-r--r--src/emu/bus/iq151/minigraf.c (renamed from src/mess/machine/iq151_minigraf.c)2
-rw-r--r--src/emu/bus/iq151/minigraf.h (renamed from src/mess/machine/iq151_minigraf.h)2
-rw-r--r--src/emu/bus/iq151/ms151a.c (renamed from src/mess/machine/iq151_ms151a.c)2
-rw-r--r--src/emu/bus/iq151/ms151a.h (renamed from src/mess/machine/iq151_ms151a.h)2
-rw-r--r--src/emu/bus/iq151/rom.c (renamed from src/mess/machine/iq151_rom.c)2
-rw-r--r--src/emu/bus/iq151/rom.h (renamed from src/mess/machine/iq151_rom.h)2
-rw-r--r--src/emu/bus/iq151/staper.c (renamed from src/mess/machine/iq151_staper.c)2
-rw-r--r--src/emu/bus/iq151/staper.h (renamed from src/mess/machine/iq151_staper.h)2
-rw-r--r--src/emu/bus/iq151/video32.c (renamed from src/mess/video/iq151_video32.c)2
-rw-r--r--src/emu/bus/iq151/video32.h (renamed from src/mess/video/iq151_video32.h)2
-rw-r--r--src/emu/bus/iq151/video64.c (renamed from src/mess/video/iq151_video64.c)2
-rw-r--r--src/emu/bus/iq151/video64.h (renamed from src/mess/video/iq151_video64.h)2
-rw-r--r--src/emu/bus/kc/d002.c (renamed from src/mess/machine/kc_d002.c)4
-rw-r--r--src/emu/bus/kc/d002.h (renamed from src/mess/machine/kc_d002.h)8
-rw-r--r--src/emu/bus/kc/d004.c (renamed from src/mess/machine/kc_d004.c)4
-rw-r--r--src/emu/bus/kc/d004.h (renamed from src/mess/machine/kc_d004.h)2
-rw-r--r--src/emu/bus/kc/kc.c (renamed from src/mess/machine/kcexp.c)4
-rw-r--r--src/emu/bus/kc/kc.h (renamed from src/mess/machine/kcexp.h)2
-rw-r--r--src/emu/bus/kc/ram.c (renamed from src/mess/machine/kc_ram.c)4
-rw-r--r--src/emu/bus/kc/ram.h (renamed from src/mess/machine/kc_ram.h)2
-rw-r--r--src/emu/bus/kc/rom.c (renamed from src/mess/machine/kc_rom.c)4
-rw-r--r--src/emu/bus/kc/rom.h (renamed from src/mess/machine/kc_rom.h)2
-rw-r--r--src/emu/bus/tvc/hbf.c (renamed from src/mess/machine/tvc_hbf.c)4
-rw-r--r--src/emu/bus/tvc/hbf.h (renamed from src/mess/machine/tvc_hbf.h)2
-rw-r--r--src/emu/bus/tvc/tvc.c (renamed from src/mess/machine/tvcexp.c)4
-rw-r--r--src/emu/bus/tvc/tvc.h (renamed from src/mess/machine/tvcexp.h)2
-rw-r--r--src/emu/bus/z88/flash.c (renamed from src/mess/machine/z88_flash.c)4
-rw-r--r--src/emu/bus/z88/flash.h (renamed from src/mess/machine/z88_flash.h)2
-rw-r--r--src/emu/bus/z88/ram.c (renamed from src/mess/machine/z88_ram.c)4
-rw-r--r--src/emu/bus/z88/ram.h (renamed from src/mess/machine/z88_ram.h)2
-rw-r--r--src/emu/bus/z88/rom.c (renamed from src/mess/machine/z88_rom.c)4
-rw-r--r--src/emu/bus/z88/rom.h (renamed from src/mess/machine/z88_rom.h)2
-rw-r--r--src/emu/bus/z88/z88.c (renamed from src/mess/machine/z88cart.c)4
-rw-r--r--src/emu/bus/z88/z88.h (renamed from src/mess/machine/z88cart.h)2
-rw-r--r--src/emu/emu.mak4
-rw-r--r--src/mess/drivers/iq151.c18
-rw-r--r--src/mess/includes/kc.h10
-rw-r--r--src/mess/includes/tvc.h4
-rw-r--r--src/mess/includes/z88.h8
-rw-r--r--src/mess/mess.mak24
48 files changed, 177 insertions, 133 deletions
diff --git a/.gitattributes b/.gitattributes
index 68f852c12a8..90a620ffcf3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -691,10 +691,38 @@ src/emu/bus/ieee488/shark.c svneol=native#text/plain
src/emu/bus/ieee488/shark.h svneol=native#text/plain
src/emu/bus/ieee488/softbox.c svneol=native#text/plain
src/emu/bus/ieee488/softbox.h svneol=native#text/plain
+src/emu/bus/iq151/disc2.c svneol=native#text/plain
+src/emu/bus/iq151/disc2.h svneol=native#text/plain
+src/emu/bus/iq151/grafik.c svneol=native#text/plain
+src/emu/bus/iq151/grafik.h svneol=native#text/plain
+src/emu/bus/iq151/iq151.c svneol=native#text/plain
+src/emu/bus/iq151/iq151.h svneol=native#text/plain
+src/emu/bus/iq151/minigraf.c svneol=native#text/plain
+src/emu/bus/iq151/minigraf.h svneol=native#text/plain
+src/emu/bus/iq151/ms151a.c svneol=native#text/plain
+src/emu/bus/iq151/ms151a.h svneol=native#text/plain
+src/emu/bus/iq151/rom.c svneol=native#text/plain
+src/emu/bus/iq151/rom.h svneol=native#text/plain
+src/emu/bus/iq151/staper.c svneol=native#text/plain
+src/emu/bus/iq151/staper.h svneol=native#text/plain
+src/emu/bus/iq151/video32.c svneol=native#text/plain
+src/emu/bus/iq151/video32.h svneol=native#text/plain
+src/emu/bus/iq151/video64.c svneol=native#text/plain
+src/emu/bus/iq151/video64.h svneol=native#text/plain
src/emu/bus/isbx/compis_fdc.c svneol=native#text/plain
src/emu/bus/isbx/compis_fdc.h svneol=native#text/plain
src/emu/bus/isbx/isbx.c svneol=native#text/plain
src/emu/bus/isbx/isbx.h svneol=native#text/plain
+src/emu/bus/kc/d002.c svneol=native#text/plain
+src/emu/bus/kc/d002.h svneol=native#text/plain
+src/emu/bus/kc/d004.c svneol=native#text/plain
+src/emu/bus/kc/d004.h svneol=native#text/plain
+src/emu/bus/kc/kc.c svneol=native#text/plain
+src/emu/bus/kc/kc.h svneol=native#text/plain
+src/emu/bus/kc/ram.c svneol=native#text/plain
+src/emu/bus/kc/ram.h svneol=native#text/plain
+src/emu/bus/kc/rom.c svneol=native#text/plain
+src/emu/bus/kc/rom.h svneol=native#text/plain
src/emu/bus/nubus/nubus.c svneol=native#text/plain
src/emu/bus/nubus/nubus.h svneol=native#text/plain
src/emu/bus/nubus/nubus_48gc.c svneol=native#text/plain
@@ -769,6 +797,10 @@ src/emu/bus/s100/s100.c svneol=native#text/plain
src/emu/bus/s100/s100.h svneol=native#text/plain
src/emu/bus/s100/wunderbus.c svneol=native#text/plain
src/emu/bus/s100/wunderbus.h svneol=native#text/plain
+src/emu/bus/tvc/hbf.c svneol=native#text/plain
+src/emu/bus/tvc/hbf.h svneol=native#text/plain
+src/emu/bus/tvc/tvc.c svneol=native#text/plain
+src/emu/bus/tvc/tvc.h svneol=native#text/plain
src/emu/bus/vcs/ctrl.c svneol=native#text/plain
src/emu/bus/vcs/ctrl.h svneol=native#text/plain
src/emu/bus/vcs/joybooster.c svneol=native#text/plain
@@ -853,6 +885,14 @@ src/emu/bus/wangpc/wangpc.c svneol=native#text/plain
src/emu/bus/wangpc/wangpc.h svneol=native#text/plain
src/emu/bus/wangpc/wdc.c svneol=native#text/plain
src/emu/bus/wangpc/wdc.h svneol=native#text/plain
+src/emu/bus/z88/flash.c svneol=native#text/plain
+src/emu/bus/z88/flash.h svneol=native#text/plain
+src/emu/bus/z88/ram.c svneol=native#text/plain
+src/emu/bus/z88/ram.h svneol=native#text/plain
+src/emu/bus/z88/rom.c svneol=native#text/plain
+src/emu/bus/z88/rom.h svneol=native#text/plain
+src/emu/bus/z88/z88.c svneol=native#text/plain
+src/emu/bus/z88/z88.h svneol=native#text/plain
src/emu/cheat.c svneol=native#text/plain
src/emu/cheat.h svneol=native#text/plain
src/emu/clifront.c svneol=native#text/plain
@@ -7742,18 +7782,6 @@ src/mess/machine/i8271.h svneol=native#text/plain
src/mess/machine/imi5000h.c svneol=native#text/plain
src/mess/machine/imi5000h.h svneol=native#text/plain
src/mess/machine/intv.c svneol=native#text/plain
-src/mess/machine/iq151_disc2.c svneol=native#text/plain
-src/mess/machine/iq151_disc2.h svneol=native#text/plain
-src/mess/machine/iq151_minigraf.c svneol=native#text/plain
-src/mess/machine/iq151_minigraf.h svneol=native#text/plain
-src/mess/machine/iq151_ms151a.c svneol=native#text/plain
-src/mess/machine/iq151_ms151a.h svneol=native#text/plain
-src/mess/machine/iq151_rom.c svneol=native#text/plain
-src/mess/machine/iq151_rom.h svneol=native#text/plain
-src/mess/machine/iq151_staper.c svneol=native#text/plain
-src/mess/machine/iq151_staper.h svneol=native#text/plain
-src/mess/machine/iq151cart.c svneol=native#text/plain
-src/mess/machine/iq151cart.h svneol=native#text/plain
src/mess/machine/isa.c svneol=native#text/plain
src/mess/machine/isa.h svneol=native#text/plain
src/mess/machine/isa_adlib.c svneol=native#text/plain
@@ -7814,18 +7842,8 @@ src/mess/machine/kb_pcat84.h svneol=native#text/plain
src/mess/machine/kb_pcxt83.c svneol=native#text/plain
src/mess/machine/kb_pcxt83.h svneol=native#text/plain
src/mess/machine/kc.c svneol=native#text/plain
-src/mess/machine/kc_d002.c svneol=native#text/plain
-src/mess/machine/kc_d002.h svneol=native#text/plain
-src/mess/machine/kc_d004.c svneol=native#text/plain
-src/mess/machine/kc_d004.h svneol=native#text/plain
src/mess/machine/kc_keyb.c svneol=native#text/plain
src/mess/machine/kc_keyb.h svneol=native#text/plain
-src/mess/machine/kc_ram.c svneol=native#text/plain
-src/mess/machine/kc_ram.h svneol=native#text/plain
-src/mess/machine/kc_rom.c svneol=native#text/plain
-src/mess/machine/kc_rom.h svneol=native#text/plain
-src/mess/machine/kcexp.c svneol=native#text/plain
-src/mess/machine/kcexp.h svneol=native#text/plain
src/mess/machine/keyboard.c svneol=native#text/plain
src/mess/machine/keyboard.h svneol=native#text/plain
src/mess/machine/kr2376.c svneol=native#text/plain
@@ -8240,10 +8258,6 @@ src/mess/machine/tms5501.h svneol=native#text/plain
src/mess/machine/trs80.c svneol=native#text/plain
src/mess/machine/trs80m2kb.c svneol=native#text/plain
src/mess/machine/trs80m2kb.h svneol=native#text/plain
-src/mess/machine/tvc_hbf.c svneol=native#text/plain
-src/mess/machine/tvc_hbf.h svneol=native#text/plain
-src/mess/machine/tvcexp.c svneol=native#text/plain
-src/mess/machine/tvcexp.h svneol=native#text/plain
src/mess/machine/upd65031.c svneol=native#text/plain
src/mess/machine/upd65031.h svneol=native#text/plain
src/mess/machine/upd71071.c svneol=native#text/plain
@@ -8270,14 +8284,6 @@ src/mess/machine/x68kexp.h svneol=native#text/plain
src/mess/machine/z80bin.c svneol=native#text/plain
src/mess/machine/z80bin.h svneol=native#text/plain
src/mess/machine/z80ne.c svneol=native#text/plain
-src/mess/machine/z88_flash.c svneol=native#text/plain
-src/mess/machine/z88_flash.h svneol=native#text/plain
-src/mess/machine/z88_ram.c svneol=native#text/plain
-src/mess/machine/z88_ram.h svneol=native#text/plain
-src/mess/machine/z88_rom.c svneol=native#text/plain
-src/mess/machine/z88_rom.h svneol=native#text/plain
-src/mess/machine/z88cart.c svneol=native#text/plain
-src/mess/machine/z88cart.h svneol=native#text/plain
src/mess/machine/zx.c svneol=native#text/plain
src/mess/machine/zx8302.c svneol=native#text/plain
src/mess/machine/zx8302.h svneol=native#text/plain
@@ -8401,12 +8407,6 @@ src/mess/video/gime.h svneol=native#text/plain
src/mess/video/hec2video.c svneol=native#text/plain
src/mess/video/hp48.c svneol=native#text/plain
src/mess/video/intv.c svneol=native#text/plain
-src/mess/video/iq151_grafik.c svneol=native#text/plain
-src/mess/video/iq151_grafik.h svneol=native#text/plain
-src/mess/video/iq151_video32.c svneol=native#text/plain
-src/mess/video/iq151_video32.h svneol=native#text/plain
-src/mess/video/iq151_video64.c svneol=native#text/plain
-src/mess/video/iq151_video64.h svneol=native#text/plain
src/mess/video/isa_cga.c svneol=native#text/plain
src/mess/video/isa_cga.h svneol=native#text/plain
src/mess/video/isa_ega.c svneol=native#text/plain
diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak
index 1db3dd09ecf..d8822a5dbf6 100644
--- a/src/emu/bus/bus.mak
+++ b/src/emu/bus/bus.mak
@@ -273,6 +273,24 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/iq151/iq151.h,BUSES += IQ151
+#-------------------------------------------------
+
+ifneq ($(filter IQ151,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/iq151/iq151.o
+BUSOBJS += $(BUSOBJ)/iq151/disc2.o
+BUSOBJS += $(BUSOBJ)/iq151/grafik.o
+BUSOBJS += $(BUSOBJ)/iq151/minigraf.o
+BUSOBJS += $(BUSOBJ)/iq151/ms151a.o
+BUSOBJS += $(BUSOBJ)/iq151/rom.o
+BUSOBJS += $(BUSOBJ)/iq151/staper.o
+BUSOBJS += $(BUSOBJ)/iq151/video32.o
+BUSOBJS += $(BUSOBJ)/iq151/video64.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/isbx/isbx.h,BUSES += ISBX
#-------------------------------------------------
@@ -284,6 +302,20 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/kc/kc.h,BUSES += KC
+#-------------------------------------------------
+
+ifneq ($(filter KC,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/kc/kc.o
+BUSOBJS += $(BUSOBJ)/kc/d002.o
+BUSOBJS += $(BUSOBJ)/kc/d004.o
+BUSOBJS += $(BUSOBJ)/kc/ram.o
+BUSOBJS += $(BUSOBJ)/kc/rom.o
+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
@@ -334,6 +366,17 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/tvc/tvc.h,BUSES += TVC
+#-------------------------------------------------
+
+ifneq ($(filter TVC,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/tvc/tvc.o
+BUSOBJS += $(BUSOBJ)/tvc/hbf.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/vcs/ctrl.h,BUSES += VCS
#-------------------------------------------------
@@ -429,6 +472,19 @@ BUSOBJS += $(BUSOBJ)/wangpc/tig.o
BUSOBJS += $(BUSOBJ)/wangpc/wdc.o
endif
+
+#-------------------------------------------------
+#
+#@src/emu/bus/z88/z88.h,BUSES += Z88
+#-------------------------------------------------
+
+ifneq ($(filter Z88,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/z88/z88.o
+BUSOBJS += $(BUSOBJ)/z88/flash.o
+BUSOBJS += $(BUSOBJ)/z88/ram.o
+BUSOBJS += $(BUSOBJ)/z88/rom.o
+endif
+
#-------------------------------------------------
#
#@src/emu/bus/a2bus/a2bus.h,BUSES += A2BUS
diff --git a/src/mess/machine/iq151_disc2.c b/src/emu/bus/iq151/disc2.c
index 67b9ff7bd57..d199ffb0a97 100644
--- a/src/mess/machine/iq151_disc2.c
+++ b/src/emu/bus/iq151/disc2.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "iq151_disc2.h"
+#include "disc2.h"
#include "formats/iq151_dsk.h"
diff --git a/src/mess/machine/iq151_disc2.h b/src/emu/bus/iq151/disc2.h
index b1661e18216..e017630cf40 100644
--- a/src/mess/machine/iq151_disc2.h
+++ b/src/emu/bus/iq151/disc2.h
@@ -4,7 +4,7 @@
#define __IQ151_DISC2_H__
#include "emu.h"
-#include "machine/iq151cart.h"
+#include "iq151.h"
#include "machine/upd765.h"
//**************************************************************************
diff --git a/src/mess/video/iq151_grafik.c b/src/emu/bus/iq151/grafik.c
index 8f29730485c..f2a72a1f712 100644
--- a/src/mess/video/iq151_grafik.c
+++ b/src/emu/bus/iq151/grafik.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "iq151_grafik.h"
+#include "grafik.h"
#define LOG 0
diff --git a/src/mess/video/iq151_grafik.h b/src/emu/bus/iq151/grafik.h
index 262d785b2e8..2db6748ef4e 100644
--- a/src/mess/video/iq151_grafik.h
+++ b/src/emu/bus/iq151/grafik.h
@@ -4,7 +4,7 @@
#define __IQ151_GRAFIK_H__
#include "emu.h"
-#include "machine/iq151cart.h"
+#include "iq151.h"
#include "machine/i8255.h"
//**************************************************************************
diff --git a/src/mess/machine/iq151cart.c b/src/emu/bus/iq151/iq151.c
index 39dd6abd99b..409ea024273 100644
--- a/src/mess/machine/iq151cart.c
+++ b/src/emu/bus/iq151/iq151.c
@@ -5,7 +5,7 @@
*********************************************************************/
#include "emu.h"
-#include "iq151cart.h"
+#include "iq151.h"
#include "emuopts.h"
#define LOG 0
diff --git a/src/mess/machine/iq151cart.h b/src/emu/bus/iq151/iq151.h
index d5a9dad486f..d5a9dad486f 100644
--- a/src/mess/machine/iq151cart.h
+++ b/src/emu/bus/iq151/iq151.h
diff --git a/src/mess/machine/iq151_minigraf.c b/src/emu/bus/iq151/minigraf.c
index c8dccc97245..dc266ccf063 100644
--- a/src/mess/machine/iq151_minigraf.c
+++ b/src/emu/bus/iq151/minigraf.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "iq151_minigraf.h"
+#include "minigraf.h"
#include "emuopts.h"
#include "png.h"
diff --git a/src/mess/machine/iq151_minigraf.h b/src/emu/bus/iq151/minigraf.h
index 2b9a721e4e6..ef4014d4f7b 100644
--- a/src/mess/machine/iq151_minigraf.h
+++ b/src/emu/bus/iq151/minigraf.h
@@ -4,7 +4,7 @@
#define __IQ151_MINIGRAF_H__
#include "emu.h"
-#include "machine/iq151cart.h"
+#include "iq151.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/iq151_ms151a.c b/src/emu/bus/iq151/ms151a.c
index 4d6312b2c81..65e47393222 100644
--- a/src/mess/machine/iq151_ms151a.c
+++ b/src/emu/bus/iq151/ms151a.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "iq151_ms151a.h"
+#include "ms151a.h"
#include "emuopts.h"
#include "png.h"
diff --git a/src/mess/machine/iq151_ms151a.h b/src/emu/bus/iq151/ms151a.h
index 8020c743575..380a81a426a 100644
--- a/src/mess/machine/iq151_ms151a.h
+++ b/src/emu/bus/iq151/ms151a.h
@@ -4,7 +4,7 @@
#define __IQ151_MS151A_H__
#include "emu.h"
-#include "machine/iq151cart.h"
+#include "iq151.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/iq151_rom.c b/src/emu/bus/iq151/rom.c
index cd58903edcf..d374eac26dc 100644
--- a/src/mess/machine/iq151_rom.c
+++ b/src/emu/bus/iq151/rom.c
@@ -10,7 +10,7 @@
***************************************************************************/
#include "emu.h"
-#include "iq151_rom.h"
+#include "rom.h"
/***************************************************************************
IMPLEMENTATION
diff --git a/src/mess/machine/iq151_rom.h b/src/emu/bus/iq151/rom.h
index 1801d7e4156..df9d872d89a 100644
--- a/src/mess/machine/iq151_rom.h
+++ b/src/emu/bus/iq151/rom.h
@@ -4,7 +4,7 @@
#define __IQ151_ROM_H__
#include "emu.h"
-#include "machine/iq151cart.h"
+#include "iq151.h"
#include "machine/i8255.h"
//**************************************************************************
diff --git a/src/mess/machine/iq151_staper.c b/src/emu/bus/iq151/staper.c
index 70ea4d2915b..d5943479051 100644
--- a/src/mess/machine/iq151_staper.c
+++ b/src/emu/bus/iq151/staper.c
@@ -12,7 +12,7 @@
***************************************************************************/
#include "emu.h"
-#include "iq151_staper.h"
+#include "staper.h"
/***************************************************************************
diff --git a/src/mess/machine/iq151_staper.h b/src/emu/bus/iq151/staper.h
index 3dfbed6465e..484babc4eac 100644
--- a/src/mess/machine/iq151_staper.h
+++ b/src/emu/bus/iq151/staper.h
@@ -4,7 +4,7 @@
#define __IQ151_STAPER_H__
#include "emu.h"
-#include "machine/iq151cart.h"
+#include "iq151.h"
#include "machine/i8255.h"
#include "imagedev/printer.h"
diff --git a/src/mess/video/iq151_video32.c b/src/emu/bus/iq151/video32.c
index ff3f3d64cb2..d83afcbc674 100644
--- a/src/mess/video/iq151_video32.c
+++ b/src/emu/bus/iq151/video32.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "iq151_video32.h"
+#include "video32.h"
/***************************************************************************
diff --git a/src/mess/video/iq151_video32.h b/src/emu/bus/iq151/video32.h
index 99aceb86567..81b40fc71b4 100644
--- a/src/mess/video/iq151_video32.h
+++ b/src/emu/bus/iq151/video32.h
@@ -4,7 +4,7 @@
#define __IQ151_VIDEO32_H__
#include "emu.h"
-#include "machine/iq151cart.h"
+#include "iq151.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/iq151_video64.c b/src/emu/bus/iq151/video64.c
index eddf2d6f0b7..f0fec9ef4fc 100644
--- a/src/mess/video/iq151_video64.c
+++ b/src/emu/bus/iq151/video64.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "iq151_video64.h"
+#include "video64.h"
/***************************************************************************
diff --git a/src/mess/video/iq151_video64.h b/src/emu/bus/iq151/video64.h
index 276001f8c0e..0bb3bacdd48 100644
--- a/src/mess/video/iq151_video64.h
+++ b/src/emu/bus/iq151/video64.h
@@ -4,7 +4,7 @@
#define __IQ151_VIDEO64_H__
#include "emu.h"
-#include "machine/iq151cart.h"
+#include "iq151.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/kc_d002.c b/src/emu/bus/kc/d002.c
index 5cba0483048..84ee18d1a37 100644
--- a/src/mess/machine/kc_d002.c
+++ b/src/emu/bus/kc/d002.c
@@ -1,13 +1,13 @@
/***************************************************************************
- kc_d002.c
+ d002.c
KC85 D002 Bus Driver emulation
***************************************************************************/
#include "emu.h"
-#include "kc_d002.h"
+#include "d002.h"
/***************************************************************************
IMPLEMENTATION
diff --git a/src/mess/machine/kc_d002.h b/src/emu/bus/kc/d002.h
index e8bf21212ea..7b710867fea 100644
--- a/src/mess/machine/kc_d002.h
+++ b/src/emu/bus/kc/d002.h
@@ -4,10 +4,10 @@
#define __KC_D002_H__
#include "emu.h"
-#include "machine/kcexp.h"
-#include "machine/kc_ram.h"
-#include "machine/kc_rom.h"
-#include "machine/kc_d004.h"
+#include "kc.h"
+#include "ram.h"
+#include "rom.h"
+#include "d004.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/kc_d004.c b/src/emu/bus/kc/d004.c
index 9359d7fabf9..b828884c035 100644
--- a/src/mess/machine/kc_d004.c
+++ b/src/emu/bus/kc/d004.c
@@ -1,13 +1,13 @@
/***************************************************************************
- kc_d004.c
+ d004.c
KC85 D004 Floppy Disk Interface
***************************************************************************/
#include "emu.h"
-#include "kc_d004.h"
+#include "d004.h"
#include "formats/mfi_dsk.h"
#include "formats/kc85_dsk.h"
diff --git a/src/mess/machine/kc_d004.h b/src/emu/bus/kc/d004.h
index ab4c15547f3..2aa577a05aa 100644
--- a/src/mess/machine/kc_d004.h
+++ b/src/emu/bus/kc/d004.h
@@ -4,7 +4,7 @@
#define __KC_D004_H__
#include "emu.h"
-#include "machine/kcexp.h"
+#include "kc.h"
#include "machine/z80ctc.h"
#include "cpu/z80/z80.h"
#include "machine/upd765.h"
diff --git a/src/mess/machine/kcexp.c b/src/emu/bus/kc/kc.c
index 724d8e344c8..d08ee821f27 100644
--- a/src/mess/machine/kcexp.c
+++ b/src/emu/bus/kc/kc.c
@@ -1,6 +1,6 @@
/*********************************************************************
- kcexp.c
+ kc.c
KC85_2/3/4/5 expansion slot emulation
@@ -103,7 +103,7 @@
*********************************************************************/
#include "emu.h"
-#include "kcexp.h"
+#include "kc.h"
#include "emuopts.h"
#define LOG 0
diff --git a/src/mess/machine/kcexp.h b/src/emu/bus/kc/kc.h
index 0c0ca03596a..2cdecef6c4d 100644
--- a/src/mess/machine/kcexp.h
+++ b/src/emu/bus/kc/kc.h
@@ -1,6 +1,6 @@
/*********************************************************************
- kcexp.h
+ kc.h
KC85_2/3/4/5 expansion slot emulation
diff --git a/src/mess/machine/kc_ram.c b/src/emu/bus/kc/ram.c
index 29853a7d5b0..3cb5d1eec16 100644
--- a/src/mess/machine/kc_ram.c
+++ b/src/emu/bus/kc/ram.c
@@ -1,6 +1,6 @@
/***************************************************************************
- kc_ram.c
+ ram.c
KC 85 RAM modules emulation
@@ -15,7 +15,7 @@
***************************************************************************/
#include "emu.h"
-#include "kc_ram.h"
+#include "ram.h"
/***************************************************************************
IMPLEMENTATION
diff --git a/src/mess/machine/kc_ram.h b/src/emu/bus/kc/ram.h
index 2e3d22a6bba..8a1e9d2f3f3 100644
--- a/src/mess/machine/kc_ram.h
+++ b/src/emu/bus/kc/ram.h
@@ -4,7 +4,7 @@
#define __KC_RAM_H__
#include "emu.h"
-#include "machine/kcexp.h"
+#include "kc.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/kc_rom.c b/src/emu/bus/kc/rom.c
index 096a71fc81a..4373525650b 100644
--- a/src/mess/machine/kc_rom.c
+++ b/src/emu/bus/kc/rom.c
@@ -1,6 +1,6 @@
/***************************************************************************
- kc_rom.c
+ rom.c
KC 85 ROM modules emulation
@@ -12,7 +12,7 @@
***************************************************************************/
#include "emu.h"
-#include "kc_rom.h"
+#include "rom.h"
#define REGION_TAG "rom"
diff --git a/src/mess/machine/kc_rom.h b/src/emu/bus/kc/rom.h
index a9de8276299..70ce992532d 100644
--- a/src/mess/machine/kc_rom.h
+++ b/src/emu/bus/kc/rom.h
@@ -4,7 +4,7 @@
#define __KC_ROM_H__
#include "emu.h"
-#include "machine/kcexp.h"
+#include "kc.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/tvc_hbf.c b/src/emu/bus/tvc/hbf.c
index 9d605c4e75e..6974382b809 100644
--- a/src/mess/machine/tvc_hbf.c
+++ b/src/emu/bus/tvc/hbf.c
@@ -1,11 +1,11 @@
/***************************************************************************
- tvc_hbf.c
+ hbf.c
***************************************************************************/
#include "emu.h"
-#include "tvc_hbf.h"
+#include "hbf.h"
/***************************************************************************
diff --git a/src/mess/machine/tvc_hbf.h b/src/emu/bus/tvc/hbf.h
index 28bbf5b30ab..fe0d45b6cc5 100644
--- a/src/mess/machine/tvc_hbf.h
+++ b/src/emu/bus/tvc/hbf.h
@@ -4,7 +4,7 @@
#define __TVC_HBF_H__
#include "emu.h"
-#include "machine/tvcexp.h"
+#include "tvc.h"
#include "machine/wd_fdc.h"
#include "formats/tvc_dsk.h"
diff --git a/src/mess/machine/tvcexp.c b/src/emu/bus/tvc/tvc.c
index be967632e00..36c607b27c7 100644
--- a/src/mess/machine/tvcexp.c
+++ b/src/emu/bus/tvc/tvc.c
@@ -1,11 +1,11 @@
/*********************************************************************
- tvcexp.c
+ tvc.c
*********************************************************************/
#include "emu.h"
-#include "tvcexp.h"
+#include "tvc.h"
#include "emuopts.h"
diff --git a/src/mess/machine/tvcexp.h b/src/emu/bus/tvc/tvc.h
index ff18936f4c6..7afb8b81e2c 100644
--- a/src/mess/machine/tvcexp.h
+++ b/src/emu/bus/tvc/tvc.h
@@ -1,6 +1,6 @@
/*********************************************************************
- tvcexp.h
+ tvc.h
**********************************************************************
diff --git a/src/mess/machine/z88_flash.c b/src/emu/bus/z88/flash.c
index 8ff4ee2a4a5..77926abad78 100644
--- a/src/mess/machine/z88_flash.c
+++ b/src/emu/bus/z88/flash.c
@@ -1,13 +1,13 @@
/***************************************************************************
- z88_flash.c
+ flash.c
Z88 Flash cartridges emulation
***************************************************************************/
#include "emu.h"
-#include "z88_flash.h"
+#include "flash.h"
//**************************************************************************
diff --git a/src/mess/machine/z88_flash.h b/src/emu/bus/z88/flash.h
index 8a7a2e4a68a..74678aa0f5e 100644
--- a/src/mess/machine/z88_flash.h
+++ b/src/emu/bus/z88/flash.h
@@ -4,7 +4,7 @@
#define __Z88_FLASH_H__
#include "emu.h"
-#include "machine/z88cart.h"
+#include "z88.h"
#include "machine/intelfsh.h"
//**************************************************************************
diff --git a/src/mess/machine/z88_ram.c b/src/emu/bus/z88/ram.c
index c24b91e4bc7..daa12e28cbc 100644
--- a/src/mess/machine/z88_ram.c
+++ b/src/emu/bus/z88/ram.c
@@ -1,13 +1,13 @@
/***************************************************************************
- z88_ram.c
+ z88.c
Z88 RAM cartridges emulation
***************************************************************************/
#include "emu.h"
-#include "z88_ram.h"
+#include "ram.h"
/***************************************************************************
IMPLEMENTATION
diff --git a/src/mess/machine/z88_ram.h b/src/emu/bus/z88/ram.h
index 9b4d91120b4..6904e317116 100644
--- a/src/mess/machine/z88_ram.h
+++ b/src/emu/bus/z88/ram.h
@@ -4,7 +4,7 @@
#define __Z88_RAM_H__
#include "emu.h"
-#include "machine/z88cart.h"
+#include "z88.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/z88_rom.c b/src/emu/bus/z88/rom.c
index d530cde93b1..b66d79e3c31 100644
--- a/src/mess/machine/z88_rom.c
+++ b/src/emu/bus/z88/rom.c
@@ -1,13 +1,13 @@
/***************************************************************************
- z88_rom.c
+ rom.c
Z88 ROM cartridges emulation
***************************************************************************/
#include "emu.h"
-#include "z88_rom.h"
+#include "rom.h"
/***************************************************************************
IMPLEMENTATION
diff --git a/src/mess/machine/z88_rom.h b/src/emu/bus/z88/rom.h
index a00843be650..48ad301d02a 100644
--- a/src/mess/machine/z88_rom.h
+++ b/src/emu/bus/z88/rom.h
@@ -4,7 +4,7 @@
#define __Z88_ROM_H__
#include "emu.h"
-#include "machine/z88cart.h"
+#include "z88.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/z88cart.c b/src/emu/bus/z88/z88.c
index 3e4e612a8f3..0c1a561c26a 100644
--- a/src/mess/machine/z88cart.c
+++ b/src/emu/bus/z88/z88.c
@@ -1,13 +1,13 @@
/*********************************************************************
- z88cart.c
+ z88.c
Z88 cartridge slots emulation
*********************************************************************/
#include "emu.h"
-#include "z88cart.h"
+#include "z88.h"
#include "emuopts.h"
diff --git a/src/mess/machine/z88cart.h b/src/emu/bus/z88/z88.h
index d4ac5dfcd82..903372e518a 100644
--- a/src/mess/machine/z88cart.h
+++ b/src/emu/bus/z88/z88.h
@@ -1,6 +1,6 @@
/*********************************************************************
- z88cart.h
+ z88.h
Z88 cartridge slots emulation
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 0f94fb2c3c2..fa89bdfc786 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -54,6 +54,10 @@ OBJDIRS += \
$(EMUOBJ)/bus/a2bus \
$(EMUOBJ)/bus/nubus \
$(EMUOBJ)/bus/centronics \
+ $(EMUOBJ)/bus/iq151 \
+ $(EMUOBJ)/bus/kc \
+ $(EMUOBJ)/bus/tvc \
+ $(EMUOBJ)/bus/z88 \
$(EMUOBJ)/drivers \
$(EMUOBJ)/machine \
$(EMUOBJ)/layout \
diff --git a/src/mess/drivers/iq151.c b/src/mess/drivers/iq151.c
index 80723a6b76e..9f2e1476f78 100644
--- a/src/mess/drivers/iq151.c
+++ b/src/mess/drivers/iq151.c
@@ -49,15 +49,15 @@ ToDo:
#include "imagedev/cassette.h"
// cartridge slot
-#include "machine/iq151cart.h"
-#include "machine/iq151_rom.h"
-#include "machine/iq151_disc2.h"
-#include "machine/iq151_minigraf.h"
-#include "machine/iq151_ms151a.h"
-#include "machine/iq151_staper.h"
-#include "video/iq151_grafik.h"
-#include "video/iq151_video32.h"
-#include "video/iq151_video64.h"
+#include "bus/iq151/iq151.h"
+#include "bus/iq151/rom.h"
+#include "bus/iq151/disc2.h"
+#include "bus/iq151/minigraf.h"
+#include "bus/iq151/ms151a.h"
+#include "bus/iq151/staper.h"
+#include "bus/iq151/grafik.h"
+#include "bus/iq151/video32.h"
+#include "bus/iq151/video64.h"
diff --git a/src/mess/includes/kc.h b/src/mess/includes/kc.h
index 9f90f5cfcf2..3d85b5f8edc 100644
--- a/src/mess/includes/kc.h
+++ b/src/mess/includes/kc.h
@@ -31,11 +31,11 @@
#include "formats/kc_cas.h"
// Expansions
-#include "machine/kcexp.h"
-#include "machine/kc_ram.h"
-#include "machine/kc_rom.h"
-#include "machine/kc_d002.h"
-#include "machine/kc_d004.h"
+#include "bus/kc/kc.h"
+#include "bus/kc/ram.h"
+#include "bus/kc/rom.h"
+#include "bus/kc/d002.h"
+#include "bus/kc/d004.h"
// from service manual
#define KC85_3_CLOCK 1751938
diff --git a/src/mess/includes/tvc.h b/src/mess/includes/tvc.h
index 022f5d4b08b..3fff7bb286c 100644
--- a/src/mess/includes/tvc.h
+++ b/src/mess/includes/tvc.h
@@ -18,8 +18,8 @@
#include "imagedev/snapquik.h"
#include "formats/tvc_cas.h"
-#include "machine/tvcexp.h"
-#include "machine/tvc_hbf.h"
+#include "bus/tvc/tvc.h"
+#include "bus/tvc/hbf.h"
#define TVC_RAM_BANK 1
#define TVC_ROM_BANK 2
diff --git a/src/mess/includes/z88.h b/src/mess/includes/z88.h
index ebf39411ee6..65ba135bd6d 100644
--- a/src/mess/includes/z88.h
+++ b/src/mess/includes/z88.h
@@ -11,10 +11,10 @@
#include "cpu/z80/z80.h"
#include "machine/upd65031.h"
#include "machine/ram.h"
-#include "machine/z88cart.h"
-#include "machine/z88_flash.h"
-#include "machine/z88_ram.h"
-#include "machine/z88_rom.h"
+#include "bus/z88/z88.h"
+#include "bus/z88/flash.h"
+#include "bus/z88/ram.h"
+#include "bus/z88/rom.h"
#include "sound/speaker.h"
#include "rendlay.h"
diff --git a/src/mess/mess.mak b/src/mess/mess.mak
index c622339d0c3..b78461ed49c 100644
--- a/src/mess/mess.mak
+++ b/src/mess/mess.mak
@@ -508,6 +508,10 @@ BUSES += WANGPC
BUSES += A2BUS
BUSES += NUBUS
BUSES += CENTRONICS
+BUSES += IQ151
+BUSES += KC
+BUSES += TVC
+BUSES += Z88
#-------------------------------------------------
# this is the list of driver libraries that
@@ -862,10 +866,6 @@ $(MESSOBJ)/acorn.a: \
$(MESS_DRIVERS)/electron.o \
$(MESS_DRIVERS)/z88.o \
$(MESS_VIDEO)/z88.o \
- $(MESS_MACHINE)/z88cart.o \
- $(MESS_MACHINE)/z88_flash.o \
- $(MESS_MACHINE)/z88_ram.o \
- $(MESS_MACHINE)/z88_rom.o \
$(MESS_MACHINE)/upd65031.o \
$(MESSOBJ)/act.a: \
@@ -2056,11 +2056,6 @@ $(MESSOBJ)/veb.a: \
$(MESS_DRIVERS)/kc.o \
$(MESS_MACHINE)/kc.o \
$(MESS_MACHINE)/kc_keyb.o \
- $(MESS_MACHINE)/kcexp.o \
- $(MESS_MACHINE)/kc_ram.o \
- $(MESS_MACHINE)/kc_rom.o \
- $(MESS_MACHINE)/kc_d002.o \
- $(MESS_MACHINE)/kc_d004.o \
$(MESS_DRIVERS)/lc80.o \
$(MESS_DRIVERS)/mc80.o \
$(MESS_VIDEO)/mc80.o \
@@ -2076,8 +2071,6 @@ $(MESSOBJ)/vidbrain.a: \
$(MESSOBJ)/videoton.a: \
$(MESS_DRIVERS)/tvc.o \
$(MESS_AUDIO)/tvc.o \
- $(MESS_MACHINE)/tvcexp.o \
- $(MESS_MACHINE)/tvc_hbf.o \
$(MESSOBJ)/visual.a: \
$(MESS_DRIVERS)/v1050.o \
@@ -2120,15 +2113,6 @@ $(MESSOBJ)/yamaha.a: \
$(MESSOBJ)/zpa.a: \
$(MESS_DRIVERS)/iq151.o \
- $(MESS_MACHINE)/iq151cart.o \
- $(MESS_MACHINE)/iq151_rom.o \
- $(MESS_MACHINE)/iq151_disc2.o \
- $(MESS_MACHINE)/iq151_minigraf.o\
- $(MESS_MACHINE)/iq151_ms151a.o \
- $(MESS_MACHINE)/iq151_staper.o \
- $(MESS_VIDEO)/iq151_grafik.o \
- $(MESS_VIDEO)/iq151_video32.o \
- $(MESS_VIDEO)/iq151_video64.o \
$(MESSOBJ)/zvt.a: \
$(MESS_DRIVERS)/pp01.o \