summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbmiec/c1571.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/cbmiec/c1571.cpp')
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp158
1 files changed, 79 insertions, 79 deletions
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index 2cbe03c58c2..336cc049118 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -605,144 +605,144 @@ static void mini_chief_isa8_cards(device_slot_interface &device)
//-------------------------------------------------
MACHINE_CONFIG_START(c1570_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c1571_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571_device, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via0_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_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(c1571_device, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_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(c1571_device, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_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, c1571_device, via1_irq_w))
MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
- MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_device, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
- MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c1571_device, cia_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1571_device, cia_cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1571_device, cia_sp_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c1571_device, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1571_device, cia_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(*this, c1571_device, cia_pc_w))
MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1571_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c1571_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571_device, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via0_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_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(c1571_device, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_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(c1571_device, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_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, c1571_device, via1_irq_w))
MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
- MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_device, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
- MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c1571_device, cia_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1571_device, cia_cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1571_device, cia_sp_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c1571_device, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1571_device, cia_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(*this, c1571_device, cia_pc_w))
MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1571cr_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c1571_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571cr_device, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571cr_device, via0_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571cr_device, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571cr_device, via0_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_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(c1571_device, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_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(c1571_device, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_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, c1571_device, via1_irq_w))
//MCFG_MOS5710_ADD(M5710_TAG, XTAL(16'000'000)/16, 0)
MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(mini_chief_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(mini_chief_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571_device, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via0_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_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(c1571_device, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_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(c1571_device, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_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, c1571_device, via1_irq_w))
MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
- MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_device, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
- MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c1571_device, cia_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1571_device, cia_cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1571_device, cia_sp_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c1571_device, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1571_device, cia_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(*this, c1571_device, cia_pc_w))
MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MCFG_DEVICE_ADD(ISA_BUS_TAG, ISA8, 0)
MCFG_ISA8_CPU(M6502_TAG)
- MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", mini_chief_isa8_cards, "wd1002a_wx1", false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, ISA_BUS_TAG, mini_chief_isa8_cards, "wd1002a_wx1", false)
MACHINE_CONFIG_END