Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 09:00:04 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

removed ca1/ca2/cb1 callbacks as they were never called anyway [smf]

Browse Source
This commit is contained in:
smf- 2014-01-01 15:59:32 +00:00
parent d83aa23ca0
commit cf7b3b7582
11 changed files with 0 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emu/bus/cbmiec/c1541.c
View File

@ -588,11 +588,6 @@ WRITE8_MEMBER( base_c1541_device::via0_pb_w )
m_bus->clk_w(this, !BIT(data, 3));
}
READ_LINE_MEMBER( base_c1541_device::atn_in_r )
{
return !m_bus->atn_r();
}
WRITE_LINE_MEMBER( base_c1541_device::via0_ca2_w )
{
if (m_other != NULL)
@ -814,7 +809,6 @@ static MACHINE_CONFIG_FRAGMENT( c1541 )
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(base_c1541_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(base_c1541_device, via0_pb_r))
MCFG_VIA6522_READCA1_HANDLER(READLINE(base_c1541_device, atn_in_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(base_c1541_device, via0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(base_c1541_device, via0_pb_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(base_c1541_device, via0_ca2_w))
@ -823,7 +817,6 @@ static MACHINE_CONFIG_FRAGMENT( c1541 )
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(base_c1541_device, via1_pb_r))
MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_r))
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(base_c1541_device, via1_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))

1
src/emu/bus/cbmiec/c1541.h
View File

@ -56,7 +56,6 @@ public:
DECLARE_READ8_MEMBER( via0_pb_r );
DECLARE_WRITE8_MEMBER( via0_pb_w );
DECLARE_WRITE_LINE_MEMBER( via0_ca2_w );
DECLARE_READ_LINE_MEMBER( atn_in_r );
DECLARE_WRITE_LINE_MEMBER( via1_irq_w );
DECLARE_READ8_MEMBER( via1_pb_r );
DECLARE_WRITE8_MEMBER( via1_pb_w );

22
src/emu/bus/cbmiec/c1571.c
View File

@ -383,16 +383,6 @@ WRITE8_MEMBER( c1571cr_device::via0_pb_w )
update_iec();
}
READ_LINE_MEMBER( c1571_device::atn_in_r )
{
return !m_bus->atn_r();
}
READ_LINE_MEMBER( c1571_device::wprt_r )
{
return !floppy_wpt_r(m_image);
}
READ8_MEMBER( c1571_device::via1_r )
{
@ -693,8 +683,6 @@ static MACHINE_CONFIG_FRAGMENT( c1570 )
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_READCA1_HANDLER(READLINE(c1571_device, atn_in_r))
MCFG_VIA6522_READCA2_HANDLER(READLINE(c1571_device, wprt_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))
@ -702,7 +690,6 @@ static MACHINE_CONFIG_FRAGMENT( c1570 )
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_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))
@ -743,8 +730,6 @@ static MACHINE_CONFIG_FRAGMENT( c1571 )
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_READCA1_HANDLER(READLINE(c1571_device, atn_in_r))
MCFG_VIA6522_READCA2_HANDLER(READLINE(c1571_device, wprt_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))
@ -752,7 +737,6 @@ static MACHINE_CONFIG_FRAGMENT( c1571 )
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_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))
@ -793,8 +777,6 @@ static MACHINE_CONFIG_FRAGMENT( c1571cr )
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_READCA1_HANDLER(READLINE(c1571_device, atn_in_r))
MCFG_VIA6522_READCA2_HANDLER(READLINE(c1571_device, wprt_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))
@ -802,7 +784,6 @@ static MACHINE_CONFIG_FRAGMENT( c1571cr )
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_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))
@ -842,8 +823,6 @@ static MACHINE_CONFIG_FRAGMENT( mini_chief )
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
MCFG_VIA6522_READCA1_HANDLER(READLINE(c1571_device, atn_in_r))
MCFG_VIA6522_READCA2_HANDLER(READLINE(c1571_device, wprt_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))
@ -851,7 +830,6 @@ static MACHINE_CONFIG_FRAGMENT( mini_chief )
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_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))

2
src/emu/bus/cbmiec/c1571.h
View File

