summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/attache.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/attache.cpp')
-rw-r--r--src/mame/drivers/attache.cpp148
1 files changed, 74 insertions, 74 deletions
diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp
index d669fa2a599..4c9b59ce5f3 100644
--- a/src/mame/drivers/attache.cpp
+++ b/src/mame/drivers/attache.cpp
@@ -1108,9 +1108,9 @@ void attache816_state::machine_reset()
}
MACHINE_CONFIG_START(attache_state::attache)
- MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(attache_map)
- MCFG_CPU_IO_MAP(attache_io)
+ MCFG_DEVICE_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(attache_map)
+ MCFG_DEVICE_IO_MAP(attache_io)
MCFG_Z80_DAISY_CHAIN(attache_daisy_chain)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1122,60 +1122,60 @@ MACHINE_CONFIG_START(attache_state::attache)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg", AY8912, XTAL(8'000'000) / 4)
+ MCFG_DEVICE_ADD("psg", AY8912, XTAL(8'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_MSM5832_ADD("rtc",XTAL(32'768))
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2)
- MCFG_Z80PIO_IN_PA_CB(READ8(attache_state, pio_portA_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(attache_state, pio_portA_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(attache_state, pio_portB_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(attache_state, pio_portB_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, attache_state, pio_portA_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, attache_state, pio_portA_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, attache_state, pio_portB_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, attache_state, pio_portB_w))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- 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_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ 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_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("brc", CLOCK, XTAL(8'000'000) / 26) // 307.692 KHz
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 4)
- MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(attache_state, hreq_w))
- MCFG_AM9517A_OUT_EOP_CB(WRITELINE(attache_state, eop_w))
- MCFG_AM9517A_IN_MEMR_CB(READ8(attache_state, dma_mem_r))
- MCFG_AM9517A_OUT_MEMW_CB(WRITE8(attache_state, dma_mem_w))
- MCFG_AM9517A_IN_IOR_0_CB(READ8(attache_state, fdc_dma_r))
- MCFG_AM9517A_OUT_IOW_0_CB(WRITE8(attache_state, fdc_dma_w))
- // MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(attache_state, fdc_dack_w))
+ MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, attache_state, hreq_w))
+ MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, attache_state, eop_w))
+ MCFG_AM9517A_IN_MEMR_CB(READ8(*this, attache_state, dma_mem_r))
+ MCFG_AM9517A_OUT_MEMW_CB(WRITE8(*this, attache_state, dma_mem_w))
+ MCFG_AM9517A_IN_IOR_0_CB(READ8(*this, attache_state, fdc_dma_r))
+ MCFG_AM9517A_OUT_IOW_0_CB(WRITE8(*this, attache_state, fdc_dma_w))
+ // MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(*this, attache_state, fdc_dack_w))
MCFG_UPD765A_ADD("fdc", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("ctc", z80ctc_device, trg3))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma", am9517a_device, dreq0_w)) MCFG_DEVCB_INVERT
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("ctc", z80ctc_device, trg3))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma", am9517a_device, dreq0_w)) MCFG_DEVCB_INVERT
MCFG_FLOPPY_DRIVE_ADD("fdc:0", attache_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", attache_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("crtc", TMS9927, 12324000 / 8)
MCFG_TMS9927_CHAR_WIDTH(8)
- MCFG_TMS9927_VSYN_CALLBACK(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_TMS9927_VSYN_CALLBACK(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1187,16 +1187,16 @@ MACHINE_CONFIG_START(attache_state::attache)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(attache816_state::attache816)
- MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(attache_map)
- MCFG_CPU_IO_MAP(attache816_io)
+ MCFG_DEVICE_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(attache_map)
+ MCFG_DEVICE_IO_MAP(attache816_io)
MCFG_Z80_DAISY_CHAIN(attache_daisy_chain)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_CPU_ADD("extcpu",I8086,XTAL(24'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(attache_x86_map)
- MCFG_CPU_IO_MAP(attache_x86_io)
+ MCFG_DEVICE_ADD("extcpu",I8086,XTAL(24'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(attache_x86_map)
+ MCFG_DEVICE_IO_MAP(attache_x86_io)
MCFG_QUANTUM_PERFECT_CPU("extcpu")
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -1206,67 +1206,67 @@ MACHINE_CONFIG_START(attache816_state::attache816)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg", AY8912, XTAL(8'000'000) / 4)
+ MCFG_DEVICE_ADD("psg", AY8912, XTAL(8'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_MSM5832_ADD("rtc",XTAL(32'768))
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2)
- MCFG_Z80PIO_IN_PA_CB(READ8(attache_state, pio_portA_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(attache_state, pio_portA_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(attache_state, pio_portB_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(attache_state, pio_portB_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, attache_state, pio_portA_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, attache_state, pio_portA_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, attache_state, pio_portB_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, attache_state, pio_portB_w))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- 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_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ 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_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("brc", CLOCK, XTAL(8'000'000) / 26) // 307.692 KHz
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(attache816_state, x86_comms_w))
- MCFG_I8255_IN_PORTA_CB(READ8(attache816_state, x86_comms_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(attache816_state, x86_irq_enable))
- MCFG_I8255_OUT_PORTC_CB(WRITELINE(attache816_state, x86_dsr)) MCFG_DEVCB_BIT(0)
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(attache816_state, ppi_irq)) MCFG_DEVCB_BIT(7) MCFG_DEVCB_INVERT
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, attache816_state, x86_comms_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, attache816_state, x86_comms_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, attache816_state, x86_irq_enable))
+ MCFG_I8255_OUT_PORTC_CB(WRITELINE(*this, attache816_state, x86_dsr)) MCFG_DEVCB_BIT(0)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, attache816_state, ppi_irq)) MCFG_DEVCB_BIT(7) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 4)
- MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(attache_state, hreq_w))
- MCFG_AM9517A_OUT_EOP_CB(WRITELINE(attache_state, eop_w))
- MCFG_AM9517A_IN_MEMR_CB(READ8(attache_state, dma_mem_r))
- MCFG_AM9517A_OUT_MEMW_CB(WRITE8(attache_state, dma_mem_w))
- MCFG_AM9517A_IN_IOR_0_CB(READ8(attache_state, fdc_dma_r))
- MCFG_AM9517A_OUT_IOW_0_CB(WRITE8(attache_state, fdc_dma_w))
- // MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(attache_state, fdc_dack_w))
+ MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, attache_state, hreq_w))
+ MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, attache_state, eop_w))
+ MCFG_AM9517A_IN_MEMR_CB(READ8(*this, attache_state, dma_mem_r))
+ MCFG_AM9517A_OUT_MEMW_CB(WRITE8(*this, attache_state, dma_mem_w))
+ MCFG_AM9517A_IN_IOR_0_CB(READ8(*this, attache_state, fdc_dma_r))
+ MCFG_AM9517A_OUT_IOW_0_CB(WRITE8(*this, attache_state, fdc_dma_w))
+ // MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(*this, attache_state, fdc_dack_w))
MCFG_UPD765A_ADD("fdc", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("ctc", z80ctc_device, trg3))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma", am9517a_device, dreq0_w)) MCFG_DEVCB_INVERT
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("ctc", z80ctc_device, trg3))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma", am9517a_device, dreq0_w)) MCFG_DEVCB_INVERT
MCFG_FLOPPY_DRIVE_ADD("fdc:0", attache_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", attache_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("crtc", TMS9927, 12324000)
MCFG_TMS9927_CHAR_WIDTH(8)
- MCFG_TMS9927_VSYN_CALLBACK(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_TMS9927_VSYN_CALLBACK(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_NVRAM_ADD_0FILL("nvram")