diff options
Diffstat (limited to 'src/mame/drivers/lisa.cpp')
-rw-r--r-- | src/mame/drivers/lisa.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/drivers/lisa.cpp b/src/mame/drivers/lisa.cpp index f981a1599e5..53b10ad2293 100644 --- a/src/mame/drivers/lisa.cpp +++ b/src/mame/drivers/lisa.cpp @@ -100,30 +100,30 @@ static const floppy_interface lisa_floppy_interface = /* Lisa1 and Lisa 2 machine */ MACHINE_CONFIG_START(lisa_state::lisa) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, 5093760) /* 20.37504 MHz / 4 */ - MCFG_CPU_PROGRAM_MAP(lisa_map) - MCFG_CPU_VBLANK_INT_DRIVER(SCREEN_TAG, lisa_state, lisa_interrupt) + MCFG_DEVICE_ADD("maincpu", M68000, 5093760) /* 20.37504 MHz / 4 */ + MCFG_DEVICE_PROGRAM_MAP(lisa_map) + MCFG_DEVICE_VBLANK_INT_DRIVER(SCREEN_TAG, lisa_state, lisa_interrupt) - MCFG_CPU_ADD(COP421_TAG, COP421, 3900000) + MCFG_DEVICE_ADD(COP421_TAG, COP421, 3900000) MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, true ) - MCFG_CPU_ADD(KB_COP421_TAG, COP421, 3900000) // ? + MCFG_DEVICE_ADD(KB_COP421_TAG, COP421, 3900000) // ? MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, true ) - MCFG_CPU_ADD("fdccpu", M6504, 2000000) /* 16.000 MHz / 8 in when DIS asserted, 16.000 MHz / 9 otherwise (?) */ - MCFG_CPU_PROGRAM_MAP(lisa_fdc_map) + MCFG_DEVICE_ADD("fdccpu", M6504, 2000000) /* 16.000 MHz / 8 in when DIS asserted, 16.000 MHz / 9 otherwise (?) */ + MCFG_DEVICE_PROGRAM_MAP(lisa_fdc_map) MCFG_QUANTUM_TIME(attotime::from_hz(60)) MCFG_DEVICE_ADD("latch", LS259, 0) // U4E - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(lisa_state, diag1_w)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(lisa_state, diag2_w)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(lisa_state, seg1_w)) - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(lisa_state, seg2_w)) - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(lisa_state, setup_w)) - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(lisa_state, sfmsk_w)) - MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(lisa_state, vtmsk_w)) - MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(lisa_state, hdmsk_w)) + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, lisa_state, diag1_w)) + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, lisa_state, diag2_w)) + MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, lisa_state, seg1_w)) + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, lisa_state, seg2_w)) + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, lisa_state, setup_w)) + MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, lisa_state, sfmsk_w)) + MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, lisa_state, vtmsk_w)) + MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, lisa_state, hdmsk_w)) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) @@ -139,7 +139,7 @@ MACHINE_CONFIG_START(lisa_state::lisa) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* nvram */ @@ -154,11 +154,11 @@ MACHINE_CONFIG_START(lisa_state::lisa) /* via */ MCFG_DEVICE_ADD("via6522_0", VIA6522, 500000) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(lisa_state, COPS_via_out_a)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(lisa_state, COPS_via_out_b)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(lisa_state, COPS_via_out_ca2)) - MCFG_VIA6522_CB2_HANDLER(WRITELINE(lisa_state, COPS_via_out_cb2)) - MCFG_VIA6522_IRQ_HANDLER(WRITELINE(lisa_state, COPS_via_irq_func)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, lisa_state, COPS_via_out_a)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, lisa_state, COPS_via_out_b)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, lisa_state, COPS_via_out_ca2)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, lisa_state, COPS_via_out_cb2)) + MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, lisa_state, COPS_via_irq_func)) MCFG_DEVICE_ADD("via6522_1", VIA6522, 500000) @@ -168,8 +168,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(lisa_state::lisa210) lisa(config); - MCFG_CPU_MODIFY( "fdccpu" ) - MCFG_CPU_PROGRAM_MAP(lisa210_fdc_map) + MCFG_DEVICE_MODIFY( "fdccpu" ) + MCFG_DEVICE_PROGRAM_MAP(lisa210_fdc_map) /* Lisa 2/10 and MacXL had a slightly different FDC interface */ MCFG_IWM_MODIFY("fdc", lisa210_fdc_interface) |