Previous

199869 Revisions

Next

r29195 Wednesday 2nd April, 2014 at 18:04:40 UTC by Oliver Stöneberg
removed assert from src/emu/cpu/sh4/sh4dmac.c and always set proper channel in sh4_ddt_dma (nw)

[src/emu/cpu/sh4]	sh4dmac.c
[src/mame/machine]	dc.c maple-dc.c
[src/mess/machine]	dccons.c

trunk/src/mame/machine/dc.c

r29194	r29195
86	86	ddt.length = length;
87	87	ddt.size =size;
88	88	ddt.direction = to_mainram;
89		ddt.channel = -1;
	89	ddt.channel = 0;
90	90	ddt.mode = -1;
91	91	sh4_dma_ddt(m_maincpu, &ddt);
92	92	}

trunk/src/mame/machine/maple-dc.c

r29194	r29195
118	118	ddtdata.size      = 4;       // bytes per word
119	119	ddtdata.buffer    = header;  // destination buffer
120	120	ddtdata.direction = 0;       // 0 source to buffer, 1 buffer to source
121		ddtdata.channel   = -1;      // not used
	121	ddtdata.channel   = 0;
122	122	ddtdata.mode      = -1;      // copy from/to buffer
123	123	sh4_dma_ddt(cpu, &ddtdata);
124	124	dma_adr += 8;
r29194	r29195
134	134	ddtdata.size      = 4;       // bytes per word
135	135	ddtdata.buffer    = data;    // destination buffer
136	136	ddtdata.direction = 0;       // 0 source to buffer, 1 buffer to source
137		ddtdata.channel   = -1;      // not used
	137	ddtdata.channel   = 0;
138	138	ddtdata.mode      = -1;      // copy from/to buffer
139	139	sh4_dma_ddt(cpu, &ddtdata);
140	140	dma_adr += length*4;
r29194	r29195
189	189	ddtdata.size        = 4;        // bytes per word
190	190	ddtdata.buffer      = &data;    // destination buffer
191	191	ddtdata.direction   = 1;        // 0 source to buffer, 1 buffer to source
192		ddtdata.channel     = -1;       // not used
	192	ddtdata.channel     = 0;
193	193	ddtdata.mode        = -1;       // copy from/to buffer
194	194	sh4_dma_ddt(cpu, &ddtdata);
195	195	dma_state = dma_endflag ? DMA_DONE : DMA_SEND;
r29194	r29195
214	214	ddtdata.size        = 4;        // bytes per word
215	215	ddtdata.buffer      = data;     // destination buffer
216	216	ddtdata.direction   = 1;        // 0 source to buffer, 1 buffer to source
217		ddtdata.channel     = -1;       // not used
	217	ddtdata.channel     = 0;
218	218	ddtdata.mode        = -1;       // copy from/to buffer
219	219	sh4_dma_ddt(cpu, &ddtdata);
220	220	dma_dest += length*4;

trunk/src/emu/cpu/sh4/sh4dmac.c

r29194	r29195
436	436	if (sh4->cpu_type != CPU_TYPE_SH4)
437	437	fatalerror("sh4_dma_ddt uses sh4->m[] with SH3\n");
438	438
439		assert(s->channel >= 0 && s->channel < ARRAY_LENGTH(sh4->dma_timer_active));
440	439	if (sh4->dma_timer_active[s->channel])
441	440	return;
442	441	if (s->mode >= 0) {

trunk/src/mess/machine/dccons.c

r29194	r29195
68	68	ddtdata.size = 4;
69	69	ddtdata.buffer = sector_buffer;
70	70	ddtdata.direction=1;    // 0 source to buffer, 1 buffer to destination
71		ddtdata.channel= -1;    // not used
	71	ddtdata.channel= 0;
72	72	ddtdata.mode= -1;       // copy from/to buffer
73	73	printf("ATAPI: DMA one sector to %x, %x remaining\n", atapi_xferbase, atapi_xferlen);
74	74	sh4_dma_ddt(m_maincpu, &ddtdata);

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team