summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/vixen.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/vixen.cpp')
-rw-r--r--src/mame/drivers/vixen.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp
index 5289c6ce3dc..af59f0a00d3 100644
--- a/src/mame/drivers/vixen.cpp
+++ b/src/mame/drivers/vixen.cpp
@@ -743,11 +743,11 @@ void vixen_state::machine_reset()
MACHINE_CONFIG_START(vixen_state::vixen)
// basic machine hardware
- MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL(23'961'600)/6)
- MCFG_CPU_PROGRAM_MAP(vixen_mem)
- MCFG_CPU_OPCODES_MAP(bios_mem)
- MCFG_CPU_IO_MAP(vixen_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vixen_state,vixen_int_ack)
+ MCFG_DEVICE_ADD(Z8400A_TAG, Z80, XTAL(23'961'600)/6)
+ MCFG_DEVICE_PROGRAM_MAP(vixen_mem)
+ MCFG_DEVICE_OPCODES_MAP(bios_mem)
+ MCFG_DEVICE_IO_MAP(vixen_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(vixen_state,vixen_int_ack)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber())
@@ -760,42 +760,42 @@ MACHINE_CONFIG_START(vixen_state::vixen)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
+ MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE)
MCFG_DISCRETE_INTF(vixen)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
// devices
MCFG_DEVICE_ADD(P8155H_TAG, I8155, XTAL(23'961'600)/6)
- MCFG_I8155_IN_PORTA_CB(READ8(vixen_state, i8155_pa_r))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(vixen_state, i8155_pb_w))
- MCFG_I8155_OUT_PORTC_CB(WRITE8(vixen_state, i8155_pc_w))
+ MCFG_I8155_IN_PORTA_CB(READ8(*this, vixen_state, i8155_pa_r))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, vixen_state, i8155_pb_w))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, vixen_state, i8155_pc_w))
MCFG_DEVICE_ADD(P8155H_IO_TAG, I8155, XTAL(23'961'600)/6)
- MCFG_I8155_OUT_PORTA_CB(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(vixen_state, io_i8155_pb_w))
- MCFG_I8155_OUT_PORTC_CB(WRITE8(vixen_state, io_i8155_pc_w))
- MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(vixen_state, io_i8155_to_w))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, vixen_state, io_i8155_pb_w))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, vixen_state, io_i8155_pc_w))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, vixen_state, io_i8155_to_w))
MCFG_DEVICE_ADD(P8251A_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(vixen_state, rxrdy_w))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(vixen_state, txrdy_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, vixen_state, rxrdy_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, vixen_state, txrdy_w))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(P8251A_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(P8251A_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(P8251A_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(P8251A_TAG, i8251_device, write_dsr))
MCFG_FD1797_ADD(FDC1797_TAG, XTAL(23'961'600)/24)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(vixen_state, fdc_intrq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, vixen_state, fdc_intrq_w))
MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":0", vixen_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":1", vixen_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(vixen_state, srq_w))
- MCFG_IEEE488_ATN_CALLBACK(WRITELINE(vixen_state, atn_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(*this, vixen_state, srq_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE(*this, vixen_state, atn_w))
/* software lists */
MCFG_SOFTWARE_LIST_ADD("disk_list", "vixen")