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

This is part of r4035, you just "Thought" you saw a new revision.. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4036 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
refraction 2010-11-19 16:32:48 +00:00
parent 96ef86f560
commit 80663917b1
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Gif.cpp
View File

@ -535,7 +535,7 @@ static __fi bool mfifoGIFchain()
gifch.madr <= (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16)) gifch.madr <= (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16))
{ {
bool ret = true; bool ret = true;
if(gifch.madr == (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16)) DevCon.Warning("Edge GIF"); // if(gifch.madr == (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16)) DevCon.Warning("Edge GIF");
if (!mfifoGIFrbTransfer()) ret = false; if (!mfifoGIFrbTransfer()) ret = false;
if(QWCinGIFMFIFO(gifch.madr) == 0) gifstate |= GIF_STATE_EMPTY; if(QWCinGIFMFIFO(gifch.madr) == 0) gifstate |= GIF_STATE_EMPTY;
return ret; return ret;

1
pcsx2/Hw.cpp
View File

@ -312,6 +312,7 @@ bool hwDmacSrcChain(DMACh& dma, int id)
switch (id) switch (id)
{ {
case TAG_REFE: // Refe - Transfer Packet According to ADDR field case TAG_REFE: // Refe - Transfer Packet According to ADDR field
dma.tadr += 16;
// End the transfer. // End the transfer.
return true; return true;

2
pcsx2/Vif1_MFIFO.cpp
View File

@ -124,7 +124,7 @@ static __fi void mfifo_VIF1chain()
if (vif1ch.madr >= dmacRegs.rbor.ADDR && if (vif1ch.madr >= dmacRegs.rbor.ADDR &&
vif1ch.madr <= (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16)) vif1ch.madr <= (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16))
{ {
if(vif1ch.madr == (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16)) DevCon.Warning("Edge VIF1"); //if(vif1ch.madr == (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16)) DevCon.Warning("Edge VIF1");
mfifoVIF1rbTransfer(); mfifoVIF1rbTransfer();
if(QWCinVIFMFIFO(vif1ch.madr) == 0) vif1.inprogress |= 0x10; if(QWCinVIFMFIFO(vif1ch.madr) == 0) vif1.inprogress |= 0x10;