diff options
Diffstat (limited to 'src/devices/bus/ieee488/c2040.cpp')
-rw-r--r-- | src/devices/bus/ieee488/c2040.cpp | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp index b6dde567971..aee0f5a895c 100644 --- a/src/devices/bus/ieee488/c2040.cpp +++ b/src/devices/bus/ieee488/c2040.cpp @@ -452,42 +452,42 @@ FLOPPY_FORMATS_END MACHINE_CONFIG_START(c2040_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) - MCFG_CPU_PROGRAM_MAP(c2040_main_mem) + MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) + MCFG_DEVICE_PROGRAM_MAP(c2040_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c2040_device, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(*this, c2040_device, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16) - MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem) + MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16) + MCFG_DEVICE_PROGRAM_MAP(c2040_fdc_mem) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16) - MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) - MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w)) - MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w)) + MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c2040_fdc_device, read)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c2040_device, via_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w)) MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16) - MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write)) - MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w)) - MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w)) - MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds1_w)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c2040_fdc_device, write)) + MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w)) + MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds0_w)) + MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds1_w)) MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) - MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r)) + MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c2040_fdc_device, wps_r)) MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000)) - MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w)) - MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) - MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_C2040_SYNC_CALLBACK(WRITELINE(M6530_TAG, mos6530_new_device, pb6_w)) + MCFG_C2040_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1)) + MCFG_C2040_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1)) MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":0", c2040_floppies, "525ssqd", c2040_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":1", c2040_floppies, "525ssqd", c2040_device::floppy_formats) MACHINE_CONFIG_END @@ -495,42 +495,42 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(c3040_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) - MCFG_CPU_PROGRAM_MAP(c2040_main_mem) + MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) + MCFG_DEVICE_PROGRAM_MAP(c2040_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c2040_device, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(*this, c2040_device, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16) - MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem) + MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16) + MCFG_DEVICE_PROGRAM_MAP(c2040_fdc_mem) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16) - MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) - MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w)) - MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w)) + MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c2040_fdc_device, read)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c2040_device, via_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w)) MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16) - MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write)) - MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w)) - MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w)) - MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds1_w)) - MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c2040_fdc_device, write)) + MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w)) + MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds0_w)) + MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds1_w)) + MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c2040_fdc_device, wps_r)) MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000)) - MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w)) - MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) - MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_C2040_SYNC_CALLBACK(WRITELINE(M6530_TAG, mos6530_new_device, pb6_w)) + MCFG_C2040_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1)) + MCFG_C2040_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1)) MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":0", c2040_floppies, "525ssqd", c3040_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":1", c2040_floppies, "525ssqd", c3040_device::floppy_formats) MACHINE_CONFIG_END @@ -538,42 +538,42 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(c4040_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) - MCFG_CPU_PROGRAM_MAP(c2040_main_mem) + MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) + MCFG_DEVICE_PROGRAM_MAP(c2040_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16) - MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c2040_device, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(*this, c2040_device, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16) - MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem) + MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16) + MCFG_DEVICE_PROGRAM_MAP(c2040_fdc_mem) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16) - MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) - MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w)) - MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w)) + MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c2040_fdc_device, read)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c2040_device, via_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w)) MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16) - MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write)) - MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w)) - MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w)) - MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds1_w)) - MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c2040_fdc_device, write)) + MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w)) + MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds0_w)) + MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds1_w)) + MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c2040_fdc_device, wps_r)) MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000)) - MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w)) - MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) - MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_C2040_SYNC_CALLBACK(WRITELINE(M6530_TAG, mos6530_new_device, pb6_w)) + MCFG_C2040_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1)) + MCFG_C2040_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1)) MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":0", c2040_floppies, "525ssqd", c4040_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":1", c2040_floppies, "525ssqd", c4040_device::floppy_formats) MACHINE_CONFIG_END |