MAME SVN History

199869 Revisions

r26852 Wednesday 1st January, 2014 at 11:32:52 UTC by smf
removed read_ca/read_cb as they just returned what you'd written to the chip already. [smf]

[src/emu/machine]	6522via.h
[src/mame/drivers]	beezer.c
[src/mess/includes]	mac.h
[src/mess/machine]	mac.c

trunk/src/emu/machine/6522via.h
r26851	r26852
79	79
80	80	class via6522_device : public device_t
81	81	{
82		friend class dart_channel;
83
84	82	public:
85	83	// construction/destruction
86	84	via6522_device(const machine_config &mconfig, const char tag, device_t owner, UINT32 clock);
r26851	r26852
106	104	DECLARE_READ8_MEMBER( read );
107	105	DECLARE_WRITE8_MEMBER( write );
108	106
109		// TODO: REMOVE THESE
110		DECLARE_READ_LINE_MEMBER( read_ca1 ) { return m_in_ca1; }
111		DECLARE_READ_LINE_MEMBER( read_ca2 ) { return m_in_ca2; }
112		DECLARE_READ_LINE_MEMBER( read_cb1 ) { return m_in_cb1; }
113		DECLARE_READ_LINE_MEMBER( read_cb2 ) { return m_in_cb2; }
114
115	107	DECLARE_WRITE_LINE_MEMBER( write_pa0 ) { write_pa(0, state); }
116	108	DECLARE_WRITE_LINE_MEMBER( write_pa1 ) { write_pa(1, state); }
117	109	DECLARE_WRITE_LINE_MEMBER( write_pa2 ) { write_pa(2, state); }

trunk/src/mess/machine/mac.c
r26851	r26852
1844	1844	}
1845	1845	else if (MAC_HAS_VIA2) // prime CB1 for ASC and slot interrupts
1846	1846	{
	1847	m_via2_ca1_hack = 1;
1847	1848	m_via2->write_ca1(1);
1848	1849	m_via2->write_cb1(1);
1849	1850	}
r26851	r26852
2115	2116	if ((m_nubus_irq_state & mask) != mask)
2116	2117	{
2117	2118	// HACK: sometimes we miss an ack (possible misbehavior in the VIA?)
2118		if (m_via2~~->read~~_ca1() == 0)
	2119	if (m_via2_ca1_hack == 0)
2119	2120	{
2120	2121	m_via2->write_ca1(1);
2121	2122	}
	2123	m_via2_ca1_hack = 0;
2122	2124	m_via2->write_ca1(0);
2123	2125	}
2124	2126	else
2125	2127	{
	2128	m_via2_ca1_hack = 1;
2126	2129	m_via2->write_ca1(1);
2127	2130	}
2128	2131	}

trunk/src/mess/includes/mac.h
r26851	r26852
216	216	m_key6(*this, "KEY6"),
217	217	m_montype(*this, "MONTYPE"),
218	218	m_vram(*this,"vram"),
219		m_vram16(*this,"vram16")
220		{ }
	219	m_vram16(*this,"vram16"),
	220	m_via2_ca1_hack(0)
	221	{
	222	}
221	223
222	224	required_device<cpu_device> m_maincpu;
223	225	required_device<via6522_device> m_via1;
r26851	r26852
443	445	// HMC for x100 PowerMacs
444	446	UINT64 m_hmc_reg, m_hmc_shiftout;
445	447
	448	int m_via2_ca1_hack;
	449
446	450	public:
447	451	emu_timer *m_scanline_timer;
448	452	emu_timer *m_adb_timer;

trunk/src/mame/drivers/beezer.c
r26851	r26852
114	114	MCFG_DEVICE_ADD("via6522_0", VIA6522, 0)
115	115	MCFG_VIA6522_READPA_HANDLER(READ8(beezer_state, b_via_0_pa_r))
116	116	MCFG_VIA6522_READPB_HANDLER(READ8(beezer_state, b_via_0_pb_r))
117		MCFG_VIA6522_READCB1_HANDLER(DEVREADLINE("via6522_1", via6522_device, read_ca2))
118	117	MCFG_VIA6522_READCA2_HANDLER(READLINE(beezer_state, b_via_0_ca2_r))
119		MCFG_VIA6522_READCB2_HANDLER(DEVREADLINE("via6522_1", via6522_device, read_ca1))
120	118	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(beezer_state, b_via_0_pa_w))
121	119	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(beezer_state, b_via_0_pb_w))
122	120	MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_ca1))
r26851	r26852
125	123	MCFG_DEVICE_ADD("via6522_1", VIA6522, 0)
126	124	MCFG_VIA6522_READPA_HANDLER(READ8(beezer_state, b_via_1_pa_r))
127	125	MCFG_VIA6522_READPB_HANDLER(READ8(beezer_state, b_via_1_pb_r))
128		MCFG_VIA6522_READCA1_HANDLER(DEVREADLINE("via6522_0", via6522_device, read_cb2))
129		MCFG_VIA6522_READCA2_HANDLER(DEVREADLINE("via6522_0", via6522_device, read_cb1))
130	126	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(beezer_state, b_via_1_pa_w))
131	127	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(beezer_state, b_via_1_pb_w))
132	128	MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
133		MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
	129	MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6809_device, irq_line))
134	130	MACHINE_CONFIG_END
135	131
136	132	/***************************************************************************

199869 Revisions