summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/wicat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/wicat.cpp')
-rw-r--r--src/mame/drivers/wicat.cpp136
1 files changed, 68 insertions, 68 deletions
diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp
index b5936c94cb0..6b0cd7ae12b 100644
--- a/src/mame/drivers/wicat.cpp
+++ b/src/mame/drivers/wicat.cpp
@@ -777,12 +777,12 @@ I8275_DRAW_CHARACTER_MEMBER(wicat_state::wicat_display_pixels)
MACHINE_CONFIG_START(wicat_state::wicat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(wicat_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(wicat_mem)
MCFG_DEVICE_ADD("via", VIA6522, XTAL(8'000'000))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(wicat_state, via_a_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(wicat_state, via_b_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, wicat_state, via_a_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, wicat_state, via_b_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_1))
MCFG_DEVICE_ADD("rtc", MM58274C, 0) // actually an MM58174AN, but should be compatible
@@ -791,44 +791,44 @@ MACHINE_CONFIG_START(wicat_state::wicat)
// internal terminal
MCFG_DEVICE_ADD("uart0", MC2661, XTAL(5'068'800)) // connected to terminal board
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("videouart0", mc2661_device, rx_w))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("videouart0", mc2661_device, rx_w))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("videouart0", mc2661_device, cts_w))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("videouart0", mc2661_device, dsr_w))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("videouart0", mc2661_device, cts_w))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("videouart0", mc2661_device, dsr_w))
// RS232C ports (x5)
MCFG_DEVICE_ADD("uart1", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("serial1", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_dtr))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("serial1", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("serial1", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_DEVICE_ADD("uart2", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial2", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("serial2", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial2", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial2", rs232_port_device, write_dtr))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("serial2", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("serial2", rs232_port_device, write_dtr))
MCFG_DEVICE_ADD("uart3", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial3", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("serial3", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial3", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial3", rs232_port_device, write_dtr))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("serial3", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("serial3", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_DEVICE_ADD("uart4", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial4", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("serial4", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial4", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial4", rs232_port_device, write_dtr))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("serial4", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("serial4", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_DEVICE_ADD("uart5", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial5", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("serial5", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial5", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial5", rs232_port_device, write_dtr))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("serial5", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("serial5", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
// modem
@@ -836,56 +836,56 @@ MACHINE_CONFIG_START(wicat_state::wicat)
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_RS232_PORT_ADD("serial1",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1",mc2661_device,rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart1",mc2661_device,dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1",mc2661_device,cts_w))
-
- MCFG_RS232_PORT_ADD("serial2",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2",mc2661_device,rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart2",mc2661_device,dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2",mc2661_device,cts_w))
-
- MCFG_RS232_PORT_ADD("serial3",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart3",mc2661_device,rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart3",mc2661_device,dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart3",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart3",mc2661_device,cts_w))
-
- MCFG_RS232_PORT_ADD("serial4",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart4",mc2661_device,rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart4",mc2661_device,dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart4",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart4",mc2661_device,cts_w))
-
- MCFG_RS232_PORT_ADD("serial5",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart5",mc2661_device,rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart5",mc2661_device,dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart5",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart5",mc2661_device,cts_w))
+ MCFG_DEVICE_ADD("serial1",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart1",mc2661_device,rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart1",mc2661_device,dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart1",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart1",mc2661_device,cts_w))
+
+ MCFG_DEVICE_ADD("serial2",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart2",mc2661_device,rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart2",mc2661_device,dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart2",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart2",mc2661_device,cts_w))
+
+ MCFG_DEVICE_ADD("serial3",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart3",mc2661_device,rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart3",mc2661_device,dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart3",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart3",mc2661_device,cts_w))
+
+ MCFG_DEVICE_ADD("serial4",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart4",mc2661_device,rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart4",mc2661_device,dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart4",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart4",mc2661_device,cts_w))
+
+ MCFG_DEVICE_ADD("serial5",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart5",mc2661_device,rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart5",mc2661_device,dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart5",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart5",mc2661_device,cts_w))
/* video hardware */
- MCFG_CPU_ADD("videocpu",Z8002,XTAL(8'000'000)/2) // AMD AMZ8002DC
- MCFG_CPU_PROGRAM_MAP(wicat_video_mem)
- MCFG_CPU_IO_MAP(wicat_video_io)
+ MCFG_DEVICE_ADD("videocpu",Z8002,XTAL(8'000'000)/2) // AMD AMZ8002DC
+ MCFG_DEVICE_PROGRAM_MAP(wicat_video_mem)
+ MCFG_DEVICE_IO_MAP(wicat_video_io)
MCFG_DEVICE_ADD("videodma", AM9517A, XTAL(8'000'000)) // clock is a bit of guess
- MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(wicat_state, dma_hrq_w))
- MCFG_AM9517A_OUT_EOP_CB(WRITELINE(wicat_state, dma_nmi_cb))
- MCFG_AM9517A_IN_MEMR_CB(READ8(wicat_state, vram_r))
- MCFG_AM9517A_OUT_MEMW_CB(WRITE8(wicat_state, vram_w))
- MCFG_AM9517A_OUT_IOW_0_CB(DEVWRITE8("video", i8275_device, dack_w))
+ MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, wicat_state, dma_hrq_w))
+ MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, wicat_state, dma_nmi_cb))
+ MCFG_AM9517A_IN_MEMR_CB(READ8(*this, wicat_state, vram_r))
+ MCFG_AM9517A_OUT_MEMW_CB(WRITE8(*this, wicat_state, vram_w))
+ MCFG_AM9517A_OUT_IOW_0_CB(WRITE8("video", i8275_device, dack_w))
MCFG_IM6402_ADD("videouart", 0, 0)
- MCFG_IM6402_DR_CALLBACK(WRITELINE(wicat_state, kb_data_ready))
+ MCFG_IM6402_DR_CALLBACK(WRITELINE(*this, wicat_state, kb_data_ready))
// terminal (2x INS2651, 1x IM6042 - one of these is for the keyboard, another communicates with the main board, the third is unknown)
MCFG_DEVICE_ADD("videouart0", MC2661, XTAL(5'068'800)) // the INS2651 looks similar enough to the MC2661...
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("uart0", mc2661_device, rx_w))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("uart0", mc2661_device, rx_w))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("videocpu", INPUT_LINE_IRQ0))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("uart0", mc2661_device, cts_w))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("uart0", mc2661_device, dsr_w))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("uart0", mc2661_device, cts_w))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("uart0", mc2661_device, dsr_w))
MCFG_DEVICE_ADD("videouart1", MC2661, XTAL(5'068'800))
MCFG_MC2661_RXC(19200)
@@ -905,16 +905,16 @@ MACHINE_CONFIG_START(wicat_state::wicat)
MCFG_DEVICE_ADD("video", I8275, XTAL(19'660'800)/8)
MCFG_I8275_CHARACTER_WIDTH(9)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(wicat_state, wicat_display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("videodma",am9517a_device, dreq0_w))
- MCFG_I8275_IRQ_CALLBACK(WRITELINE(wicat_state,crtc_cb))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE("videodma",am9517a_device, dreq0_w))
+ MCFG_I8275_IRQ_CALLBACK(WRITELINE(*this, wicat_state,crtc_cb))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEFAULT_LAYOUT(layout_wicat)
/* Winchester Disk Controller (WD1000 + FD1795) */
- MCFG_CPU_ADD("wd1kcpu",N8X300,XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(wicat_wd1000_mem)
- MCFG_CPU_IO_MAP(wicat_wd1000_io)
+ MCFG_DEVICE_ADD("wd1kcpu",N8X300,XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(wicat_wd1000_mem)
+ MCFG_DEVICE_IO_MAP(wicat_wd1000_io)
MCFG_FD1795_ADD("fdc",XTAL(8'000'000))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", wicat_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)