From d756fa8ec44d6572cf192a4883c1d7e00e5c47cc Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Sun, 20 Oct 2013 19:50:55 +0000 Subject: [PATCH] (MESS) vip: Moved expansion and byte I/O ports under emu/bus. (nw) --- .gitattributes | 40 +++++++++---------- src/emu/bus/bus.mak | 20 ++++++++++ .../vip_byteio.c => emu/bus/vip/byteio.c} | 2 +- .../vip_byteio.h => emu/bus/vip/byteio.h} | 2 +- .../machine/vip_exp.c => emu/bus/vip/exp.c} | 2 +- .../machine/vip_exp.h => emu/bus/vip/exp.h} | 14 +++---- src/{mess/machine => emu/bus/vip}/vp550.c | 0 src/{mess/machine => emu/bus/vip}/vp550.h | 2 +- src/{mess/machine => emu/bus/vip}/vp570.c | 0 src/{mess/machine => emu/bus/vip}/vp570.h | 2 +- src/{mess/machine => emu/bus/vip}/vp575.c | 0 src/{mess/machine => emu/bus/vip}/vp575.h | 2 +- src/{mess/machine => emu/bus/vip}/vp585.c | 0 src/{mess/machine => emu/bus/vip}/vp585.h | 2 +- src/{mess/machine => emu/bus/vip}/vp590.c | 0 src/{mess/machine => emu/bus/vip}/vp590.h | 2 +- src/{mess/machine => emu/bus/vip}/vp595.c | 0 src/{mess/machine => emu/bus/vip}/vp595.h | 2 +- src/{mess/machine => emu/bus/vip}/vp620.c | 0 src/{mess/machine => emu/bus/vip}/vp620.h | 2 +- src/{mess/machine => emu/bus/vip}/vp700.c | 0 src/{mess/machine => emu/bus/vip}/vp700.h | 2 +- src/emu/emu.mak | 1 + src/mess/includes/vip.h | 4 +- src/mess/mess.mak | 11 +---- 25 files changed, 62 insertions(+), 50 deletions(-) rename src/{mess/machine/vip_byteio.c => emu/bus/vip/byteio.c} (99%) rename src/{mess/machine/vip_byteio.h => emu/bus/vip/byteio.h} (99%) rename src/{mess/machine/vip_exp.c => emu/bus/vip/exp.c} (99%) rename src/{mess/machine/vip_exp.h => emu/bus/vip/exp.h} (96%) rename src/{mess/machine => emu/bus/vip}/vp550.c (100%) rename src/{mess/machine => emu/bus/vip}/vp550.h (98%) rename src/{mess/machine => emu/bus/vip}/vp570.c (100%) rename src/{mess/machine => emu/bus/vip}/vp570.h (98%) rename src/{mess/machine => emu/bus/vip}/vp575.c (100%) rename src/{mess/machine => emu/bus/vip}/vp575.h (99%) rename src/{mess/machine => emu/bus/vip}/vp585.c (100%) rename src/{mess/machine => emu/bus/vip}/vp585.h (97%) rename src/{mess/machine => emu/bus/vip}/vp590.c (100%) rename src/{mess/machine => emu/bus/vip}/vp590.h (98%) rename src/{mess/machine => emu/bus/vip}/vp595.c (100%) rename src/{mess/machine => emu/bus/vip}/vp595.h (97%) rename src/{mess/machine => emu/bus/vip}/vp620.c (100%) rename src/{mess/machine => emu/bus/vip}/vp620.h (97%) rename src/{mess/machine => emu/bus/vip}/vp700.c (100%) rename src/{mess/machine => emu/bus/vip}/vp700.h (97%) diff --git a/.gitattributes b/.gitattributes index 5350c6a9920..701150ac7d8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -613,6 +613,26 @@ 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/vip/byteio.c svneol=native#text/plain +src/emu/bus/vip/byteio.h svneol=native#text/plain +src/emu/bus/vip/exp.c svneol=native#text/plain +src/emu/bus/vip/exp.h svneol=native#text/plain +src/emu/bus/vip/vp550.c svneol=native#text/plain +src/emu/bus/vip/vp550.h svneol=native#text/plain +src/emu/bus/vip/vp570.c svneol=native#text/plain +src/emu/bus/vip/vp570.h svneol=native#text/plain +src/emu/bus/vip/vp575.c svneol=native#text/plain +src/emu/bus/vip/vp575.h svneol=native#text/plain +src/emu/bus/vip/vp585.c svneol=native#text/plain +src/emu/bus/vip/vp585.h svneol=native#text/plain +src/emu/bus/vip/vp590.c svneol=native#text/plain +src/emu/bus/vip/vp590.h svneol=native#text/plain +src/emu/bus/vip/vp595.c svneol=native#text/plain +src/emu/bus/vip/vp595.h svneol=native#text/plain +src/emu/bus/vip/vp620.c svneol=native#text/plain +src/emu/bus/vip/vp620.h svneol=native#text/plain +src/emu/bus/vip/vp700.c svneol=native#text/plain +src/emu/bus/vip/vp700.h svneol=native#text/plain src/emu/bus/wangpc/emb.c svneol=native#text/plain src/emu/bus/wangpc/emb.h svneol=native#text/plain src/emu/bus/wangpc/lic.c svneol=native#text/plain @@ -8202,26 +8222,6 @@ src/mess/machine/victor9kb.c svneol=native#text/plain src/mess/machine/victor9kb.h svneol=native#text/plain src/mess/machine/vidbrain_exp.c svneol=native#text/plain src/mess/machine/vidbrain_exp.h svneol=native#text/plain -src/mess/machine/vip_byteio.c svneol=native#text/plain -src/mess/machine/vip_byteio.h svneol=native#text/plain -src/mess/machine/vip_exp.c svneol=native#text/plain -src/mess/machine/vip_exp.h svneol=native#text/plain -src/mess/machine/vp550.c svneol=native#text/plain -src/mess/machine/vp550.h svneol=native#text/plain -src/mess/machine/vp570.c svneol=native#text/plain -src/mess/machine/vp570.h svneol=native#text/plain -src/mess/machine/vp575.c svneol=native#text/plain -src/mess/machine/vp575.h svneol=native#text/plain -src/mess/machine/vp585.c svneol=native#text/plain -src/mess/machine/vp585.h svneol=native#text/plain -src/mess/machine/vp590.c svneol=native#text/plain -src/mess/machine/vp590.h svneol=native#text/plain -src/mess/machine/vp595.c svneol=native#text/plain -src/mess/machine/vp595.h svneol=native#text/plain -src/mess/machine/vp620.c svneol=native#text/plain -src/mess/machine/vp620.h svneol=native#text/plain -src/mess/machine/vp700.c svneol=native#text/plain -src/mess/machine/vp700.h svneol=native#text/plain src/mess/machine/vtech2.c svneol=native#text/plain src/mess/machine/wangpckb.c svneol=native#text/plain src/mess/machine/wangpckb.h svneol=native#text/plain diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak index 7f6acb60f5e..192a0685def 100644 --- a/src/emu/bus/bus.mak +++ b/src/emu/bus/bus.mak @@ -215,6 +215,26 @@ BUSOBJS += $(BUSOBJ)/s100/wunderbus.o endif +#------------------------------------------------- +# +#@src/emu/bus/vip/byteio.h,BUSES += VIP +#@src/emu/bus/vip/exp.h,BUSES += VIP +#------------------------------------------------- + +ifneq ($(filter VIP,$(BUSES)),) +BUSOBJS += $(BUSOBJ)/vip/byteio.o +BUSOBJS += $(BUSOBJ)/vip/vp620.o +BUSOBJS += $(BUSOBJ)/vip/exp.o +BUSOBJS += $(BUSOBJ)/vip/vp550.o +BUSOBJS += $(BUSOBJ)/vip/vp570.o +BUSOBJS += $(BUSOBJ)/vip/vp575.o +BUSOBJS += $(BUSOBJ)/vip/vp585.o +BUSOBJS += $(BUSOBJ)/vip/vp590.o +BUSOBJS += $(BUSOBJ)/vip/vp595.o +BUSOBJS += $(BUSOBJ)/vip/vp700.o +endif + + #------------------------------------------------- # #@src/emu/bus/wangpc/wangpc.h,BUSES += WANGPC diff --git a/src/mess/machine/vip_byteio.c b/src/emu/bus/vip/byteio.c similarity index 99% rename from src/mess/machine/vip_byteio.c rename to src/emu/bus/vip/byteio.c index d5f972caa70..5410cd8c9be 100644 --- a/src/mess/machine/vip_byteio.c +++ b/src/emu/bus/vip/byteio.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "machine/vip_byteio.h" +#include "byteio.h" diff --git a/src/mess/machine/vip_byteio.h b/src/emu/bus/vip/byteio.h similarity index 99% rename from src/mess/machine/vip_byteio.h rename to src/emu/bus/vip/byteio.h index ecfec06f7d3..4fa9423f192 100644 --- a/src/mess/machine/vip_byteio.h +++ b/src/emu/bus/vip/byteio.h @@ -127,7 +127,7 @@ extern const device_type VIP_BYTEIO_PORT; // slot devices -#include "machine/vp620.h" +#include "vp620.h" SLOT_INTERFACE_EXTERN( vip_byteio_cards ); diff --git a/src/mess/machine/vip_exp.c b/src/emu/bus/vip/exp.c similarity index 99% rename from src/mess/machine/vip_exp.c rename to src/emu/bus/vip/exp.c index 4db0a19e228..511dd0814e0 100644 --- a/src/mess/machine/vip_exp.c +++ b/src/emu/bus/vip/exp.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "machine/vip_exp.h" +#include "exp.h" diff --git a/src/mess/machine/vip_exp.h b/src/emu/bus/vip/exp.h similarity index 96% rename from src/mess/machine/vip_exp.h rename to src/emu/bus/vip/exp.h index 835e70e718f..c4f95fc62d8 100644 --- a/src/mess/machine/vip_exp.h +++ b/src/emu/bus/vip/exp.h @@ -159,13 +159,13 @@ extern const device_type VIP_EXPANSION_SLOT; // slot devices -#include "machine/vp550.h" -#include "machine/vp570.h" -#include "machine/vp575.h" -#include "machine/vp585.h" -#include "machine/vp590.h" -#include "machine/vp595.h" -#include "machine/vp700.h" +#include "vp550.h" +#include "vp570.h" +#include "vp575.h" +#include "vp585.h" +#include "vp590.h" +#include "vp595.h" +#include "vp700.h" SLOT_INTERFACE_EXTERN( vip_expansion_cards ); diff --git a/src/mess/machine/vp550.c b/src/emu/bus/vip/vp550.c similarity index 100% rename from src/mess/machine/vp550.c rename to src/emu/bus/vip/vp550.c diff --git a/src/mess/machine/vp550.h b/src/emu/bus/vip/vp550.h similarity index 98% rename from src/mess/machine/vp550.h rename to src/emu/bus/vip/vp550.h index 007a9a65681..c4de33993e8 100644 --- a/src/mess/machine/vp550.h +++ b/src/emu/bus/vip/vp550.h @@ -15,7 +15,7 @@ #define __VP550__ #include "emu.h" -#include "machine/vip_exp.h" +#include "exp.h" #include "sound/cdp1863.h" diff --git a/src/mess/machine/vp570.c b/src/emu/bus/vip/vp570.c similarity index 100% rename from src/mess/machine/vp570.c rename to src/emu/bus/vip/vp570.c diff --git a/src/mess/machine/vp570.h b/src/emu/bus/vip/vp570.h similarity index 98% rename from src/mess/machine/vp570.h rename to src/emu/bus/vip/vp570.h index 83a89ab55cf..23b0d047384 100644 --- a/src/mess/machine/vp570.h +++ b/src/emu/bus/vip/vp570.h @@ -15,7 +15,7 @@ #define __VP570__ #include "emu.h" -#include "machine/vip_exp.h" +#include "exp.h" diff --git a/src/mess/machine/vp575.c b/src/emu/bus/vip/vp575.c similarity index 100% rename from src/mess/machine/vp575.c rename to src/emu/bus/vip/vp575.c diff --git a/src/mess/machine/vp575.h b/src/emu/bus/vip/vp575.h similarity index 99% rename from src/mess/machine/vp575.h rename to src/emu/bus/vip/vp575.h index 5e82e9c1549..375af27a26a 100644 --- a/src/mess/machine/vp575.h +++ b/src/emu/bus/vip/vp575.h @@ -15,7 +15,7 @@ #define __VP575__ #include "emu.h" -#include "machine/vip_exp.h" +#include "exp.h" diff --git a/src/mess/machine/vp585.c b/src/emu/bus/vip/vp585.c similarity index 100% rename from src/mess/machine/vp585.c rename to src/emu/bus/vip/vp585.c diff --git a/src/mess/machine/vp585.h b/src/emu/bus/vip/vp585.h similarity index 97% rename from src/mess/machine/vp585.h rename to src/emu/bus/vip/vp585.h index f144fc8959a..6ed7803ed15 100644 --- a/src/mess/machine/vp585.h +++ b/src/emu/bus/vip/vp585.h @@ -15,7 +15,7 @@ #define __VP585__ #include "emu.h" -#include "machine/vip_exp.h" +#include "exp.h" diff --git a/src/mess/machine/vp590.c b/src/emu/bus/vip/vp590.c similarity index 100% rename from src/mess/machine/vp590.c rename to src/emu/bus/vip/vp590.c diff --git a/src/mess/machine/vp590.h b/src/emu/bus/vip/vp590.h similarity index 98% rename from src/mess/machine/vp590.h rename to src/emu/bus/vip/vp590.h index c7547e1d49f..81db82f10ea 100644 --- a/src/mess/machine/vp590.h +++ b/src/emu/bus/vip/vp590.h @@ -16,7 +16,7 @@ #include "emu.h" #include "machine/rescap.h" -#include "machine/vip_exp.h" +#include "exp.h" #include "video/cdp1862.h" diff --git a/src/mess/machine/vp595.c b/src/emu/bus/vip/vp595.c similarity index 100% rename from src/mess/machine/vp595.c rename to src/emu/bus/vip/vp595.c diff --git a/src/mess/machine/vp595.h b/src/emu/bus/vip/vp595.h similarity index 97% rename from src/mess/machine/vp595.h rename to src/emu/bus/vip/vp595.h index 7d8025a9fef..0a788e4a585 100644 --- a/src/mess/machine/vp595.h +++ b/src/emu/bus/vip/vp595.h @@ -15,7 +15,7 @@ #define __VP595__ #include "emu.h" -#include "machine/vip_exp.h" +#include "exp.h" #include "sound/cdp1863.h" diff --git a/src/mess/machine/vp620.c b/src/emu/bus/vip/vp620.c similarity index 100% rename from src/mess/machine/vp620.c rename to src/emu/bus/vip/vp620.c diff --git a/src/mess/machine/vp620.h b/src/emu/bus/vip/vp620.h similarity index 97% rename from src/mess/machine/vp620.h rename to src/emu/bus/vip/vp620.h index df5ef38ced9..509820fd2d8 100644 --- a/src/mess/machine/vp620.h +++ b/src/emu/bus/vip/vp620.h @@ -15,8 +15,8 @@ #define __VP620__ #include "emu.h" +#include "byteio.h" #include "machine/keyboard.h" -#include "machine/vip_byteio.h" diff --git a/src/mess/machine/vp700.c b/src/emu/bus/vip/vp700.c similarity index 100% rename from src/mess/machine/vp700.c rename to src/emu/bus/vip/vp700.c diff --git a/src/mess/machine/vp700.h b/src/emu/bus/vip/vp700.h similarity index 97% rename from src/mess/machine/vp700.h rename to src/emu/bus/vip/vp700.h index f72ae957b10..62194a2c96a 100644 --- a/src/mess/machine/vp700.h +++ b/src/emu/bus/vip/vp700.h @@ -15,7 +15,7 @@ #define __VP700__ #include "emu.h" -#include "machine/vip_exp.h" +#include "exp.h" #include "sound/cdp1863.h" diff --git a/src/emu/emu.mak b/src/emu/emu.mak index 32ceb8dafc5..e935833c8d6 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -36,6 +36,7 @@ OBJDIRS += \ $(EMUOBJ)/bus/ieee488 \ $(EMUOBJ)/bus/isbx \ $(EMUOBJ)/bus/s100 \ + $(EMUOBJ)/bus/vip \ $(EMUOBJ)/bus/wangpc \ $(EMUOBJ)/drivers \ $(EMUOBJ)/machine \ diff --git a/src/mess/includes/vip.h b/src/mess/includes/vip.h index 80112929fd4..6d2cca87b08 100644 --- a/src/mess/includes/vip.h +++ b/src/mess/includes/vip.h @@ -6,12 +6,12 @@ #define __VIP__ #include "emu.h" +#include "bus/vip/byteio.h" +#include "bus/vip/exp.h" #include "cpu/cosmac/cosmac.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" #include "machine/ram.h" -#include "machine/vip_byteio.h" -#include "machine/vip_exp.h" #include "sound/discrete.h" #include "video/cdp1861.h" diff --git a/src/mess/mess.mak b/src/mess/mess.mak index 5eee069fff4..f523f809a1a 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -485,6 +485,7 @@ BUSES += COMX35 BUSES += IEEE488 BUSES += ISBX BUSES += S100 +BUSES += VIP BUSES += WANGPC #------------------------------------------------- @@ -1770,16 +1771,6 @@ $(MESSOBJ)/rca.a: \ $(MESS_DRIVERS)/microkit.o \ $(MESS_DRIVERS)/studio2.o \ $(MESS_DRIVERS)/vip.o \ - $(MESS_MACHINE)/vip_byteio.o\ - $(MESS_MACHINE)/vip_exp.o \ - $(MESS_MACHINE)/vp550.o \ - $(MESS_MACHINE)/vp570.o \ - $(MESS_MACHINE)/vp575.o \ - $(MESS_MACHINE)/vp585.o \ - $(MESS_MACHINE)/vp590.o \ - $(MESS_MACHINE)/vp595.o \ - $(MESS_MACHINE)/vp620.o \ - $(MESS_MACHINE)/vp700.o \ $(MESSOBJ)/rm.a: \ $(MESS_DRIVERS)/rm380z.o \