diff options
Diffstat (limited to 'src/mame/drivers/bw2.cpp')
-rw-r--r-- | src/mame/drivers/bw2.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp index 3a3328c6e4e..cbad8c05804 100644 --- a/src/mame/drivers/bw2.cpp +++ b/src/mame/drivers/bw2.cpp @@ -575,9 +575,9 @@ void bw2_state::machine_start() MACHINE_CONFIG_START(bw2_state::bw2) // basic machine hardware - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) - MCFG_CPU_PROGRAM_MAP(bw2_mem) - MCFG_CPU_IO_MAP(bw2_io) + MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) + MCFG_DEVICE_PROGRAM_MAP(bw2_mem) + MCFG_DEVICE_IO_MAP(bw2_io) // video hardware MCFG_DEFAULT_LAYOUT(layout_lcd) @@ -593,40 +593,40 @@ MACHINE_CONFIG_START(bw2_state::bw2) // devices MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0) MCFG_PIT8253_CLK0(XTAL(16'000'000)/4) // 8251 USART TXC, RXC - MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc)) + MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_txc)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(I8251_TAG, i8251_device, write_rxc)) MCFG_PIT8253_CLK1(11000) // LCD controller - MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(I8253_TAG, pit8253_device, write_clk2)) + MCFG_PIT8253_OUT1_HANDLER(WRITELINE(I8253_TAG, pit8253_device, write_clk2)) MCFG_PIT8253_CLK2(0) // Floppy /MTRON - MCFG_PIT8253_OUT2_HANDLER(WRITELINE(bw2_state, mtron_w)) + MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, bw2_state, mtron_w)) MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8(bw2_state, ppi_pa_w)) - MCFG_I8255_IN_PORTB_CB(READ8(bw2_state, ppi_pb_r)) - MCFG_I8255_IN_PORTC_CB(READ8(bw2_state, ppi_pc_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(bw2_state, ppi_pc_w)) + MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, bw2_state, ppi_pa_w)) + MCFG_I8255_IN_PORTB_CB(READ8(*this, bw2_state, ppi_pb_r)) + MCFG_I8255_IN_PORTC_CB(READ8(*this, bw2_state, ppi_pc_r)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, bw2_state, ppi_pc_w)) MCFG_DEVICE_ADD(MSM6255_TAG, MSM6255, XTAL(16'000'000)) MCFG_DEVICE_ADDRESS_MAP(0, lcdc_map) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(bw2_state, write_centronics_busy)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, bw2_state, write_centronics_busy)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) MCFG_DEVICE_ADD(I8251_TAG, I8251, 0) - MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) - MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr)) - MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts)) + MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd)) + MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr)) + MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts)) - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) + MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd)) + MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr)) MCFG_WD2797_ADD(WD2797_TAG, XTAL(16'000'000)/16) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bw2_state, fdc_drq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bw2_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", bw2_floppies, "35dd", bw2_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", bw2_floppies, nullptr, bw2_state::floppy_formats) |