diff options
Diffstat (limited to 'src/mame/drivers/imds2.cpp')
-rw-r--r-- | src/mame/drivers/imds2.cpp | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp index 8d220318034..e93542570ee 100644 --- a/src/mame/drivers/imds2.cpp +++ b/src/mame/drivers/imds2.cpp @@ -759,53 +759,53 @@ static void imds2_floppies(device_slot_interface &device) } MACHINE_CONFIG_START(imds2_state::imds2) - MCFG_CPU_ADD("ipccpu" , I8085A , IPC_XTAL_Y2 / 2) // 4 MHz - MCFG_CPU_PROGRAM_MAP(ipc_mem_map) - MCFG_CPU_IO_MAP(ipc_io_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("ipcsyspic" , pic8259_device , inta_cb) + MCFG_DEVICE_ADD("ipccpu" , I8085A , IPC_XTAL_Y2 / 2) // 4 MHz + MCFG_DEVICE_PROGRAM_MAP(ipc_mem_map) + MCFG_DEVICE_IO_MAP(ipc_io_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("ipcsyspic" , pic8259_device , inta_cb) MCFG_QUANTUM_TIME(attotime::from_hz(100)) MCFG_DEVICE_ADD("ipcsyspic", PIC8259, 0) - MCFG_PIC8259_OUT_INT_CB(WRITELINE(imds2_state, imds2_ipc_intr)) + MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, imds2_state, imds2_ipc_intr)) MCFG_PIC8259_IN_SP_CB(VCC) MCFG_DEVICE_ADD("ipclocpic", PIC8259, 0) - MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("ipcsyspic", pic8259_device, ir7_w)) + MCFG_PIC8259_OUT_INT_CB(WRITELINE("ipcsyspic", pic8259_device, ir7_w)) MCFG_PIC8259_IN_SP_CB(VCC) // ??? MCFG_DEVICE_ADD("ipctimer" , PIT8253 , 0) MCFG_PIT8253_CLK0(IPC_XTAL_Y1 / 16) MCFG_PIT8253_CLK1(IPC_XTAL_Y1 / 16) MCFG_PIT8253_CLK2(IPC_XTAL_Y1 / 16) - MCFG_PIT8253_OUT0_HANDLER(WRITELINE(imds2_state , imds2_baud_clk_0_w)) - MCFG_PIT8253_OUT1_HANDLER(WRITELINE(imds2_state , imds2_baud_clk_1_w)) - MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("ipclocpic" , pic8259_device , ir4_w)) - - MCFG_DEVICE_ADD("ipcusart0" , I8251 , 0) - MCFG_I8251_RTS_HANDLER(DEVWRITELINE("ipcusart0" , i8251_device , write_cts)) - MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("ipclocpic" , pic8259_device , ir0_w)) - MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("ipclocpic" , pic8259_device , ir1_w)) - MCFG_I8251_TXD_HANDLER(DEVWRITELINE("serial0" , rs232_port_device , write_txd)) - - MCFG_DEVICE_ADD("ipcusart1" , I8251 , 0) - MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("ipclocpic" , pic8259_device , ir2_w)) - MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("ipclocpic" , pic8259_device , ir3_w)) - MCFG_I8251_TXD_HANDLER(DEVWRITELINE("serial1" , rs232_port_device , write_txd)) - MCFG_I8251_RTS_HANDLER(DEVWRITELINE("serial1" , rs232_port_device , write_rts)) - MCFG_I8251_DTR_HANDLER(DEVWRITELINE("serial1" , rs232_port_device , write_dtr)) - - MCFG_RS232_PORT_ADD("serial0" , default_rs232_devices , nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ipcusart0" , i8251_device , write_rxd)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ipcusart0" , i8251_device , write_dsr)) - - MCFG_RS232_PORT_ADD("serial1" , default_rs232_devices , nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ipcusart1" , i8251_device , write_rxd)) - MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ipcusart1" , i8251_device , write_cts)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ipcusart1" , i8251_device , write_dsr)) - - MCFG_CPU_ADD("ioccpu" , I8080A , IOC_XTAL_Y2 / 18) // 2.448 MHz but running at 50% (due to wait states & DMA usage of bus) - MCFG_CPU_PROGRAM_MAP(ioc_mem_map) - MCFG_CPU_IO_MAP(ioc_io_map) + MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, imds2_state , imds2_baud_clk_0_w)) + MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, imds2_state , imds2_baud_clk_1_w)) + MCFG_PIT8253_OUT2_HANDLER(WRITELINE("ipclocpic" , pic8259_device , ir4_w)) + + MCFG_DEVICE_ADD("ipcusart0" , I8251 , 0) + MCFG_I8251_RTS_HANDLER(WRITELINE("ipcusart0" , i8251_device , write_cts)) + MCFG_I8251_RXRDY_HANDLER(WRITELINE("ipclocpic" , pic8259_device , ir0_w)) + MCFG_I8251_TXRDY_HANDLER(WRITELINE("ipclocpic" , pic8259_device , ir1_w)) + MCFG_I8251_TXD_HANDLER(WRITELINE("serial0" , rs232_port_device , write_txd)) + + MCFG_DEVICE_ADD("ipcusart1" , I8251 , 0) + MCFG_I8251_RXRDY_HANDLER(WRITELINE("ipclocpic" , pic8259_device , ir2_w)) + MCFG_I8251_TXRDY_HANDLER(WRITELINE("ipclocpic" , pic8259_device , ir3_w)) + MCFG_I8251_TXD_HANDLER(WRITELINE("serial1" , rs232_port_device , write_txd)) + MCFG_I8251_RTS_HANDLER(WRITELINE("serial1" , rs232_port_device , write_rts)) + MCFG_I8251_DTR_HANDLER(WRITELINE("serial1" , rs232_port_device , write_dtr)) + + MCFG_DEVICE_ADD("serial0" , RS232_PORT, default_rs232_devices , nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE("ipcusart0" , i8251_device , write_rxd)) + MCFG_RS232_DSR_HANDLER(WRITELINE("ipcusart0" , i8251_device , write_dsr)) + + MCFG_DEVICE_ADD("serial1" , RS232_PORT, default_rs232_devices , nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE("ipcusart1" , i8251_device , write_rxd)) + MCFG_RS232_CTS_HANDLER(WRITELINE("ipcusart1" , i8251_device , write_cts)) + MCFG_RS232_DSR_HANDLER(WRITELINE("ipcusart1" , i8251_device , write_dsr)) + + MCFG_DEVICE_ADD("ioccpu" , I8080A , IOC_XTAL_Y2 / 18) // 2.448 MHz but running at 50% (due to wait states & DMA usage of bus) + MCFG_DEVICE_PROGRAM_MAP(ioc_mem_map) + MCFG_DEVICE_IO_MAP(ioc_io_map) MCFG_QUANTUM_TIME(attotime::from_hz(100)) // The IOC CRT hw is a bit complex, as the character clock (CCLK) to i8275 @@ -834,7 +834,7 @@ MACHINE_CONFIG_START(imds2_state::imds2) MCFG_DEVICE_ADD("ioccrtc" , I8275 , 22853600 / 14) MCFG_I8275_CHARACTER_WIDTH(14) MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(imds2_state , crtc_display_pixels) - MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("iocdma" , i8257_device , dreq2_w)) + MCFG_I8275_DRQ_CALLBACK(WRITELINE("iocdma" , i8257_device , dreq2_w)) MCFG_I8275_IRQ_CALLBACK(INPUTLINE("ioccpu" , I8085_INTR_LINE)) MCFG_VIDEO_SET_SCREEN("screen") @@ -845,45 +845,45 @@ MACHINE_CONFIG_START(imds2_state::imds2) MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("iocbeep" , BEEP , IOC_BEEP_FREQ) + MCFG_DEVICE_ADD("iocbeep" , BEEP , IOC_BEEP_FREQ) MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 1.00) MCFG_DEVICE_ADD("iocdma" , I8257 , IOC_XTAL_Y2 / 9) - MCFG_I8257_OUT_HRQ_CB(WRITELINE(imds2_state, imds2_hrq_w)) - MCFG_I8257_IN_MEMR_CB(READ8(imds2_state , imds2_ioc_mem_r)) - MCFG_I8257_OUT_MEMW_CB(WRITE8(imds2_state , imds2_ioc_mem_w)) - MCFG_I8257_IN_IOR_1_CB(DEVREAD8("iocfdc" , i8271_device , data_r)) - MCFG_I8257_OUT_IOW_1_CB(DEVWRITE8("iocfdc" , i8271_device , data_w)) - MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("ioccrtc" , i8275_device , dack_w)) + MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, imds2_state, imds2_hrq_w)) + MCFG_I8257_IN_MEMR_CB(READ8(*this, imds2_state , imds2_ioc_mem_r)) + MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, imds2_state , imds2_ioc_mem_w)) + MCFG_I8257_IN_IOR_1_CB(READ8("iocfdc" , i8271_device , data_r)) + MCFG_I8257_OUT_IOW_1_CB(WRITE8("iocfdc" , i8271_device , data_w)) + MCFG_I8257_OUT_IOW_2_CB(WRITE8("ioccrtc" , i8275_device , dack_w)) MCFG_DEVICE_ADD("ioctimer" , PIT8253 , 0) MCFG_PIT8253_CLK0(IOC_XTAL_Y1 / 4) - MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("ioctimer" , pit8253_device , write_clk2)); - MCFG_PIT8253_OUT2_HANDLER(WRITELINE(imds2_state , imds2_beep_timer_w)); + MCFG_PIT8253_OUT0_HANDLER(WRITELINE("ioctimer" , pit8253_device , write_clk2)); + MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, imds2_state , imds2_beep_timer_w)); MCFG_DEVICE_ADD("iocfdc" , I8271 , IOC_XTAL_Y1 / 2) - MCFG_I8271_DRQ_CALLBACK(DEVWRITELINE("iocdma" , i8257_device , dreq1_w)) + MCFG_I8271_DRQ_CALLBACK(WRITELINE("iocdma" , i8257_device , dreq1_w)) MCFG_FLOPPY_DRIVE_ADD("iocfdc:0", imds2_floppies, "8sssd", floppy_image_device::default_floppy_formats) MCFG_SLOT_FIXED(true) - MCFG_CPU_ADD("iocpio" , I8041 , IOC_XTAL_Y3) - MCFG_MCS48_PORT_P1_IN_CB(READ8(imds2_state, imds2_pio_port_p1_r)) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(imds2_state, imds2_pio_port_p1_w)) - MCFG_MCS48_PORT_P2_IN_CB(READ8(imds2_state, imds2_pio_port_p2_r)) - MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(imds2_state, imds2_pio_port_p2_w)) + MCFG_DEVICE_ADD("iocpio" , I8041 , IOC_XTAL_Y3) + MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, imds2_state, imds2_pio_port_p1_r)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, imds2_state, imds2_pio_port_p1_w)) + MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, imds2_state, imds2_pio_port_p2_r)) + MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, imds2_state, imds2_pio_port_p2_w)) MCFG_QUANTUM_TIME(attotime::from_hz(100)) - MCFG_CPU_ADD("kbcpu", I8741, XTAL(3'579'545)) /* 3.579545 MHz */ - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(imds2_state, imds2_kb_port_p1_w)) - MCFG_MCS48_PORT_P2_IN_CB(READ8(imds2_state, imds2_kb_port_p2_r)) - MCFG_MCS48_PORT_T0_IN_CB(READLINE(imds2_state, imds2_kb_port_t0_r)) - MCFG_MCS48_PORT_T1_IN_CB(READLINE(imds2_state, imds2_kb_port_t1_r)) + MCFG_DEVICE_ADD("kbcpu", I8741, XTAL(3'579'545)) /* 3.579545 MHz */ + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, imds2_state, imds2_kb_port_p1_w)) + MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, imds2_state, imds2_kb_port_p2_r)) + MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, imds2_state, imds2_kb_port_t0_r)) + MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, imds2_state, imds2_kb_port_t1_r)) MCFG_QUANTUM_TIME(attotime::from_hz(100)) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") - MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(imds2_state , imds2_pio_lpt_ack_w)) - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(imds2_state , imds2_pio_lpt_busy_w)) - MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(imds2_state , imds2_pio_lpt_select_w)) + MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, imds2_state , imds2_pio_lpt_ack_w)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, imds2_state , imds2_pio_lpt_busy_w)) + MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, imds2_state , imds2_pio_lpt_select_w)) MACHINE_CONFIG_END ROM_START(imds2) |