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

IPU: Return contents of the bottom of the FIFO in CMD except FDEC/VDEC

This commit is contained in:
refractionpcsx2 2020-12-31 13:46:22 +00:00
parent c998a51f71
commit a8a5d4bca9
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcsx2/IPU/IPU.cpp
View File

@ -204,6 +204,16 @@ __fi u32 ipuRead32(u32 mem)
switch (mem)
{
ipucase(IPU_CMD) : // IPU_CMD
{
if (ipu_cmd.CMD != SCE_IPU_FDEC && ipu_cmd.CMD != SCE_IPU_VDEC)
{
if (getBits32((u8*)&ipuRegs.cmd.DATA, 0))
ipuRegs.cmd.DATA = BigEndian(ipuRegs.cmd.DATA);
}
return ipuRegs.cmd.DATA;
}
ipucase(IPU_CTRL): // IPU_CTRL
{
ipuRegs.ctrl.IFC = g_BP.IFC;
@ -247,9 +257,17 @@ __fi u64 ipuRead64(u32 mem)
switch (mem)
{
ipucase(IPU_CMD): // IPU_CMD
{
if (ipu_cmd.CMD != SCE_IPU_FDEC && ipu_cmd.CMD != SCE_IPU_VDEC)
{
if (getBits32((u8*)&ipuRegs.cmd.DATA, 0))
ipuRegs.cmd.DATA = BigEndian(ipuRegs.cmd.DATA);
}
if (ipuRegs.cmd.DATA & 0xffffff)
IPU_LOG("read64: IPU_CMD=BUSY=%x, DATA=%08X", ipuRegs.cmd.BUSY ? 1 : 0, ipuRegs.cmd.DATA);
break;
return ipuRegs.cmd._u64;
}
ipucase(IPU_CTRL):
DevCon.Warning("reading 64bit IPU ctrl");
@ -980,6 +998,6 @@ __noinline void IPUWorker()
// success
ipuRegs.ctrl.BUSY = 0;
ipu_cmd.current = 0xffffffff;
//ipu_cmd.current = 0xffffffff;
hwIntcIrq(INTC_IPU);
}

14
pcsx2/IPU/IPU.h
View File

@ -29,12 +29,16 @@
// Bitfield Structures
//
struct tIPU_CMD
union tIPU_CMD
{
u32 DATA;
u32 BUSY;
void SetBusy(bool busy=true)
struct
{
u32 DATA;
u32 BUSY;
};
u64 _u64;
void SetBusy(bool busy = true)
{
BUSY = busy ? 0x80000000 : 0;
}