From 9cd179295e4783237b05a0c1369b46254da7c04a Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Sun, 20 Oct 2013 17:17:35 +0000 Subject: [PATCH] (MESS) adamnet: Moved under emu/bus. (nw) --- .gitattributes | 24 +++++++++---------- .../machine => emu/bus/adamnet}/adamnet.c | 2 +- .../machine => emu/bus/adamnet}/adamnet.h | 10 ++++---- .../adam_ddp.c => emu/bus/adamnet/ddp.c} | 2 +- .../adam_ddp.h => emu/bus/adamnet/ddp.h} | 2 +- .../adam_fdc.c => emu/bus/adamnet/fdc.c} | 2 +- .../adam_fdc.h => emu/bus/adamnet/fdc.h} | 2 +- .../adam_kb.c => emu/bus/adamnet/kb.c} | 2 +- .../adam_kb.h => emu/bus/adamnet/kb.h} | 2 +- .../adam_prn.c => emu/bus/adamnet/printer.c} | 2 +- .../adam_prn.h => emu/bus/adamnet/printer.h} | 4 ++-- .../adam_spi.c => emu/bus/adamnet/spi.c} | 2 +- .../adam_spi.h => emu/bus/adamnet/spi.h} | 2 +- src/emu/bus/bus.mak | 15 ++++++++++++ src/emu/emu.mak | 1 + src/mess/includes/adam.h | 2 +- src/mess/mess.mak | 7 +----- 17 files changed, 47 insertions(+), 36 deletions(-) rename src/{mess/machine => emu/bus/adamnet}/adamnet.c (99%) rename src/{mess/machine => emu/bus/adamnet}/adamnet.h (95%) rename src/{mess/machine/adam_ddp.c => emu/bus/adamnet/ddp.c} (99%) rename src/{mess/machine/adam_ddp.h => emu/bus/adamnet/ddp.h} (98%) rename src/{mess/machine/adam_fdc.c => emu/bus/adamnet/fdc.c} (99%) rename src/{mess/machine/adam_fdc.h => emu/bus/adamnet/fdc.h} (98%) rename src/{mess/machine/adam_kb.c => emu/bus/adamnet/kb.c} (99%) rename src/{mess/machine/adam_kb.h => emu/bus/adamnet/kb.h} (98%) rename src/{mess/machine/adam_prn.c => emu/bus/adamnet/printer.c} (99%) rename src/{mess/machine/adam_prn.h => emu/bus/adamnet/printer.h} (95%) rename src/{mess/machine/adam_spi.c => emu/bus/adamnet/spi.c} (99%) rename src/{mess/machine/adam_spi.h => emu/bus/adamnet/spi.h} (97%) diff --git a/.gitattributes b/.gitattributes index 25987596f93..85a9bc9030a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -356,6 +356,18 @@ src/emu/attotime.c svneol=native#text/plain src/emu/attotime.h svneol=native#text/plain src/emu/audit.c svneol=native#text/plain src/emu/audit.h svneol=native#text/plain +src/emu/bus/adamnet/adamnet.c svneol=native#text/plain +src/emu/bus/adamnet/adamnet.h svneol=native#text/plain +src/emu/bus/adamnet/ddp.c svneol=native#text/plain +src/emu/bus/adamnet/ddp.h svneol=native#text/plain +src/emu/bus/adamnet/fdc.c svneol=native#text/plain +src/emu/bus/adamnet/fdc.h svneol=native#text/plain +src/emu/bus/adamnet/kb.c svneol=native#text/plain +src/emu/bus/adamnet/kb.h svneol=native#text/plain +src/emu/bus/adamnet/printer.c svneol=native#text/plain +src/emu/bus/adamnet/printer.h svneol=native#text/plain +src/emu/bus/adamnet/spi.c svneol=native#text/plain +src/emu/bus/adamnet/spi.h svneol=native#text/plain src/emu/bus/bus.mak svneol=native#text/plain src/emu/bus/cbmiec/c1541.c svneol=native#text/plain src/emu/bus/cbmiec/c1541.h svneol=native#text/plain @@ -7224,26 +7236,14 @@ src/mess/machine/abckb.h svneol=native#text/plain src/mess/machine/ac1.c svneol=native#text/plain src/mess/machine/acb4070.c svneol=native#text/plain src/mess/machine/acb4070.h svneol=native#text/plain -src/mess/machine/adam_ddp.c svneol=native#text/plain -src/mess/machine/adam_ddp.h svneol=native#text/plain -src/mess/machine/adam_fdc.c svneol=native#text/plain -src/mess/machine/adam_fdc.h svneol=native#text/plain src/mess/machine/adam_ide.c svneol=native#text/plain src/mess/machine/adam_ide.h svneol=native#text/plain -src/mess/machine/adam_kb.c svneol=native#text/plain -src/mess/machine/adam_kb.h svneol=native#text/plain -src/mess/machine/adam_prn.c svneol=native#text/plain -src/mess/machine/adam_prn.h svneol=native#text/plain src/mess/machine/adam_ram.c svneol=native#text/plain src/mess/machine/adam_ram.h svneol=native#text/plain -src/mess/machine/adam_spi.c svneol=native#text/plain -src/mess/machine/adam_spi.h svneol=native#text/plain src/mess/machine/adamexp.c svneol=native#text/plain src/mess/machine/adamexp.h svneol=native#text/plain src/mess/machine/adamlink.c svneol=native#text/plain src/mess/machine/adamlink.h svneol=native#text/plain -src/mess/machine/adamnet.c svneol=native#text/plain -src/mess/machine/adamnet.h svneol=native#text/plain src/mess/machine/advision.c svneol=native#text/plain src/mess/machine/aim65.c svneol=native#text/plain src/mess/machine/amigacd.c svneol=native#text/plain diff --git a/src/mess/machine/adamnet.c b/src/emu/bus/adamnet/adamnet.c similarity index 99% rename from src/mess/machine/adamnet.c rename to src/emu/bus/adamnet/adamnet.c index 8d669d1a7c4..39e39810255 100644 --- a/src/mess/machine/adamnet.c +++ b/src/emu/bus/adamnet/adamnet.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "machine/adamnet.h" +#include "adamnet.h" diff --git a/src/mess/machine/adamnet.h b/src/emu/bus/adamnet/adamnet.h similarity index 95% rename from src/mess/machine/adamnet.h rename to src/emu/bus/adamnet/adamnet.h index bd7d4eacf3c..37002f72a60 100644 --- a/src/mess/machine/adamnet.h +++ b/src/emu/bus/adamnet/adamnet.h @@ -128,11 +128,11 @@ extern const device_type ADAMNET_SLOT; // slot devices -#include "machine/adam_ddp.h" -#include "machine/adam_fdc.h" -#include "machine/adam_kb.h" -#include "machine/adam_prn.h" -#include "machine/adam_spi.h" +#include "ddp.h" +#include "fdc.h" +#include "kb.h" +#include "printer.h" +#include "spi.h" SLOT_INTERFACE_EXTERN( adamnet_devices ); diff --git a/src/mess/machine/adam_ddp.c b/src/emu/bus/adamnet/ddp.c similarity index 99% rename from src/mess/machine/adam_ddp.c rename to src/emu/bus/adamnet/ddp.c index 750fc7a5618..8755d266f5e 100644 --- a/src/mess/machine/adam_ddp.c +++ b/src/emu/bus/adamnet/ddp.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "adam_ddp.h" +#include "ddp.h" diff --git a/src/mess/machine/adam_ddp.h b/src/emu/bus/adamnet/ddp.h similarity index 98% rename from src/mess/machine/adam_ddp.h rename to src/emu/bus/adamnet/ddp.h index f52ca836301..3afb4dbe614 100644 --- a/src/mess/machine/adam_ddp.h +++ b/src/emu/bus/adamnet/ddp.h @@ -15,10 +15,10 @@ #define __ADAM_DDP__ #include "emu.h" +#include "adamnet.h" #include "cpu/m6800/m6800.h" #include "formats/adam_cas.h" #include "imagedev/cassette.h" -#include "machine/adamnet.h" diff --git a/src/mess/machine/adam_fdc.c b/src/emu/bus/adamnet/fdc.c similarity index 99% rename from src/mess/machine/adam_fdc.c rename to src/emu/bus/adamnet/fdc.c index 3a82047d15a..b8fc5c2748c 100644 --- a/src/mess/machine/adam_fdc.c +++ b/src/emu/bus/adamnet/fdc.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "adam_fdc.h" +#include "fdc.h" diff --git a/src/mess/machine/adam_fdc.h b/src/emu/bus/adamnet/fdc.h similarity index 98% rename from src/mess/machine/adam_fdc.h rename to src/emu/bus/adamnet/fdc.h index be3cee7db0d..4cd457c313e 100644 --- a/src/mess/machine/adam_fdc.h +++ b/src/emu/bus/adamnet/fdc.h @@ -15,9 +15,9 @@ #define __ADAM_FDC__ #include "emu.h" +#include "adamnet.h" #include "cpu/m6800/m6800.h" #include "formats/adam_dsk.h" -#include "machine/adamnet.h" #include "machine/wd_fdc.h" diff --git a/src/mess/machine/adam_kb.c b/src/emu/bus/adamnet/kb.c similarity index 99% rename from src/mess/machine/adam_kb.c rename to src/emu/bus/adamnet/kb.c index bc0d4f091ba..01feeea9e5b 100644 --- a/src/mess/machine/adam_kb.c +++ b/src/emu/bus/adamnet/kb.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "adam_kb.h" +#include "kb.h" diff --git a/src/mess/machine/adam_kb.h b/src/emu/bus/adamnet/kb.h similarity index 98% rename from src/mess/machine/adam_kb.h rename to src/emu/bus/adamnet/kb.h index 60866cb54b7..d917bc7ae07 100644 --- a/src/mess/machine/adam_kb.h +++ b/src/emu/bus/adamnet/kb.h @@ -15,8 +15,8 @@ #define __ADAM_KB__ #include "emu.h" +#include "adamnet.h" #include "cpu/m6800/m6800.h" -#include "machine/adamnet.h" diff --git a/src/mess/machine/adam_prn.c b/src/emu/bus/adamnet/printer.c similarity index 99% rename from src/mess/machine/adam_prn.c rename to src/emu/bus/adamnet/printer.c index 7fa8ce88816..4016fca312f 100644 --- a/src/mess/machine/adam_prn.c +++ b/src/emu/bus/adamnet/printer.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "adam_prn.h" +#include "printer.h" diff --git a/src/mess/machine/adam_prn.h b/src/emu/bus/adamnet/printer.h similarity index 95% rename from src/mess/machine/adam_prn.h rename to src/emu/bus/adamnet/printer.h index 8f31232f24d..68f31f31b94 100644 --- a/src/mess/machine/adam_prn.h +++ b/src/emu/bus/adamnet/printer.h @@ -2,7 +2,7 @@ // copyright-holders:Curt Coder /********************************************************************** - Coleco Adam floppy disk controller emulation + Coleco Adam printer controller emulation Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -15,8 +15,8 @@ #define __ADAM_PRN__ #include "emu.h" +#include "adamnet.h" #include "cpu/m6800/m6800.h" -#include "machine/adamnet.h" diff --git a/src/mess/machine/adam_spi.c b/src/emu/bus/adamnet/spi.c similarity index 99% rename from src/mess/machine/adam_spi.c rename to src/emu/bus/adamnet/spi.c index 0f62375db77..37ef5dafdff 100644 --- a/src/mess/machine/adam_spi.c +++ b/src/emu/bus/adamnet/spi.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "adam_spi.h" +#include "spi.h" diff --git a/src/mess/machine/adam_spi.h b/src/emu/bus/adamnet/spi.h similarity index 97% rename from src/mess/machine/adam_spi.h rename to src/emu/bus/adamnet/spi.h index d653dbd356d..425174c911f 100644 --- a/src/mess/machine/adam_spi.h +++ b/src/emu/bus/adamnet/spi.h @@ -15,8 +15,8 @@ #define __ADAM_SPI__ #include "emu.h" +#include "adamnet.h" #include "cpu/m6800/m6800.h" -#include "machine/adamnet.h" diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak index b947076a1a4..c17e238cc5b 100644 --- a/src/emu/bus/bus.mak +++ b/src/emu/bus/bus.mak @@ -14,6 +14,21 @@ BUSSRC = $(EMUSRC)/bus BUSOBJ = $(EMUOBJ)/bus +#------------------------------------------------- +# +#@src/emu/bus/adamnet/adamnet.h,BUSES += ADAMNET +#------------------------------------------------- + +ifneq ($(filter ADAMNET,$(BUSES)),) +BUSOBJS += $(BUSOBJ)/adamnet/adamnet.o +BUSOBJS += $(BUSOBJ)/adamnet/ddp.o +BUSOBJS += $(BUSOBJ)/adamnet/fdc.o +BUSOBJS += $(BUSOBJ)/adamnet/kb.o +BUSOBJS += $(BUSOBJ)/adamnet/printer.o +BUSOBJS += $(BUSOBJ)/adamnet/spi.o +endif + + #------------------------------------------------- # #@src/emu/bus/cbmiec/cbmiec.h,BUSES += CBMIEC diff --git a/src/emu/emu.mak b/src/emu/emu.mak index de7d209e908..53cfe212e89 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -28,6 +28,7 @@ OBJDIRS += \ $(EMUOBJ)/debugint \ $(EMUOBJ)/audio \ $(EMUOBJ)/bus \ + $(EMUOBJ)/bus/adamnet \ $(EMUOBJ)/bus/cbmiec \ $(EMUOBJ)/bus/ieee488 \ $(EMUOBJ)/bus/isbx \ diff --git a/src/mess/includes/adam.h b/src/mess/includes/adam.h index 38e6c5c9769..40429c89500 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/adamnet/adamnet.h" #include "cpu/z80/z80.h" #include "cpu/m6800/m6800.h" #include "imagedev/cartslot.h" #include "machine/adamexp.h" -#include "machine/adamnet.h" #include "machine/coleco.h" #include "machine/ram.h" #include "sound/sn76496.h" diff --git a/src/mess/mess.mak b/src/mess/mess.mak index d6fb77b1f96..aac9bbf182b 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -476,6 +476,7 @@ MACHINES += PCCARD # specify available bus cores #------------------------------------------------- +BUSES += ADAMNET BUSES += CBMIEC BUSES += IEEE488 BUSES += ISBX @@ -1244,12 +1245,6 @@ $(MESSOBJ)/coleco.a: \ $(MESS_MACHINE)/adamlink.o \ $(MESS_MACHINE)/adam_ide.o \ $(MESS_MACHINE)/adam_ram.o \ - $(MESS_MACHINE)/adamnet.o \ - $(MESS_MACHINE)/adam_ddp.o \ - $(MESS_MACHINE)/adam_fdc.o \ - $(MESS_MACHINE)/adam_kb.o \ - $(MESS_MACHINE)/adam_prn.o \ - $(MESS_MACHINE)/adam_spi.o \ $(MESSOBJ)/cromemco.a: \ $(MESS_DRIVERS)/c10.o \