ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't know how/why these changed in the DMA commit, but reverting to what it should be. 

(seriously, i don't remember changing this!)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5920 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
refraction@gmail.com 2014-03-05 10:11:28 +00:00
parent e6b363ef54
commit fb13a502d2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/SPR.cpp
View File

@ -120,7 +120,7 @@ int _SPR0chain()
__fi void SPR0chain() __fi void SPR0chain()
{ {
int cycles = 0; int cycles = 0;
cycles = _SPR0chain() / BIAS; cycles = _SPR0chain() * BIAS;
CPU_INT(DMAC_FROM_SPR, cycles); CPU_INT(DMAC_FROM_SPR, cycles);
} }
@ -136,7 +136,7 @@ void _SPR0interleave()
SPR_LOG("SPR0 interleave size=%d, tqwc=%d, sqwc=%d, addr=%lx sadr=%lx", SPR_LOG("SPR0 interleave size=%d, tqwc=%d, sqwc=%d, addr=%lx sadr=%lx",
spr0ch.qwc, tqwc, sqwc, spr0ch.madr, spr0ch.sadr); spr0ch.qwc, tqwc, sqwc, spr0ch.madr, spr0ch.sadr);
CPU_INT(DMAC_FROM_SPR, qwc / BIAS); CPU_INT(DMAC_FROM_SPR, qwc * BIAS);
while (qwc > 0) while (qwc > 0)
{ {
@ -360,7 +360,7 @@ __fi void SPR1chain()
int cycles = 0; int cycles = 0;
if(!CHECK_IPUWAITHACK) if(!CHECK_IPUWAITHACK)
{ {
cycles = _SPR1chain() / BIAS; cycles = _SPR1chain() * BIAS;
CPU_INT(DMAC_TO_SPR, cycles); CPU_INT(DMAC_TO_SPR, cycles);
} }
else else
@ -380,7 +380,7 @@ void _SPR1interleave()
if (tqwc == 0) tqwc = qwc; if (tqwc == 0) tqwc = qwc;
SPR_LOG("SPR1 interleave size=%d, tqwc=%d, sqwc=%d, addr=%lx sadr=%lx", SPR_LOG("SPR1 interleave size=%d, tqwc=%d, sqwc=%d, addr=%lx sadr=%lx",
spr1ch.qwc, tqwc, sqwc, spr1ch.madr, spr1ch.sadr); spr1ch.qwc, tqwc, sqwc, spr1ch.madr, spr1ch.sadr);
CPU_INT(DMAC_TO_SPR, qwc / BIAS); CPU_INT(DMAC_TO_SPR, qwc * BIAS);
while (qwc > 0) while (qwc > 0)
{ {
spr1ch.qwc = std::min(tqwc, qwc); spr1ch.qwc = std::min(tqwc, qwc);