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

SPU2: fix DMA issues

This commit is contained in:
GovanifY 2020-09-26 12:42:15 +02:00 committed by refractionpcsx2
parent a3a530adf6
commit 5cf2147754
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/IopDma.cpp
View File

@ -28,7 +28,7 @@ using namespace R3000A;
static void __fastcall psxDmaGeneric(u32 madr, u32 bcr, u32 chcr, u32 spuCore) static void __fastcall psxDmaGeneric(u32 madr, u32 bcr, u32 chcr, u32 spuCore)
{ {
const char dmaNum = spuCore ? '7' : '4'; const char dmaNum = spuCore ? 7 : 4;
/*if (chcr & 0x400) DevCon.Status("SPU 2 DMA %c linked list chain mode! chcr = %x madr = %x bcr = %x\n", dmaNum, chcr, madr, bcr); /*if (chcr & 0x400) DevCon.Status("SPU 2 DMA %c linked list chain mode! chcr = %x madr = %x bcr = %x\n", dmaNum, chcr, madr, bcr);
if (chcr & 0x40000000) DevCon.Warning("SPU 2 DMA %c Unusual bit set on 'to' direction chcr = %x madr = %x bcr = %x\n", dmaNum, chcr, madr, bcr); if (chcr & 0x40000000) DevCon.Warning("SPU 2 DMA %c Unusual bit set on 'to' direction chcr = %x madr = %x bcr = %x\n", dmaNum, chcr, madr, bcr);
@ -58,7 +58,7 @@ static void __fastcall psxDmaGeneric(u32 madr, u32 bcr, u32 chcr, u32 spuCore)
switch (chcr) switch (chcr)
{ {
case 0x01000201: //cpu to spu2 transfer case 0x01000201: //cpu to spu2 transfer
PSXDMA_LOG("*** DMA %c - mem2spu *** %x addr = %x size = %x", dmaNum, chcr, madr, bcr); PSXDMA_LOG("*** DMA %d - mem2spu *** %x addr = %x size = %x", dmaNum, chcr, madr, bcr);
if(dmaNum==7) if(dmaNum==7)
SPU2writeDMA7Mem((u16 *)iopPhysMem(madr), size*2); SPU2writeDMA7Mem((u16 *)iopPhysMem(madr), size*2);
else if(dmaNum==4) else if(dmaNum==4)
@ -66,7 +66,7 @@ static void __fastcall psxDmaGeneric(u32 madr, u32 bcr, u32 chcr, u32 spuCore)
break; break;
case 0x01000200: //spu2 to cpu transfer case 0x01000200: //spu2 to cpu transfer
PSXDMA_LOG("*** DMA %c - spu2mem *** %x addr = %x size = %x", dmaNum, chcr, madr, bcr); PSXDMA_LOG("*** DMA %d - spu2mem *** %x addr = %x size = %x", dmaNum, chcr, madr, bcr);
if(dmaNum==7) if(dmaNum==7)
SPU2readDMA7Mem((u16 *)iopPhysMem(madr), size*2); SPU2readDMA7Mem((u16 *)iopPhysMem(madr), size*2);
else if(dmaNum==4) else if(dmaNum==4)
@ -75,7 +75,7 @@ static void __fastcall psxDmaGeneric(u32 madr, u32 bcr, u32 chcr, u32 spuCore)
break; break;
default: default:
Console.Error("*** DMA %c - SPU unknown *** %x addr = %x size = %x", dmaNum, chcr, madr, bcr); Console.Error("*** DMA %d - SPU unknown *** %x addr = %x size = %x", dmaNum, chcr, madr, bcr);
break; break;
} }
} }

1
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -729,6 +729,7 @@
<ResourceCompile Include="..\..\..\3rdparty\wxwidgets3.0\include\wx\msw\wx.rc"> <ResourceCompile Include="..\..\..\3rdparty\wxwidgets3.0\include\wx\msw\wx.rc">
<AdditionalIncludeDirectories>$(SolutionDir)3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile> </ResourceCompile>
<ResourceCompile Include="..\..\SPU2\Windows\SPU2.rc" />
<ResourceCompile Include="..\wxResources.rc" /> <ResourceCompile Include="..\wxResources.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
View File

@ -1523,6 +1523,9 @@
<ResourceCompile Include="..\..\..\3rdparty\wxwidgets3.0\include\wx\msw\wx.rc"> <ResourceCompile Include="..\..\..\3rdparty\wxwidgets3.0\include\wx\msw\wx.rc">
<Filter>AppHost\Resources</Filter> <Filter>AppHost\Resources</Filter>
</ResourceCompile> </ResourceCompile>
<ResourceCompile Include="..\..\SPU2\Windows\SPU2.rc">
<Filter>System\Ps2\SPU2</Filter>
</ResourceCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuildStep Include="..\..\rdebug\deci2.h"> <CustomBuildStep Include="..\..\rdebug\deci2.h">