summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/apricotp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/apricotp.cpp')
-rw-r--r--src/mame/drivers/apricotp.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp
index c1868990dcb..e6bcf0ae926 100644
--- a/src/mame/drivers/apricotp.cpp
+++ b/src/mame/drivers/apricotp.cpp
@@ -586,14 +586,14 @@ static void fp_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(fp_state::fp)
/* basic machine hardware */
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(15'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(fp_mem)
- MCFG_CPU_IO_MAP(fp_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
-
- MCFG_CPU_ADD(HD63B01V1_TAG, HD6301, 2000000)
- MCFG_CPU_PROGRAM_MAP(sound_mem)
- MCFG_CPU_IO_MAP(sound_io)
+ MCFG_DEVICE_ADD(I8086_TAG, I8086, XTAL(15'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(fp_mem)
+ MCFG_DEVICE_IO_MAP(fp_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
+
+ MCFG_DEVICE_ADD(HD63B01V1_TAG, HD6301, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_mem)
+ MCFG_DEVICE_IO_MAP(sound_io)
MCFG_DEVICE_DISABLE()
/* video hardware */
@@ -624,41 +624,41 @@ MACHINE_CONFIG_START(fp_state::fp)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, 2000000)
+ MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* Devices */
MCFG_DEVICE_ADD(APRICOT_KEYBOARD_TAG, APRICOT_KEYBOARD, 0)
MCFG_DEVICE_ADD(I8237_TAG, AM9517A, 250000)
- MCFG_I8237_OUT_EOP_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir7_w))
- MCFG_I8237_IN_IOR_1_CB(DEVREAD8(WD2797_TAG, wd_fdc_device_base, data_r))
- MCFG_I8237_OUT_IOW_1_CB(DEVWRITE8(WD2797_TAG, wd_fdc_device_base, data_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(I8259A_TAG, pic8259_device, ir7_w))
+ MCFG_I8237_IN_IOR_1_CB(READ8(WD2797_TAG, wd_fdc_device_base, data_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(WD2797_TAG, wd_fdc_device_base, data_w))
MCFG_DEVICE_ADD(I8259A_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8253A5_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(2000000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259A_TAG, pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8259A_TAG, pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(2000000)
MCFG_PIT8253_CLK2(2000000)
MCFG_DEVICE_ADD(Z80SIO0_TAG, Z80SIO, 2500000)
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir4_w))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE(I8259A_TAG, pic8259_device, ir4_w))
MCFG_WD2797_ADD(WD2797_TAG, 2000000)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(I8259A_TAG, pic8259_device, ir1_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(I8237_TAG, am9517a_device, dreq1_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(I8259A_TAG, pic8259_device, ir1_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(I8237_TAG, am9517a_device, dreq1_w))
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":0", fp_floppies, "d32w", fp_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":1", fp_floppies, nullptr, fp_state::floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fp_state, write_centronics_busy))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(fp_state, write_centronics_select))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fp_state, write_centronics_fault))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fp_state, write_centronics_perror))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fp_state, write_centronics_busy))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, fp_state, write_centronics_select))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fp_state, write_centronics_fault))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fp_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)