From ca5bc06cff4168163acadd61e5e7a7d8354a5bcf Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Sat, 22 Mar 2014 03:52:23 +0000 Subject: [PATCH] (MESS) Move corvushd to emu/ so slot devices can see it (nw) --- .gitattributes | 4 ++-- src/emu/bus/ieee488/hardbox.h | 2 +- src/emu/bus/ieee488/softbox.h | 2 +- src/{mess => emu}/machine/corvushd.c | 2 +- src/{mess/includes => emu/machine}/corvushd.h | 0 src/emu/machine/machine.mak | 9 +++++++++ src/mess/includes/softbox.h | 2 +- src/mess/mess.mak | 2 +- 8 files changed, 16 insertions(+), 7 deletions(-) rename src/{mess => emu}/machine/corvushd.c (99%) rename src/{mess/includes => emu/machine}/corvushd.h (100%) diff --git a/.gitattributes b/.gitattributes index 08fdd58dcd0..fc6edef845a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2284,6 +2284,8 @@ src/emu/machine/clock.c svneol=native#text/plain src/emu/machine/clock.h svneol=native#text/plain src/emu/machine/com8116.c svneol=native#text/plain src/emu/machine/com8116.h svneol=native#text/plain +src/emu/machine/corvushd.c svneol=native#text/plain +src/emu/machine/corvushd.h svneol=native#text/plain src/emu/machine/cr589.c svneol=native#text/plain src/emu/machine/cr589.h svneol=native#text/plain src/emu/machine/cs4031.c svneol=native#text/plain @@ -8073,7 +8075,6 @@ src/mess/includes/compis.h svneol=native#text/plain src/mess/includes/comquest.h svneol=native#text/plain src/mess/includes/comx35.h svneol=native#text/plain src/mess/includes/concept.h svneol=native#text/plain -src/mess/includes/corvushd.h svneol=native#text/plain src/mess/includes/cosmicos.h svneol=native#text/plain src/mess/includes/crvision.h svneol=native#text/plain src/mess/includes/cxhumax.h svneol=native#text/plain @@ -8412,7 +8413,6 @@ src/mess/machine/compiskb.h svneol=native#text/plain src/mess/machine/concept.c svneol=native#text/plain src/mess/machine/concept_exp.c svneol=native#text/plain src/mess/machine/concept_exp.h svneol=native#text/plain -src/mess/machine/corvushd.c svneol=native#text/plain src/mess/machine/cuda.c svneol=native#text/plain src/mess/machine/cuda.h svneol=native#text/plain src/mess/machine/cx4data.inc svneol=native#text/plain diff --git a/src/emu/bus/ieee488/hardbox.h b/src/emu/bus/ieee488/hardbox.h index 4c798448632..6aeff4d2f9c 100644 --- a/src/emu/bus/ieee488/hardbox.h +++ b/src/emu/bus/ieee488/hardbox.h @@ -19,7 +19,7 @@ #include "machine/i8251.h" #include "machine/i8255.h" #include "imagedev/harddriv.h" -#include "includes/corvushd.h" +#include "machine/corvushd.h" diff --git a/src/emu/bus/ieee488/softbox.h b/src/emu/bus/ieee488/softbox.h index f5f4902b81c..a292b898f7b 100644 --- a/src/emu/bus/ieee488/softbox.h +++ b/src/emu/bus/ieee488/softbox.h @@ -18,7 +18,7 @@ #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" #include "imagedev/harddriv.h" -#include "includes/corvushd.h" +#include "machine/corvushd.h" #include "machine/com8116.h" #include "machine/i8251.h" #include "machine/i8255.h" diff --git a/src/mess/machine/corvushd.c b/src/emu/machine/corvushd.c similarity index 99% rename from src/mess/machine/corvushd.c rename to src/emu/machine/corvushd.c index bf1b327b972..caaa027179c 100644 --- a/src/mess/machine/corvushd.c +++ b/src/emu/machine/corvushd.c @@ -64,7 +64,7 @@ #include "emu.h" #include "imagedev/harddriv.h" -#include "includes/corvushd.h" +#include "machine/corvushd.h" #include diff --git a/src/mess/includes/corvushd.h b/src/emu/machine/corvushd.h similarity index 100% rename from src/mess/includes/corvushd.h rename to src/emu/machine/corvushd.h diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak index d652d107e9c..94341db4bb4 100644 --- a/src/emu/machine/machine.mak +++ b/src/emu/machine/machine.mak @@ -1838,3 +1838,12 @@ endif ifneq ($(filter STRATA,$(MACHINES)),) MACHINEOBJS += $(MACHINEOBJ)/strata.o endif + +#------------------------------------------------- +# +#@src/emu/machine/corvushd.h,MACHINES += CORVUSHD +#------------------------------------------------- +ifneq ($(filter CORVUSHD,$(MACHINES)),) +MACHINEOBJS += $(MACHINEOBJ)/corvushd.o +endif + diff --git a/src/mess/includes/softbox.h b/src/mess/includes/softbox.h index d259a92f9c8..de14f94812c 100644 --- a/src/mess/includes/softbox.h +++ b/src/mess/includes/softbox.h @@ -10,7 +10,7 @@ #include "bus/imi7000/imi7000.h" #include "cpu/z80/z80.h" #include "imagedev/harddriv.h" -#include "includes/corvushd.h" +#include "machine/corvushd.h" #include "machine/com8116.h" #include "machine/i8251.h" #include "machine/i8255.h" diff --git a/src/mess/mess.mak b/src/mess/mess.mak index 47fd57aa12f..580b6169727 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -514,6 +514,7 @@ MACHINES += Z8536 MACHINES += SMC92X4 MACHINES += TI99_HD MACHINES += STRATA +MACHINES += CORVUSHD #------------------------------------------------- # specify available bus cores @@ -1112,7 +1113,6 @@ $(MESSOBJ)/concept.a: \ $(MESS_DRIVERS)/concept.o \ $(MESS_MACHINE)/concept.o \ $(MESS_MACHINE)/concept_exp.o \ - $(MESS_MACHINE)/corvushd.o \ $(MESSOBJ)/conitec.a: \ $(MESS_DRIVERS)/prof80.o \