diff options
Diffstat (limited to 'src/mame/drivers/upscope.cpp')
-rw-r--r-- | src/mame/drivers/upscope.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp index 6a6ea53f5ac..6b8c9c2eb9f 100644 --- a/src/mame/drivers/upscope.cpp +++ b/src/mame/drivers/upscope.cpp @@ -266,8 +266,8 @@ INPUT_PORTS_END MACHINE_CONFIG_START(upscope_state::upscope) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC) - MCFG_CPU_PROGRAM_MAP(main_map) + MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC) + MCFG_DEVICE_PROGRAM_MAP(main_map) MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0) MCFG_DEVICE_PROGRAM_MAP(overlay_512kb_map) @@ -289,38 +289,38 @@ MACHINE_CONFIG_START(upscope_state::upscope) /* 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, "rspeaker", 0.50) MCFG_SOUND_ROUTE(1, "lspeaker", 0.50) MCFG_SOUND_ROUTE(2, "lspeaker", 0.50) MCFG_SOUND_ROUTE(3, "rspeaker", 0.50) - 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)) /* cia */ MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC) - MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq)) - MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write)) - MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(upscope_state, upscope_cia_0_portb_r)) - MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(upscope_state, upscope_cia_0_portb_w)) + MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq)) + MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write)) + MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, upscope_state, upscope_cia_0_portb_r)) + MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, upscope_state, upscope_cia_0_portb_w)) MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC) - MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq)) - MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(upscope_state, upscope_cia_1_porta_r)) - MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(upscope_state, upscope_cia_1_porta_w)) + MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_1_irq)) + MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, upscope_state, upscope_cia_1_porta_r)) + MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, upscope_state, upscope_cia_1_porta_w)) /* 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)) // i/o extension MCFG_DEVICE_ADD("ppi", I8255, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("IO0")) - MCFG_I8255_OUT_PORTB_CB(WRITE8(upscope_state, lamps_w)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(upscope_state, coin_counter_w)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, upscope_state, lamps_w)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, upscope_state, coin_counter_w)) MACHINE_CONFIG_END |