Previous 199869 Revisions Next

r26866 Wednesday 1st January, 2014 at 15:59:32 UTC by smf
removed ca1/ca2/cb1 callbacks as they were never called anyway [smf]
[src/emu/bus/cbmiec]c1541.c c1541.h c1571.c c1571.h
[src/emu/bus/ieee488]c2031.c c2031.h d9060.c
[src/emu/machine]6522via.c 6522via.h
[src/mess/drivers]ec65.c vic20.c

trunk/src/emu/machine/6522via.c
r26865r26866
150150   : device_t(mconfig, VIA6522, "6522 VIA", tag, owner, clock, "via6522", __FILE__),
151151      m_in_a_handler(*this),
152152      m_in_b_handler(*this),
153      m_in_ca1_handler(*this),
154      m_in_cb1_handler(*this),
155      m_in_ca2_handler(*this),
156153      m_in_cb2_handler(*this),
157154      m_out_a_handler(*this),
158155      m_out_b_handler(*this),
r26865r26866
174171{
175172   m_in_a_handler.resolve();
176173   m_in_b_handler.resolve();
177   m_in_ca1_handler.resolve();
178   m_in_cb1_handler.resolve();
179   m_in_ca2_handler.resolve();
180174   m_in_cb2_handler.resolve();
181175   m_out_a_handler.resolve_safe();
182176   m_out_b_handler.resolve_safe();
trunk/src/emu/machine/6522via.h
r26865r26866
3131#define MCFG_VIA6522_READPB_HANDLER(_devcb) \
3232   devcb = &via6522_device::set_readpb_handler(*device, DEVCB2_##_devcb);
3333
34// NOT USED
35#define MCFG_VIA6522_READCA1_HANDLER(_devcb) \
36   devcb = &via6522_device::set_readca1_handler(*device, DEVCB2_##_devcb);
37
38// NOT USED
39#define MCFG_VIA6522_READCB1_HANDLER(_devcb) \
40   devcb = &via6522_device::set_readcb1_handler(*device, DEVCB2_##_devcb);
41
42// NOT USED
43#define MCFG_VIA6522_READCA2_HANDLER(_devcb) \
44   devcb = &via6522_device::set_readca2_handler(*device, DEVCB2_##_devcb);
45
4634#define MCFG_VIA6522_READCB2_HANDLER(_devcb) \
4735   devcb = &via6522_device::set_readcb2_handler(*device, DEVCB2_##_devcb);
4836
r26865r26866
8674   // TODO: REMOVE THESE
8775   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); }
8876   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); }
89   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); }
90   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); }
91   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); }
9277   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); }
9378
9479   // TODO: CONVERT THESE TO WRITE LINE
r26865r26866
170155   // TODO: REMOVE THESE
171156   devcb2_read8 m_in_a_handler;
172157   devcb2_read8 m_in_b_handler;
173   devcb2_read_line m_in_ca1_handler;
174   devcb2_read_line m_in_cb1_handler;
175   devcb2_read_line m_in_ca2_handler;
176158   devcb2_read_line m_in_cb2_handler;
177159
178160   // TODO: CONVERT THESE TO WRITE LINE
trunk/src/emu/bus/cbmiec/c1571.h
r26865r26866
6363   DECLARE_WRITE8_MEMBER( via0_pa_w );
6464   DECLARE_READ8_MEMBER( via0_pb_r );
6565   DECLARE_WRITE8_MEMBER( via0_pb_w );
66   DECLARE_READ_LINE_MEMBER( atn_in_r );
67   DECLARE_READ_LINE_MEMBER( wprt_r );
6866
6967   DECLARE_READ8_MEMBER( via1_r );
7068   DECLARE_WRITE8_MEMBER( via1_w );
trunk/src/emu/bus/cbmiec/c1541.c
r26865r26866
588588   m_bus->clk_w(this, !BIT(data, 3));
589589}
590590
591READ_LINE_MEMBER( base_c1541_device::atn_in_r )
592{
593   return !m_bus->atn_r();
594}
595
596591WRITE_LINE_MEMBER( base_c1541_device::via0_ca2_w )
597592{
598593   if (m_other != NULL)
r26865r26866
814809   MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
815810   MCFG_VIA6522_READPA_HANDLER(READ8(base_c1541_device, via0_pa_r))
816811   MCFG_VIA6522_READPB_HANDLER(READ8(base_c1541_device, via0_pb_r))
817   MCFG_VIA6522_READCA1_HANDLER(READLINE(base_c1541_device, atn_in_r))
818812   MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(base_c1541_device, via0_pa_w))
819813   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(base_c1541_device, via0_pb_w))
820814   MCFG_VIA6522_CB2_HANDLER(WRITELINE(base_c1541_device, via0_ca2_w))
r26865r26866
823817   MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
824818   MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
825819   MCFG_VIA6522_READPB_HANDLER(READ8(base_c1541_device, via1_pb_r))
826   MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_r))
827820   MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
828821   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(base_c1541_device, via1_pb_w))
829822   MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
trunk/src/emu/bus/cbmiec/c1571.c
r26865r26866
383383   update_iec();
384384}
385385
386READ_LINE_MEMBER( c1571_device::atn_in_r )
387{
388   return !m_bus->atn_r();
389}
390386
391READ_LINE_MEMBER( c1571_device::wprt_r )
392{
393   return !floppy_wpt_r(m_image);
394}
395
396
397387READ8_MEMBER( c1571_device::via1_r )
398388{
399389   UINT8 data = m_via1->read(space, offset);
r26865r26866
693683   MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
694684   MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
695685   MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
696   MCFG_VIA6522_READCA1_HANDLER(READLINE(c1571_device, atn_in_r))
697   MCFG_VIA6522_READCA2_HANDLER(READLINE(c1571_device, wprt_r))
698686   MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
699687   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
700688   MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
r26865r26866
702690   MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
703691   MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
704692   MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
705   MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_r))
706693   MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
707694   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
708695   MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
r26865r26866
743730   MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
744731   MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
745732   MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
746   MCFG_VIA6522_READCA1_HANDLER(READLINE(c1571_device, atn_in_r))
747   MCFG_VIA6522_READCA2_HANDLER(READLINE(c1571_device, wprt_r))
748733   MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
749734   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
750735   MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
r26865r26866
752737   MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
753738   MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
754739   MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
755   MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_r))
756740   MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
757741   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
758742   MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
r26865r26866
793777   MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
794778   MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
795779   MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
796   MCFG_VIA6522_READCA1_HANDLER(READLINE(c1571_device, atn_in_r))
797   MCFG_VIA6522_READCA2_HANDLER(READLINE(c1571_device, wprt_r))
798780   MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571cr_device, via0_pa_w))
799781   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571cr_device, via0_pb_w))
800782   MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
r26865r26866
802784   MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
803785   MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
804786   MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
805   MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_r))
806787   MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
807788   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
808789   MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
r26865r26866
842823   MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
843824   MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
844825   MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
845   MCFG_VIA6522_READCA1_HANDLER(READLINE(c1571_device, atn_in_r))
846   MCFG_VIA6522_READCA2_HANDLER(READLINE(c1571_device, wprt_r))
847826   MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
848827   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
849828   MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
r26865r26866
851830   MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
852831   MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
853832   MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
854   MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_r))
855833   MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
856834   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
857835   MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
trunk/src/emu/bus/cbmiec/c1541.h
r26865r26866
5656   DECLARE_READ8_MEMBER( via0_pb_r );
5757   DECLARE_WRITE8_MEMBER( via0_pb_w );
5858   DECLARE_WRITE_LINE_MEMBER( via0_ca2_w );
59   DECLARE_READ_LINE_MEMBER( atn_in_r );
6059   DECLARE_WRITE_LINE_MEMBER( via1_irq_w );
6160   DECLARE_READ8_MEMBER( via1_pb_r );
6261   DECLARE_WRITE8_MEMBER( via1_pb_w );
trunk/src/emu/bus/ieee488/c2031.c
r26865r26866
202202   m_via0->write_ca2(get_device_number());
203203}
204204
205READ_LINE_MEMBER( c2031_device::via0_ca1_r )
206{
207   return !m_bus->atn_r();
208}
209205
210READ_LINE_MEMBER( c2031_device::via0_ca2_r )
211{
212   return get_device_number();
213}
214
215
216206WRITE_LINE_MEMBER( c2031_device::via1_irq_w )
217207{
218208   m_via1_irq = state;
r26865r26866
338328   MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL_16MHz/16)
339329   MCFG_VIA6522_READPA_HANDLER(READ8(c2031_device, via0_pa_r))
340330   MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via0_pb_r))
341   MCFG_VIA6522_READCA1_HANDLER(READLINE(c2031_device, via0_ca1_r))
342   MCFG_VIA6522_READCA2_HANDLER(READLINE(c2031_device, via0_ca2_r))
343331   MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c2031_device, via0_pa_w))
344332   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2031_device, via0_pb_w))
345333   MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c2031_device, via0_irq_w))
r26865r26866
347335   MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL_16MHz/16)
348336   MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
349337   MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via1_pb_r))
350   MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(C64H156_TAG, c64h156_device, byte_r))
351338   MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
352339   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2031_device, via1_pb_w))
353340   MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
trunk/src/emu/bus/ieee488/c2031.h
r26865r26866
4141   DECLARE_WRITE8_MEMBER( via0_pa_w );
4242   DECLARE_READ8_MEMBER( via0_pb_r );
4343   DECLARE_WRITE8_MEMBER( via0_pb_w );
44   DECLARE_READ_LINE_MEMBER( via0_ca1_r );
45   DECLARE_READ_LINE_MEMBER( via0_ca2_r );
4644   DECLARE_WRITE_LINE_MEMBER( via1_irq_w );
4745   DECLARE_READ8_MEMBER( via1_pb_r );
4846   DECLARE_WRITE8_MEMBER( via1_pb_w );
trunk/src/emu/bus/ieee488/d9060.c
r26865r26866
441441   MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_4MHz/4)
442442   MCFG_VIA6522_READPA_HANDLER(DEVREAD8(SASIBUS_TAG ":host", scsicb_device, scsi_data_r))
443443   MCFG_VIA6522_READPB_HANDLER(READ8(base_d9060_device, via_pb_r))
444   MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(SASIBUS_TAG ":host", scsicb_device, scsi_req_r))
445444   MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(base_d9060_device, scsi_data_w))
446445   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(base_d9060_device, via_pb_w))
447446   MCFG_VIA6522_CA2_HANDLER(WRITELINE(base_d9060_device, ack_w))
trunk/src/mess/drivers/ec65.c
r26865r26866
3333      m_maincpu(*this, "maincpu") { }
3434
3535   DECLARE_READ8_MEMBER(ec65_via_read_a);
36   DECLARE_READ_LINE_MEMBER(ec65_read_ca1);
3736   DECLARE_READ8_MEMBER(ec65_via_read_b);
3837   DECLARE_WRITE8_MEMBER(ec65_via_write_a);
3938   DECLARE_WRITE8_MEMBER(ec65_via_write_b);
r26865r26866
10099   return m_keyboard_input;
101100}
102101
103READ_LINE_MEMBER( ec65_state::ec65_read_ca1 )
104{
105   return 0;
106}
107
108102READ8_MEMBER( ec65_state::ec65_via_read_b)
109103{
110104   return 0xff;
r26865r26866
238232
239233   MCFG_DEVICE_ADD(VIA6522_0_TAG, VIA6522, XTAL_4MHz / 4)
240234   MCFG_VIA6522_READPA_HANDLER(READ8(ec65_state, ec65_via_read_a))
241   MCFG_VIA6522_READCA1_HANDLER(READLINE(ec65_state, ec65_read_ca1))
242235
243236   MCFG_DEVICE_ADD(VIA6522_1_TAG, VIA6522, XTAL_4MHz / 4)
244237   MCFG_VIA6522_READPB_HANDLER(READ8(ec65_state, ec65_via_read_b))
trunk/src/mess/drivers/vic20.c
r26865r26866
623623   MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 0)
624624   MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via1_pa_r))
625625   MCFG_VIA6522_READPB_HANDLER(DEVREAD8(VIC20_USER_PORT_TAG, vic20_user_port_device, pb_r))
626   MCFG_VIA6522_READCA1_HANDLER(IOPORT("RESTORE"))
627626   MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(vic20_state, via1_pa_w))
628627   MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8(VIC20_USER_PORT_TAG, vic20_user_port_device, pb_w))
629628   MCFG_VIA6522_CB1_HANDLER(DEVWRITELINE(VIC20_USER_PORT_TAG, vic20_user_port_device, cb1_w))
r26865r26866
634633   MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, 0)
635634   MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via2_pa_r))
636635   MCFG_VIA6522_READPB_HANDLER(READ8(vic20_state, via2_pb_r))
637   MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read))
638636   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via2_pb_w))
639637   MCFG_VIA6522_CA2_HANDLER(WRITELINE(vic20_state, via2_ca2_w))
640638   MCFG_VIA6522_CB2_HANDLER(WRITELINE(vic20_state, via2_cb2_w))

Previous 199869 Revisions Next

© 1997-2024 The MAME Team