From f6b2d2489e408d6d0d1d0be3e74820af6b04ce27 Mon Sep 17 00:00:00 2001 From: Wilbert Pol Date: Wed, 26 Feb 2014 21:23:32 +0000 Subject: [PATCH] removing some unused legacy things (nw) --- .gitattributes | 2 - src/emu/cpu/cpu.mak | 12 ---- src/emu/cpu/tms9900/tms9900l.h | 111 -------------------------------- src/emu/cpu/tms9900/tms9980al.c | 15 ----- src/emu/cpu/tms9900/tms9995l.c | 15 ----- src/mame/mame.mak | 1 - src/mess/drivers/cortex.c | 29 +-------- src/mess/mess.mak | 1 - 8 files changed, 2 insertions(+), 184 deletions(-) delete mode 100644 src/emu/cpu/tms9900/tms9980al.c delete mode 100644 src/emu/cpu/tms9900/tms9995l.c diff --git a/.gitattributes b/.gitattributes index 020e722fcb6..f4d80c7f4f0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1534,10 +1534,8 @@ src/emu/cpu/tms9900/tms9900l.c svneol=native#text/plain src/emu/cpu/tms9900/tms9900l.h svneol=native#text/plain src/emu/cpu/tms9900/tms9980a.c svneol=native#text/plain src/emu/cpu/tms9900/tms9980a.h svneol=native#text/plain -src/emu/cpu/tms9900/tms9980al.c svneol=native#text/plain src/emu/cpu/tms9900/tms9995.c svneol=native#text/plain src/emu/cpu/tms9900/tms9995.h svneol=native#text/plain -src/emu/cpu/tms9900/tms9995l.c svneol=native#text/plain src/emu/cpu/tms9900/tms99com.h svneol=native#text/plain src/emu/cpu/uml.c svneol=native#text/plain src/emu/cpu/uml.h svneol=native#text/plain diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak index 1b201de82f2..d78646847ef 100644 --- a/src/emu/cpu/cpu.mak +++ b/src/emu/cpu/cpu.mak @@ -1890,9 +1890,7 @@ OBJDIRS += $(CPUOBJ)/tms9900 CPUOBJS += $(CPUOBJ)/tms9900/tms9900.o CPUOBJS += $(CPUOBJ)/tms9900/tms9900l.o CPUOBJS += $(CPUOBJ)/tms9900/tms9980a.o -CPUOBJS += $(CPUOBJ)/tms9900/tms9980al.o CPUOBJS += $(CPUOBJ)/tms9900/tms9995.o -CPUOBJS += $(CPUOBJ)/tms9900/tms9995l.o CPUOBJS += $(CPUOBJ)/tms9900/ti990_10l.o DASMOBJS += $(CPUOBJ)/tms9900/9900dasm.o endif @@ -1910,19 +1908,9 @@ $(CPUOBJ)/tms9900/tms9980a.o: $(CPUSRC)/tms9900/tms9980a.c \ $(CPUSRC)/tms9900/tms9900.c \ $(CPUSRC)/tms9900/tms9900.h -$(CPUOBJ)/tms9900/tms9980al.o: $(CPUSRC)/tms9900/tms9980al.c \ - $(CPUSRC)/tms9900/tms9900l.h \ - $(CPUSRC)/tms9900/99xxcore.h \ - $(CPUSRC)/tms9900/99xxstat.h - $(CPUOBJ)/tms9900/tms9995.o: $(CPUSRC)/tms9900/tms9995.c \ $(CPUSRC)/tms9900/tms9995.h -$(CPUOBJ)/tms9900/tms9995l.o: $(CPUSRC)/tms9900/tms9995l.c \ - $(CPUSRC)/tms9900/tms9900l.h \ - $(CPUSRC)/tms9900/99xxcore.h \ - $(CPUSRC)/tms9900/99xxstat.h - $(CPUOBJ)/tms9900/ti990_10l.o: $(CPUSRC)/tms9900/ti990_10l.c \ $(CPUSRC)/tms9900/tms9900l.h \ $(CPUSRC)/tms9900/99xxcore.h \ diff --git a/src/emu/cpu/tms9900/tms9900l.h b/src/emu/cpu/tms9900/tms9900l.h index ab7be6fdbbe..ab7bb70f740 100644 --- a/src/emu/cpu/tms9900/tms9900l.h +++ b/src/emu/cpu/tms9900/tms9900l.h @@ -96,115 +96,4 @@ struct tms9900reset_param -//DECLARE_LEGACY_CPU_DEVICE(TMS9940, tms9940); - -/* - structure with optional parameters for tms9940_reset. -*/ -struct tms9940reset_param -{ - ti99xx_idle_func idle_callback; -}; - - - -DECLARE_LEGACY_CPU_DEVICE(TMS9980L, tms9980al); - -/* - structure with optional parameters for tms9980a_reset. -*/ -struct tms9980areset_param -{ - ti99xx_idle_func idle_callback; -}; - - - -//DECLARE_LEGACY_CPU_DEVICE(TMS9985, tms9985); - -/*// - structure with optional parameters for tms9985_reset. -*/ -struct tms9985reset_param -{ - ti99xx_idle_func idle_callback; -}; - - - -//DECLARE_LEGACY_CPU_DEVICE(TMS9989, tms9989); - -/* - structure with optional parameters for tms9989_reset. -*/ -struct tms9989reset_param -{ - ti99xx_idle_func idle_callback; -}; - - - -DECLARE_LEGACY_CPU_DEVICE(TMS9995L, tms9995l); - -/* - structure with the parameters tms9995_reset wants. -*/ -struct tms9995reset_param -{ - /* auto_wait_state : a non-zero value makes tms9995 generate a wait state automatically on each - memory access */ - int auto_wait_state; - - ti99xx_idle_func idle_callback; - - /* on the tms9995-mp9537, internal RAM and decrementer register are - disabled. This chip is used by the ti99/8 so that internal RAM does - not prevent the mapper from working correctly. */ - int is_mp9537; -}; - -/* accessor for the first 252 bytes of internal RAM */ -extern DECLARE_READ8_HANDLER(tms9995_internal1_r); -extern DECLARE_WRITE8_HANDLER(tms9995_internal1_w); -/* accessors for the last 4 bytes of internal RAM */ -extern DECLARE_READ8_HANDLER(tms9995_internal2_r); -extern DECLARE_WRITE8_HANDLER(tms9995_internal2_w); - - - -//DECLARE_LEGACY_CPU_DEVICE(TMS99000, tms99000); - -/* - structure with optional parameters for tms99000_reset. -*/ -struct tms99000reset_param -{ - ti99xx_idle_func idle_callback; -}; - - - -//DECLARE_LEGACY_CPU_DEVICE(TMS99105A, tms99105a); - -/* - structure with optional parameters for tms99105a_reset. -*/ -struct tms99105areset_param -{ - ti99xx_idle_func idle_callback; -}; - - - -//DECLARE_LEGACY_CPU_DEVICE(TMS99110A, tms99110a); - -/* - structure with optional parameters for tms99110a_reset. -*/ -struct tms99110areset_param -{ - ti99xx_idle_func idle_callback; -}; - - #endif /* __TMS9900_H__ */ diff --git a/src/emu/cpu/tms9900/tms9980al.c b/src/emu/cpu/tms9900/tms9980al.c deleted file mode 100644 index 303b8edd848..00000000000 --- a/src/emu/cpu/tms9900/tms9980al.c +++ /dev/null @@ -1,15 +0,0 @@ -// license:MAME -// copyright-holders:Raphael Nabet -/* - generate the tms9980a/tms9981 emulator -*/ - -#include "emu.h" -#include "debugger.h" -#include "tms9900l.h" - -#define TMS99XX_MODEL TMS9980_ID - -#include "99xxcore.h" - -DEFINE_LEGACY_CPU_DEVICE(TMS9980L, tms9980al); diff --git a/src/emu/cpu/tms9900/tms9995l.c b/src/emu/cpu/tms9900/tms9995l.c deleted file mode 100644 index cc5fc0f3e83..00000000000 --- a/src/emu/cpu/tms9900/tms9995l.c +++ /dev/null @@ -1,15 +0,0 @@ -// license:MAME -// copyright-holders:Raphael Nabet -/* - generate the tms9995 emulator -*/ - -#include "emu.h" -#include "debugger.h" -#include "tms9900l.h" - -#define TMS99XX_MODEL TMS9995_ID - -#include "99xxcore.h" - -DEFINE_LEGACY_CPU_DEVICE(TMS9995L, tms9995l); diff --git a/src/mame/mame.mak b/src/mame/mame.mak index f4c7c1488a4..0a05608e47c 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -66,7 +66,6 @@ CPUS += TMS340X0 CPUS += TMS9900 CPUS += TMS9995 CPUS += TMS9900L -CPUS += TMS9995L CPUS += Z8000 CPUS += Z8001 CPUS += TMS32010 diff --git a/src/mess/drivers/cortex.c b/src/mess/drivers/cortex.c index fb50940e2f6..04b46221585 100644 --- a/src/mess/drivers/cortex.c +++ b/src/mess/drivers/cortex.c @@ -22,14 +22,9 @@ ****************************************************************************/ -#define MODERN 1 #include "emu.h" -#if MODERN #include "cpu/tms9900/tms9995.h" -#else -#include "cpu/tms9900/tms9900l.h" -#endif #include "video/tms9928a.h" class cortex_state : public driver_device @@ -42,7 +37,7 @@ public: { } virtual void machine_reset(); - required_device m_maincpu; + required_device m_maincpu; required_shared_ptr m_p_ram; }; @@ -77,14 +72,9 @@ void cortex_state::machine_reset() { UINT8* ROM = memregion("maincpu")->base(); memcpy(m_p_ram, ROM, 0x6000); -#if MODERN - static_cast(machine().device("maincpu"))->set_ready(ASSERT_LINE); -#else - m_maincpu->reset(); -#endif + m_maincpu->set_ready(ASSERT_LINE); } -#if MODERN static TMS9995_CONFIG( cpuconf95 ) { DEVCB_NULL, // external op @@ -95,14 +85,6 @@ static TMS9995_CONFIG( cpuconf95 ) INTERNAL_RAM, // use internal RAM NO_OVERFLOW_INT // The generally available versions of TMS9995 have a deactivated overflow interrupt }; -#else -static const struct tms9995reset_param cortex_processor_config = -{ - 0, /* disable automatic wait state generation */ - 0, /* no IDLE callback */ - 0 /* no MP9537 mask */ -}; -#endif static TMS9928A_INTERFACE(cortex_tms9929a_interface) { @@ -113,14 +95,7 @@ static TMS9928A_INTERFACE(cortex_tms9929a_interface) static MACHINE_CONFIG_START( cortex, cortex_state ) /* basic machine hardware */ /* TMS9995 CPU @ 12.0 MHz */ -#if MODERN MCFG_TMS99xx_ADD("maincpu", TMS9995, 12000000, cortex_mem, cortex_io, cpuconf95) -#else - MCFG_CPU_ADD("maincpu", TMS9995L, 12000000) - MCFG_CPU_CONFIG(cortex_processor_config) - MCFG_CPU_PROGRAM_MAP(cortex_mem) - MCFG_CPU_IO_MAP(cortex_io) -#endif /* video hardware */ MCFG_TMS9928A_ADD( "tms9928a", TMS9929A, cortex_tms9929a_interface ) diff --git a/src/mess/mess.mak b/src/mess/mess.mak index a3938abac8c..4d6a71b7070 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -50,7 +50,6 @@ CPUS += TMS340X0 CPUS += TMS9900 CPUS += TMS9995 CPUS += TMS9900L -CPUS += TMS9995L CPUS += Z8000 CPUS += Z8001 CPUS += TMS32010