diff options
Diffstat (limited to 'src/mame/drivers/pet.cpp')
-rw-r--r-- | src/mame/drivers/pet.cpp | 174 |
1 files changed, 87 insertions, 87 deletions
diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index 3ad844da28b..ef726da104b 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -1782,8 +1782,8 @@ MACHINE_CONFIG_START(pet_state::pet) MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet) // basic machine hardware - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(8'000'000)/8) - MCFG_CPU_PROGRAM_MAP(pet2001_mem) + MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(8'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(pet2001_mem) MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks // video hardware @@ -1799,51 +1799,51 @@ MACHINE_CONFIG_START(pet_state::pet) // devices MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(8'000'000)/8) - MCFG_VIA6522_READPB_HANDLER(READ8(pet_state, via_pb_r)) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(pet_state, via_pa_w)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(pet_state, via_pb_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(pet_state, via_ca2_w)) - MCFG_VIA6522_CB2_HANDLER(WRITELINE(pet_state, via_cb2_w)) - MCFG_VIA6522_IRQ_HANDLER(WRITELINE(pet_state, via_irq_w)) + MCFG_VIA6522_READPB_HANDLER(READ8(*this, pet_state, via_pb_r)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, pet_state, via_pa_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, pet_state, via_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, pet_state, via_ca2_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, pet_state, via_cb2_w)) + MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, pet_state, via_irq_w)) MCFG_DEVICE_ADD(M6520_1_TAG, PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(pet_state, pia1_pa_r)) - MCFG_PIA_READPB_HANDLER(READ8(pet_state, pia1_pb_r)) - MCFG_PIA_READCA1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(pet_state, pia1_pa_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(pet_state, pia1_ca2_w)) - MCFG_PIA_CB2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia1_irqa_w)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia1_irqb_w)) + MCFG_PIA_READPA_HANDLER(READ8(*this, pet_state, pia1_pa_r)) + MCFG_PIA_READPB_HANDLER(READ8(*this, pet_state, pia1_pb_r)) + MCFG_PIA_READCA1_HANDLER(READLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, pet_state, pia1_pa_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, pet_state, pia1_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, pet_state, pia1_irqa_w)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, pet_state, pia1_irqb_w)) MCFG_DEVICE_ADD(M6520_2_TAG, PIA6821, 0) - MCFG_PIA_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r)) - MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w)) - MCFG_PIA_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_PIA_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia2_irqa_w)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia2_irqb_w)) + MCFG_PIA_READPA_HANDLER(READ8(IEEE488_TAG, ieee488_device, dio_r)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, dio_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, pet_state, pia2_irqa_w)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, pet_state, pia2_irqb_w)) MCFG_CBM_IEEE488_ADD("c4040") - MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, cb1_w)) - MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, ca1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(M6520_2_TAG, pia6821_device, cb1_w)) + MCFG_IEEE488_ATN_CALLBACK(WRITELINE(M6520_2_TAG, pia6821_device, ca1_w)) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", WRITELINE(M6520_1_TAG, pia6821_device, ca1_w)) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, WRITELINE(M6522_TAG, via6522_device, write_cb1)) MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(8'000'000)/8, pet_expansion_cards, nullptr) - MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) + MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(*this, pet_state, read), WRITE8(*this, pet_state, write)) MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, pet_user_port_cards, nullptr) - MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(pet_state, user_diag_w)) - MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) - MCFG_PET_USER_PORT_C_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa0)) - MCFG_PET_USER_PORT_D_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa1)) - MCFG_PET_USER_PORT_E_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa2)) - MCFG_PET_USER_PORT_F_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa3)) - MCFG_PET_USER_PORT_H_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa4)) - MCFG_PET_USER_PORT_J_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa5)) - MCFG_PET_USER_PORT_K_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa6)) - MCFG_PET_USER_PORT_L_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa7)) - MCFG_PET_USER_PORT_M_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_cb2)) + MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(*this, pet_state, user_diag_w)) + MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_ca1)) + MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa0)) + MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa1)) + MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa2)) + MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa3)) + MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa4)) + MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa5)) + MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa6)) + MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa7)) + MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_cb2)) MCFG_QUICKLOAD_ADD("quickload", pet_state, cbm_pet, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) MCFG_QUICKLOAD_INTERFACE("cbm_quik") @@ -1980,7 +1980,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(pet2001b_state::pet2001b) pet2001n(config); MCFG_DEVICE_MODIFY(M6520_1_TAG) - MCFG_PIA_READPB_HANDLER(READ8(pet2001b_state, pia1_pb_r)) + MCFG_PIA_READPB_HANDLER(READ8(*this, pet2001b_state, pia1_pb_r)) MACHINE_CONFIG_END @@ -2089,11 +2089,11 @@ MACHINE_CONFIG_START(pet2001b_state::pet4032f) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update) MCFG_MC6845_UPDATE_ROW_CB(pet_state, pet40_update_row) - MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(M6520_1_TAG, pia6821_device, cb1_w)) + MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(M6520_1_TAG, pia6821_device, cb1_w)) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) _32k(config); @@ -2165,11 +2165,11 @@ MACHINE_CONFIG_START(pet_state::cbm4032f) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update) MCFG_MC6845_UPDATE_ROW_CB(pet_state, pet40_update_row) - MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(M6520_1_TAG, pia6821_device, cb1_w)) + MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(M6520_1_TAG, pia6821_device, cb1_w)) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) _32k(config); @@ -2235,8 +2235,8 @@ MACHINE_CONFIG_START(pet80_state::pet80) MCFG_MACHINE_RESET_OVERRIDE(pet80_state, pet80) // basic machine hardware - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) - MCFG_CPU_PROGRAM_MAP(pet2001_mem) + MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) + MCFG_DEVICE_PROGRAM_MAP(pet2001_mem) MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks // video hardware @@ -2252,61 +2252,61 @@ MACHINE_CONFIG_START(pet80_state::pet80) MCFG_MC6845_CHAR_WIDTH(2*8) MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update) MCFG_MC6845_UPDATE_ROW_CB(pet80_state, pet80_update_row) - MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(M6520_1_TAG, pia6821_device, cb1_w)) + MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(M6520_1_TAG, pia6821_device, cb1_w)) MCFG_PALETTE_ADD_MONOCHROME("palette") // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // devices MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16) - MCFG_VIA6522_READPB_HANDLER(READ8(pet_state, via_pb_r)) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(pet_state, via_pa_w)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(pet_state, via_pb_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(pet_state, via_ca2_w)) - MCFG_VIA6522_CB2_HANDLER(WRITELINE(pet_state, via_cb2_w)) - MCFG_VIA6522_IRQ_HANDLER(WRITELINE(pet_state, via_irq_w)) + MCFG_VIA6522_READPB_HANDLER(READ8(*this, pet_state, via_pb_r)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, pet_state, via_pa_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, pet_state, via_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, pet_state, via_ca2_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, pet_state, via_cb2_w)) + MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, pet_state, via_irq_w)) MCFG_DEVICE_ADD(M6520_1_TAG, PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(pet_state, pia1_pa_r)) - MCFG_PIA_READPB_HANDLER(READ8(pet_state, pia1_pb_r)) - MCFG_PIA_READCA1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(pet_state, pia1_pa_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(pet_state, pia1_ca2_w)) - MCFG_PIA_CB2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia1_irqa_w)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia1_irqb_w)) + MCFG_PIA_READPA_HANDLER(READ8(*this, pet_state, pia1_pa_r)) + MCFG_PIA_READPB_HANDLER(READ8(*this, pet_state, pia1_pb_r)) + MCFG_PIA_READCA1_HANDLER(READLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, pet_state, pia1_pa_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, pet_state, pia1_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, pet_state, pia1_irqa_w)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, pet_state, pia1_irqb_w)) MCFG_DEVICE_ADD(M6520_2_TAG, PIA6821, 0) - MCFG_PIA_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r)) - MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w)) - MCFG_PIA_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) - MCFG_PIA_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia2_irqa_w)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia2_irqb_w)) + MCFG_PIA_READPA_HANDLER(READ8(IEEE488_TAG, ieee488_device, dio_r)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, dio_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, dav_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, pet_state, pia2_irqa_w)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, pet_state, pia2_irqb_w)) MCFG_CBM_IEEE488_ADD("c8050") - MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, cb1_w)) - MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, ca1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w)) - MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) + MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(M6520_2_TAG, pia6821_device, cb1_w)) + MCFG_IEEE488_ATN_CALLBACK(WRITELINE(M6520_2_TAG, pia6821_device, ca1_w)) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", WRITELINE(M6520_1_TAG, pia6821_device, ca1_w)) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, WRITELINE(M6522_TAG, via6522_device, write_cb1)) MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, nullptr) - MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) + MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(*this, pet_state, read), WRITE8(*this, pet_state, write)) MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, pet_user_port_cards, nullptr) - MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1)) - MCFG_PET_USER_PORT_C_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa0)) - MCFG_PET_USER_PORT_D_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa1)) - MCFG_PET_USER_PORT_E_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa2)) - MCFG_PET_USER_PORT_F_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa3)) - MCFG_PET_USER_PORT_H_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa4)) - MCFG_PET_USER_PORT_J_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa5)) - MCFG_PET_USER_PORT_K_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa6)) - MCFG_PET_USER_PORT_L_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa7)) - MCFG_PET_USER_PORT_M_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_cb2)) + MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_ca1)) + MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa0)) + MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa1)) + MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa2)) + MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa3)) + MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa4)) + MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa5)) + MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa6)) + MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa7)) + MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_cb2)) MCFG_QUICKLOAD_ADD("quickload", pet_state, cbm_pet, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS) MCFG_QUICKLOAD_INTERFACE("cbm_quik") @@ -2344,7 +2344,7 @@ MACHINE_CONFIG_START(superpet_state::superpet) pet8032(config); MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG) MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, "superpet") - MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) + MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(*this, pet_state, read), WRITE8(*this, pet_state, write)) MCFG_SOFTWARE_LIST_ADD("flop_list2", "superpet_flop") MACHINE_CONFIG_END @@ -2358,7 +2358,7 @@ MACHINE_CONFIG_START(cbm8096_state::cbm8096) pet80(config); MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG) MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, "64k") - MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) + MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(*this, pet_state, read), WRITE8(*this, pet_state, write)) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("96K") @@ -2376,8 +2376,8 @@ MACHINE_CONFIG_START(cbm8296_state::cbm8296) MCFG_MACHINE_START_OVERRIDE(cbm8296_state, cbm8296) MCFG_MACHINE_RESET_OVERRIDE(cbm8296_state, cbm8296) - MCFG_CPU_MODIFY(M6502_TAG) - MCFG_CPU_PROGRAM_MAP(cbm8296_mem) + MCFG_DEVICE_MODIFY(M6502_TAG) + MCFG_DEVICE_PROGRAM_MAP(cbm8296_mem) MCFG_PLS100_ADD(PLA1_TAG) MCFG_PLS100_ADD(PLA2_TAG) @@ -2387,7 +2387,7 @@ MACHINE_CONFIG_START(cbm8296_state::cbm8296) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(2*8) MCFG_MC6845_UPDATE_ROW_CB(pet80_state, cbm8296_update_row) - MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(M6520_1_TAG, pia6821_device, cb1_w)) + MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(M6520_1_TAG, pia6821_device, cb1_w)) MCFG_DEVICE_MODIFY("ieee8") MCFG_SLOT_DEFAULT_OPTION("c8250") |