diff options
Diffstat (limited to 'src/mame/drivers/vic20.cpp')
-rw-r--r-- | src/mame/drivers/vic20.cpp | 51 |
1 files changed, 17 insertions, 34 deletions
diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp index 2d5846e80c5..86db0c42385 100644 --- a/src/mame/drivers/vic20.cpp +++ b/src/mame/drivers/vic20.cpp @@ -789,6 +789,23 @@ WRITE_LINE_MEMBER(vic20_state::write_user_cassette_switch) static MACHINE_CONFIG_START( vic20 ) // devices + MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 0) + MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via1_pa_r)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(vic20_state, via1_pa_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via1_pb_w)) + MCFG_VIA6522_CB1_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_b)) + MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w)) + MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_m)) + MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_NMI_LINE)) + + MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, 0) + MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via2_pa_r)) + MCFG_VIA6522_READPB_HANDLER(READ8(vic20_state, via2_pb_r)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via2_pb_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(vic20_state, via2_ca2_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(vic20_state, via2_cb2_w)) + MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_IRQ_LINE)) + MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(M6522_2_TAG, via6522_device, write_ca1)) MCFG_CBM_IEC_ADD("c1541") MCFG_CBM_IEC_BUS_SRQ_CALLBACK(DEVWRITELINE(M6522_2_TAG, via6522_device, write_cb1)) @@ -837,23 +854,6 @@ static MACHINE_CONFIG_DERIVED( ntsc, vic20 ) MCFG_CPU_PROGRAM_MAP(vic20_mem) MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, MOS6560_CLOCK) - MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via1_pa_r)) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(vic20_state, via1_pa_w)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via1_pb_w)) - MCFG_VIA6522_CB1_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_b)) - MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w)) - MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_m)) - MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_NMI_LINE)) - - MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, MOS6560_CLOCK) - MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via2_pa_r)) - MCFG_VIA6522_READPB_HANDLER(READ8(vic20_state, via2_pb_r)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via2_pb_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(vic20_state, via2_ca2_w)) - MCFG_VIA6522_CB2_HANDLER(WRITELINE(vic20_state, via2_cb2_w)) - MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_IRQ_LINE)) - // video/sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_MOS6560_ADD(M6560_TAG, SCREEN_TAG, MOS6560_CLOCK, vic_videoram_map, vic_colorram_map) @@ -884,23 +884,6 @@ static MACHINE_CONFIG_DERIVED( pal, vic20 ) MCFG_CPU_PROGRAM_MAP(vic20_mem) MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks - MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, MOS6561_CLOCK) - MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via1_pa_r)) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(vic20_state, via1_pa_w)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via1_pb_w)) - MCFG_VIA6522_CB1_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_b)) - MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w)) - MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_m)) - MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_NMI_LINE)) - - MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, MOS6561_CLOCK) - MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via2_pa_r)) - MCFG_VIA6522_READPB_HANDLER(READ8(vic20_state, via2_pb_r)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via2_pb_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(vic20_state, via2_ca2_w)) - MCFG_VIA6522_CB2_HANDLER(WRITELINE(vic20_state, via2_cb2_w)) - MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_IRQ_LINE)) - // video/sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_MOS6561_ADD(M6560_TAG, SCREEN_TAG, MOS6561_CLOCK, vic_videoram_map, vic_colorram_map) |