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

IPU: Remove some DMA hacks

This commit is contained in:
refractionpcsx2 2022-06-12 06:11:11 +01:00
parent 3922091a58
commit 9441d2a33a
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pcsx2/IPU/IPU.cpp
View File

@ -58,7 +58,7 @@ void tIPU_cmd::clear()
__fi void IPUProcessInterrupt() __fi void IPUProcessInterrupt()
{ {
if (ipuRegs.ctrl.BUSY && !CommandExecuteQueued) // && (g_BP.FP || g_BP.IFC || (ipu1ch.chcr.STR && ipu1ch.qwc > 0))) if (ipuRegs.ctrl.BUSY && !CommandExecuteQueued)
IPUWorker(); IPUWorker();
} }
@ -277,16 +277,6 @@ __fi RETURNS_R64 ipuRead64(u32 mem)
void ipuSoftReset() void ipuSoftReset()
{ {
if (ipu1ch.chcr.STR && g_BP.IFC < 8 && IPU1Status.DataRequested)
{
DevCon.Warning("Refill input fifo on reset");
ipu1Interrupt();
}
if (!ipu1ch.chcr.STR)
psHu32(DMAC_STAT) &= ~(1 << DMAC_TO_IPU);
ipu_fifo.clear(); ipu_fifo.clear();
memzero(g_BP); memzero(g_BP);
@ -317,8 +307,8 @@ __fi bool ipuWrite32(u32 mem, u32 value)
return false; return false;
ipucase(IPU_CTRL): // IPU_CTRL ipucase(IPU_CTRL): // IPU_CTRL
// CTRL = the first 16 bits of ctrl [0x8000ffff], + value for the next 16 bits, // CTRL = the first 16 bits of ctrl [0x8000ffff], + value for the next 16 bits,
// minus the reserved bits. (18-19; 27-29) [0x47f30000] // minus the reserved bits. (18-19; 27-29) [0x47f30000]
ipuRegs.ctrl.write(value); ipuRegs.ctrl.write(value);
if (ipuRegs.ctrl.IDP == 3) if (ipuRegs.ctrl.IDP == 3)
{ {
@ -361,12 +351,6 @@ __fi bool ipuWrite64(u32 mem, u64 value)
static void ipuBCLR(u32 val) static void ipuBCLR(u32 val)
{ {
if (ipu1ch.chcr.STR && g_BP.IFC < 8 && IPU1Status.DataRequested)
ipu1Interrupt();
if(!ipu1ch.chcr.STR)
psHu32(DMAC_STAT) &= ~(1 << DMAC_TO_IPU);
ipu_fifo.in.clear(); ipu_fifo.in.clear();
memzero(g_BP); memzero(g_BP);
g_BP.BP = val & 0x7F; g_BP.BP = val & 0x7F;
@ -950,11 +934,6 @@ __noinline void IPUWorker()
//ipuRegs.ctrl.OFC = 0; //ipuRegs.ctrl.OFC = 0;
ipuRegs.topbusy = 0; ipuRegs.topbusy = 0;
ipuRegs.cmd.BUSY = 0; ipuRegs.cmd.BUSY = 0;
// CHECK!: IPU0dma remains when IDEC is done, so we need to clear it
// Check Mana Khemia 1 "off campus" to trigger a GUST IDEC messup.
// This hackfixes it :/
//if (ipu0ch.qwc > 0 && ipu0ch.chcr.STR) ipu0Interrupt();
break; break;
case SCE_IPU_BDEC: case SCE_IPU_BDEC:

3
pcsx2/IPU/IPU_Fifo.cpp
View File

@ -41,9 +41,10 @@ void IPU_Fifo_Input::clear()
// Because the FIFO is drained it will request more data immediately // Because the FIFO is drained it will request more data immediately
IPU1Status.DataRequested = true; IPU1Status.DataRequested = true;
if (ipu1ch.chcr.STR && cpuRegs.eCycle[4] == 0x9999) if (ipu1ch.chcr.STR && cpuRegs.eCycle[4] == 0x9999)
{ {
CPU_INT(DMAC_TO_IPU, 32); CPU_INT(DMAC_TO_IPU, 4);
} }
} }