From 0694bfd7171fa40e6a381f349f34872ea8e14d83 Mon Sep 17 00:00:00 2001 From: Fabio Priuli Date: Tue, 5 Mar 2013 11:01:22 +0000 Subject: [PATCH] moved snes add-on chips emulation to src/mess/, at last. --- .gitattributes | 20 ++++++++++---------- src/mame/includes/snes.h | 19 ------------------- src/mame/machine/snes.c | 9 +-------- src/mame/mame.mak | 9 --------- src/{mame => mess}/machine/cx4data.c | 0 src/{mame => mess}/machine/cx4fn.c | 0 src/{mame => mess}/machine/cx4oam.c | 0 src/{mame => mess}/machine/cx4ops.c | 0 src/{mame => mess}/machine/snes7110.c | 0 src/mess/machine/snescart.c | 8 ++++++++ src/mess/machine/snescart.h | 24 ++++++++++++++++++++++-- src/{mame => mess}/machine/snescx4.c | 0 src/{mame => mess}/machine/snescx4.h | 0 src/{mame => mess}/machine/snesobc1.c | 0 src/{mame => mess}/machine/snesrtc.c | 0 src/{mame => mess}/machine/snessdd1.c | 0 src/mess/mess.mak | 18 +++++++++--------- 17 files changed, 50 insertions(+), 57 deletions(-) rename src/{mame => mess}/machine/cx4data.c (100%) rename src/{mame => mess}/machine/cx4fn.c (100%) rename src/{mame => mess}/machine/cx4oam.c (100%) rename src/{mame => mess}/machine/cx4ops.c (100%) rename src/{mame => mess}/machine/snes7110.c (100%) rename src/{mame => mess}/machine/snescx4.c (100%) rename src/{mame => mess}/machine/snescx4.h (100%) rename src/{mame => mess}/machine/snesobc1.c (100%) rename src/{mame => mess}/machine/snesrtc.c (100%) rename src/{mame => mess}/machine/snessdd1.c (100%) diff --git a/.gitattributes b/.gitattributes index 3b801be2feb..3b110706509 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4803,10 +4803,6 @@ src/mame/machine/cdislave.c svneol=native#text/plain src/mame/machine/cdislave.h svneol=native#text/plain src/mame/machine/chaknpop.c svneol=native#text/plain src/mame/machine/cps2crpt.c svneol=native#text/plain -src/mame/machine/cx4data.c svneol=native#text/plain -src/mame/machine/cx4fn.c svneol=native#text/plain -src/mame/machine/cx4oam.c svneol=native#text/plain -src/mame/machine/cx4ops.c svneol=native#text/plain src/mame/machine/dc-ctrl.c svneol=native#text/plain src/mame/machine/dc-ctrl.h svneol=native#text/plain src/mame/machine/dc.c svneol=native#text/plain @@ -4993,12 +4989,6 @@ src/mame/machine/slapfght.c svneol=native#text/plain src/mame/machine/slapstic.c svneol=native#text/plain src/mame/machine/slikshot.c svneol=native#text/plain src/mame/machine/snes.c svneol=native#text/plain -src/mame/machine/snes7110.c svneol=native#text/plain -src/mame/machine/snescx4.c svneol=native#text/plain -src/mame/machine/snescx4.h svneol=native#text/plain -src/mame/machine/snesobc1.c svneol=native#text/plain -src/mame/machine/snesrtc.c svneol=native#text/plain -src/mame/machine/snessdd1.c svneol=native#text/plain src/mame/machine/spisprit.c svneol=native#text/plain src/mame/machine/starwars.c svneol=native#text/plain src/mame/machine/steppers.c svneol=native#text/plain @@ -7081,6 +7071,10 @@ src/mess/machine/cs8221.c svneol=native#text/plain src/mess/machine/cs8221.h 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.c svneol=native#text/plain +src/mess/machine/cx4fn.c svneol=native#text/plain +src/mess/machine/cx4oam.c svneol=native#text/plain +src/mess/machine/cx4ops.c svneol=native#text/plain src/mess/machine/cybiko.c svneol=native#text/plain src/mess/machine/d9060.c svneol=native#text/plain src/mess/machine/d9060.h svneol=native#text/plain @@ -7476,8 +7470,14 @@ src/mess/machine/smartmed.h svneol=native#text/plain src/mess/machine/smc92x4.c svneol=native#text/plain src/mess/machine/smc92x4.h svneol=native#text/plain src/mess/machine/sms.c svneol=native#text/plain +src/mess/machine/snes7110.c svneol=native#text/plain src/mess/machine/snescart.c svneol=native#text/plain src/mess/machine/snescart.h svneol=native#text/plain +src/mess/machine/snescx4.c svneol=native#text/plain +src/mess/machine/snescx4.h svneol=native#text/plain +src/mess/machine/snesobc1.c svneol=native#text/plain +src/mess/machine/snesrtc.c svneol=native#text/plain +src/mess/machine/snessdd1.c svneol=native#text/plain src/mess/machine/sns_bsx.c svneol=native#text/plain src/mess/machine/sns_bsx.h svneol=native#text/plain src/mess/machine/sns_rom.c svneol=native#text/plain diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index 140b25baccf..bb7969fd934 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -766,25 +766,6 @@ extern DECLARE_WRITE8_HANDLER( snes_w_bank7 ); extern UINT8 *snes_ram; /* Main memory */ -// add-on chips IO -void srtc_write(running_machine &machine, UINT16 addr, UINT8 data); -UINT8 srtc_read(address_space &space, UINT16 addr); -void srtc_init(running_machine &machine); -extern DECLARE_READ8_HANDLER(obc1_read); -extern DECLARE_WRITE8_HANDLER(obc1_write); -void obc1_init(running_machine &machine); -UINT8 CX4_read(UINT32 addr); -void CX4_write(running_machine &machine, UINT32 addr, UINT8 data); -UINT8 sdd1_mmio_read(address_space &space, UINT32 addr); -void sdd1_mmio_write(address_space &space, UINT32 addr, UINT8 data); -void sdd1_init(running_machine& machine); -UINT8 sdd1_read(running_machine& machine, UINT32 addr); -UINT8 spc7110_mmio_read(address_space &space, UINT32 addr); -void spc7110_mmio_write(running_machine &machine, UINT32 addr, UINT8 data); -UINT8 spc7110_bank7_read(address_space &space, UINT32 offset); -void spc7110_init(running_machine& machine); -void spc7110rtc_init(running_machine& machine); - extern struct snes_cart_info snes_cart; /*----------- defined in video/snes.c -----------*/ diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 349e4e1c784..039bcd5fd98 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -33,14 +33,7 @@ UINT8 *snes_ram = NULL; /* 65816 ram */ struct snes_cart_info snes_cart; -#define DMA_REG(a) m_dma_regs[a - 0x4300] // regs 0x4300-0x437f - -// add-on chip emulators -#include "machine/snesobc1.c" -#include "machine/snescx4.c" -#include "machine/snesrtc.c" -#include "machine/snessdd1.c" -#include "machine/snes7110.c" +#define DMA_REG(a) m_dma_regs[a - 0x4300] // regs 0x4300-0x437f VIDEO_START( snes ) diff --git a/src/mame/mame.mak b/src/mame/mame.mak index 4f2341394ac..0368647d2dd 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -2380,15 +2380,6 @@ $(MACHINE)/megacd.o: $(LAYOUT)/megacd.lh $(DRIVERS)/galaxian.o: $(MAMESRC)/drivers/galdrvr.c $(DRIVERS)/neogeo.o: $(MAMESRC)/drivers/neodrvr.c -$(MACHINE)/snes.o: $(MAMESRC)/machine/snesobc1.c \ - $(MAMESRC)/machine/snescx4.c \ - $(MAMESRC)/machine/cx4ops.c \ - $(MAMESRC)/machine/cx4oam.c \ - $(MAMESRC)/machine/cx4fn.c \ - $(MAMESRC)/machine/cx4data.c \ - $(MAMESRC)/machine/snesrtc.c \ - $(MAMESRC)/machine/snessdd1.c \ - $(MAMESRC)/machine/snes7110.c $(MACHINE)/nes_mmc.o: $(MAMESRC)/machine/nes_ines.c \ $(MAMESRC)/machine/nes_pcb.c \ $(MAMESRC)/machine/nes_unif.c diff --git a/src/mame/machine/cx4data.c b/src/mess/machine/cx4data.c similarity index 100% rename from src/mame/machine/cx4data.c rename to src/mess/machine/cx4data.c diff --git a/src/mame/machine/cx4fn.c b/src/mess/machine/cx4fn.c similarity index 100% rename from src/mame/machine/cx4fn.c rename to src/mess/machine/cx4fn.c diff --git a/src/mame/machine/cx4oam.c b/src/mess/machine/cx4oam.c similarity index 100% rename from src/mame/machine/cx4oam.c rename to src/mess/machine/cx4oam.c diff --git a/src/mame/machine/cx4ops.c b/src/mess/machine/cx4ops.c similarity index 100% rename from src/mame/machine/cx4ops.c rename to src/mess/machine/cx4ops.c diff --git a/src/mame/machine/snes7110.c b/src/mess/machine/snes7110.c similarity index 100% rename from src/mame/machine/snes7110.c rename to src/mess/machine/snes7110.c diff --git a/src/mess/machine/snescart.c b/src/mess/machine/snescart.c index 5931aeda38c..3c25884a1d9 100644 --- a/src/mess/machine/snescart.c +++ b/src/mess/machine/snescart.c @@ -1305,3 +1305,11 @@ DRIVER_INIT_MEMBER(snes_state,snesst) } } + +// add-on chip emulators +#include "machine/snesobc1.c" +#include "machine/snescx4.c" +#include "machine/snesrtc.c" +#include "machine/snessdd1.c" +#include "machine/snes7110.c" + diff --git a/src/mess/machine/snescart.h b/src/mess/machine/snescart.h index 163bdeafefc..167630f48ab 100644 --- a/src/mess/machine/snescart.h +++ b/src/mess/machine/snescart.h @@ -6,8 +6,6 @@ #ifndef _SNESCART_H #define _SNESCART_H -#include "imagedev/cartslot.h" - void snes_machine_stop(running_machine &machine); void sufami_machine_stop(running_machine &machine); @@ -15,4 +13,26 @@ MACHINE_CONFIG_EXTERN( snes_cartslot ); MACHINE_CONFIG_EXTERN( snesp_cartslot ); MACHINE_CONFIG_EXTERN( sufami_cartslot ); + +// add-on chips IO +void srtc_write(running_machine &machine, UINT16 addr, UINT8 data); +UINT8 srtc_read(address_space &space, UINT16 addr); +void srtc_init(running_machine &machine); +extern DECLARE_READ8_HANDLER(obc1_read); +extern DECLARE_WRITE8_HANDLER(obc1_write); +void obc1_init(running_machine &machine); +UINT8 CX4_read(UINT32 addr); +void CX4_write(running_machine &machine, UINT32 addr, UINT8 data); +UINT8 sdd1_mmio_read(address_space &space, UINT32 addr); +void sdd1_mmio_write(address_space &space, UINT32 addr, UINT8 data); +void sdd1_init(running_machine& machine); +UINT8 sdd1_read(running_machine& machine, UINT32 addr); +UINT8 spc7110_mmio_read(address_space &space, UINT32 addr); +void spc7110_mmio_write(running_machine &machine, UINT32 addr, UINT8 data); +UINT8 spc7110_bank7_read(address_space &space, UINT32 offset); +void spc7110_init(running_machine& machine); +void spc7110rtc_init(running_machine& machine); + + + #endif /* _SNESCART_H */ diff --git a/src/mame/machine/snescx4.c b/src/mess/machine/snescx4.c similarity index 100% rename from src/mame/machine/snescx4.c rename to src/mess/machine/snescx4.c diff --git a/src/mame/machine/snescx4.h b/src/mess/machine/snescx4.h similarity index 100% rename from src/mame/machine/snescx4.h rename to src/mess/machine/snescx4.h diff --git a/src/mame/machine/snesobc1.c b/src/mess/machine/snesobc1.c similarity index 100% rename from src/mame/machine/snesobc1.c rename to src/mess/machine/snesobc1.c diff --git a/src/mame/machine/snesrtc.c b/src/mess/machine/snesrtc.c similarity index 100% rename from src/mame/machine/snesrtc.c rename to src/mess/machine/snesrtc.c diff --git a/src/mame/machine/snessdd1.c b/src/mess/machine/snessdd1.c similarity index 100% rename from src/mame/machine/snessdd1.c rename to src/mess/machine/snessdd1.c diff --git a/src/mess/mess.mak b/src/mess/mess.mak index 2824d52ccc2..8dfacc97697 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -2137,15 +2137,15 @@ $(MESSOBJ)/skeleton.a: \ # miscellaneous dependencies #------------------------------------------------- -$(MAME_MACHINE)/snes.o: $(MAMESRC)/machine/snesobc1.c \ - $(MAMESRC)/machine/snescx4.c \ - $(MAMESRC)/machine/cx4ops.c \ - $(MAMESRC)/machine/cx4oam.c \ - $(MAMESRC)/machine/cx4fn.c \ - $(MAMESRC)/machine/cx4data.c \ - $(MAMESRC)/machine/snesrtc.c \ - $(MAMESRC)/machine/snessdd1.c \ - $(MAMESRC)/machine/snes7110.c \ +$(MESS_MACHINE)/snescart.o: $(MESSSRC)/machine/snesobc1.c \ + $(MESSSRC)/machine/snescx4.c \ + $(MESSSRC)/machine/cx4ops.c \ + $(MESSSRC)/machine/cx4oam.c \ + $(MESSSRC)/machine/cx4fn.c \ + $(MESSSRC)/machine/cx4data.c \ + $(MESSSRC)/machine/snesrtc.c \ + $(MESSSRC)/machine/snessdd1.c \ + $(MESSSRC)/machine/snes7110.c \ $(MESS_VIDEO)/gba.o: $(MESSSRC)/video/gbamode0.c \ $(MESSSRC)/video/gbamode1.c \