@ -63,8 +63,6 @@ public:
DECLARE_WRITE8_MEMBER( via0_pa_w );
DECLARE_READ8_MEMBER( via0_pb_r );
DECLARE_WRITE8_MEMBER( via0_pb_w );
DECLARE_READ_LINE_MEMBER( atn_in_r );
DECLARE_READ_LINE_MEMBER( wprt_r );
DECLARE_READ8_MEMBER( via1_r );
DECLARE_WRITE8_MEMBER( via1_w );

13
src/emu/bus/ieee488/c2031.c
View File

@ -202,16 +202,6 @@ WRITE8_MEMBER( c2031_device::via0_pb_w )
m_via0->write_ca2(get_device_number());
}
READ_LINE_MEMBER( c2031_device::via0_ca1_r )
{
return !m_bus->atn_r();
}
READ_LINE_MEMBER( c2031_device::via0_ca2_r )
{
return get_device_number();
}
WRITE_LINE_MEMBER( c2031_device::via1_irq_w )
{
@ -338,8 +328,6 @@ static MACHINE_CONFIG_FRAGMENT( c2031 )
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(READ8(c2031_device, via0_pa_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via0_pb_r))
MCFG_VIA6522_READCA1_HANDLER(READLINE(c2031_device, via0_ca1_r))
MCFG_VIA6522_READCA2_HANDLER(READLINE(c2031_device, via0_ca2_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))
@ -347,7 +335,6 @@ static MACHINE_CONFIG_FRAGMENT( c2031 )
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via1_pb_r))
MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_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))

2
src/emu/bus/ieee488/c2031.h
View File

@ -41,8 +41,6 @@ public:
DECLARE_WRITE8_MEMBER( via0_pa_w );
DECLARE_READ8_MEMBER( via0_pb_r );
DECLARE_WRITE8_MEMBER( via0_pb_w );
DECLARE_READ_LINE_MEMBER( via0_ca1_r );
DECLARE_READ_LINE_MEMBER( via0_ca2_r );
DECLARE_WRITE_LINE_MEMBER( via1_irq_w );
DECLARE_READ8_MEMBER( via1_pb_r );
DECLARE_WRITE8_MEMBER( via1_pb_w );

1
src/emu/bus/ieee488/d9060.c
View File

@ -441,7 +441,6 @@ static MACHINE_CONFIG_FRAGMENT( d9060 )
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_4MHz/4)
MCFG_VIA6522_READPA_HANDLER(DEVREAD8(SASIBUS_TAG ":host", scsicb_device, scsi_data_r))
MCFG_VIA6522_READPB_HANDLER(READ8(base_d9060_device, via_pb_r))
MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(SASIBUS_TAG ":host", scsicb_device, scsi_req_r))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(base_d9060_device, scsi_data_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(base_d9060_device, via_pb_w))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(base_d9060_device, ack_w))

6
src/emu/machine/6522via.c
View File

