From 0678ae3e8d4fd760d435e57ddc4b0b4f05403aa7 Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 11 Oct 2017 19:11:46 -0400 Subject: At least one version of Cameltry uses PC060HA (nw) --- src/mame/drivers/taito_f2.cpp | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp index 2a67d962bcf..c305f2c7aa7 100644 --- a/src/mame/drivers/taito_f2.cpp +++ b/src/mame/drivers/taito_f2.cpp @@ -695,6 +695,22 @@ static ADDRESS_MAP_START( cameltry_map, AS_PROGRAM, 16, taitof2_state ) AM_RANGE(0xd00000, 0xd0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_device, write, 0x00ff) /* ?? */ ADDRESS_MAP_END +static ADDRESS_MAP_START( cameltrya_map, AS_PROGRAM, 16, taitof2_state ) + AM_RANGE(0x000000, 0x03ffff) AM_ROM + AM_RANGE(0x100000, 0x10ffff) AM_RAM + AM_RANGE(0x200000, 0x201fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") + AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, read, write, 0x00ff) + AM_RANGE(0x300018, 0x30001f) AM_READ(cameltry_paddle_r) + AM_RANGE(0x320000, 0x320001) AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0xff00) + AM_RANGE(0x320002, 0x320003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0xff00) + AM_RANGE(0x800000, 0x813fff) AM_DEVREADWRITE("tc0100scn", tc0100scn_device, word_r, word_w) /* tilemaps */ + AM_RANGE(0x820000, 0x82000f) AM_DEVREADWRITE("tc0100scn", tc0100scn_device, ctrl_word_r, ctrl_word_w) + AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_SHARE("spriteram") + AM_RANGE(0xa00000, 0xa01fff) AM_DEVREADWRITE("tc0280grd", tc0280grd_device, tc0280grd_word_r, tc0280grd_word_w) /* ROZ tilemap */ + AM_RANGE(0xa02000, 0xa0200f) AM_DEVWRITE("tc0280grd", tc0280grd_device, tc0280grd_ctrl_word_w) + AM_RANGE(0xd00000, 0xd0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_device, write, 0x00ff) /* ?? */ +ADDRESS_MAP_END + static ADDRESS_MAP_START( qtorimon_map, AS_PROGRAM, 16, taitof2_state ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM @@ -1099,8 +1115,8 @@ static ADDRESS_MAP_START( cameltrya_sound_map, AS_PROGRAM, 8, taitof2_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM // I can't see a bank control, but there ARE some bytes past 0x8000 AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("tc0140syt", tc0140syt_device, slave_port_w) - AM_RANGE(0xa001, 0xa001) AM_DEVREADWRITE("tc0140syt", tc0140syt_device, slave_comm_r, slave_comm_w) + AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("ciu", pc060ha_device, slave_port_w) + AM_RANGE(0xa001, 0xa001) AM_DEVREADWRITE("ciu", pc060ha_device, slave_comm_r, slave_comm_w) // AM_RANGE(0xb000, 0xb000) AM_WRITE(unknown_w) // probably controlling sample player? AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("oki", okim6295_device, read, write) ADDRESS_MAP_END @@ -3630,7 +3646,7 @@ static MACHINE_CONFIG_START( cameltrya ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(cameltry_map) + MCFG_CPU_PROGRAM_MAP(cameltrya_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", taitof2_state, taitof2_interrupt) MCFG_CPU_ADD("audiocpu", Z80,24000000/4) /* verifed on pcb */ @@ -3689,9 +3705,9 @@ static MACHINE_CONFIG_START( cameltrya ) MCFG_OKIM6295_ADD("oki", XTAL_4_224MHz/4, PIN7_HIGH) /* verified on pcb */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10) - MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0) - MCFG_TC0140SYT_MASTER_CPU("maincpu") - MCFG_TC0140SYT_SLAVE_CPU("audiocpu") + MCFG_DEVICE_ADD("ciu", PC060HA, 0) + MCFG_PC060HA_MASTER_CPU("maincpu") + MCFG_PC060HA_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END -- cgit v1.2.3