summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/ninjaw.cpp
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2017-06-08 16:17:10 -0400
committer AJR <ajrhacker@users.noreply.github.com>2017-06-08 16:17:10 -0400
commite61fc8189b5a97ce3d851074b47660ab1621abef (patch)
tree39502ed6a869d344d8fe9a903ac460f5ff27b611 /src/mame/drivers/ninjaw.cpp
parentf31b1520801a4848a15a0cbb646797f44e476d33 (diff)
Make TC0040IOC its own device type and separate its functionality from TC0220IOC
Diffstat (limited to 'src/mame/drivers/ninjaw.cpp')
-rw-r--r--src/mame/drivers/ninjaw.cpp26
1 files changed, 11 insertions, 15 deletions
diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp
index cb9e15ad39b..e4626748f8d 100644
--- a/src/mame/drivers/ninjaw.cpp
+++ b/src/mame/drivers/ninjaw.cpp
@@ -423,8 +423,7 @@ WRITE16_MEMBER(ninjaw_state::tc0100scn_triple_screen_w)
static ADDRESS_MAP_START( ninjaw_master_map, AS_PROGRAM, 16, ninjaw_state )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* main ram */
- AM_RANGE(0x200000, 0x200001) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, portreg_r, portreg_w, 0x00ff)
- AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, port_r, port_w, 0x00ff)
+ AM_RANGE(0x200000, 0x200003) AM_DEVREADWRITE8("tc0040ioc", tc0040ioc_device, read, write, 0x00ff)
AM_RANGE(0x210000, 0x210001) AM_WRITE(cpua_ctrl_w)
AM_RANGE(0x220000, 0x220003) AM_READWRITE(sound_r,sound_w)
AM_RANGE(0x240000, 0x24ffff) AM_RAM AM_SHARE("share1")
@@ -446,8 +445,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ninjaw_slave_map, AS_PROGRAM, 16, ninjaw_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM /* main ram */
- AM_RANGE(0x200000, 0x200001) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, portreg_r, portreg_w, 0x00ff)
- AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, port_r, port_w, 0x00ff)
+ AM_RANGE(0x200000, 0x200003) AM_DEVREADWRITE8("tc0040ioc", tc0040ioc_device, read, write, 0x00ff)
AM_RANGE(0x240000, 0x24ffff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x260000, 0x263fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x280000, 0x293fff) AM_DEVREAD("tc0100scn_1", tc0100scn_device, word_r) AM_WRITE(tc0100scn_triple_screen_w) /* tilemaps (1st screen/all screens) */
@@ -459,8 +457,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( darius2_master_map, AS_PROGRAM, 16, ninjaw_state )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* main ram */
- AM_RANGE(0x200000, 0x200001) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, portreg_r, portreg_w, 0x00ff)
- AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, port_r, port_w, 0x00ff)
+ AM_RANGE(0x200000, 0x200003) AM_DEVREADWRITE8("tc0040ioc", tc0040ioc_device, read, write, 0x00ff)
AM_RANGE(0x210000, 0x210001) AM_WRITE(cpua_ctrl_w)
AM_RANGE(0x220000, 0x220003) AM_READWRITE(sound_r,sound_w)
AM_RANGE(0x240000, 0x24ffff) AM_RAM AM_SHARE("share1")
@@ -479,8 +476,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( darius2_slave_map, AS_PROGRAM, 16, ninjaw_state )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM /* main ram */
- AM_RANGE(0x200000, 0x200001) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, portreg_r, portreg_w, 0x00ff)
- AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, port_r, port_w, 0x00ff)
+ AM_RANGE(0x200000, 0x200003) AM_DEVREADWRITE8("tc0040ioc", tc0040ioc_device, read, write, 0x00ff)
AM_RANGE(0x240000, 0x24ffff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x260000, 0x263fff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x280000, 0x293fff) AM_DEVREAD("tc0100scn_1", tc0100scn_device, word_r) AM_WRITE(tc0100scn_triple_screen_w) /* tilemaps (1st screen/all screens) */
@@ -748,13 +744,13 @@ static MACHINE_CONFIG_START( ninjaw )
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices */
- MCFG_DEVICE_ADD("tc0220ioc", TC0220IOC, 0)
- MCFG_TC0220IOC_READ_0_CB(IOPORT("DSWA"))
- MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
- MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
- MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(ninjaw_state, coin_control_w))
- MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
+ MCFG_DEVICE_ADD("tc0040ioc", TC0040IOC, 0)
+ MCFG_TC0040IOC_READ_0_CB(IOPORT("DSWA"))
+ MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
+ MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
+ MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(ninjaw_state, coin_control_w))
+ MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ninjaw)