@ -150,9 +150,6 @@ via6522_device::via6522_device(const machine_config &mconfig, const char *tag, d
: device_t(mconfig, VIA6522, "6522 VIA", tag, owner, clock, "via6522", __FILE__),
m_in_a_handler(*this),
m_in_b_handler(*this),
m_in_ca1_handler(*this),
m_in_cb1_handler(*this),
m_in_ca2_handler(*this),
m_in_cb2_handler(*this),
m_out_a_handler(*this),
m_out_b_handler(*this),
@ -174,9 +171,6 @@ void via6522_device::device_start()
{
m_in_a_handler.resolve();
m_in_b_handler.resolve();
m_in_ca1_handler.resolve();
m_in_cb1_handler.resolve();
m_in_ca2_handler.resolve();
m_in_cb2_handler.resolve();
m_out_a_handler.resolve_safe();
m_out_b_handler.resolve_safe();

18
src/emu/machine/6522via.h
View File

@ -31,18 +31,6 @@
#define MCFG_VIA6522_READPB_HANDLER(_devcb) \
devcb = &via6522_device::set_readpb_handler(*device, DEVCB2_##_devcb);
// NOT USED
#define MCFG_VIA6522_READCA1_HANDLER(_devcb) \
devcb = &via6522_device::set_readca1_handler(*device, DEVCB2_##_devcb);
// NOT USED
#define MCFG_VIA6522_READCB1_HANDLER(_devcb) \
devcb = &via6522_device::set_readcb1_handler(*device, DEVCB2_##_devcb);
// NOT USED
#define MCFG_VIA6522_READCA2_HANDLER(_devcb) \
devcb = &via6522_device::set_readca2_handler(*device, DEVCB2_##_devcb);
#define MCFG_VIA6522_READCB2_HANDLER(_devcb) \
devcb = &via6522_device::set_readcb2_handler(*device, DEVCB2_##_devcb);
@ -86,9 +74,6 @@ public:
// TODO: REMOVE THESE
template<class _Object> static devcb2_base &set_readpa_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_a_handler.set_callback(object); }
template<class _Object> static devcb2_base &set_readpb_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_b_handler.set_callback(object); }
template<class _Object> static devcb2_base &set_readca1_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_ca1_handler.set_callback(object); }
template<class _Object> static devcb2_base &set_readcb1_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_cb1_handler.set_callback(object); }
template<class _Object> static devcb2_base &set_readca2_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_ca2_handler.set_callback(object); }
template<class _Object> static devcb2_base &set_readcb2_handler(device_t &device, _Object object) { return downcast<via6522_device &>(device).m_in_cb2_handler.set_callback(object); }
// TODO: CONVERT THESE TO WRITE LINE
@ -170,9 +155,6 @@ private:
// TODO: REMOVE THESE
devcb2_read8 m_in_a_handler;
devcb2_read8 m_in_b_handler;
devcb2_read_line m_in_ca1_handler;
devcb2_read_line m_in_cb1_handler;
devcb2_read_line m_in_ca2_handler;
devcb2_read_line m_in_cb2_handler;
// TODO: CONVERT THESE TO WRITE LINE

7
src/mess/drivers/ec65.c
View File

@ -33,7 +33,6 @@ public:
m_maincpu(*this, "maincpu") { }
DECLARE_READ8_MEMBER(ec65_via_read_a);
DECLARE_READ_LINE_MEMBER(ec65_read_ca1);
DECLARE_READ8_MEMBER(ec65_via_read_b);
DECLARE_WRITE8_MEMBER(ec65_via_write_a);
DECLARE_WRITE8_MEMBER(ec65_via_write_b);
@ -100,11 +99,6 @@ READ8_MEMBER( ec65_state::ec65_via_read_a)
return m_keyboard_input;
}
READ_LINE_MEMBER( ec65_state::ec65_read_ca1 )
{
return 0;
}
READ8_MEMBER( ec65_state::ec65_via_read_b)
{
return 0xff;
@ -238,7 +232,6 @@ static MACHINE_CONFIG_START( ec65, ec65_state )
MCFG_DEVICE_ADD(VIA6522_0_TAG, VIA6522, XTAL_4MHz / 4)
MCFG_VIA6522_READPA_HANDLER(READ8(ec65_state, ec65_via_read_a))
MCFG_VIA6522_READCA1_HANDLER(READLINE(ec65_state, ec65_read_ca1))
MCFG_DEVICE_ADD(VIA6522_1_TAG, VIA6522, XTAL_4MHz / 4)
MCFG_VIA6522_READPB_HANDLER(READ8(ec65_state, ec65_via_read_b))

2
src/mess/drivers/vic20.c
View File

@ -623,7 +623,6 @@ static MACHINE_CONFIG_START( vic20, vic20_state )
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 0)
MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via1_pa_r))
MCFG_VIA6522_READPB_HANDLER(DEVREAD8(VIC20_USER_PORT_TAG, vic20_user_port_device, pb_r))
MCFG_VIA6522_READCA1_HANDLER(IOPORT("RESTORE"))
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(vic20_state, via1_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8(VIC20_USER_PORT_TAG, vic20_user_port_device, pb_w))
MCFG_VIA6522_CB1_HANDLER(DEVWRITELINE(VIC20_USER_PORT_TAG, vic20_user_port_device, cb1_w))
@ -634,7 +633,6 @@ static MACHINE_CONFIG_START( vic20, vic20_state )
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_READCA1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read))
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))