Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

moved snes add-on chips emulation to src/mess/, at last.

Browse Source
This commit is contained in:
Fabio Priuli 2013-03-05 11:01:22 +00:00
parent 6fbf9923e3
commit 0694bfd717
17 changed files with 50 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitattributes vendored
View File

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

19
src/mame/includes/snes.h
View File

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

9
src/mame/machine/snes.c
View File

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

9
src/mame/mame.mak
View File

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

0
src/mame/machine/cx4data.c → src/mess/machine/cx4data.c
View File

0
src/mame/machine/cx4fn.c → src/mess/machine/cx4fn.c
View File

0
src/mame/machine/cx4oam.c → src/mess/machine/cx4oam.c
View File

0
src/mame/machine/cx4ops.c → src/mess/machine/cx4ops.c
View File

0
src/mame/machine/snes7110.c → src/mess/machine/snes7110.c
View File

8
src/mess/machine/snescart.c
View File

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

24
src/mess/machine/snescart.h
View File

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

0
src/mame/machine/snescx4.c → src/mess/machine/snescx4.c
View File

0
src/mame/machine/snescx4.h → src/mess/machine/snescx4.h
View File

0
src/mame/machine/snesobc1.c → src/mess/machine/snesobc1.c
View File

0
src/mame/machine/snesrtc.c → src/mess/machine/snesrtc.c
View File

0
src/mame/machine/snessdd1.c → src/mess/machine/snessdd1.c
View File

18
src/mess/mess.mak
View File

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