MAME SVN History

199869 Revisions

r31592 Sunday 10th August, 2014 at 14:23:46 UTC by Phil Bennett
05637: gauntdl, gauntdl24: Emulation hangs after initialization [Phil Bennett] This reverts r31185 (oliverst: more passing of attotime as const references). flush_fifos() is the problem here. If anybody knows why, I'd love to know. -nw-

[src/emu/video]

voodoo.c

trunk/src/emu/video/voodoo.c
r31591	r31592
205	205	static void init_tmu(voodoo_state v, tmu_state t, voodoo_reg reg, void memory, int tmem);
206	206	static void soft_reset(voodoo_state *v);
207	207	static void recompute_video_memory(voodoo_state *v);
208		static void check_stalled_cpu(voodoo_state *v, const attotime &current_time);
209		static void flush_fifos(voodoo_state *v, const attotime &current_time);
	208	static void check_stalled_cpu(voodoo_state *v, attotime current_time);
	209	static void flush_fifos(voodoo_state *v, attotime current_time);
210	210	static TIMER_CALLBACK( stall_cpu_callback );
211		static void stall_cpu(voodoo_state *v, int state, ~~const~~ attotime &current_time);
	211	static void stall_cpu(voodoo_state *v, int state, attotime current_time);
212	212	static TIMER_CALLBACK( vblank_callback );
213	213	static INT32 register_w(voodoo_state *v, offs_t offset, UINT32 data);
214	214	static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask, int forcefront);
r31591	r31592
2108	2108	}
2109	2109
2110	2110
2111		static void check_stalled_cpu(voodoo_state *v, ~~const~~ attotime &current_time)
	2111	static void check_stalled_cpu(voodoo_state *v, attotime current_time)
2112	2112	{
2113	2113	int resume = FALSE;
2114	2114
r31591	r31592
2162	2162	}
2163	2163
2164	2164
2165		static void stall_cpu(voodoo_state *v, int state, ~~const~~ attotime &current_time)
	2165	static void stall_cpu(voodoo_state *v, int state, attotime current_time)
2166	2166	{
2167	2167	/* sanity check */
2168	2168	if (!v->pci.op_pending) fatalerror("FIFOs not empty, no op pending!\n");
r31591	r31592
3421	3421	*
3422	3422	*************************************/
3423	3423
3424		static void flush_fifos(voodoo_state *v, ~~const~~ attotime &current_time)
	3424	static void flush_fifos(voodoo_state *v, attotime current_time)
3425	3425	{
3426	3426	static UINT8 in_flush;
3427	3427

199869 Revisions