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/c8050.cpp | |
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/c8050.cpp')
-rw-r--r-- | src/devices/bus/ieee488/c8050.cpp | 180 |
1 files changed, 90 insertions, 90 deletions
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 |