diff options
Diffstat (limited to 'src/mame/drivers/altos8600.cpp')
-rw-r--r-- | src/mame/drivers/altos8600.cpp | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp index a4deb8b808b..3ecdff23e47 100644 --- a/src/mame/drivers/altos8600.cpp +++ b/src/mame/drivers/altos8600.cpp @@ -726,34 +726,34 @@ static void altos8600_floppies(device_slot_interface &device) } MACHINE_CONFIG_START(altos8600_state::altos8600) - MCFG_CPU_ADD("maincpu", I8086, 5_MHz_XTAL) - MCFG_CPU_PROGRAM_MAP(cpu_mem) - MCFG_CPU_IO_MAP(cpu_io) - MCFG_CPU_OPCODES_MAP(code_mem) + MCFG_DEVICE_ADD("maincpu", I8086, 5_MHz_XTAL) + MCFG_DEVICE_PROGRAM_MAP(cpu_mem) + MCFG_DEVICE_IO_MAP(cpu_io) + MCFG_DEVICE_OPCODES_MAP(code_mem) MCFG_I8086_STACK_MAP(stack_mem) MCFG_I8086_CODE_MAP(code_mem) MCFG_I8086_EXTRA_MAP(extra_mem) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(altos8600_state, inta) - MCFG_I8086_IF_HANDLER(WRITELINE(altos8600_state, cpuif_w)) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(altos8600_state, inta) + MCFG_I8086_IF_HANDLER(WRITELINE(*this, altos8600_state, cpuif_w)) - MCFG_CPU_ADD("dmac", I8089, 5_MHz_XTAL) - MCFG_CPU_PROGRAM_MAP(dmac_mem) - MCFG_CPU_IO_MAP(dmac_io) + MCFG_DEVICE_ADD("dmac", I8089, 5_MHz_XTAL) + MCFG_DEVICE_PROGRAM_MAP(dmac_mem) + MCFG_DEVICE_IO_MAP(dmac_io) MCFG_I8089_DATA_WIDTH(16) - MCFG_I8089_SINTR1(WRITELINE(altos8600_state, sintr1_w)) - MCFG_I8089_SINTR2(DEVWRITELINE("pic8259_2", pic8259_device, ir4_w)) + MCFG_I8089_SINTR1(WRITELINE(*this, altos8600_state, sintr1_w)) + MCFG_I8089_SINTR2(WRITELINE("pic8259_2", pic8259_device, ir4_w)) MCFG_DEVICE_ADD("pic8259_1", PIC8259, 0) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0)) MCFG_PIC8259_IN_SP_CB(VCC) - MCFG_PIC8259_CASCADE_ACK_CB(READ8(altos8600_state, get_slave_ack)) + MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, altos8600_state, get_slave_ack)) MCFG_DEVICE_ADD("pic8259_2", PIC8259, 0) - MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir2_w)) + MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir2_w)) MCFG_PIC8259_IN_SP_CB(GND) MCFG_DEVICE_ADD("pic8259_3", PIC8259, 0) - MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir3_w)) + MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir3_w)) MCFG_PIC8259_IN_SP_CB(GND) MCFG_RAM_ADD(RAM_TAG) @@ -761,38 +761,38 @@ MACHINE_CONFIG_START(altos8600_state::altos8600) //MCFG_RAM_EXTRA_OPTIONS("512K") MCFG_DEVICE_ADD("uart8274", I8274_NEW, 16_MHz_XTAL/4) - MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd)) - MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr)) - MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts)) - MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd)) - MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr)) - MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts)) - MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir7_w)) - - MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxa_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, dcda_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, ctsa_w)) - - MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxb_w)) - MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, dcdb_w)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, ctsb_w)) + MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr)) + MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts)) + MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd)) + MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr)) + MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts)) + MCFG_Z80SIO_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir7_w)) + + MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE("uart8274", i8274_new_device, rxa_w)) + MCFG_RS232_DCD_HANDLER(WRITELINE("uart8274", i8274_new_device, dcda_w)) + MCFG_RS232_CTS_HANDLER(WRITELINE("uart8274", i8274_new_device, ctsa_w)) + + MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE("uart8274", i8274_new_device, rxb_w)) + MCFG_RS232_DCD_HANDLER(WRITELINE("uart8274", i8274_new_device, dcdb_w)) + MCFG_RS232_CTS_HANDLER(WRITELINE("uart8274", i8274_new_device, ctsb_w)) MCFG_DEVICE_ADD("ppi", I8255A, 0) MCFG_DEVICE_ADD("pit", PIT8253, 0) MCFG_PIT8253_CLK0(1228800) - MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxca_w)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart8274", i8274_new_device, txca_w)) + MCFG_PIT8253_OUT0_HANDLER(WRITELINE("uart8274", i8274_new_device, rxca_w)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart8274", i8274_new_device, txca_w)) MCFG_PIT8253_CLK1(1228800) - MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxtxcb_w)) + MCFG_PIT8253_OUT1_HANDLER(WRITELINE("uart8274", i8274_new_device, rxtxcb_w)) MCFG_PIT8253_CLK2(1228800) - MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic8259_1", pic8259_device, ir1_w)) + MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pic8259_1", pic8259_device, ir1_w)) MCFG_FD1797_ADD("fd1797", 2000000) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic8259_2", pic8259_device, ir1_w)) - MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(altos8600_state, fddrq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic8259_2", pic8259_device, ir1_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, altos8600_state, fddrq_w)) MCFG_FLOPPY_DRIVE_ADD("fd1797:0", altos8600_floppies, "8dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1797:1", altos8600_floppies, "8dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1797:2", altos8600_floppies, "8dd", floppy_image_device::default_floppy_formats) @@ -800,8 +800,8 @@ MACHINE_CONFIG_START(altos8600_state::altos8600) MCFG_DEVICE_ADD("ics", ACS8600_ICS, 0) MCFG_ACS8600_ICS_MAINCPU(":dmac") // TODO: fixme - MCFG_ACS8600_ICS_IRQ1(DEVWRITELINE("pic8259_1", pic8259_device, ir5_w)) - MCFG_ACS8600_ICS_IRQ2(DEVWRITELINE("pic8259_1", pic8259_device, ir6_w)) + MCFG_ACS8600_ICS_IRQ1(WRITELINE("pic8259_1", pic8259_device, ir5_w)) + MCFG_ACS8600_ICS_IRQ2(WRITELINE("pic8259_1", pic8259_device, ir6_w)) MCFG_HARDDISK_ADD("hdd") MACHINE_CONFIG_END |