From 4edc055c9520414541f803e1579dd4458c9a25f9 Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 11 Oct 2017 17:45:22 -0400 Subject: Draw a nominal distinction between PC060HA and TC0140SYT --- src/mame/audio/taitosnd.cpp | 20 +++++++++++++++-- src/mame/audio/taitosnd.h | 14 ++++++++++++ src/mame/drivers/asuka.cpp | 50 +++++++++++++++++++++--------------------- src/mame/drivers/exzisus.cpp | 16 +++++++------- src/mame/drivers/gokidetor.cpp | 14 ++++++------ src/mame/drivers/mlanding.cpp | 14 ++++++------ src/mame/drivers/opwolf.cpp | 28 +++++++++++------------ src/mame/drivers/rastan.cpp | 22 +++++++++---------- src/mame/drivers/rbisland.cpp | 14 ++++++------ src/mame/drivers/taito_b.cpp | 42 +++++++++++++++++------------------ src/mame/drivers/taito_l.cpp | 27 +++++++++++++---------- src/mame/drivers/taito_x.cpp | 14 ++++++------ src/mame/drivers/topspeed.cpp | 16 ++++++-------- src/mame/drivers/volfied.cpp | 14 ++++++------ 14 files changed, 169 insertions(+), 136 deletions(-) diff --git a/src/mame/audio/taitosnd.cpp b/src/mame/audio/taitosnd.cpp index 6dc984d925e..02b5e9aa079 100644 --- a/src/mame/audio/taitosnd.cpp +++ b/src/mame/audio/taitosnd.cpp @@ -31,6 +31,7 @@ // device type definition DEFINE_DEVICE_TYPE(TC0140SYT, tc0140syt_device, "tc0140syt", "Taito TC0140SYT") +DEFINE_DEVICE_TYPE(PC060HA, pc060ha_device, "pc060ha", "Taito PC060HA CIU") //************************************************************************** @@ -41,8 +42,8 @@ DEFINE_DEVICE_TYPE(TC0140SYT, tc0140syt_device, "tc0140syt", "Taito TC0140SYT") // tc0140syt_device - constructor //------------------------------------------------- -tc0140syt_device::tc0140syt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, TC0140SYT, tag, owner, clock) +tc0140syt_device::tc0140syt_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, type, tag, owner, clock) , m_mainmode(0) , m_submode(0) , m_status(0) @@ -54,6 +55,11 @@ tc0140syt_device::tc0140syt_device(const machine_config &mconfig, const char *ta memset(m_masterdata, 0, sizeof(uint8_t)*4); } +tc0140syt_device::tc0140syt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : tc0140syt_device(mconfig, TC0140SYT, tag, owner, clock) +{ +} + //------------------------------------------------- // device_start - device-specific startup @@ -285,3 +291,13 @@ READ8_MEMBER( tc0140syt_device::slave_comm_r ) return res; } + + +//------------------------------------------------- +// pc060ha_device - constructor +//------------------------------------------------- + +pc060ha_device::pc060ha_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : tc0140syt_device(mconfig, PC060HA, tag, owner, clock) +{ +} diff --git a/src/mame/audio/taitosnd.h b/src/mame/audio/taitosnd.h index 3738575cb02..d2b140d201f 100644 --- a/src/mame/audio/taitosnd.h +++ b/src/mame/audio/taitosnd.h @@ -14,6 +14,9 @@ #define MCFG_TC0140SYT_SLAVE_CPU(_tag) \ tc0140syt_device::set_slave_tag(*device, "^" _tag); +#define MCFG_PC060HA_MASTER_CPU(_tag) MCFG_TC0140SYT_MASTER_CPU(_tag) +#define MCFG_PC060HA_SLAVE_CPU(_tag) MCFG_TC0140SYT_SLAVE_CPU(_tag) + //************************************************************************** // TYPE DEFINITIONS @@ -40,6 +43,8 @@ public: DECLARE_WRITE8_MEMBER( slave_comm_w ); protected: + tc0140syt_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + // device-level overrides virtual void device_start() override; virtual void device_reset() override; @@ -58,7 +63,16 @@ private: required_device m_slavecpu; /* this is the audiocpu */ }; +// ======================> pc060ha_device + +class pc060ha_device : public tc0140syt_device +{ +public: + pc060ha_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +}; + DECLARE_DEVICE_TYPE(TC0140SYT, tc0140syt_device) +DECLARE_DEVICE_TYPE(PC060HA, pc060ha_device) #endif // MAME_AUDIO_TAITOSND_H diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp index 83c82f203fd..db50ec8524d 100644 --- a/src/mame/drivers/asuka.cpp +++ b/src/mame/drivers/asuka.cpp @@ -354,8 +354,8 @@ static ADDRESS_MAP_START( asuka_map, AS_PROGRAM, 16, asuka_state ) AM_RANGE(0x1076f0, 0x1076f1) AM_READNOP /* Mofflott init does dummy reads here */ AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE("tc0110pcr", tc0110pcr_device, word_r, step1_word_w) AM_RANGE(0x3a0000, 0x3a0003) AM_WRITE(asuka_spritectrl_w) - AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0x00ff) - AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0x00ff) + AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0x00ff) + AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0x00ff) AM_RANGE(0x400000, 0x40000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, read, write, 0x00ff) AM_RANGE(0xc00000, 0xc0ffff) AM_DEVREADWRITE("tc0100scn", tc0100scn_device, word_r, word_w) /* tilemaps */ AM_RANGE(0xc10000, 0xc103ff) AM_WRITENOP /* error in Asuka init code */ @@ -366,8 +366,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cadash_map, AS_PROGRAM, 16, asuka_state ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x080000, 0x080003) AM_WRITE(asuka_spritectrl_w) - AM_RANGE(0x0c0000, 0x0c0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0x00ff) - AM_RANGE(0x0c0002, 0x0c0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0x00ff) + AM_RANGE(0x0c0000, 0x0c0001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0x00ff) + AM_RANGE(0x0c0002, 0x0c0003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0x00ff) AM_RANGE(0x100000, 0x107fff) AM_RAM AM_RANGE(0x800000, 0x800fff) AM_READWRITE(cadash_share_r,cadash_share_w) /* network ram */ AM_RANGE(0x900000, 0x90000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, read, write, 0x00ff) @@ -384,8 +384,8 @@ static ADDRESS_MAP_START( eto_map, AS_PROGRAM, 16 /* N.B. tc100scn mirror over AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, read, write, 0x00ff) AM_RANGE(0x400000, 0x40000f) AM_DEVREAD8("tc0220ioc", tc0220ioc_device, read, 0x00ff) /* service mode mirror */ AM_RANGE(0x4a0000, 0x4a0003) AM_WRITE(asuka_spritectrl_w) - AM_RANGE(0x4e0000, 0x4e0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0x00ff) - AM_RANGE(0x4e0002, 0x4e0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0x00ff) + AM_RANGE(0x4e0000, 0x4e0001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0x00ff) + AM_RANGE(0x4e0002, 0x4e0003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0x00ff) AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("pc090oj", pc090oj_device, word_r, word_w) /* sprite ram */ AM_RANGE(0xc00000, 0xc0ffff) AM_DEVWRITE("tc0100scn", tc0100scn_device, word_w) AM_RANGE(0xd00000, 0xd0ffff) AM_DEVREADWRITE("tc0100scn", tc0100scn_device, word_r, word_w) /* tilemaps */ @@ -415,8 +415,8 @@ static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8, asuka_state ) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) // AM_RANGE(0x9002, 0x9100) AM_READNOP - 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(asuka_msm5205_address_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(asuka_msm5205_start_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(asuka_msm5205_stop_w) @@ -428,8 +428,8 @@ static ADDRESS_MAP_START( cadash_z80_map, AS_PROGRAM, 8, asuka_state ) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("audiobank") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_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) ADDRESS_MAP_END /* @@ -948,9 +948,9 @@ static MACHINE_CONFIG_START( asuka ) MCFG_DEVICE_ADD("adpcm_select", LS157, 0) MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w)) - 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 static MACHINE_CONFIG_START( cadash ) @@ -1016,9 +1016,9 @@ static MACHINE_CONFIG_START( cadash ) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) - 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 static MACHINE_CONFIG_START( mofflott ) @@ -1087,9 +1087,9 @@ static MACHINE_CONFIG_START( mofflott ) MCFG_DEVICE_ADD("adpcm_select", LS157, 0) MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w)) - 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 static MACHINE_CONFIG_START( galmedes ) @@ -1150,9 +1150,9 @@ static MACHINE_CONFIG_START( galmedes ) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) - 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 static MACHINE_CONFIG_START( eto ) @@ -1213,9 +1213,9 @@ static MACHINE_CONFIG_START( eto ) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) - 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 diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp index 24d509f3b68..5d96882f4e6 100644 --- a/src/mame/drivers/exzisus.cpp +++ b/src/mame/drivers/exzisus.cpp @@ -20,7 +20,7 @@ System specs : =============== CPU : Z80 x 4 Sound : YM2151 - Chips : TC0010VCU x 2 + TC0140SYT + Chips : TC0010VCU x 2 + PC060HA There are two types of Exzisus PCB: @@ -117,8 +117,8 @@ static ADDRESS_MAP_START( cpub_map, AS_PROGRAM, 8, exzisus_state ) AM_RANGE(0xc000, 0xc5ff) AM_RAM AM_SHARE("objectram0") AM_RANGE(0xc600, 0xdfff) AM_RAM AM_SHARE("videoram0") AM_RANGE(0xe000, 0xefff) AM_RAM - AM_RANGE(0xf000, 0xf000) AM_READNOP AM_DEVWRITE("tc0140syt", tc0140syt_device, master_port_w) - AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w) + AM_RANGE(0xf000, 0xf000) AM_READNOP AM_DEVWRITE("ciu", pc060ha_device, master_port_w) + AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE("ciu", pc060ha_device, master_comm_r, master_comm_w) AM_RANGE(0xf400, 0xf400) AM_READ_PORT("P1") AM_RANGE(0xf400, 0xf400) AM_WRITE(cpub_bankswitch_w) AM_RANGE(0xf401, 0xf401) AM_READ_PORT("P2") @@ -142,8 +142,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, exzisus_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) - AM_RANGE(0xa000, 0xa000) AM_READNOP 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_READNOP AM_DEVWRITE("ciu", pc060ha_device, slave_port_w) + AM_RANGE(0xa001, 0xa001) AM_DEVREADWRITE("ciu", pc060ha_device, slave_comm_r, slave_comm_w) ADDRESS_MAP_END @@ -265,9 +265,9 @@ static MACHINE_CONFIG_START( exzisus ) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) - MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0) - MCFG_TC0140SYT_MASTER_CPU("cpub") - MCFG_TC0140SYT_SLAVE_CPU("audiocpu") + MCFG_DEVICE_ADD("ciu", PC060HA, 0) + MCFG_PC060HA_MASTER_CPU("cpub") + MCFG_PC060HA_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END diff --git a/src/mame/drivers/gokidetor.cpp b/src/mame/drivers/gokidetor.cpp index 3c6f88f3d3b..3d2ee790640 100644 --- a/src/mame/drivers/gokidetor.cpp +++ b/src/mame/drivers/gokidetor.cpp @@ -98,8 +98,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, gokidetor_state ) // de00 ?input // df00 ?input AM_RANGE(0xe000, 0xe003) AM_READNOP // ?input - AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("pc060ha", tc0140syt_device, master_port_w) - AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE("pc060ha", tc0140syt_device, master_comm_r, master_comm_w) + AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("ciu", pc060ha_device, master_port_w) + AM_RANGE(0xf001, 0xf001) AM_DEVREADWRITE("ciu", pc060ha_device, master_comm_r, master_comm_w) // f600 ?output // f700 ?output ADDRESS_MAP_END @@ -109,8 +109,8 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, gokidetor_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) - AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("pc060ha", tc0140syt_device, slave_port_w) - AM_RANGE(0xa001, 0xa001) AM_DEVREADWRITE("pc060ha", 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_DEVREADWRITE("oki", okim6295_device, read, write) ADDRESS_MAP_END @@ -137,9 +137,9 @@ MACHINE_CONFIG_START( gokidetor ) MCFG_CPU_ADD("soundcpu", Z80, 4000000) MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_DEVICE_ADD("pc060ha", TC0140SYT, 0) - MCFG_TC0140SYT_MASTER_CPU("maincpu") - MCFG_TC0140SYT_SLAVE_CPU("soundcpu") + MCFG_DEVICE_ADD("ciu", PC060HA, 0) + MCFG_PC060HA_MASTER_CPU("maincpu") + MCFG_PC060HA_SLAVE_CPU("soundcpu") MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp index c1fc8a30cec..0fb4a68c1f3 100644 --- a/src/mame/drivers/mlanding.cpp +++ b/src/mame/drivers/mlanding.cpp @@ -730,8 +730,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, mlanding_state ) AM_RANGE(0x2b0006, 0x2b0007) AM_READ(analog2_lsb_r) AM_RANGE(0x2c0000, 0x2c0001) AM_READ(analog3_msb_r) AM_RANGE(0x2c0002, 0x2c0003) AM_READ(analog3_lsb_r) - AM_RANGE(0x2d0000, 0x2d0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0x00ff) - AM_RANGE(0x2d0002, 0x2d0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0x00ff) + AM_RANGE(0x2d0000, 0x2d0001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0x00ff) + AM_RANGE(0x2d0002, 0x2d0003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0x00ff) ADDRESS_MAP_END @@ -779,8 +779,8 @@ static ADDRESS_MAP_START( audio_map_prog, AS_PROGRAM, 8, mlanding_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_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(msm5205_2_start_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(msm5205_2_stop_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(msm5205_1_start_w) @@ -935,9 +935,9 @@ static MACHINE_CONFIG_START( mlanding ) MCFG_DEVICE_ADD("ctc", Z80CTC, 4000000) MCFG_Z80CTC_ZC0_CB(WRITELINE(mlanding_state, z80ctc_to0)) - 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") MCFG_QUANTUM_TIME(attotime::from_hz(600)) diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp index abd1b36782f..092d80ec845 100644 --- a/src/mame/drivers/opwolf.cpp +++ b/src/mame/drivers/opwolf.cpp @@ -359,8 +359,8 @@ static ADDRESS_MAP_START( opwolf_map, AS_PROGRAM, 16, opwolf_state ) AM_RANGE(0x380000, 0x380003) AM_WRITE(opwolf_spritectrl_w) // usually 0x4, changes when you fire AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 */ AM_RANGE(0x3c0000, 0x3c0001) AM_WRITENOP /* watchdog ?? */ - AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0xff00) - AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0xff00) + AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0xff00) + AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0xff00) AM_RANGE(0xc00000, 0xc0ffff) AM_DEVREADWRITE("pc080sn", pc080sn_device, word_r, word_w) AM_RANGE(0xc10000, 0xc1ffff) AM_WRITEONLY /* error in init code (?) */ AM_RANGE(0xc20000, 0xc20003) AM_DEVWRITE("pc080sn", pc080sn_device, yscroll_word_w) @@ -380,8 +380,8 @@ static ADDRESS_MAP_START( opwolfb_map, AS_PROGRAM, 16, opwolf_state ) AM_RANGE(0x380000, 0x380003) AM_WRITE(opwolf_spritectrl_w) // usually 0x4, changes when you fire AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 */ AM_RANGE(0x3c0000, 0x3c0001) AM_WRITENOP /* watchdog ?? */ - AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0xff00) - AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0xff00) + AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0xff00) + AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0xff00) AM_RANGE(0xc00000, 0xc0ffff) AM_DEVREADWRITE("pc080sn", pc080sn_device, word_r, word_w) AM_RANGE(0xc10000, 0xc1ffff) AM_WRITEONLY /* error in init code (?) */ AM_RANGE(0xc20000, 0xc20003) AM_DEVWRITE("pc080sn", pc080sn_device, yscroll_word_w) @@ -399,8 +399,8 @@ static ADDRESS_MAP_START( opwolfp_map, AS_PROGRAM, 16, opwolf_state ) AM_RANGE(0x380000, 0x380003) AM_WRITE(opwolf_spritectrl_w) // usually 0x4, changes when you fire AM_RANGE(0x3a0000, 0x3a0003) AM_READ(opwolf_lightgun_r) /* lightgun, read at $11e0/6 (AND INPUTS) */ AM_RANGE(0x3c0000, 0x3c0001) AM_WRITENOP /* watchdog ?? */ - AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0xff00) - AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0xff00) + AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0xff00) + AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0xff00) AM_RANGE(0xc00000, 0xc0ffff) AM_DEVREADWRITE("pc080sn", pc080sn_device, word_r, word_w) AM_RANGE(0xc10000, 0xc1ffff) AM_WRITEONLY /* error in init code (?) */ AM_RANGE(0xc20000, 0xc20003) AM_DEVWRITE("pc080sn", pc080sn_device, yscroll_word_w) @@ -556,8 +556,8 @@ static ADDRESS_MAP_START( opwolf_sound_z80_map, AS_PROGRAM, 8, opwolf_state ) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_device,read,write) AM_RANGE(0x9002, 0x9100) AM_READNOP - 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, 0xb006) AM_WRITE(opwolf_adpcm_b_w) AM_RANGE(0xc000, 0xc006) AM_WRITE(opwolf_adpcm_c_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(opwolf_adpcm_d_w) @@ -832,9 +832,9 @@ static MACHINE_CONFIG_START( opwolf ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) - 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 @@ -908,9 +908,9 @@ static MACHINE_CONFIG_START( opwolfb ) /* OSC clocks unknown for the bootleg, bu MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) - 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 diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp index c584bf4ae0c..afea8c00a98 100644 --- a/src/mame/drivers/rastan.cpp +++ b/src/mame/drivers/rastan.cpp @@ -11,7 +11,7 @@ custom ICs ---------- PC040DA x3 video DAC PC050 coin I/O -PC060HS main/sub CPU communication +PC060HA main/sub CPU communication PC080 tilemap generator PC090 sprite generator @@ -46,7 +46,7 @@ Address Dir Data Name Description 0011101----------------- W ---------------x SUB RESET [1] 0011110----------------- R ---------------- n.c. 0011110----------------- W ---------------- watchdog reset -0011111---------------x- R/W ------------xxxx SNRD/SNWR PC060HS +0011111---------------x- R/W ------------xxxx SNRD/SNWR PC060HA 0011 EXT [1] 11000xxxxxxxxxxxxxxxxxxx R/W xxxxxxxxxxxxxxxx SCN PC080 PGA 11010000---xxxxxxxxxxxxx R/W xxxxxxxxxxxxxxxx OBJ PC090 PGA @@ -62,7 +62,7 @@ Address Dir Data Name Description 01xxxxxxxxxxxxxx R xxxxxxxx program ROM (banked) 1000xxxxxxxxxxxx R/W xxxxxxxx SRAM work RAM 1001-----------x R/W xxxxxxxx YM2151 YM2151 [1] -1010-----------x R/W ----xxxx PC6 PC060HS +1010-----------x R/W ----xxxx PC6 PC060HA 1011------------ W xxxxxxxx V-ST-ADRS MSM5205 start address (bits 15-8) 1100------------ W -------- START-VCE MSM5205 start 1101------------ W -------- STOP-VCE MSM5205 stop @@ -75,7 +75,7 @@ Address Dir Data Name Description Notes: - For sound communication, we are using code in audio/taitosnd.c, which claims to be for the TC0140SYT chip. That chip is not present in Rastan, - the communication is handled by PC060HS, which I guess is compatible. + the communication is handled by PC060HA, which I guess is compatible. TODO: - Unknown writes to 0x350008. @@ -221,8 +221,8 @@ static ADDRESS_MAP_START( rastan_map, AS_PROGRAM, 16, rastan_state ) AM_RANGE(0x390008, 0x390009) AM_READ_PORT("DSWA") AM_RANGE(0x39000a, 0x39000b) AM_READ_PORT("DSWB") AM_RANGE(0x3c0000, 0x3c0001) AM_DEVWRITE("watchdog", watchdog_timer_device, reset16_w) - AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0x00ff) - AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0x00ff) + AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0x00ff) + AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0x00ff) AM_RANGE(0xc00000, 0xc0ffff) AM_DEVREADWRITE("pc080sn", pc080sn_device, word_r, word_w) AM_RANGE(0xc20000, 0xc20003) AM_DEVWRITE("pc080sn", pc080sn_device, yscroll_word_w) AM_RANGE(0xc40000, 0xc40003) AM_DEVWRITE("pc080sn", pc080sn_device, xscroll_word_w) @@ -236,8 +236,8 @@ static ADDRESS_MAP_START( rastan_s_map, AS_PROGRAM, 8, rastan_state ) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_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(rastan_msm5205_address_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(rastan_msm5205_start_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(rastan_msm5205_stop_w) @@ -414,9 +414,9 @@ static MACHINE_CONFIG_START( rastan ) MCFG_DEVICE_ADD("adpcm_sel", LS157, 0) MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w)) - 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 diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp index 84ad16a0665..584fa49ac47 100644 --- a/src/mame/drivers/rbisland.cpp +++ b/src/mame/drivers/rbisland.cpp @@ -355,8 +355,8 @@ static ADDRESS_MAP_START( rbisland_map, AS_PROGRAM, 16, rbisland_state ) AM_RANGE(0x3a0000, 0x3a0001) AM_WRITE(rbisland_spritectrl_w) AM_RANGE(0x3b0000, 0x3b0003) AM_READ_PORT("DSWB") AM_RANGE(0x3c0000, 0x3c0003) AM_WRITENOP /* written very often, watchdog? */ - AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0x00ff) - AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0x00ff) + AM_RANGE(0x3e0000, 0x3e0001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0x00ff) + AM_RANGE(0x3e0002, 0x3e0003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0x00ff) AM_RANGE(0x800000, 0x8007ff) AM_READWRITE(rbisland_cchip_ram_r,rbisland_cchip_ram_w) AM_RANGE(0x800802, 0x800803) AM_READWRITE(rbisland_cchip_ctrl_r,rbisland_cchip_ctrl_w) AM_RANGE(0x800c00, 0x800c01) AM_WRITE(rbisland_cchip_bank_w) @@ -414,8 +414,8 @@ static ADDRESS_MAP_START( rbisland_sound_map, AS_PROGRAM, 8, rbisland_state ) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_device,read,write) AM_RANGE(0x9002, 0x9100) AM_READNOP - 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) ADDRESS_MAP_END static ADDRESS_MAP_START( jumping_sound_map, AS_PROGRAM, 8, rbisland_state ) @@ -672,9 +672,9 @@ static MACHINE_CONFIG_START( rbisland ) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) - 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 diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp index ee3cbf8ced3..de5b01f1930 100644 --- a/src/mame/drivers/taito_b.cpp +++ b/src/mame/drivers/taito_b.cpp @@ -504,8 +504,8 @@ static ADDRESS_MAP_START( tetrista_map, AS_PROGRAM, 16, taitob_state ) TC0180VCU_MEMRW( 0x400000 ) AM_RANGE(0x600000, 0x600003) AM_DEVREADWRITE8("tc0040ioc", tc0040ioc_device, read, write, 0xff00) AM_RANGE(0x800000, 0x803fff) AM_RAM /* Main RAM */ - AM_RANGE(0xa00000, 0xa00001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0xff00) - AM_RANGE(0xa00002, 0xa00003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0xff00) + AM_RANGE(0xa00000, 0xa00001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0xff00) + AM_RANGE(0xa00002, 0xa00003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0xff00) ADDRESS_MAP_END @@ -514,8 +514,8 @@ static ADDRESS_MAP_START( hitice_map, AS_PROGRAM, 16, taitob_state ) TC0180VCU_MEMRW( 0x400000 ) AM_RANGE(0x600000, 0x60000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, read, write, 0xff00) AM_RANGE(0x610000, 0x610001) AM_READ_PORT("P3_P4") - AM_RANGE(0x700000, 0x700001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0xff00) - AM_RANGE(0x700002, 0x700003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0xff00) + AM_RANGE(0x700000, 0x700001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0xff00) + AM_RANGE(0x700002, 0x700003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0xff00) AM_RANGE(0x800000, 0x803fff) AM_RAM /* Main RAM */ AM_RANGE(0xa00000, 0xa01fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0xb00000, 0xb7ffff) AM_RAM_WRITE(hitice_pixelram_w) AM_SHARE("pixelram") @@ -608,8 +608,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( viofight_map, AS_PROGRAM, 16, taitob_state ) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x200000, 0x200001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0xff00) - AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0xff00) + AM_RANGE(0x200000, 0x200001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0xff00) + AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0xff00) TC0180VCU_MEMRW( 0x400000 ) AM_RANGE(0x600000, 0x601fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0x800000, 0x80000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_device, read, write, 0xff00) @@ -623,8 +623,8 @@ static ADDRESS_MAP_START( masterw_map, AS_PROGRAM, 16, taitob_state ) TC0180VCU_MEMRW( 0x400000 ) AM_RANGE(0x600000, 0x601fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0x800000, 0x800003) AM_DEVREADWRITE8("tc0040ioc", tc0040ioc_device, read, write, 0xff00) - AM_RANGE(0xa00000, 0xa00001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0xff00) - AM_RANGE(0xa00002, 0xa00003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0xff00) + AM_RANGE(0xa00000, 0xa00001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0xff00) + AM_RANGE(0xa00002, 0xa00003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0xff00) ADDRESS_MAP_END @@ -695,8 +695,8 @@ static ADDRESS_MAP_START( masterw_sound_map, AS_PROGRAM, 8, taitob_state ) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") 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) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, taitob_state ) @@ -720,8 +720,8 @@ static ADDRESS_MAP_START( viofight_sound_map, AS_PROGRAM, 8, taitob_state ) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("oki", okim6295_device, read, write) /* yes, both addresses for the same chip */ - 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) ADDRESS_MAP_END @@ -2015,9 +2015,9 @@ static MACHINE_CONFIG_START( masterw ) MCFG_SOUND_ROUTE(2, "mono", 0.25) MCFG_SOUND_ROUTE(3, "mono", 0.80) - 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 @@ -2210,9 +2210,9 @@ static MACHINE_CONFIG_START( hitice ) MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - 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 @@ -2633,9 +2633,9 @@ static MACHINE_CONFIG_START( viofight ) MCFG_OKIM6295_ADD("oki", XTAL_4_224MHz/4, PIN7_HIGH) // 1.056MHz clock frequency, but pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - 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 diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 294e759a429..ec47b4d87f6 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -501,8 +501,8 @@ static ADDRESS_MAP_START( fhawk_2_map, AS_PROGRAM, 8, fhawk_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank6") AM_RANGE(0xc000, 0xc000) AM_WRITE(rombank2switch_w) - AM_RANGE(0xc800, 0xc800) AM_READNOP AM_DEVWRITE("tc0140syt", tc0140syt_device, master_port_w) - AM_RANGE(0xc801, 0xc801) AM_DEVREADWRITE("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w) + AM_RANGE(0xc800, 0xc800) AM_READNOP AM_DEVWRITE("ciu", pc060ha_device, master_port_w) + AM_RANGE(0xc801, 0xc801) AM_DEVREADWRITE("ciu", pc060ha_device, master_comm_r, master_comm_w) AM_RANGE(0xd000, 0xd007) AM_DEVREADWRITE("tc0220ioc", tc0220ioc_device, read, write) AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("share1") ADDRESS_MAP_END @@ -511,8 +511,8 @@ static ADDRESS_MAP_START( fhawk_3_map, AS_PROGRAM, 8, fhawk_state ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank7") AM_RANGE(0x8000, 0x9fff) AM_RAM - AM_RANGE(0xe000, 0xe000) AM_READNOP AM_DEVWRITE("tc0140syt", tc0140syt_device, slave_port_w) - AM_RANGE(0xe001, 0xe001) AM_DEVREADWRITE("tc0140syt", tc0140syt_device, slave_comm_r, slave_comm_w) + AM_RANGE(0xe000, 0xe000) AM_READNOP AM_DEVWRITE("ciu", pc060ha_device, slave_port_w) + AM_RANGE(0xe001, 0xe001) AM_DEVREADWRITE("ciu", pc060ha_device, slave_comm_r, slave_comm_w) AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) ADDRESS_MAP_END @@ -565,8 +565,8 @@ static ADDRESS_MAP_START( champwr_2_map, AS_PROGRAM, 8, champwr_state ) AM_RANGE(0xc000, 0xdfff) AM_RAM AM_SHARE("share1") AM_RANGE(0xe000, 0xe007) AM_DEVREADWRITE("tc0220ioc", tc0220ioc_device, read, write) AM_RANGE(0xe008, 0xe00f) AM_READNOP - AM_RANGE(0xe800, 0xe800) AM_READNOP AM_DEVWRITE("tc0140syt", tc0140syt_device, master_port_w) - AM_RANGE(0xe801, 0xe801) AM_DEVREADWRITE("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w) + AM_RANGE(0xe800, 0xe800) AM_READNOP AM_DEVWRITE("ciu", pc060ha_device, master_port_w) + AM_RANGE(0xe801, 0xe801) AM_DEVREADWRITE("ciu", pc060ha_device, master_comm_r, master_comm_w) AM_RANGE(0xf000, 0xf000) AM_READWRITE(rombank2switch_r, rombank2switch_w) ADDRESS_MAP_END @@ -575,8 +575,8 @@ static ADDRESS_MAP_START( champwr_3_map, AS_PROGRAM, 8, champwr_state ) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank7") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) - AM_RANGE(0xa000, 0xa000) AM_READNOP 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_READNOP 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(msm5205_hi_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(msm5205_lo_w) AM_RANGE(0xd000, 0xd000) AM_WRITE(msm5205_start_w) @@ -1583,9 +1583,9 @@ static MACHINE_CONFIG_START( fhawk ) MCFG_SOUND_ROUTE(2, "mono", 0.20) MCFG_SOUND_ROUTE(3, "mono", 0.80) - MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0) - MCFG_TC0140SYT_MASTER_CPU("slave") - MCFG_TC0140SYT_SLAVE_CPU("audiocpu") + MCFG_DEVICE_ADD("ciu", PC060HA, 0) + MCFG_PC060HA_MASTER_CPU("slave") + MCFG_PC060HA_SLAVE_CPU("audiocpu") MACHINE_CONFIG_END @@ -1638,6 +1638,11 @@ static MACHINE_CONFIG_DERIVED( raimais, fhawk ) MCFG_DEVICE_ADD("dpram", MB8421, 0) + MCFG_DEVICE_REMOVE("ciu") + MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0) + MCFG_TC0140SYT_MASTER_CPU("slave") + MCFG_TC0140SYT_SLAVE_CPU("audiocpu") + /* sound hardware */ MCFG_SOUND_REPLACE("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp index 94ff160882b..a95431396ea 100644 --- a/src/mame/drivers/taito_x.cpp +++ b/src/mame/drivers/taito_x.cpp @@ -557,8 +557,8 @@ static ADDRESS_MAP_START( daisenpu_map, AS_PROGRAM, 16, taitox_state ) // AM_RANGE(0x400000, 0x400001) AM_WRITENOP /* written each frame at $2ac, values change */ AM_RANGE(0x500000, 0x50000f) AM_READ(superman_dsw_input_r) // AM_RANGE(0x600000, 0x600001) AM_WRITENOP /* written each frame at $2a2, values change */ - AM_RANGE(0x800000, 0x800001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0x00ff) - AM_RANGE(0x800002, 0x800003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0x00ff) + AM_RANGE(0x800000, 0x800001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0x00ff) + AM_RANGE(0x800002, 0x800003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0x00ff) AM_RANGE(0x900000, 0x90000f) AM_READWRITE(daisenpu_input_r, daisenpu_input_w) AM_RANGE(0xb00000, 0xb00fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", seta001_device, spriteylow_r16, spriteylow_w16) // Sprites Y @@ -619,8 +619,8 @@ static ADDRESS_MAP_START( daisenpu_sound_map, AS_PROGRAM, 8, taitox_state ) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("z80bank") AM_RANGE(0xc000, 0xdfff) AM_RAM AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) - AM_RANGE(0xe200, 0xe200) AM_READNOP AM_DEVWRITE("tc0140syt", tc0140syt_device, slave_port_w) - AM_RANGE(0xe201, 0xe201) AM_DEVREADWRITE("tc0140syt", tc0140syt_device, slave_comm_r, slave_comm_w) + AM_RANGE(0xe200, 0xe200) AM_READNOP AM_DEVWRITE("ciu", pc060ha_device, slave_port_w) + AM_RANGE(0xe201, 0xe201) AM_DEVREADWRITE("ciu", pc060ha_device, slave_comm_r, slave_comm_w) AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */ AM_RANGE(0xea00, 0xea00) AM_READNOP AM_RANGE(0xee00, 0xee00) AM_WRITENOP /* ? */ @@ -1006,9 +1006,9 @@ static MACHINE_CONFIG_START( daisenpu ) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) - 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 static MACHINE_CONFIG_START( gigandes ) diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp index 02746977d76..cec71cfa914 100644 --- a/src/mame/drivers/topspeed.cpp +++ b/src/mame/drivers/topspeed.cpp @@ -53,8 +53,6 @@ Taito: 2 * PC080SN, PC060HA, TC0040IOC, 2 * TC0060DCA, PC050CM TODO Lists ========== -Replace TC0140SYT with PC060HA - Minor black glitches on the road: these are all on the right hand edge of the tilemap making up the "left" half: this is the upper of the two road tilemaps so any gunk will be visible. @@ -384,8 +382,8 @@ static ADDRESS_MAP_START( cpua_map, AS_PROGRAM, 16, topspeed_state ) AM_RANGE(0x400000, 0x40ffff) AM_RAM AM_SHARE("sharedram") AM_RANGE(0x500000, 0x503fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0x600002, 0x600003) AM_WRITE(cpua_ctrl_w) - AM_RANGE(0x7e0000, 0x7e0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0x00ff) - AM_RANGE(0x7e0002, 0x7e0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0x00ff) + AM_RANGE(0x7e0000, 0x7e0001) AM_READNOP AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0x00ff) + AM_RANGE(0x7e0002, 0x7e0003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0x00ff) AM_RANGE(0x800000, 0x8003ff) AM_RAM AM_SHARE("raster_ctrl") AM_RANGE(0x800400, 0x80ffff) AM_RAM AM_RANGE(0x880000, 0x880007) AM_WRITENOP // Lamps/outputs? @@ -417,8 +415,8 @@ static ADDRESS_MAP_START( z80_prg, AS_PROGRAM, 8, topspeed_state ) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("sndbank") AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_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, 0xcfff) AM_WRITE(msm5205_command_w) AM_RANGE(0xd000, 0xdfff) AM_WRITE(volume_w) ADDRESS_MAP_END @@ -598,9 +596,9 @@ static MACHINE_CONFIG_START( topspeed ) MCFG_PC080SN_OFFSETS(0, 8) MCFG_PC080SN_GFXDECODE("gfxdecode") - 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") MCFG_DEVICE_ADD("tc0040ioc", TC0040IOC, 0) MCFG_TC0040IOC_READ_0_CB(IOPORT("DSWA")) diff --git a/src/mame/drivers/volfied.cpp b/src/mame/drivers/volfied.cpp index b81b699d474..f94cb93fe91 100644 --- a/src/mame/drivers/volfied.cpp +++ b/src/mame/drivers/volfied.cpp @@ -76,8 +76,8 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, volfied_state ) AM_RANGE(0x600000, 0x600001) AM_WRITE(video_mask_w) AM_RANGE(0x700000, 0x700001) AM_WRITE(sprite_ctrl_w) AM_RANGE(0xd00000, 0xd00001) AM_READWRITE(video_ctrl_r, video_ctrl_w) - AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE8("tc0140syt", tc0140syt_device, master_port_w, 0x00ff) - AM_RANGE(0xe00002, 0xe00003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, master_comm_r, master_comm_w, 0x00ff) + AM_RANGE(0xe00000, 0xe00001) AM_DEVWRITE8("ciu", pc060ha_device, master_port_w, 0x00ff) + AM_RANGE(0xe00002, 0xe00003) AM_DEVREADWRITE8("ciu", pc060ha_device, master_comm_r, master_comm_w, 0x00ff) AM_RANGE(0xf00000, 0xf007ff) AM_READWRITE(cchip_ram_r, cchip_ram_w) AM_RANGE(0xf00802, 0xf00803) AM_READWRITE(cchip_ctrl_r, cchip_ctrl_w) AM_RANGE(0xf00c00, 0xf00c01) AM_WRITE(cchip_bank_w) @@ -86,8 +86,8 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8, volfied_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0x87ff) AM_RAM - AM_RANGE(0x8800, 0x8800) AM_DEVWRITE("tc0140syt", tc0140syt_device, slave_port_w) - AM_RANGE(0x8801, 0x8801) AM_DEVREADWRITE("tc0140syt", tc0140syt_device, slave_comm_r, slave_comm_w) + AM_RANGE(0x8800, 0x8800) AM_DEVWRITE("ciu", pc060ha_device, slave_port_w) + AM_RANGE(0x8801, 0x8801) AM_DEVREADWRITE("ciu", pc060ha_device, slave_comm_r, slave_comm_w) AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_device, read, write) AM_RANGE(0x9800, 0x9800) AM_WRITENOP /* ? */ ADDRESS_MAP_END @@ -263,9 +263,9 @@ static MACHINE_CONFIG_START( volfied ) MCFG_SOUND_ROUTE(2, "mono", 0.15) MCFG_SOUND_ROUTE(3, "mono", 0.60) - 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