diff options
Diffstat (limited to 'src/mame/drivers/zorba.cpp')
-rw-r--r-- | src/mame/drivers/zorba.cpp | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index ec360fcea3b..533261ac9eb 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -137,9 +137,9 @@ GFXDECODE_END MACHINE_CONFIG_START(zorba_state::zorba) // basic machine hardware - MCFG_CPU_ADD(m_maincpu, Z80, 24_MHz_XTAL / 6) - MCFG_CPU_PROGRAM_MAP(zorba_mem) - MCFG_CPU_IO_MAP(zorba_io) + MCFG_DEVICE_ADD(m_maincpu, Z80, 24_MHz_XTAL / 6) + MCFG_DEVICE_PROGRAM_MAP(zorba_mem) + MCFG_DEVICE_IO_MAP(zorba_io) /* video hardware */ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green()) @@ -150,86 +150,86 @@ MACHINE_CONFIG_START(zorba_state::zorba) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD(m_beep, BEEP, 800) // should be horizontal frequency / 16, so depends on CRTC parameters + MCFG_DEVICE_ADD(m_beep, BEEP, 800) // should be horizontal frequency / 16, so depends on CRTC parameters MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_INPUT_MERGER_ANY_HIGH("irq0") - MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(zorba_state, irq_w<0>)) + MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, zorba_state, irq_w<0>)) MCFG_INPUT_MERGER_ANY_HIGH("irq1") - MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(zorba_state, irq_w<1>)) + MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, zorba_state, irq_w<1>)) MCFG_INPUT_MERGER_ANY_HIGH("irq2") - MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(zorba_state, irq_w<2>)) + MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, zorba_state, irq_w<2>)) /* devices */ MCFG_DEVICE_ADD(m_dma, Z80DMA, 24_MHz_XTAL / 6) // busack on cpu connects to bai pin - MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(zorba_state, busreq_w)) //connects to busreq on cpu - MCFG_Z80DMA_OUT_INT_CB(DEVWRITELINE("irq0", input_merger_device, in_w<0>)) + MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, zorba_state, busreq_w)) //connects to busreq on cpu + MCFG_Z80DMA_OUT_INT_CB(WRITELINE("irq0", input_merger_device, in_w<0>)) //ba0 - not connected - MCFG_Z80DMA_IN_MREQ_CB(READ8(zorba_state, memory_read_byte)) - MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(zorba_state, memory_write_byte)) - MCFG_Z80DMA_IN_IORQ_CB(READ8(zorba_state, io_read_byte)) - MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(zorba_state, io_write_byte)) + MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, zorba_state, memory_read_byte)) + MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, zorba_state, memory_write_byte)) + MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, zorba_state, io_read_byte)) + MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, zorba_state, io_write_byte)) MCFG_DEVICE_ADD(m_uart0, I8251, 0) // U32 COM port J2 - MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) // TODO: this line has a LED attached - MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) - MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) - MCFG_I8251_RXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<1>)) - MCFG_I8251_TXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<0>)) + MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd)) // TODO: this line has a LED attached + MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr)) + MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts)) + MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<1>)) + MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<0>)) MCFG_DEVICE_ADD(m_uart1, I8251, 0) // U31 printer port J3 - MCFG_I8251_TXD_HANDLER(DEVWRITELINE("serprn", rs232_port_device, write_txd)) - MCFG_I8251_RTS_HANDLER(DEVWRITELINE("serprn", rs232_port_device, write_rts)) - MCFG_I8251_RXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<3>)) - MCFG_I8251_TXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<2>)) + MCFG_I8251_TXD_HANDLER(WRITELINE("serprn", rs232_port_device, write_txd)) + MCFG_I8251_RTS_HANDLER(WRITELINE("serprn", rs232_port_device, write_rts)) + MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<3>)) + MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<2>)) MCFG_DEVICE_ADD(m_uart2, I8251, 0) // U30 serial keyboard J6 - MCFG_I8251_TXD_HANDLER(DEVWRITELINE("keyboard", zorba_keyboard_device, txd_w)) - MCFG_I8251_RXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<5>)) - MCFG_I8251_TXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<4>)) + MCFG_I8251_TXD_HANDLER(WRITELINE("keyboard", zorba_keyboard_device, txd_w)) + MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<5>)) + MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<4>)) // port A - disk select etc, beeper // port B - parallel interface MCFG_DEVICE_ADD(m_pia0, PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(zorba_state, pia0_porta_w)) - MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("parprndata", output_latch_device, write)) - MCFG_PIA_CB2_HANDLER(DEVWRITELINE("parprn", centronics_device, write_strobe)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, zorba_state, pia0_porta_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("parprndata", output_latch_device, write)) + MCFG_PIA_CB2_HANDLER(WRITELINE("parprn", centronics_device, write_strobe)) // IEEE488 interface MCFG_DEVICE_ADD(m_pia1, PIA6821, 0) - MCFG_PIA_READPA_HANDLER(DEVREAD8(m_ieee, ieee488_device, dio_r)) // TODO: gated with PB1 - MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8(m_ieee, ieee488_device, dio_w)) // TODO: gated with PB1 - MCFG_PIA_READPB_HANDLER(READ8(zorba_state, pia1_portb_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(zorba_state, pia1_portb_w)) - MCFG_PIA_CA2_HANDLER(DEVWRITELINE(m_ieee, ieee488_device, ifc_w)) - MCFG_PIA_CB2_HANDLER(DEVWRITELINE(m_ieee, ieee488_device, ren_w)) - MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("irq1", input_merger_device, in_w<0>)) - MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("irq1", input_merger_device, in_w<1>)) + MCFG_PIA_READPA_HANDLER(READ8(m_ieee, ieee488_device, dio_r)) // TODO: gated with PB1 + MCFG_PIA_WRITEPA_HANDLER(WRITE8(m_ieee, ieee488_device, dio_w)) // TODO: gated with PB1 + MCFG_PIA_READPB_HANDLER(READ8(*this, zorba_state, pia1_portb_r)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, zorba_state, pia1_portb_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(m_ieee, ieee488_device, ifc_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(m_ieee, ieee488_device, ren_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE("irq1", input_merger_device, in_w<0>)) + MCFG_PIA_IRQB_HANDLER(WRITELINE("irq1", input_merger_device, in_w<1>)) // PIT MCFG_DEVICE_ADD("pit", PIT8254, 0) MCFG_PIT8253_CLK0(24_MHz_XTAL / 3) MCFG_PIT8253_CLK1(24_MHz_XTAL / 3) MCFG_PIT8253_CLK2(24_MHz_XTAL / 3) - MCFG_PIT8253_OUT0_HANDLER(WRITELINE(zorba_state, br1_w)) - MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(m_uart1, i8251_device, write_txc)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(m_uart1, i8251_device, write_rxc)) - MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(m_uart2, i8251_device, write_txc)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(m_uart2, i8251_device, write_rxc)) + MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, zorba_state, br1_w)) + MCFG_PIT8253_OUT1_HANDLER(WRITELINE(m_uart1, i8251_device, write_txc)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(m_uart1, i8251_device, write_rxc)) + MCFG_PIT8253_OUT2_HANDLER(WRITELINE(m_uart2, i8251_device, write_txc)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(m_uart2, i8251_device, write_rxc)) // CRTC MCFG_DEVICE_ADD(m_crtc, I8275, 14.318'181_MHz_XTAL / 7) MCFG_I8275_CHARACTER_WIDTH(8) MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(zorba_state, zorba_update_chr) - MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE(m_dma, z80dma_device, rdy_w)) - MCFG_I8275_IRQ_CALLBACK(DEVWRITELINE("irq0", input_merger_device, in_w<1>)) + MCFG_I8275_DRQ_CALLBACK(WRITELINE(m_dma, z80dma_device, rdy_w)) + MCFG_I8275_IRQ_CALLBACK(WRITELINE("irq0", input_merger_device, in_w<1>)) MCFG_VIDEO_SET_SCREEN("screen") // Floppies MCFG_FD1793_ADD(m_fdc, 24_MHz_XTAL / 24) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("irq2", input_merger_device, in_w<0>)) - MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("irq2", input_merger_device, in_w<1>)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("irq2", input_merger_device, in_w<0>)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("irq2", input_merger_device, in_w<1>)) MCFG_FLOPPY_DRIVE_ADD(m_floppy0, zorba_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD(m_floppy1, zorba_floppies, "525dd", floppy_image_device::default_floppy_formats) @@ -237,30 +237,30 @@ MACHINE_CONFIG_START(zorba_state::zorba) // J1 IEEE-488 MCFG_IEEE488_BUS_ADD() - MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(m_pia1, pia6821_device, ca2_w)) // TODO: gated with PB1 from PIA + MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(m_pia1, pia6821_device, ca2_w)) // TODO: gated with PB1 from PIA // J2 EIA RS232/internal modem // TODO: this has additional lines compared to a regular RS232 port (TxC in, RxC in, RxC out, speaker in, power) - MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(m_uart0, i8251_device, write_rxd)) // TODO: this line has a LED attached - MCFG_RS232_CTS_HANDLER(DEVWRITELINE(m_uart0, i8251_device, write_cts)) // TODO: this line has a LED attached - MCFG_RS232_DSR_HANDLER(DEVWRITELINE(m_uart0, i8251_device, write_dsr)) + MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(m_uart0, i8251_device, write_rxd)) // TODO: this line has a LED attached + MCFG_RS232_CTS_HANDLER(WRITELINE(m_uart0, i8251_device, write_cts)) // TODO: this line has a LED attached + MCFG_RS232_DSR_HANDLER(WRITELINE(m_uart0, i8251_device, write_dsr)) // J3 Parallel printer MCFG_CENTRONICS_OUTPUT_LATCH_ADD("parprndata", "parprn") MCFG_CENTRONICS_ADD("parprn", centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(m_uart1, i8251_device, write_cts)) - MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(m_uart1, i8251_device, write_dsr)) // TODO: shared with serial CTS - MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(zorba_state, printer_fault_w)) - MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(zorba_state, printer_select_w)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(m_uart1, i8251_device, write_cts)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(m_uart1, i8251_device, write_dsr)) // TODO: shared with serial CTS + MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, zorba_state, printer_fault_w)) + MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, zorba_state, printer_select_w)) // J3 Serial printer - MCFG_RS232_PORT_ADD("serprn", default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(m_uart1, i8251_device, write_rxd)) // TODO: this line has a LED attached + MCFG_DEVICE_ADD("serprn", RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(m_uart1, i8251_device, write_rxd)) // TODO: this line has a LED attached // J6 TTL-level serial keyboard MCFG_DEVICE_ADD("keyboard", ZORBA_KEYBOARD, 0) - MCFG_ZORBA_KEYBOARD_RXD_CB(DEVWRITELINE(m_uart2, i8251_device, write_rxd)) + MCFG_ZORBA_KEYBOARD_RXD_CB(WRITELINE(m_uart2, i8251_device, write_rxd)) MCFG_SOFTWARE_LIST_ADD("flop_list", "zorba") MACHINE_CONFIG_END |