summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/x68k.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/x68k.cpp')
-rw-r--r--src/mame/drivers/x68k.cpp64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp
index 976d4c031e8..504edfee48d 100644
--- a/src/mame/drivers/x68k.cpp
+++ b/src/mame/drivers/x68k.cpp
@@ -1637,9 +1637,9 @@ static void keyboard(device_slot_interface &device)
MACHINE_CONFIG_START(x68k_state::x68000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MCFG_CPU_PROGRAM_MAP(x68k_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(x68k_state,x68k_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(x68k_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(x68k_state,x68k_int_ack)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1648,32 +1648,32 @@ MACHINE_CONFIG_START(x68k_state::x68000)
MCFG_MC68901_TIMER_CLOCK(4000000)
MCFG_MC68901_RX_CLOCK(0)
MCFG_MC68901_TX_CLOCK(0)
- MCFG_MC68901_OUT_IRQ_CB(WRITELINE(x68k_state, mfp_irq_callback))
- MCFG_MC68901_OUT_TBO_CB(DEVWRITELINE(MC68901_TAG, mc68901_device, clock_w))
- MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("keyboard", rs232_port_device, write_txd))
+ MCFG_MC68901_OUT_IRQ_CB(WRITELINE(*this, x68k_state, mfp_irq_callback))
+ MCFG_MC68901_OUT_TBO_CB(WRITELINE(MC68901_TAG, mc68901_device, clock_w))
+ MCFG_MC68901_OUT_SO_CB(WRITELINE("keyboard", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("keyboard", keyboard, "x68k")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, write_rx))
+ MCFG_DEVICE_ADD("keyboard", RS232_PORT, keyboard, "x68k")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, write_rx))
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(x68k_state, ppi_port_a_r))
- MCFG_I8255_IN_PORTB_CB(READ8(x68k_state, ppi_port_b_r))
- MCFG_I8255_IN_PORTC_CB(READ8(x68k_state, ppi_port_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(x68k_state, ppi_port_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, x68k_state, ppi_port_a_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, x68k_state, ppi_port_b_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, x68k_state, ppi_port_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, x68k_state, ppi_port_c_w))
MCFG_DEVICE_ADD("hd63450", HD63450, 0)
MCFG_HD63450_CPU("maincpu") // CPU - 68000
MCFG_HD63450_CLOCKS(attotime::from_usec(2), attotime::from_nsec(450), attotime::from_usec(4), attotime::from_hz(15625/2))
MCFG_HD63450_BURST_CLOCKS(attotime::from_usec(2), attotime::from_nsec(450), attotime::from_nsec(50), attotime::from_nsec(50))
- MCFG_HD63450_DMA_END_CB(WRITE8(x68k_state, dma_end))
- MCFG_HD63450_DMA_ERROR_CB(WRITE8(x68k_state, dma_error))
- MCFG_HD63450_DMA_READ_0_CB(DEVREAD8("upd72065", upd72065_device, mdma_r))
- MCFG_HD63450_DMA_WRITE_0_CB(DEVWRITE8("upd72065", upd72065_device, mdma_w))
+ MCFG_HD63450_DMA_END_CB(WRITE8(*this, x68k_state, dma_end))
+ MCFG_HD63450_DMA_ERROR_CB(WRITE8(*this, x68k_state, dma_error))
+ MCFG_HD63450_DMA_READ_0_CB(READ8("upd72065", upd72065_device, mdma_r))
+ MCFG_HD63450_DMA_WRITE_0_CB(WRITE8("upd72065", upd72065_device, mdma_w))
MCFG_DEVICE_ADD("scc", SCC8530, 5000000)
MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
- MCFG_RP5C15_OUT_ALARM_CB(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w))
+ MCFG_RP5C15_OUT_ALARM_CB(WRITELINE(MC68901_TAG, mc68901_device, i0_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1696,8 +1696,8 @@ MACHINE_CONFIG_START(x68k_state::x68000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_YM2151_ADD("ym2151", 4000000)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(x68k_state,x68k_fm_irq))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(x68k_state,x68k_ct_w)) // CT1, CT2 from YM2151 port 0x1b
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, x68k_state,x68k_fm_irq))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, x68k_state,x68k_ct_w)) // CT1, CT2 from YM2151 port 0x1b
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -1714,8 +1714,8 @@ MACHINE_CONFIG_START(x68k_state::x68000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_UPD72065_ADD("upd72065", true, false)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(x68k_state, fdc_irq))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("hd63450", hd63450_device, drq0_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, x68k_state, fdc_irq))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("hd63450", hd63450_device, drq0_w))
MCFG_FLOPPY_DRIVE_ADD("upd72065:0", x68k_floppies, "525hd", x68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:1", x68k_floppies, "525hd", x68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:2", x68k_floppies, "525hd", x68k_state::floppy_formats)
@@ -1725,8 +1725,8 @@ MACHINE_CONFIG_START(x68k_state::x68000)
MCFG_DEVICE_ADD("exp", X68K_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(x68000_exp_cards, nullptr, false)
- MCFG_X68K_EXPANSION_SLOT_OUT_IRQ2_CB(WRITELINE(x68k_state, x68k_irq2_line))
- MCFG_X68K_EXPANSION_SLOT_OUT_IRQ4_CB(WRITELINE(x68k_state, x68k_irq4_line))
+ MCFG_X68K_EXPANSION_SLOT_OUT_IRQ2_CB(WRITELINE(*this, x68k_state, x68k_irq2_line))
+ MCFG_X68K_EXPANSION_SLOT_OUT_IRQ4_CB(WRITELINE(*this, x68k_state, x68k_irq4_line))
MCFG_X68K_EXPANSION_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
/* internal ram */
@@ -1743,8 +1743,8 @@ MACHINE_CONFIG_START(x68k_state::x68ksupr)
x68000(config);
MCFG_DEVICE_REMOVE("x68k_hdc")
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(x68kxvi_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(x68kxvi_map)
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_0)
@@ -1757,21 +1757,21 @@ MACHINE_CONFIG_START(x68k_state::x68ksupr)
MCFG_DEVICE_ADD("mb89352", MB89352A, 0)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_MB89352A_IRQ_CB(WRITELINE(x68k_state, x68k_scsi_irq))
- MCFG_MB89352A_DRQ_CB(WRITELINE(x68k_state, x68k_scsi_drq))
+ MCFG_MB89352A_IRQ_CB(WRITELINE(*this, x68k_state, x68k_scsi_irq))
+ MCFG_MB89352A_DRQ_CB(WRITELINE(*this, x68k_state, x68k_scsi_drq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(x68k_state::x68kxvi)
x68ksupr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(16000000) /* 16 MHz */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(16000000) /* 16 MHz */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(x68k_state::x68030)
x68ksupr(config);
- MCFG_CPU_REPLACE("maincpu", M68030, 25000000) /* 25 MHz 68EC030 */
- MCFG_CPU_PROGRAM_MAP(x68030_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(x68k_state,x68k_int_ack)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 25000000) /* 25 MHz 68EC030 */
+ MCFG_DEVICE_PROGRAM_MAP(x68030_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(x68k_state,x68k_int_ack)
MACHINE_CONFIG_END
ROM_START( x68000 )