diff options
Diffstat (limited to 'src/mame/drivers/spinb.cpp')
-rw-r--r-- | src/mame/drivers/spinb.cpp | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp index 99c8746cae3..8daddcc50b5 100644 --- a/src/mame/drivers/spinb.cpp +++ b/src/mame/drivers/spinb.cpp @@ -636,19 +636,19 @@ uint32_t spinb_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, MACHINE_CONFIG_START(spinb_state::spinb) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2) - MCFG_CPU_PROGRAM_MAP(spinb_map) - MCFG_CPU_PERIODIC_INT_DRIVER(spinb_state, irq0_line_hold, 160) // NE556 adjustable (if faster, then jolypark has a stack problem) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000) / 2) - MCFG_CPU_PROGRAM_MAP(spinb_audio_map) - MCFG_CPU_ADD("musiccpu", Z80, XTAL(5'000'000) / 2) - MCFG_CPU_PROGRAM_MAP(spinb_music_map) - MCFG_CPU_ADD("dmdcpu",I8031, XTAL(16'000'000)) - MCFG_CPU_PROGRAM_MAP(dmd_mem) - MCFG_CPU_IO_MAP(dmd_io) - MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(spinb_state, p1_w)) - MCFG_MCS51_PORT_P3_IN_CB(READ8(spinb_state, p3_r)) - MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(spinb_state, p3_w)) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(5'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(spinb_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(spinb_state, irq0_line_hold, 160) // NE556 adjustable (if faster, then jolypark has a stack problem) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(5'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(spinb_audio_map) + MCFG_DEVICE_ADD("musiccpu", Z80, XTAL(5'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(spinb_music_map) + MCFG_DEVICE_ADD("dmdcpu",I8031, XTAL(16'000'000)) + MCFG_DEVICE_PROGRAM_MAP(dmd_mem) + MCFG_DEVICE_IO_MAP(dmd_io) + MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, spinb_state, p1_w)) + MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, spinb_state, p3_r)) + MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, spinb_state, p3_w)) MCFG_NVRAM_ADD_1FILL("nvram") @@ -666,82 +666,82 @@ MACHINE_CONFIG_START(spinb_state::spinb) /* Sound */ genpin_audio(config); MCFG_SPEAKER_STANDARD_MONO("msmavol") - MCFG_SOUND_ADD("msm_a", MSM5205, XTAL(384'000)) - MCFG_MSM5205_VCK_CALLBACK(DEVWRITELINE("ic5a", ttl7474_device, clock_w)) + MCFG_DEVICE_ADD("msm_a", MSM5205, XTAL(384'000)) + MCFG_MSM5205_VCK_CALLBACK(WRITELINE("ic5a", ttl7474_device, clock_w)) MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmavol", 1.0) MCFG_SPEAKER_STANDARD_MONO("msmmvol") - MCFG_SOUND_ADD("msm_m", MSM5205, XTAL(384'000)) - MCFG_MSM5205_VCK_CALLBACK(DEVWRITELINE("ic5m", ttl7474_device, clock_w)) + MCFG_DEVICE_ADD("msm_m", MSM5205, XTAL(384'000)) + MCFG_MSM5205_VCK_CALLBACK(WRITELINE("ic5m", ttl7474_device, clock_w)) MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmmvol", 1.0) /* Devices */ MCFG_DEVICE_ADD("ppi60", I8255A, 0 ) - //MCFG_I8255_IN_PORTA_CB(READ8(spinb_state, ppi60a_r)) - MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppi60a_w)) - //MCFG_I8255_IN_PORTB_CB(READ8(spinb_state, ppi60b_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppi60b_w)) - MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, sw_r)) - //MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppi60c_w)) + //MCFG_I8255_IN_PORTA_CB(READ8(*this, spinb_state, ppi60a_r)) + MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppi60a_w)) + //MCFG_I8255_IN_PORTB_CB(READ8(*this, spinb_state, ppi60b_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppi60b_w)) + MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, sw_r)) + //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppi60c_w)) MCFG_DEVICE_ADD("ppi64", I8255A, 0 ) - //MCFG_I8255_IN_PORTA_CB(READ8(spinb_state, ppi64a_r)) - //MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppi64a_w)) - //MCFG_I8255_IN_PORTB_CB(READ8(spinb_state, ppi64b_r)) - //MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppi64b_w)) - //MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, ppi64c_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppi64c_w)) + //MCFG_I8255_IN_PORTA_CB(READ8(*this, spinb_state, ppi64a_r)) + //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppi64a_w)) + //MCFG_I8255_IN_PORTB_CB(READ8(*this, spinb_state, ppi64b_r)) + //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppi64b_w)) + //MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, ppi64c_r)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppi64c_w)) MCFG_DEVICE_ADD("ppi68", I8255A, 0 ) - //MCFG_I8255_IN_PORTA_CB(READ8(spinb_state, ppi68a_r)) - //MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppi68a_w)) - //MCFG_I8255_IN_PORTB_CB(READ8(spinb_state, ppi68b_r)) - //MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppi68b_w)) - //MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, ppi68c_r)) - //MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppi68c_w)) + //MCFG_I8255_IN_PORTA_CB(READ8(*this, spinb_state, ppi68a_r)) + //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppi68a_w)) + //MCFG_I8255_IN_PORTB_CB(READ8(*this, spinb_state, ppi68b_r)) + //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppi68b_w)) + //MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, ppi68c_r)) + //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppi68c_w)) MCFG_DEVICE_ADD("ppi6c", I8255A, 0 ) - //MCFG_I8255_IN_PORTA_CB(READ8(spinb_state, ppi6ca_r)) - //MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppi6ca_w)) - //MCFG_I8255_IN_PORTB_CB(READ8(spinb_state, ppi6cb_r)) - //MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppi6cb_w)) - //MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, ppi6cc_r)) - //MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppi6cc_w)) + //MCFG_I8255_IN_PORTA_CB(READ8(*this, spinb_state, ppi6ca_r)) + //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppi6ca_w)) + //MCFG_I8255_IN_PORTB_CB(READ8(*this, spinb_state, ppi6cb_r)) + //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppi6cb_w)) + //MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, ppi6cc_r)) + //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppi6cc_w)) MCFG_DEVICE_ADD("ppia", I8255A, 0 ) - MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppia_a_w)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppia_b_w)) - MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, ppia_c_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppia_c_w)) + MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppia_a_w)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppia_b_w)) + MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, ppia_c_r)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppia_c_w)) MCFG_DEVICE_ADD("ppim", I8255A, 0 ) - MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppim_a_w)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppim_b_w)) - MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, ppim_c_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppim_c_w)) + MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppim_a_w)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppim_b_w)) + MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, ppim_c_r)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppim_c_w)) MCFG_DEVICE_ADD("ic5a", TTL7474, 0) - MCFG_7474_COMP_OUTPUT_CB(WRITELINE(spinb_state, ic5a_w)) + MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, spinb_state, ic5a_w)) MCFG_DEVICE_ADD("ic14a", HC157, 0) // actually IC15 on Jolly Park - MCFG_74157_OUT_CB(DEVWRITE8("msm_a", msm5205_device, data_w)) + MCFG_74157_OUT_CB(WRITE8("msm_a", msm5205_device, data_w)) MCFG_DEVICE_ADD("ic5m", TTL7474, 0) - MCFG_7474_COMP_OUTPUT_CB(WRITELINE(spinb_state, ic5m_w)) + MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, spinb_state, ic5m_w)) MCFG_DEVICE_ADD("ic14m", HC157, 0) // actually IC15 on Jolly Park - MCFG_74157_OUT_CB(DEVWRITE8("msm_m", msm5205_device, data_w)) + MCFG_74157_OUT_CB(WRITE8("msm_m", msm5205_device, data_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(spinb_state::jolypark) spinb(config); - MCFG_SOUND_REPLACE("msm_a", MSM6585, XTAL(640'000)) - MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("ic5a", ttl7474_device, clock_w)) + MCFG_DEVICE_REPLACE("msm_a", MSM6585, XTAL(640'000)) + MCFG_MSM6585_VCK_CALLBACK(WRITELINE("ic5a", ttl7474_device, clock_w)) MCFG_MSM6585_PRESCALER_SELECTOR(S40) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmavol", 1.0) - MCFG_SOUND_REPLACE("msm_m", MSM6585, XTAL(640'000)) - MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("ic5m", ttl7474_device, clock_w)) + MCFG_DEVICE_REPLACE("msm_m", MSM6585, XTAL(640'000)) + MCFG_MSM6585_VCK_CALLBACK(WRITELINE("ic5m", ttl7474_device, clock_w)) MCFG_MSM6585_PRESCALER_SELECTOR(S40) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmmvol", 1.0) MACHINE_CONFIG_END @@ -749,8 +749,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(spinb_state::vrnwrld) jolypark(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(vrnwrld_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(vrnwrld_map) MACHINE_CONFIG_END |