summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cubo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/cubo.cpp')
-rw-r--r--src/mame/drivers/cubo.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp
index 50bdf263c8f..436730b9009 100644
--- a/src/mame/drivers/cubo.cpp
+++ b/src/mame/drivers/cubo.cpp
@@ -1033,8 +1033,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cubo_state::cubo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
- MCFG_CPU_PROGRAM_MAP(cubo_mem)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cubo_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_2mb_map32)
@@ -1048,12 +1048,12 @@ MACHINE_CONFIG_START(cubo_state::cubo)
MCFG_I2CMEM_DATA_SIZE(1024)
MCFG_AKIKO_ADD("akiko")
- MCFG_AKIKO_MEM_READ_CB(READ16(amiga_state, chip_ram_r))
- MCFG_AKIKO_MEM_WRITE_CB(WRITE16(amiga_state, chip_ram_w))
- MCFG_AKIKO_INT_CB(WRITELINE(cubo_state, akiko_int_w))
- MCFG_AKIKO_SCL_HANDLER(DEVWRITELINE("i2cmem", i2cmem_device, write_scl))
- MCFG_AKIKO_SDA_READ_HANDLER(DEVREADLINE("i2cmem", i2cmem_device, read_sda))
- MCFG_AKIKO_SDA_WRITE_HANDLER(DEVWRITELINE("i2cmem", i2cmem_device, write_sda))
+ MCFG_AKIKO_MEM_READ_CB(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_AKIKO_MEM_WRITE_CB(WRITE16(*this, amiga_state, chip_ram_w))
+ MCFG_AKIKO_INT_CB(WRITELINE(*this, cubo_state, akiko_int_w))
+ MCFG_AKIKO_SCL_HANDLER(WRITELINE("i2cmem", i2cmem_device, write_scl))
+ MCFG_AKIKO_SDA_READ_HANDLER(READLINE("i2cmem", i2cmem_device, read_sda))
+ MCFG_AKIKO_SDA_WRITE_HANDLER(WRITELINE("i2cmem", i2cmem_device, write_sda))
// video hardware
pal_video(config);
@@ -1066,39 +1066,39 @@ MACHINE_CONFIG_START(cubo_state::cubo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_PAL)
+ MCFG_DEVICE_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_PAL)
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_ADD("cdda", CDDA, 0)
+ MCFG_DEVICE_ADD("cdda", CDDA)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
/* cia */
// these are setup differently on other amiga drivers (needed for floppy to work) which is correct / why?
MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_PAL)
- 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("CIA0PORTA"))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(cubo_state, akiko_cia_0_port_a_write))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, cubo_state, akiko_cia_0_port_a_write))
MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_PAL)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_1_irq))
- MCFG_MICROTOUCH_ADD("microtouch", 9600, WRITELINE(cubo_state, rs232_rx_w))
+ MCFG_MICROTOUCH_ADD("microtouch", 9600, WRITELINE(*this, cubo_state, rs232_rx_w))
MCFG_CDROM_ADD("cd32_cdrom")
MCFG_CDROM_INTERFACE("cd32_cdrom")
/* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_PAL)
- 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