summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/apricot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/apricot.cpp')
-rw-r--r--src/mame/drivers/apricot.cpp90
1 files changed, 45 insertions, 45 deletions
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index 3ad783046ce..eeacbb4b68e 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -357,19 +357,19 @@ void apricot_state::apricot_io(address_map &map)
MACHINE_CONFIG_START(apricot_state::apricot)
// main cpu
- MCFG_CPU_ADD("ic91", I8086, XTAL(15'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(apricot_mem)
- MCFG_CPU_IO_MAP(apricot_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("ic31", pic8259_device, inta_cb)
- MCFG_I8086_LOCK_HANDLER(WRITELINE(apricot_state, i8086_lock_w))
+ MCFG_DEVICE_ADD("ic91", I8086, XTAL(15'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(apricot_mem)
+ MCFG_DEVICE_IO_MAP(apricot_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("ic31", pic8259_device, inta_cb)
+ MCFG_I8086_LOCK_HANDLER(WRITELINE(*this, apricot_state, i8086_lock_w))
// i/o cpu
- MCFG_CPU_ADD("ic71", I8089, XTAL(15'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(apricot_mem)
- MCFG_CPU_IO_MAP(apricot_io)
+ MCFG_DEVICE_ADD("ic71", I8089, XTAL(15'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(apricot_mem)
+ MCFG_DEVICE_IO_MAP(apricot_io)
MCFG_I8089_DATA_WIDTH(16)
- MCFG_I8089_SINTR1(DEVWRITELINE("ic31", pic8259_device, ir0_w))
- MCFG_I8089_SINTR2(DEVWRITELINE("ic31", pic8259_device, ir1_w))
+ MCFG_I8089_SINTR1(WRITELINE("ic31", pic8259_device, ir0_w))
+ MCFG_I8089_SINTR2(WRITELINE("ic31", pic8259_device, ir1_w))
// ram
MCFG_RAM_ADD(RAM_TAG)
@@ -388,71 +388,71 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(10)
MCFG_MC6845_UPDATE_ROW_CB(apricot_state, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(apricot_state, apricot_hd6845_de))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, apricot_state, apricot_hd6845_de))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ic7", SN76489, XTAL(4'000'000) / 2)
+ MCFG_DEVICE_ADD("ic7", SN76489, XTAL(4'000'000) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// devices
MCFG_DEVICE_ADD("ic17", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("cent_data_in", input_buffer_device, read))
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(apricot_state, i8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(apricot_state, i8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(apricot_state, i8255_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8("cent_data_in", input_buffer_device, read))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, apricot_state, i8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, apricot_state, i8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, apricot_state, i8255_portc_w))
MCFG_DEVICE_ADD("ic31", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("ic91", 0))
MCFG_DEVICE_ADD("ic16", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(4'000'000) / 16)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("ic31", pic8259_device, ir6_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("ic31", pic8259_device, ir6_w))
MCFG_PIT8253_CLK1(XTAL(4'000'000) / 2)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("ic14", ttl153_device, i0a_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("ic14", ttl153_device, i0a_w))
MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("ic14", ttl153_device, i0b_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ic14", ttl153_device, i2a_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ic14", ttl153_device, i2b_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("ic14", ttl153_device, i0b_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ic14", ttl153_device, i2a_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ic14", ttl153_device, i2b_w))
MCFG_TTL153_ADD("ic14")
- MCFG_TTL153_ZA_CB(DEVWRITELINE("ic15", z80sio_device, rxca_w))
- MCFG_TTL153_ZB_CB(DEVWRITELINE("ic15", z80sio_device, txca_w))
+ MCFG_TTL153_ZA_CB(WRITELINE("ic15", z80sio_device, rxca_w))
+ MCFG_TTL153_ZB_CB(WRITELINE("ic15", z80sio_device, txca_w))
MCFG_CLOCK_ADD("ic15_rxtxcb", XTAL(4'000'000) / 16)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ic15", z80sio_device, rxtxcb_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ic15", z80sio_device, rxtxcb_w))
MCFG_DEVICE_ADD("ic15", Z80SIO, XTAL(15'000'000) / 6)
MCFG_Z80SIO_CPU("ic91")
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_WRDYA_CB(DEVWRITELINE("ic71", i8089_device, drq2_w))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("kbd", apricot_keyboard_bus_device, out_w))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("ic14", ttl153_device, s0_w))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("ic14", ttl153_device, s1_w))
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("ic31", pic8259_device, ir5_w))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE("ic71", i8089_device, drq2_w))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("kbd", apricot_keyboard_bus_device, out_w))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("ic14", ttl153_device, s0_w))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("ic14", ttl153_device, s1_w))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE("ic31", pic8259_device, ir5_w))
// rs232 port
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
// note: missing a receive clock callback to support external clock mode (i1 to 153)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ic15", z80sio_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ic15", z80sio_device, dcda_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ic15", z80sio_device, synca_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ic15", z80sio_device, ctsa_w)) MCFG_DEVCB_XOR(1)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ic15", z80sio_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ic15", z80sio_device, dcda_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ic15", z80sio_device, synca_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ic15", z80sio_device, ctsa_w)) MCFG_DEVCB_XOR(1)
// keyboard
MCFG_APRICOT_KEYBOARD_INTERFACE_ADD("kbd", "hle")
- MCFG_APRICOT_KEYBOARD_IN_HANDLER(DEVWRITELINE("ic15", z80sio_device, rxb_w))
+ MCFG_APRICOT_KEYBOARD_IN_HANDLER(WRITELINE("ic15", z80sio_device, rxb_w))
// centronics printer
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("ic15", z80sio_device, ctsb_w))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("ic15", z80sio_device, dcdb_w))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(apricot_state, write_centronics_fault))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(apricot_state, write_centronics_perror))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("ic15", z80sio_device, ctsb_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("ic15", z80sio_device, dcdb_w))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, apricot_state, write_centronics_fault))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, apricot_state, write_centronics_perror))
//MCFG_CENTRONICS_SELECT_HANDLER() // schematic page 294 says this is connected to pc4, but that is an output to the printer
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
@@ -460,8 +460,8 @@ MACHINE_CONFIG_START(apricot_state::apricot)
// floppy
MCFG_WD2797_ADD("ic68", XTAL(4'000'000) / 2)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(apricot_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("ic71", i8089_device, drq1_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, apricot_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("ic71", i8089_device, drq1_w))
MCFG_FLOPPY_DRIVE_ADD("ic68:0", apricot_floppies, "d32w", apricot_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("ic68:1", apricot_floppies, "d32w", apricot_state::floppy_formats)