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

Fixed issue with DBZ Tenchaichi 2 not booting, also fixed line endings for the logging to file, man that was hard to read! 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@864 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
refraction 2009-03-30 18:05:23 +00:00
parent 695608991c
commit f8fb985737
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/SourceLog.cpp
View File

@ -75,6 +75,7 @@ void __Log( const char* fmt, ... )
else if( emuLog != NULL ) // manually write to the logfile.
{
fputs( tmp, emuLog );
fputs( "\n", emuLog );
//fputs( "\r\n", emuLog );
fflush( emuLog );
}
@ -112,7 +113,7 @@ static __forceinline void _vSourceLog( u16 protocol, u8 source, u32 cpuPc, u32 c
} else if( emuLog != NULL ) // manually write to the logfile.
{
fputs( tmp, emuLog );
//fputs( "\r\n", emuLog );
fputs( "\n", emuLog );
fflush( emuLog );
}
}

16
pcsx2/VifDma.cpp
View File

@ -2065,9 +2065,12 @@ int VIF1transfer(u32 *data, int size, int istag)
{
transferred = transferred >> 2;
vif1ch->madr += (transferred << 4);
vif1ch->qwc -= transferred;
if (vif1ch->qwc == 0 && vif1.irqoffset == 0) vif1.inprogress = 0;
vif1ch->qwc -= transferred;
}
if (vif1ch->qwc == 0 && (vif1.irqoffset == 0 || istag == 1))
vif1.inprogress = 0;
return 0;
}
@ -2213,6 +2216,8 @@ __forceinline void vif1SetupTransfer()
}
}
vif1.inprogress = 1;
if (vif1ch->chcr & 0x40)
{
@ -2225,7 +2230,7 @@ __forceinline void vif1SetupTransfer()
if (ret == -2) return; //IRQ set by VIFTransfer
}
vif1.inprogress = 1;
vif1.done |= hwDmacSrcChainWithStack(vif1ch, id);
if ((vif1ch->chcr & 0x80) && (vif1ptag[0] >> 31)) //Check TIE bit of CHCR and IRQ bit of tag
@ -2310,6 +2315,8 @@ void dmaVIF1()
g_vifCycles = 0;
vif1.inprogress = 0;
vif1Regs->stat |= 0x10000000; // FQC=16
if (((psHu32(DMAC_CTRL) & 0xC) == 0x8)) // VIF MFIFO
{
//Console::WriteLn("VIFMFIFO\n");
@ -2325,8 +2332,7 @@ void dmaVIF1()
}
#endif
vif1Regs->stat |= 0x10000000; // FQC=16
if (!(vif1ch->chcr & 0x4) || vif1ch->qwc > 0) // Normal Mode
{