diff options
Diffstat (limited to 'src/mame/drivers/alg.cpp')
-rw-r--r-- | src/mame/drivers/alg.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index 4e54a82a135..32c4d3eb432 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -305,8 +305,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(alg_state::alg_r1) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC) - MCFG_CPU_PROGRAM_MAP(main_map_r1) + MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC) + MCFG_DEVICE_PROGRAM_MAP(main_map_r1) MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(overlay_512kb_map) @@ -334,48 +334,48 @@ MACHINE_CONFIG_START(alg_state::alg_r1) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_NTSC) + MCFG_DEVICE_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_NTSC) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(1, "rspeaker", 0.25) MCFG_SOUND_ROUTE(2, "rspeaker", 0.25) MCFG_SOUND_ROUTE(3, "lspeaker", 0.25) - MCFG_PAULA_MEM_READ_CB(READ16(amiga_state, chip_ram_r)) - MCFG_PAULA_INT_CB(WRITELINE(amiga_state, paula_int_w)) + MCFG_PAULA_MEM_READ_CB(READ16(*this, amiga_state, chip_ram_r)) + MCFG_PAULA_INT_CB(WRITELINE(*this, amiga_state, paula_int_w)) - MCFG_SOUND_MODIFY("laserdisc") + MCFG_DEVICE_MODIFY("laserdisc") MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) /* cia */ MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC) - MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq)) + MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq)) MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("FIRE")) - MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write)) + MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write)) MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC) - MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq)) + MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_1_irq)) /* fdc */ MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC) - MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w)) - MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(amiga_state, chip_ram_r)) - MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(amiga_state, chip_ram_w)) - MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(amiga_state, fdc_dskblk_w)) - MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(amiga_state, fdc_dsksyn_w)) + MCFG_AMIGA_FDC_INDEX_CALLBACK(WRITELINE("cia_1", mos8520_device, flag_w)) + MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(*this, amiga_state, chip_ram_r)) + MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(*this, amiga_state, chip_ram_w)) + MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(*this, amiga_state, fdc_dskblk_w)) + MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(*this, amiga_state, fdc_dsksyn_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(alg_state::alg_r2) alg_r1(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(main_map_r2) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(main_map_r2) MACHINE_CONFIG_END MACHINE_CONFIG_START(alg_state::picmatic) alg_r1(config); /* adjust for PAL specs */ - MCFG_CPU_REPLACE("maincpu", M68000, amiga_state::CLK_7M_PAL) - MCFG_CPU_PROGRAM_MAP(main_map_picmatic) + MCFG_DEVICE_REPLACE("maincpu", M68000, amiga_state::CLK_7M_PAL) + MCFG_DEVICE_PROGRAM_MAP(main_map_picmatic) MCFG_DEVICE_REMOVE("screen") pal_video(config); |