diff options
Diffstat (limited to 'src/mame/drivers/twinkle.cpp')
-rw-r--r-- | src/mame/drivers/twinkle.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp index f2e150c6d9a..bfb7907b7f3 100644 --- a/src/mame/drivers/twinkle.cpp +++ b/src/mame/drivers/twinkle.cpp @@ -1075,8 +1075,8 @@ void twinkle_state::cdrom_config(device_t *device) MACHINE_CONFIG_START(twinkle_state::twinkle) /* basic machine hardware */ - MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) ) - MCFG_CPU_PROGRAM_MAP( main_map ) + MCFG_DEVICE_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) ) + MCFG_DEVICE_PROGRAM_MAP( main_map ) MCFG_RAM_MODIFY("maincpu:ram") MCFG_RAM_DEFAULT_SIZE("4M") @@ -1084,10 +1084,10 @@ MACHINE_CONFIG_START(twinkle_state::twinkle) MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&twinkle_state::scsi_dma_read, this ) ) MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&twinkle_state::scsi_dma_write, this ) ) - MCFG_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16.000 MHz */ - MCFG_CPU_PROGRAM_MAP( sound_map ) - MCFG_CPU_PERIODIC_INT_DRIVER(twinkle_state, irq1_line_assert, 60) - MCFG_CPU_PERIODIC_INT_DRIVER(twinkle_state, irq2_line_assert, 60) + MCFG_DEVICE_ADD("audiocpu", M68000, 32000000/2) /* 16.000 MHz */ + MCFG_DEVICE_PROGRAM_MAP( sound_map ) + MCFG_DEVICE_PERIODIC_INT_DRIVER(twinkle_state, irq1_line_assert, 60) + MCFG_DEVICE_PERIODIC_INT_DRIVER(twinkle_state, irq2_line_assert, 60) MCFG_WATCHDOG_ADD("watchdog") MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1200)) /* check TD pin on LTC1232 */ @@ -1098,11 +1098,11 @@ MACHINE_CONFIG_START(twinkle_state::twinkle) MCFG_DEVICE_ADD("am53cf96", AM53CF96, 0) MCFG_LEGACY_SCSI_PORT("scsi") - MCFG_AM53CF96_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10)) + MCFG_AM53CF96_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin10)) MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true) - MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(twinkle_state, spu_ata_irq)) - MCFG_ATA_INTERFACE_DMARQ_HANDLER(WRITELINE(twinkle_state, spu_ata_dmarq)) + MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, twinkle_state, spu_ata_irq)) + MCFG_ATA_INTERFACE_DMARQ_HANDLER(WRITELINE(*this, twinkle_state, spu_ata_dmarq)) MCFG_DEVICE_ADD("rtc", RTC65271, 0) @@ -1112,16 +1112,16 @@ MACHINE_CONFIG_START(twinkle_state::twinkle) MCFG_SLOT_OPTION_ADD("xvd701", JVC_XVD701) // MCFG_SLOT_OPTION_ADD("xvs1100", JVC_XVS1100) // 8th mix only MCFG_SLOT_DEFAULT_OPTION("xvd701") - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("fdc37c665gt:uart2", ins8250_uart_device, rx_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("fdc37c665gt:uart2", ins8250_uart_device, dcd_w)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE("fdc37c665gt:uart2", ins8250_uart_device, dsr_w)) - MCFG_RS232_RI_HANDLER(DEVWRITELINE("fdc37c665gt:uart2", ins8250_uart_device, ri_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("fdc37c665gt:uart2", ins8250_uart_device, cts_w)) + MCFG_RS232_RXD_HANDLER(WRITELINE("fdc37c665gt:uart2", ins8250_uart_device, rx_w)) + MCFG_RS232_DCD_HANDLER(WRITELINE("fdc37c665gt:uart2", ins8250_uart_device, dcd_w)) + MCFG_RS232_DSR_HANDLER(WRITELINE("fdc37c665gt:uart2", ins8250_uart_device, dsr_w)) + MCFG_RS232_RI_HANDLER(WRITELINE("fdc37c665gt:uart2", ins8250_uart_device, ri_w)) + MCFG_RS232_CTS_HANDLER(WRITELINE("fdc37c665gt:uart2", ins8250_uart_device, cts_w)) MCFG_DEVICE_MODIFY("fdc37c665gt:uart2") - MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd)) - MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) - MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts)) + MCFG_INS8250_OUT_TX_CB(WRITELINE("rs232", rs232_port_device, write_txd)) + MCFG_INS8250_OUT_DTR_CB(WRITELINE("rs232", rs232_port_device, write_dtr)) + MCFG_INS8250_OUT_RTS_CB(WRITELINE("rs232", rs232_port_device, write_rts)) /* video hardware */ MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL(53'693'175) ) |