diff options
author | Vas Crabb <vas@vastheman.com> | 2018-05-06 00:40:40 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-05-06 00:51:27 +1000 |
commit | 4ea3cd0bc1f54e47a0d38a47afac38101549e9ee (patch) | |
tree | bbadc20010b6bad48cf321b1c864655587e4b8ad /src/devices/bus/ieee488 | |
parent | bba5127d7a73ca44fdc0dcab7286846c81206771 (diff) |
Streamline machine configuration macros - everyone's a device edition.
Start replacing special device macros with additional constructors,
starting with ISA, INTELLEC 4 and RS-232 buses.
Allow an object finder to take on the target of another object finder.
(For a combination of the previous two things in action, see either the
INTELLEC 4 driver, or the Apple 2 PC Exporter card. Also check out
looping over a device finder array to instantiate devices in some
places. Lots of things no longer need to pass tags around.)
Start supplying default clocks for things that have a standard clock or
have all clocks internal.
Eliminate the separate DEV versions of the DEVCB_ macros. Previously,
the plain versions were a shortcut for DEVICE_SELF as the target. You
can now supply a string tag (relative to current device being
configured), an object finder (takes on the base and relative tag), or
a reference to a device/interface (only do this if you know the device
won't be replaced out from under it, but that's a safe assumption for
your subdevices). In almost all cases, you can get the effect you want
by supplying *this as the target.
Eliminate sound and CPU versions of macros. They serve no useful
purpose, provide no extra checks, make error messages longer, add
indirection, and mislead newbies into thinking there's a difference.
Remove a lot of now-unnecessary ":" prefixes binding things relative to
machine root.
Clean up some miscellaneous rot.
Examples of new functionality in use in (some more subtle than others):
* src/mame/drivers/intellec4.cpp
* src/mame/drivers/tranz330.cpp
* src/mame/drivers/osboren1.cpp
* src/mame/drivers/zorba.cpp
* src/mame/devices/smioc.cpp
* src/devices/bus/a2bus/pc_xporter.cpp
* src/devices/bus/isa/isa.h
* src/devices/bus/isa/isa.h
* src/devices/bus/intellec4/intellec4.h
Diffstat (limited to 'src/devices/bus/ieee488')
-rw-r--r-- | src/devices/bus/ieee488/c2031.cpp | 30 | ||||
-rw-r--r-- | src/devices/bus/ieee488/c2040.cpp | 132 | ||||
-rw-r--r-- | src/devices/bus/ieee488/c8050.cpp | 180 | ||||
-rw-r--r-- | src/devices/bus/ieee488/c8280.cpp | 20 | ||||
-rw-r--r-- | src/devices/bus/ieee488/d9060.cpp | 54 | ||||
-rw-r--r-- | src/devices/bus/ieee488/hardbox.cpp | 20 | ||||
-rw-r--r-- | src/devices/bus/ieee488/hp9895.cpp | 28 | ||||
-rw-r--r-- | src/devices/bus/ieee488/shark.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/ieee488/softbox.cpp | 34 |
9 files changed, 253 insertions, 253 deletions
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index 5a04cef0254..af6172cb178 100644 --- a/src/devices/bus/ieee488/c2031.cpp +++ b/src/devices/bus/ieee488/c2031.cpp @@ -305,28 +305,28 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(c2031_device::device_add_mconfig) - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) - MCFG_CPU_PROGRAM_MAP(c2031_mem) + MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) + MCFG_DEVICE_PROGRAM_MAP(c2031_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16) - MCFG_VIA6522_READPA_HANDLER(READ8(c2031_device, via0_pa_r)) - MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via0_pb_r)) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c2031_device, via0_pa_w)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2031_device, via0_pb_w)) - MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c2031_device, via0_irq_w)) + MCFG_VIA6522_READPA_HANDLER(READ8(*this, c2031_device, via0_pa_r)) + MCFG_VIA6522_READPB_HANDLER(READ8(*this, c2031_device, via0_pb_r)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c2031_device, via0_pa_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c2031_device, via0_pb_w)) + MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c2031_device, via0_irq_w)) MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16) - MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r)) - MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via1_pb_r)) - MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2031_device, via1_pb_w)) - MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w)) - MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w)) - MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c2031_device, via1_irq_w)) + MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r)) + MCFG_VIA6522_READPB_HANDLER(READ8(*this, c2031_device, via1_pb_r)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c2031_device, via1_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, soe_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w)) + MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c2031_device, via1_irq_w)) MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000)) - MCFG_64H156_BYTE_CALLBACK(WRITELINE(c2031_device, byte_w)) + MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c2031_device, byte_w)) MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c2031_floppies, "525ssqd", c2031_device::floppy_formats) MACHINE_CONFIG_END 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 diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index f97ccc61f0d..c15eebb6c14 100644 --- a/src/devices/bus/ieee488/c8050.cpp +++ b/src/devices/bus/ieee488/c8050.cpp @@ -533,44 +533,44 @@ FLOPPY_FORMATS_END MACHINE_CONFIG_START(c8050_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) - MCFG_CPU_PROGRAM_MAP(c8050_main_mem) + MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) + MCFG_DEVICE_PROGRAM_MAP(c8050_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c8050_device, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(*this, c8050_device, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) - MCFG_CPU_PROGRAM_MAP(c8050_fdc_mem) + MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) + MCFG_DEVICE_PROGRAM_MAP(c8050_fdc_mem) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12) - MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) - MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) - MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) + MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c8050_fdc_device, read)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c8050_device, via_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write)) - MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w)) - MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) - MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds1_w)) - MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c8050_fdc_device, wps_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c8050_fdc_device, write)) + MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w)) + MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) + MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds1_w)) + MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c8050_fdc_device, wps_r)) MCFG_MOS6530n_IN_PB6_CB(VCC) // SINGLE SIDED MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2) - MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7)) - MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) + MCFG_C8050_SYNC_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_pb7)) + MCFG_C8050_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) - MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_C8050_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1)) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8050_floppies, "525ssqd", c8050_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8050_floppies, "525ssqd", c8050_device::floppy_formats) MACHINE_CONFIG_END @@ -578,45 +578,45 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(c8250_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) - MCFG_CPU_PROGRAM_MAP(c8050_main_mem) + MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) + MCFG_DEVICE_PROGRAM_MAP(c8050_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c8050_device, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(*this, c8050_device, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) - MCFG_CPU_PROGRAM_MAP(c8050_fdc_mem) + MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) + MCFG_DEVICE_PROGRAM_MAP(c8050_fdc_mem) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12) - MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) - MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) - MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) + MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c8050_fdc_device, read)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c8050_device, via_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write)) - MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w)) - MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) - MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds1_w)) - MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c8050_fdc_device, wps_r)) - MCFG_MOS6530n_OUT_PB4_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c8050_fdc_device, write)) + MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w)) + MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) + MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds1_w)) + MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c8050_fdc_device, wps_r)) + MCFG_MOS6530n_OUT_PB4_CB(WRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w)) MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2) - MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7)) - MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) + MCFG_C8050_SYNC_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_pb7)) + MCFG_C8050_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) - MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_C8050_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1)) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8250_floppies, "525qd", c8250_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8250_floppies, "525qd", c8250_device::floppy_formats) MACHINE_CONFIG_END @@ -624,45 +624,45 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(c8250lp_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) - MCFG_CPU_PROGRAM_MAP(c8050_main_mem) + MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) + MCFG_DEVICE_PROGRAM_MAP(c8050_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c8050_device, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(*this, c8050_device, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) - MCFG_CPU_PROGRAM_MAP(c8250lp_fdc_mem) + MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) + MCFG_DEVICE_PROGRAM_MAP(c8250lp_fdc_mem) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12) - MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) - MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) - MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) + MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c8050_fdc_device, read)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c8050_device, via_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write)) - MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w)) - MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) - MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds1_w)) - MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c8050_fdc_device, wps_r)) - MCFG_MOS6530n_OUT_PB4_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c8050_fdc_device, write)) + MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w)) + MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) + MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds1_w)) + MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c8050_fdc_device, wps_r)) + MCFG_MOS6530n_OUT_PB4_CB(WRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w)) MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2) - MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7)) - MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) + MCFG_C8050_SYNC_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_pb7)) + MCFG_C8050_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) - MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_C8050_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1)) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8250_floppies, "525qd", c8250lp_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8250_floppies, "525qd", c8250lp_device::floppy_formats) MACHINE_CONFIG_END @@ -670,44 +670,44 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(sfd1001_device::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) - MCFG_CPU_PROGRAM_MAP(c8050_main_mem) + MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12) + MCFG_DEVICE_PROGRAM_MAP(c8050_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c8050_device, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(*this, c8050_device, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) - MCFG_CPU_PROGRAM_MAP(sfd1001_fdc_mem) + MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12) + MCFG_DEVICE_PROGRAM_MAP(sfd1001_fdc_mem) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12) - MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) - MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) - MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) + MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c8050_fdc_device, read)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c8050_device, via_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w)) MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12) - MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write)) - MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) - MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds1_w)) - MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c8050_fdc_device, wps_r)) - MCFG_MOS6530n_OUT_PB4_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c8050_fdc_device, write)) + MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds0_w)) + MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds1_w)) + MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c8050_fdc_device, wps_r)) + MCFG_MOS6530n_OUT_PB4_CB(WRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w)) MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE)) MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2) - MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7)) - MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) + MCFG_C8050_SYNC_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_pb7)) + MCFG_C8050_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1)) MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1) - MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_C8050_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1)) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", sfd1001_floppies, "525qd", sfd1001_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp index d032491c812..4a142b625b5 100644 --- a/src/devices/bus/ieee488/c8280.cpp +++ b/src/devices/bus/ieee488/c8280.cpp @@ -293,22 +293,22 @@ FLOPPY_FORMATS_END //------------------------------------------------- MACHINE_CONFIG_START(c8280_device::device_add_mconfig) - MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL(12'000'000)/8) - MCFG_CPU_PROGRAM_MAP(c8280_main_mem) + MCFG_DEVICE_ADD(M6502_DOS_TAG, M6502, XTAL(12'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(c8280_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/8) - MCFG_MOS6530n_IN_PA_CB(READ8(c8280_device, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_device, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8280_device, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8280_device, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/8) - MCFG_MOS6530n_IN_PA_CB(READ8(c8280_device, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8280_device, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(c8280_device, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_device, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8280_device, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c8280_device, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(*this, c8280_device, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8280_device, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_DOS_TAG, INPUT_LINE_IRQ0)) - MCFG_CPU_ADD(M6502_FDC_TAG, M6502, XTAL(12'000'000)/8) - MCFG_CPU_PROGRAM_MAP(c8280_fdc_mem) + MCFG_DEVICE_ADD(M6502_FDC_TAG, M6502, XTAL(12'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(c8280_fdc_mem) MCFG_FD1797_ADD(WD1797_TAG, XTAL(12'000'000)/6) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_IRQ_LINE)) diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp index 8505b8b7da8..8618dc944cd 100644 --- a/src/devices/bus/ieee488/d9060.cpp +++ b/src/devices/bus/ieee488/d9060.cpp @@ -372,45 +372,45 @@ WRITE8_MEMBER( d9060_device_base::scsi_data_w ) MACHINE_CONFIG_START(d9060_device_base::device_add_mconfig) // DOS - MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL(4'000'000)/4) - MCFG_CPU_PROGRAM_MAP(d9060_main_mem) + MCFG_DEVICE_ADD(M6502_DOS_TAG, M6502, XTAL(4'000'000)/4) + MCFG_DEVICE_PROGRAM_MAP(d9060_main_mem) MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(4'000'000)/4) - MCFG_MOS6530n_IN_PA_CB(READ8(d9060_device_base, dio_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(d9060_device_base, dio_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, d9060_device_base, dio_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, d9060_device_base, dio_w)) MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(4'000'000)/4) - MCFG_MOS6530n_IN_PA_CB(READ8(d9060_device_base, riot1_pa_r)) - MCFG_MOS6530n_OUT_PA_CB(WRITE8(d9060_device_base, riot1_pa_w)) - MCFG_MOS6530n_IN_PB_CB(READ8(d9060_device_base, riot1_pb_r)) - MCFG_MOS6530n_OUT_PB_CB(WRITE8(d9060_device_base, riot1_pb_w)) + MCFG_MOS6530n_IN_PA_CB(READ8(*this, d9060_device_base, riot1_pa_r)) + MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, d9060_device_base, riot1_pa_w)) + MCFG_MOS6530n_IN_PB_CB(READ8(*this, d9060_device_base, riot1_pb_r)) + MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, d9060_device_base, riot1_pb_w)) MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_DOS_TAG, INPUT_LINE_IRQ0)) // controller - MCFG_CPU_ADD(M6502_HDC_TAG, M6502, XTAL(4'000'000)/4) - MCFG_CPU_PROGRAM_MAP(d9060_hdc_mem) + MCFG_DEVICE_ADD(M6502_HDC_TAG, M6502, XTAL(4'000'000)/4) + MCFG_DEVICE_PROGRAM_MAP(d9060_hdc_mem) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(4'000'000)/4) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(d9060_device_base, scsi_data_w)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(d9060_device_base, via_pb_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(d9060_device_base, ack_w)) - MCFG_VIA6522_CB2_HANDLER(WRITELINE(d9060_device_base, enable_w)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, d9060_device_base, scsi_data_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, d9060_device_base, via_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, d9060_device_base, ack_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, d9060_device_base, enable_w)) MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_HDC_TAG, M6502_IRQ_LINE)) MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0) - MCFG_SCSI_REQ_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) - MCFG_SCSI_CD_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pb2)) - MCFG_SCSI_BSY_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pb3)) - MCFG_SCSI_IO_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pb6)) - MCFG_SCSI_MSG_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7)) - MCFG_SCSI_DATA0_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa0)) - MCFG_SCSI_DATA1_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa1)) - MCFG_SCSI_DATA2_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa2)) - MCFG_SCSI_DATA3_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa3)) - MCFG_SCSI_DATA4_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa4)) - MCFG_SCSI_DATA5_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa5)) - MCFG_SCSI_DATA6_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa6)) - MCFG_SCSI_DATA7_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa7)) + MCFG_SCSI_REQ_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_ca1)) + MCFG_SCSI_CD_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pb2)) + MCFG_SCSI_BSY_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pb3)) + MCFG_SCSI_IO_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pb6)) + MCFG_SCSI_MSG_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pb7)) + MCFG_SCSI_DATA0_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa0)) + MCFG_SCSI_DATA1_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa1)) + MCFG_SCSI_DATA2_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa2)) + MCFG_SCSI_DATA3_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa3)) + MCFG_SCSI_DATA4_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa4)) + MCFG_SCSI_DATA5_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa5)) + MCFG_SCSI_DATA6_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa6)) + MCFG_SCSI_DATA7_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa7)) MCFG_SCSI_OUTPUT_LATCH_ADD("sasi_data_out", SASIBUS_TAG) diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp index a5da9825cc9..14a2a9a16d2 100644 --- a/src/devices/bus/ieee488/hardbox.cpp +++ b/src/devices/bus/ieee488/hardbox.cpp @@ -269,21 +269,21 @@ WRITE8_MEMBER( hardbox_device::ppi1_pc_w ) MACHINE_CONFIG_START(hardbox_device::device_add_mconfig) // basic machine hardware - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) - MCFG_CPU_PROGRAM_MAP(hardbox_mem) - MCFG_CPU_IO_MAP(hardbox_io) + MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) + MCFG_DEVICE_PROGRAM_MAP(hardbox_mem) + MCFG_DEVICE_IO_MAP(hardbox_io) // devices MCFG_DEVICE_ADD(I8255_0_TAG, I8255A, 0) - MCFG_I8255_IN_PORTA_CB(READ8(hardbox_device, ppi0_pa_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(hardbox_device, ppi0_pb_w)) - MCFG_I8255_IN_PORTC_CB(READ8(hardbox_device, ppi0_pc_r)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, hardbox_device, ppi0_pa_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, hardbox_device, ppi0_pb_w)) + MCFG_I8255_IN_PORTC_CB(READ8(*this, hardbox_device, ppi0_pc_r)) MCFG_DEVICE_ADD(I8255_1_TAG, I8255A, 0) - MCFG_I8255_IN_PORTA_CB(READ8(hardbox_device, ppi1_pa_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(hardbox_device, ppi1_pb_w)) - MCFG_I8255_IN_PORTC_CB(READ8(hardbox_device, ppi1_pc_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(hardbox_device, ppi1_pc_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, hardbox_device, ppi1_pa_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, hardbox_device, ppi1_pb_w)) + MCFG_I8255_IN_PORTC_CB(READ8(*this, hardbox_device, ppi1_pc_r)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, hardbox_device, ppi1_pc_w)) MCFG_DEVICE_ADD(CORVUS_HDC_TAG, CORVUS_HDC, 0) MCFG_HARDDISK_ADD("harddisk1") diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp index 565fc3ee924..6c42e64371e 100644 --- a/src/devices/bus/ieee488/hp9895.cpp +++ b/src/devices/bus/ieee488/hp9895.cpp @@ -886,22 +886,22 @@ const tiny_rom_entry *hp9895_device::device_rom_region() const } MACHINE_CONFIG_START(hp9895_device::device_add_mconfig) - MCFG_CPU_ADD("cpu" , Z80 , 4000000) - MCFG_CPU_PROGRAM_MAP(z80_program_map) - MCFG_CPU_IO_MAP(z80_io_map) - MCFG_Z80_SET_REFRESH_CALLBACK(WRITE8(hp9895_device , z80_m1_w)) + MCFG_DEVICE_ADD("cpu" , Z80 , 4000000) + MCFG_DEVICE_PROGRAM_MAP(z80_program_map) + MCFG_DEVICE_IO_MAP(z80_io_map) + MCFG_Z80_SET_REFRESH_CALLBACK(WRITE8(*this, hp9895_device , z80_m1_w)) MCFG_DEVICE_ADD("phi" , PHI , 0) - MCFG_PHI_EOI_WRITE_CB(WRITELINE(hp9895_device , phi_eoi_w)) - MCFG_PHI_DAV_WRITE_CB(WRITELINE(hp9895_device , phi_dav_w)) - MCFG_PHI_NRFD_WRITE_CB(WRITELINE(hp9895_device , phi_nrfd_w)) - MCFG_PHI_NDAC_WRITE_CB(WRITELINE(hp9895_device , phi_ndac_w)) - MCFG_PHI_IFC_WRITE_CB(WRITELINE(hp9895_device , phi_ifc_w)) - MCFG_PHI_SRQ_WRITE_CB(WRITELINE(hp9895_device , phi_srq_w)) - MCFG_PHI_ATN_WRITE_CB(WRITELINE(hp9895_device , phi_atn_w)) - MCFG_PHI_REN_WRITE_CB(WRITELINE(hp9895_device , phi_ren_w)) - MCFG_PHI_DIO_READWRITE_CB(READ8(hp9895_device , phi_dio_r) , WRITE8(hp9895_device , phi_dio_w)) - MCFG_PHI_INT_WRITE_CB(WRITELINE(hp9895_device , phi_int_w)) + MCFG_PHI_EOI_WRITE_CB(WRITELINE(*this, hp9895_device , phi_eoi_w)) + MCFG_PHI_DAV_WRITE_CB(WRITELINE(*this, hp9895_device , phi_dav_w)) + MCFG_PHI_NRFD_WRITE_CB(WRITELINE(*this, hp9895_device , phi_nrfd_w)) + MCFG_PHI_NDAC_WRITE_CB(WRITELINE(*this, hp9895_device , phi_ndac_w)) + MCFG_PHI_IFC_WRITE_CB(WRITELINE(*this, hp9895_device , phi_ifc_w)) + MCFG_PHI_SRQ_WRITE_CB(WRITELINE(*this, hp9895_device , phi_srq_w)) + MCFG_PHI_ATN_WRITE_CB(WRITELINE(*this, hp9895_device , phi_atn_w)) + MCFG_PHI_REN_WRITE_CB(WRITELINE(*this, hp9895_device , phi_ren_w)) + MCFG_PHI_DIO_READWRITE_CB(READ8(*this, hp9895_device , phi_dio_r) , WRITE8(*this, hp9895_device , phi_dio_w)) + MCFG_PHI_INT_WRITE_CB(WRITELINE(*this, hp9895_device , phi_int_w)) MCFG_PHI_SYS_CNTRL_READ_CB(GND) MCFG_FLOPPY_DRIVE_ADD("floppy0" , hp9895_floppies , "8dsdd" , hp9895_floppy_formats) diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp index ac2e1e42b94..8e2a60985ef 100644 --- a/src/devices/bus/ieee488/shark.cpp +++ b/src/devices/bus/ieee488/shark.cpp @@ -82,13 +82,13 @@ void mshark_device::mshark_io(address_map &map) MACHINE_CONFIG_START(mshark_device::device_add_mconfig) // basic machine hardware - MCFG_CPU_ADD(I8085_TAG, I8085A, 1000000) - MCFG_CPU_PROGRAM_MAP(mshark_mem) - MCFG_CPU_IO_MAP(mshark_io) + MCFG_DEVICE_ADD(I8085_TAG, I8085A, 1000000) + MCFG_DEVICE_PROGRAM_MAP(mshark_mem) + MCFG_DEVICE_IO_MAP(mshark_io) // devices MCFG_HARDDISK_ADD("harddisk1") - MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr) + MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) MACHINE_CONFIG_END diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index caad857c087..5d6be33930c 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -236,35 +236,35 @@ DEVICE_INPUT_DEFAULTS_END MACHINE_CONFIG_START(softbox_device::device_add_mconfig) // basic machine hardware - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) - MCFG_CPU_PROGRAM_MAP(softbox_mem) - MCFG_CPU_IO_MAP(softbox_io) + MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) + MCFG_DEVICE_PROGRAM_MAP(softbox_mem) + MCFG_DEVICE_IO_MAP(softbox_io) // devices MCFG_DEVICE_ADD(I8251_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_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_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr) - MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd)) - MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) + MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr) + MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd)) + MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr)) MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal) MCFG_DEVICE_ADD(I8255_0_TAG, I8255A, 0) - MCFG_I8255_IN_PORTA_CB(READ8(softbox_device, ppi0_pa_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(softbox_device, ppi0_pb_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, softbox_device, ppi0_pa_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, softbox_device, ppi0_pb_w)) MCFG_I8255_IN_PORTC_CB(IOPORT("SW1")) MCFG_DEVICE_ADD(I8255_1_TAG, I8255A, 0) - MCFG_I8255_IN_PORTA_CB(READ8(softbox_device, ppi1_pa_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(softbox_device, ppi1_pb_w)) - MCFG_I8255_IN_PORTC_CB(READ8(softbox_device, ppi1_pc_r)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(softbox_device, ppi1_pc_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, softbox_device, ppi1_pa_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, softbox_device, ppi1_pb_w)) + MCFG_I8255_IN_PORTC_CB(READ8(*this, softbox_device, ppi1_pc_r)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, softbox_device, ppi1_pc_w)) MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800)) - MCFG_COM8116_FR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc)) - MCFG_COM8116_FT_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc)) + MCFG_COM8116_FR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxc)) + MCFG_COM8116_FT_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_txc)) MCFG_DEVICE_ADD(CORVUS_HDC_TAG, CORVUS_HDC, 0) MCFG_HARDDISK_ADD("harddisk1") |