diff options
Diffstat (limited to 'src/mame/drivers/nyny.cpp')
-rw-r--r-- | src/mame/drivers/nyny.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp index a03016a1931..f185af5aa2e 100644 --- a/src/mame/drivers/nyny.cpp +++ b/src/mame/drivers/nyny.cpp @@ -595,15 +595,15 @@ void nyny_state::machine_reset() MACHINE_CONFIG_START(nyny_state::nyny) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", MC6809, 5600000) /* 1.40 MHz? The clock signal is generated by analog chips */ - MCFG_CPU_PROGRAM_MAP(nyny_main_map) - MCFG_CPU_PERIODIC_INT_DRIVER(nyny_state, update_pia_1, 25) + MCFG_DEVICE_ADD("maincpu", MC6809, 5600000) /* 1.40 MHz? The clock signal is generated by analog chips */ + MCFG_DEVICE_PROGRAM_MAP(nyny_main_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(nyny_state, update_pia_1, 25) - MCFG_CPU_ADD("audiocpu", M6802, AUDIO_CPU_1_CLOCK) - MCFG_CPU_PROGRAM_MAP(nyny_audio_1_map) + MCFG_DEVICE_ADD("audiocpu", M6802, AUDIO_CPU_1_CLOCK) + MCFG_DEVICE_PROGRAM_MAP(nyny_audio_1_map) - MCFG_CPU_ADD("audio2", M6802, AUDIO_CPU_2_CLOCK) - MCFG_CPU_PROGRAM_MAP(nyny_audio_2_map) + MCFG_DEVICE_ADD("audio2", M6802, AUDIO_CPU_2_CLOCK) + MCFG_DEVICE_PROGRAM_MAP(nyny_audio_2_map) MCFG_NVRAM_ADD_0FILL("nvram") @@ -619,7 +619,7 @@ MACHINE_CONFIG_START(nyny_state::nyny) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(nyny_state, crtc_update_row) MCFG_MC6845_END_UPDATE_CB(nyny_state, crtc_end_update) - MCFG_MC6845_OUT_DE_CB(DEVWRITELINE("ic48_1", ttl74123_device, a_w)) + MCFG_MC6845_OUT_DE_CB(WRITELINE("ic48_1", ttl74123_device, a_w)) /* 74LS123 */ MCFG_DEVICE_ADD("ic48_1", TTL74123, 0) @@ -629,20 +629,20 @@ MACHINE_CONFIG_START(nyny_state::nyny) MCFG_TTL74123_A_PIN_VALUE(1) /* A pin - driven by the CRTC */ MCFG_TTL74123_B_PIN_VALUE(1) /* B pin - pulled high */ MCFG_TTL74123_CLEAR_PIN_VALUE(1) /* Clear pin - pulled high */ - MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(nyny_state, ic48_1_74123_output_changed)) + MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, nyny_state, ic48_1_74123_output_changed)) MCFG_DEVICE_ADD("pia1", PIA6821, 0) MCFG_PIA_READPA_HANDLER(IOPORT("IN0")) MCFG_PIA_READPB_HANDLER(IOPORT("IN1")) - MCFG_PIA_IRQA_HANDLER(WRITELINE(nyny_state, main_cpu_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(nyny_state, main_cpu_irq)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, nyny_state, main_cpu_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, nyny_state, main_cpu_irq)) MCFG_DEVICE_ADD("pia2", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(nyny_state,pia_2_port_a_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(nyny_state,pia_2_port_b_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(nyny_state,flipscreen_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(nyny_state,main_cpu_firq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(nyny_state,main_cpu_irq)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, nyny_state,pia_2_port_a_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, nyny_state,pia_2_port_b_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, nyny_state,flipscreen_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, nyny_state,main_cpu_firq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, nyny_state,main_cpu_irq)) /* audio hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") @@ -651,20 +651,20 @@ MACHINE_CONFIG_START(nyny_state::nyny) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_GENERIC_LATCH_8_ADD("soundlatch3") - MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CPU_1_CLOCK) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nyny_state, nyny_ay8910_37_port_a_w)) - MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write)) + MCFG_DEVICE_ADD("ay1", AY8910, AUDIO_CPU_1_CLOCK) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nyny_state, nyny_ay8910_37_port_a_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("dac", dac_byte_interface, write)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) - MCFG_SOUND_ADD("ay2", AY8910, AUDIO_CPU_1_CLOCK) + MCFG_DEVICE_ADD("ay2", AY8910, AUDIO_CPU_1_CLOCK) MCFG_AY8910_PORT_A_READ_CB(IOPORT("SW2")) MCFG_AY8910_PORT_B_READ_CB(IOPORT("SW1")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) - MCFG_SOUND_ADD("ay3", AY8910, AUDIO_CPU_2_CLOCK) + MCFG_DEVICE_ADD("ay3", AY8910, AUDIO_CPU_2_CLOCK) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.03) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) MACHINE_CONFIG_END |