Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

(MESS) adamnet: Moved under emu/bus. (nw)

Browse source
This commit is contained in:
Curt Coder 2013-10-20 17:17:35 +00:00
parent 2116152056
commit 9cd179295e
17 changed files with 47 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.gitattributes vendored
View file

@ -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

2
src/mess/machine/adamnet.c → src/emu/bus/adamnet/adamnet.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "machine/adamnet.h"
#include "adamnet.h"

10
src/mess/machine/adamnet.h → src/emu/bus/adamnet/adamnet.h
View file

@ -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 );

2
src/mess/machine/adam_ddp.c → src/emu/bus/adamnet/ddp.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "adam_ddp.h"
#include "ddp.h"

2
src/mess/machine/adam_ddp.h → src/emu/bus/adamnet/ddp.h
View file

@ -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"

2
src/mess/machine/adam_fdc.c → src/emu/bus/adamnet/fdc.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "adam_fdc.h"
#include "fdc.h"

2
src/mess/machine/adam_fdc.h → src/emu/bus/adamnet/fdc.h
View file

@ -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"

2
src/mess/machine/adam_kb.c → src/emu/bus/adamnet/kb.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "adam_kb.h"
#include "kb.h"

2
src/mess/machine/adam_kb.h → src/emu/bus/adamnet/kb.h
View file

@ -15,8 +15,8 @@
#define __ADAM_KB__
#include "emu.h"
#include "adamnet.h"
#include "cpu/m6800/m6800.h"
#include "machine/adamnet.h"

2
src/mess/machine/adam_prn.c → src/emu/bus/adamnet/printer.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "adam_prn.h"
#include "printer.h"

4
src/mess/machine/adam_prn.h → src/emu/bus/adamnet/printer.h
View file

@ -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"

2
src/mess/machine/adam_spi.c → src/emu/bus/adamnet/spi.c
View file

@ -9,7 +9,7 @@
**********************************************************************/
#include "adam_spi.h"
#include "spi.h"

2
src/mess/machine/adam_spi.h → src/emu/bus/adamnet/spi.h
View file

@ -15,8 +15,8 @@
#define __ADAM_SPI__
#include "emu.h"
#include "adamnet.h"
#include "cpu/m6800/m6800.h"
#include "machine/adamnet.h"

15
src/emu/bus/bus.mak
View file

@ -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

1
src/emu/emu.mak
View file

@ -28,6 +28,7 @@ OBJDIRS += \
$(EMUOBJ)/debugint \
$(EMUOBJ)/audio \
$(EMUOBJ)/bus \
$(EMUOBJ)/bus/adamnet \
$(EMUOBJ)/bus/cbmiec \
$(EMUOBJ)/bus/ieee488 \
$(EMUOBJ)/bus/isbx \

2
src/mess/includes/adam.h
View file

@ -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"

7
src/mess/mess.mak
View file

@ -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 \