From ea3780417a03fb4ef6540bc4cf68200e72bd96f1 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 26 Jun 2008 15:24:55 +0000 Subject: From: Atari Ace [mailto:atari_ace@verizon.net] Subject: [patch] Fix minor CPU/SOUND core build issues Hi mamedev, This small patch fixes a few build problems with the cpu/sound cores M65CE02, ALPHA8201, TMC0285, TMS5200 and corrects the dependencies for the mips core. ~aa --- src/emu/cpu/alph8201/alph8201.c | 2 ++ src/emu/cpu/cpu.mak | 10 +++++----- src/emu/cpu/m6502/m65ce02.c | 7 +++++-- src/emu/sound/5220intf.c | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c index 532cdc2f61f..a2313b351ab 100644 --- a/src/emu/cpu/alph8201/alph8201.c +++ b/src/emu/cpu/alph8201/alph8201.c @@ -305,6 +305,7 @@ INLINE void M_UNDEFINED2(void) static void undefined(void) { M_UNDEFINED(); } static void undefined2(void) { M_UNDEFINED2(); } +#if (HAS_ALPHA8301) static void need_verify(const char *s) { UINT8 op = M_RDOP(PC-1); @@ -316,6 +317,7 @@ static void need_verify(const char *s) debugger_break(Machine); #endif } +#endif #if 0 static void need_verify2(const char *s) diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak index 03cddd1d521..104ebbe577d 100644 --- a/src/emu/cpu/cpu.mak +++ b/src/emu/cpu/cpu.mak @@ -845,12 +845,12 @@ CPUOBJS += $(CPUOBJ)/mips/mips3com.o $(CPUOBJ)/mips/mips3fe.o $(CPUOBJ)/mips/mip DBGOBJS += $(CPUOBJ)/mips/mips3dsm.o endif -$(CPUOBJ)/powerpc/mips3com.o: $(CPUSRC)/powerpc/mips3.h \ - $(CPUSRC)/powerpc/mips3com.h +$(CPUOBJ)/mips/mips3com.o: $(CPUSRC)/mips/mips3.h \ + $(CPUSRC)/mips/mips3com.h -$(CPUOBJ)/powerpc/mips3fe.o: $(CPUSRC)/powerpc/mips3.h \ - $(CPUSRC)/powerpc/mips3com.h \ - $(CPUSRC)/powerpc/mips3fe.h +$(CPUOBJ)/mips/mips3fe.o: $(CPUSRC)/mips/mips3.h \ + $(CPUSRC)/mips/mips3com.h \ + $(CPUSRC)/mips/mips3fe.h $(CPUOBJ)/mips/mips3drc.o: $(CPUSRC)/mips/mips3drc.c \ $(CPUSRC)/mips/mips3.h \ diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c index 5630cface38..1acea42d01d 100644 --- a/src/emu/cpu/m6502/m65ce02.c +++ b/src/emu/cpu/m6502/m65ce02.c @@ -88,10 +88,13 @@ static m65ce02_Regs m65ce02; #include "t65ce02.c" +static READ8_HANDLER( default_rdmem_id ) { return program_read_byte_8le(offset); } +static WRITE8_HANDLER( default_wdmem_id ) { program_write_byte_8le(offset, data); } + static void m65ce02_init(int index, int clock, const void *config, int (*irqcallback)(int)) { - m65ce02.rdmem_id = program_read_byte_8le; - m65ce02.wrmem_id = program_write_byte_8le; + m65ce02.rdmem_id = default_rdmem_id; + m65ce02.wrmem_id = default_wdmem_id; m65ce02.irq_callback = irqcallback; } diff --git a/src/emu/sound/5220intf.c b/src/emu/sound/5220intf.c index 634f579085e..fd66066ccc5 100644 --- a/src/emu/sound/5220intf.c +++ b/src/emu/sound/5220intf.c @@ -73,7 +73,7 @@ static void *tms5220_start(int sndindex, int clock, const void *config) } -#if (HAS_TMC0285) && (HAS_TMS5200) +#if (HAS_TMC0285 || HAS_TMS5200) static void *tms5200_start(int sndindex, int clock, const void *config) { struct tms5220_info *info = tms5220_start(sndindex, clock, config); -- cgit v1.2.3