From 33e78ca27d816cbd10b317960134341b0bf88894 Mon Sep 17 00:00:00 2001 From: Michael Zapf Date: Mon, 21 Oct 2013 18:43:03 +0000 Subject: [PATCH] New 9995 now working, can drop old code. --- src/mame/drivers/nsm.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/src/mame/drivers/nsm.c b/src/mame/drivers/nsm.c index 494a67879a8..f40aaa1bef9 100644 --- a/src/mame/drivers/nsm.c +++ b/src/mame/drivers/nsm.c @@ -15,16 +15,9 @@ ToDo: *********************************************************************************/ -#define MODERN 0 - #include "machine/genpin.h" -#if MODERN #include "cpu/tms9900/tms9995.h" -#else -#include "cpu/tms9900/tms9900l.h" -#endif - #include "sound/ay8910.h" #include "nsm.lh" @@ -52,23 +45,12 @@ private: UINT8 m_cru_count; }; -#if MODERN static ADDRESS_MAP_START( nsm_map, AS_PROGRAM, 8, nsm_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0xe000, 0xefff) AM_RAM AM_RANGE(0xffec, 0xffed) AM_DEVWRITE("ay1", ay8910_device, address_data_w) AM_RANGE(0xffee, 0xffef) AM_DEVWRITE("ay2", ay8910_device, address_data_w) ADDRESS_MAP_END -#else -static ADDRESS_MAP_START( nsm_map, AS_PROGRAM, 8, nsm_state ) - AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0xe000, 0xefff) AM_RAM - AM_RANGE(0xf000, 0xf0fb) AM_READ_LEGACY(tms9995_internal1_r) - AM_RANGE(0xffec, 0xffed) AM_DEVWRITE("ay1", ay8910_device, address_data_w) - AM_RANGE(0xffee, 0xffef) AM_DEVWRITE("ay2", ay8910_device, address_data_w) - AM_RANGE(0xfffc, 0xffff) AM_READ_LEGACY(tms9995_internal2_r) -ADDRESS_MAP_END -#endif static ADDRESS_MAP_START( nsm_io_map, AS_IO, 8, nsm_state ) // 00-71 selected by IC600 (74LS151) @@ -126,7 +108,6 @@ WRITE8_MEMBER( nsm_state::cru_w ) } } -#if MODERN static TMS9995_CONFIG( cpuconf95 ) { DEVCB_NULL, // external op @@ -137,7 +118,6 @@ static TMS9995_CONFIG( cpuconf95 ) INTERNAL_RAM, // use internal RAM NO_OVERFLOW_INT // The generally available versions of TMS9995 have a deactivated overflow interrupt }; -#endif void nsm_state::machine_reset() { @@ -145,13 +125,8 @@ void nsm_state::machine_reset() static MACHINE_CONFIG_START( nsm, nsm_state ) /* basic machine hardware */ -#if MODERN MCFG_TMS99xx_ADD("maincpu", TMS9995, 11052000, nsm_map, nsm_io_map, cpuconf95) -#else - MCFG_CPU_ADD("maincpu", TMS9995L, 11052000) - MCFG_CPU_PROGRAM_MAP(nsm_map) - MCFG_CPU_IO_MAP(nsm_io_map) -#endif + /* Video */ MCFG_DEFAULT_LAYOUT(layout_nsm)