diff options
Diffstat (limited to 'src/mame/drivers/dec0.cpp')
-rw-r--r-- | src/mame/drivers/dec0.cpp | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp index 2f3e3252d64..5f97b6877d5 100644 --- a/src/mame/drivers/dec0.cpp +++ b/src/mame/drivers/dec0.cpp @@ -1643,12 +1643,12 @@ MACHINE_CONFIG_START(dec0_state::dec0) dec0_base(config); /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2) - MCFG_CPU_PROGRAM_MAP(dec0_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_assert) /* VBL */ + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(dec0_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_assert) /* VBL */ - MCFG_CPU_ADD("audiocpu", M6502, XTAL(12'000'000) / 8) - MCFG_CPU_PROGRAM_MAP(dec0_s_map) + MCFG_DEVICE_ADD("audiocpu", M6502, XTAL(12'000'000) / 8) + MCFG_DEVICE_PROGRAM_MAP(dec0_s_map) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0) @@ -1659,13 +1659,13 @@ MACHINE_CONFIG_START(dec0_state::dec0) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000) / 8) + MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000) / 8) MCFG_SOUND_ROUTE(0, "mono", 0.90) MCFG_SOUND_ROUTE(1, "mono", 0.90) MCFG_SOUND_ROUTE(2, "mono", 0.90) MCFG_SOUND_ROUTE(3, "mono", 0.35) - MCFG_SOUND_ADD("ym2", YM3812, XTAL(12'000'000) / 4) + MCFG_DEVICE_ADD("ym2", YM3812, XTAL(12'000'000) / 4) MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) @@ -1688,13 +1688,13 @@ MACHINE_CONFIG_START(dec0_state::dec1) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */ + MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */ MCFG_SOUND_ROUTE(0, "mono", 0.90) MCFG_SOUND_ROUTE(1, "mono", 0.90) MCFG_SOUND_ROUTE(2, "mono", 0.90) MCFG_SOUND_ROUTE(3, "mono", 0.35) - MCFG_SOUND_ADD("ym2", YM3812, XTAL(12'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_ADD("ym2", YM3812, XTAL(12'000'000)/4) /* verified on pcb */ MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) @@ -1734,12 +1734,12 @@ WRITE_LINE_MEMBER(dec0_automat_state::msm2_vclk_cb) MACHINE_CONFIG_START(dec0_automat_state::automat) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 10000000) - MCFG_CPU_PROGRAM_MAP(automat_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */ + MCFG_DEVICE_ADD("maincpu", M68000, 10000000) + MCFG_DEVICE_PROGRAM_MAP(automat_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */ - MCFG_CPU_ADD("audiocpu", Z80, 3000000)// ? - MCFG_CPU_PROGRAM_MAP(automat_s_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 3000000)// ? + MCFG_DEVICE_PROGRAM_MAP(automat_s_map) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0_nodma) @@ -1776,31 +1776,31 @@ MACHINE_CONFIG_START(dec0_automat_state::automat) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_SOUND_ADD("2203a", YM2203, 1250000) + MCFG_DEVICE_ADD("2203a", YM2203, 1250000) MCFG_SOUND_ROUTE(0, "mono", 0.90) MCFG_SOUND_ROUTE(1, "mono", 0.90) MCFG_SOUND_ROUTE(2, "mono", 0.90) MCFG_SOUND_ROUTE(3, "mono", 0.35) - MCFG_SOUND_ADD("2203b", YM2203, 1250000) + MCFG_DEVICE_ADD("2203b", YM2203, 1250000) MCFG_SOUND_ROUTE(0, "mono", 0.90) MCFG_SOUND_ROUTE(1, "mono", 0.90) MCFG_SOUND_ROUTE(2, "mono", 0.90) MCFG_SOUND_ROUTE(3, "mono", 0.35) MCFG_DEVICE_ADD("adpcm_select1", LS157, 0) - MCFG_74157_OUT_CB(DEVWRITE8("msm1", msm5205_device, data_w)) + MCFG_74157_OUT_CB(WRITE8("msm1", msm5205_device, data_w)) MCFG_DEVICE_ADD("adpcm_select2", LS157, 0) - MCFG_74157_OUT_CB(DEVWRITE8("msm2", msm5205_device, data_w)) + MCFG_74157_OUT_CB(WRITE8("msm2", msm5205_device, data_w)) - MCFG_SOUND_ADD("msm1", MSM5205, 384000) - MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm1_vclk_cb)) + MCFG_DEVICE_ADD("msm1", MSM5205, 384000) + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dec0_automat_state, msm1_vclk_cb)) MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_SOUND_ADD("msm2", MSM5205, 384000) - MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm2_vclk_cb)) + MCFG_DEVICE_ADD("msm2", MSM5205, 384000) + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dec0_automat_state, msm2_vclk_cb)) MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1809,12 +1809,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dec0_automat_state::secretab) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ - MCFG_CPU_PROGRAM_MAP(secretab_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */ + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ + MCFG_DEVICE_PROGRAM_MAP(secretab_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */ - MCFG_CPU_ADD("audiocpu", Z80, 3000000)// ? - MCFG_CPU_PROGRAM_MAP(secretab_s_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 3000000)// ? + MCFG_DEVICE_PROGRAM_MAP(secretab_s_map) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0_nodma) @@ -1851,28 +1851,28 @@ MACHINE_CONFIG_START(dec0_automat_state::secretab) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_SOUND_ADD("2203a", YM2203, 1250000) + MCFG_DEVICE_ADD("2203a", YM2203, 1250000) MCFG_SOUND_ROUTE(0, "mono", 0.90) MCFG_SOUND_ROUTE(1, "mono", 0.90) MCFG_SOUND_ROUTE(2, "mono", 0.90) MCFG_SOUND_ROUTE(3, "mono", 0.35) - MCFG_SOUND_ADD("ym3812", YM3812, 2500000) + MCFG_DEVICE_ADD("ym3812", YM3812, 2500000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_DEVICE_ADD("adpcm_select1", LS157, 0) - MCFG_74157_OUT_CB(DEVWRITE8("msm1", msm5205_device, data_w)) + MCFG_74157_OUT_CB(WRITE8("msm1", msm5205_device, data_w)) MCFG_DEVICE_ADD("adpcm_select2", LS157, 0) - MCFG_74157_OUT_CB(DEVWRITE8("msm2", msm5205_device, data_w)) + MCFG_74157_OUT_CB(WRITE8("msm2", msm5205_device, data_w)) - MCFG_SOUND_ADD("msm1", MSM5205, 384000) - MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm1_vclk_cb)) + MCFG_DEVICE_ADD("msm1", MSM5205, 384000) + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dec0_automat_state, msm1_vclk_cb)) MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MCFG_SOUND_ADD("msm2", MSM5205, 384000) - MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm2_vclk_cb)) + MCFG_DEVICE_ADD("msm2", MSM5205, 384000) + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dec0_automat_state, msm2_vclk_cb)) MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1881,12 +1881,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dec0_state::hbarrel) dec0(config); - MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000)) - MCFG_MCS51_PORT_P0_IN_CB(READ8(dec0_state, dec0_mcu_port0_r)) - MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(dec0_state, dec0_mcu_port0_w)) - MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(dec0_state, dec0_mcu_port1_w)) - MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(dec0_state, dec0_mcu_port2_w)) - MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(dec0_state, dec0_mcu_port3_w)) + MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000)) + MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, dec0_state, dec0_mcu_port0_r)) + MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port0_w)) + MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port1_w)) + MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port2_w)) + MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port3_w)) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1896,12 +1896,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dec0_state::baddudes) dec0(config); - MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000)) - MCFG_MCS51_PORT_P0_IN_CB(READ8(dec0_state, dec0_mcu_port0_r)) - MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(dec0_state, dec0_mcu_port0_w)) - MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(dec0_state, dec0_mcu_port1_w)) - MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(dec0_state, dec0_mcu_port2_w)) - MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(dec0_state, dec0_mcu_port3_w)) + MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000)) + MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, dec0_state, dec0_mcu_port0_r)) + MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port0_w)) + MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port1_w)) + MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port2_w)) + MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port3_w)) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -1927,8 +1927,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dec0_state::robocop) dec0(config); - MCFG_CPU_ADD("sub", H6280, XTAL(21'477'272) / 16) - MCFG_CPU_PROGRAM_MAP(robocop_sub_map) + MCFG_DEVICE_ADD("sub", H6280, XTAL(21'477'272) / 16) + MCFG_DEVICE_PROGRAM_MAP(robocop_sub_map) MCFG_QUANTUM_TIME(attotime::from_hz(3000)) /* Interleave between HuC6280 & 68000 */ @@ -1948,8 +1948,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dec0_state::hippodrm) dec0(config); - MCFG_CPU_ADD("sub", H6280, XTAL(21'477'272) / 16) - MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map) + MCFG_DEVICE_ADD("sub", H6280, XTAL(21'477'272) / 16) + MCFG_DEVICE_PROGRAM_MAP(hippodrm_sub_map) MCFG_QUANTUM_TIME(attotime::from_hz(300)) /* Interleave between H6280 & 68000 */ @@ -1961,8 +1961,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dec0_state::ffantasybl) dec0(config); -// MCFG_CPU_ADD("sub", H6280, XTAL(21'477'272) / 16) -// MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map) +// MCFG_DEVICE_ADD("sub", H6280, XTAL(21'477'272) / 16) +// MCFG_DEVICE_PROGRAM_MAP(hippodrm_sub_map) // MCFG_QUANTUM_TIME(attotime::from_hz(300)) /* Interleave between H6280 & 68000 */ @@ -1984,13 +1984,13 @@ MACHINE_CONFIG_START(dec0_state::slyspy) dec1(config); /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ - MCFG_CPU_PROGRAM_MAP(slyspy_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold) /* VBL, apparently it auto-acks */ + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ + MCFG_DEVICE_PROGRAM_MAP(slyspy_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold) /* VBL, apparently it auto-acks */ // TODO: both games doesn't like /3 here, MT #06740 - MCFG_CPU_ADD("audiocpu", H6280, XTAL(12'000'000)/2/2) /* verified on pcb (6Mhz is XIN on pin 10 of H6280) */ - MCFG_CPU_PROGRAM_MAP(slyspy_s_map) + MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(12'000'000)/2/2) /* verified on pcb (6Mhz is XIN on pin 10 of H6280) */ + MCFG_DEVICE_PROGRAM_MAP(slyspy_s_map) MCFG_DEVICE_ADD("pfprotect", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(slyspy_protection_map) @@ -2018,12 +2018,12 @@ MACHINE_CONFIG_START(dec0_state::midres) dec1(config); /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ - MCFG_CPU_PROGRAM_MAP(midres_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */ + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ + MCFG_DEVICE_PROGRAM_MAP(midres_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */ - MCFG_CPU_ADD("audiocpu", H6280, XTAL(24'000'000)/4/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ - MCFG_CPU_PROGRAM_MAP(midres_s_map) + MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(24'000'000)/4/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(midres_s_map) /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -2034,15 +2034,15 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dec0_state::midresb) midres(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(midresb_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(midresb_map) - MCFG_CPU_REPLACE("audiocpu", M6502, 1500000 ) - MCFG_CPU_PROGRAM_MAP(dec0_s_map) + MCFG_DEVICE_REPLACE("audiocpu", M6502, 1500000 ) + MCFG_DEVICE_PROGRAM_MAP(dec0_s_map) - MCFG_CPU_ADD("mcu", M68705R3, XTAL(3'579'545)) + MCFG_DEVICE_ADD("mcu", M68705R3, XTAL(3'579'545)) - MCFG_SOUND_MODIFY("ym2") + MCFG_DEVICE_MODIFY("ym2") MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) |