From acfd09004ec870edd9cbb561d6d007cfa67b0b57 Mon Sep 17 00:00:00 2001 From: AJR Date: Fri, 25 May 2018 15:45:22 -0400 Subject: taito_b.cpp: Add clock for TC0180VCU; use device finder instead of machine().device (nw) --- src/mame/drivers/taito_b.cpp | 122 +++++++++++++++++++++---------------------- src/mame/includes/taito_b.h | 3 +- 2 files changed, 62 insertions(+), 63 deletions(-) diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp index 7364faa6a2c..7acd624ca20 100644 --- a/src/mame/drivers/taito_b.cpp +++ b/src/mame/drivers/taito_b.cpp @@ -1931,8 +1931,6 @@ WRITE8_MEMBER(taitob_state::mb87078_gain_changed) void taitob_state::machine_start() { - m_ym = machine().device("ymsnd"); - save_item(NAME(m_eep_latch)); save_item(NAME(m_coin_word)); } @@ -1947,11 +1945,11 @@ void taitob_state::machine_reset() MACHINE_CONFIG_START(taitob_state::rastsag2) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(rastsag2_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -1980,7 +1978,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order0) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0xc0) MCFG_TC0180VCU_FG_COLORBASE(0x80) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -1989,7 +1987,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL / 2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2004,11 +2002,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::masterw) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(masterw_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, masterw_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */ + MCFG_DEVICE_ADD("audiocpu", Z80, 24_MHz_XTAL / 4) /* 6 MHz Z80B */ MCFG_DEVICE_PROGRAM_MAP(masterw_sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2037,7 +2035,7 @@ MACHINE_CONFIG_START(taitob_state::masterw) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x30) MCFG_TC0180VCU_FG_COLORBASE(0x20) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2046,7 +2044,7 @@ MACHINE_CONFIG_START(taitob_state::masterw) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2203, 24_MHz_XTAL / 8) /* 3 MHz */ MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitob_state, bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.25) @@ -2082,11 +2080,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::ashura) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(rastsag2_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2115,7 +2113,7 @@ MACHINE_CONFIG_START(taitob_state::ashura) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order0) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0xc0) MCFG_TC0180VCU_FG_COLORBASE(0x80) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2124,7 +2122,7 @@ MACHINE_CONFIG_START(taitob_state::ashura) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL / 2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2139,11 +2137,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::crimec) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(crimec_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, crimec_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2172,7 +2170,7 @@ MACHINE_CONFIG_START(taitob_state::crimec) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order1) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x00) MCFG_TC0180VCU_FG_COLORBASE(0x40) MCFG_TC0180VCU_TX_COLORBASE(0xc0) @@ -2181,7 +2179,7 @@ MACHINE_CONFIG_START(taitob_state::crimec) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL / 2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) @@ -2197,11 +2195,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::hitice) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(hitice_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, hitice_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */ + MCFG_DEVICE_ADD("audiocpu", Z80, 24_MHz_XTAL / 4) /* 6 MHz Z80B */ MCFG_DEVICE_PROGRAM_MAP(viofight_sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2231,7 +2229,7 @@ MACHINE_CONFIG_START(taitob_state::hitice) MCFG_VIDEO_START_OVERRIDE(taitob_state,hitice) MCFG_VIDEO_RESET_OVERRIDE(taitob_state,hitice) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) // nominally "6.6 MHZ" MCFG_TC0180VCU_BG_COLORBASE(0xc0) MCFG_TC0180VCU_FG_COLORBASE(0x80) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2240,7 +2238,7 @@ MACHINE_CONFIG_START(taitob_state::hitice) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2203, 24_MHz_XTAL / 8) /* 3 MHz */ MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitob_state, bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.25) @@ -2260,11 +2258,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::rambo3p) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* verified on pcb */ MCFG_DEVICE_PROGRAM_MAP(rambo3_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) /* verified on pcb */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2293,7 +2291,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order0) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0xc0) MCFG_TC0180VCU_FG_COLORBASE(0x80) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2302,7 +2300,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL / 2) /* verified on pcb */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) @@ -2318,11 +2316,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::rambo3) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz verified on pcb */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12MHz verified on pcb */ MCFG_DEVICE_PROGRAM_MAP(rambo3_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz verified on pcb */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) /* 4MHz verified on pcb */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2351,7 +2349,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x30) MCFG_TC0180VCU_FG_COLORBASE(0x20) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2360,7 +2358,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz verified on pcb */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL / 2) /* 8 MHz verified on pcb */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2375,11 +2373,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::pbobble) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(pbobble_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/2) /* 4 MHz */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 2) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(sound_map) @@ -2414,7 +2412,7 @@ MACHINE_CONFIG_START(taitob_state::pbobble) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order1) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x00) MCFG_TC0180VCU_FG_COLORBASE(0x40) MCFG_TC0180VCU_TX_COLORBASE(0xc0) @@ -2423,7 +2421,7 @@ MACHINE_CONFIG_START(taitob_state::pbobble) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610B, 16_MHz_XTAL / 2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2438,11 +2436,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::spacedx) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(spacedx_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2477,7 +2475,7 @@ MACHINE_CONFIG_START(taitob_state::spacedx) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order1) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x00) MCFG_TC0180VCU_FG_COLORBASE(0x40) MCFG_TC0180VCU_TX_COLORBASE(0xc0) @@ -2486,7 +2484,7 @@ MACHINE_CONFIG_START(taitob_state::spacedx) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL / 2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2501,11 +2499,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::spacedxo) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(spacedxo_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2534,7 +2532,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x30) MCFG_TC0180VCU_FG_COLORBASE(0x20) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2543,7 +2541,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL / 2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2597,7 +2595,7 @@ MACHINE_CONFIG_START(taitob_state::qzshowby) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order1) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x00) MCFG_TC0180VCU_FG_COLORBASE(0x40) MCFG_TC0180VCU_TX_COLORBASE(0xc0) @@ -2621,11 +2619,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::viofight) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(viofight_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, viofight_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz verified */ + MCFG_DEVICE_ADD("audiocpu", Z80, 24_MHz_XTAL / 4) /* 6 MHz verified */ MCFG_DEVICE_PROGRAM_MAP(viofight_sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2654,7 +2652,7 @@ MACHINE_CONFIG_START(taitob_state::viofight) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x30) MCFG_TC0180VCU_FG_COLORBASE(0x20) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2663,7 +2661,7 @@ MACHINE_CONFIG_START(taitob_state::viofight) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2203, 24_MHz_XTAL / 8) /* 3 MHz */ MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitob_state, bankswitch_w)) MCFG_SOUND_ROUTE(0, "mono", 0.25) @@ -2671,7 +2669,7 @@ MACHINE_CONFIG_START(taitob_state::viofight) MCFG_SOUND_ROUTE(2, "mono", 0.25) MCFG_SOUND_ROUTE(3, "mono", 0.80) - MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(4'224'000)/4, okim6295_device::PIN7_HIGH) // 1.056MHz clock frequency, but pin 7 not verified + MCFG_DEVICE_ADD("oki", OKIM6295, 4.224_MHz_XTAL / 4, okim6295_device::PIN7_HIGH) // 1.056MHz clock frequency, but pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_DEVICE_ADD("ciu", PC060HA, 0) @@ -2683,11 +2681,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::silentd) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(silentd_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, silentd_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2716,7 +2714,7 @@ MACHINE_CONFIG_START(taitob_state::silentd) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x30) MCFG_TC0180VCU_FG_COLORBASE(0x20) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2725,7 +2723,7 @@ MACHINE_CONFIG_START(taitob_state::silentd) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL / 2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2740,11 +2738,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(taitob_state::selfeena) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(selfeena_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2773,7 +2771,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x30) MCFG_TC0180VCU_FG_COLORBASE(0x20) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2782,7 +2780,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL / 2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2806,11 +2804,11 @@ void taitob_state::ryujin_patch(void) MACHINE_CONFIG_START(taitob_state::ryujin) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */ + MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 12 MHz */ MCFG_DEVICE_PROGRAM_MAP(selfeena_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */ + MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4) /* 4 MHz */ MCFG_DEVICE_PROGRAM_MAP(sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -2839,7 +2837,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order2) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0x30) MCFG_TC0180VCU_FG_COLORBASE(0x20) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2848,7 +2846,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin) /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */ + MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL / 2) /* 8 MHz */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -2903,7 +2901,7 @@ MACHINE_CONFIG_START(taitob_state::sbm) MCFG_VIDEO_START_OVERRIDE(taitob_state,taitob_color_order0) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0xc0) MCFG_TC0180VCU_FG_COLORBASE(0x80) MCFG_TC0180VCU_TX_COLORBASE(0x00) @@ -2961,7 +2959,7 @@ MACHINE_CONFIG_START(taitob_c_state::realpunc) MCFG_HD63484_ADD("hd63484", 0, realpunc_hd63484_map) MCFG_HD63484_AUTO_CONFIGURE_SCREEN(false) - MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 0) + MCFG_DEVICE_ADD("tc0180vcu", TC0180VCU, 27.164_MHz_XTAL / 4) MCFG_TC0180VCU_BG_COLORBASE(0xc0) MCFG_TC0180VCU_FG_COLORBASE(0x80) MCFG_TC0180VCU_TX_COLORBASE(0x00) diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 114f60214b4..60ba3526d45 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -30,6 +30,7 @@ public: m_pixelram(*this, "pixelram"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), + m_ym(*this, "ymsnd"), m_hd63484(*this, "hd63484"), m_tc0180vcu(*this, "tc0180vcu"), m_tc0640fio(*this, "tc0640fio"), @@ -157,7 +158,7 @@ private: /* devices */ required_device m_maincpu; required_device m_audiocpu; - device_t *m_ym; + required_device m_ym; optional_device m_hd63484; required_device m_tc0180vcu; optional_device m_tc0640fio; -- cgit v1.2.3