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

Chagne a few thigns around for the spu2-x Irq flagging. If this breaks anything please tell. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2559 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gigaherz 2010-02-04 18:39:15 +00:00
parent 34e44e4956
commit 7090edf371
3 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
plugins/spu2-x/src/Dma.cpp
View File

@ -274,14 +274,14 @@ void V_Core::PlainDMAWrite(u16 *pMem, u32 size)
if( Cores[i].IRQEnable && (Cores[i].IRQA >= TSA) || (Cores[i].IRQA < TDA) )
{
Spdif.Info = 4 << i;
Spdif.Info |= 4 << i;
SetIrqCall();
}
}
#else
if( IRQEnable && (IRQA >= TSA) || (IRQA < TDA) )
{
Spdif.Info = 4 << Index;
Spdif.Info |= 4 << Index;
SetIrqCall();
}
#endif
@ -303,14 +303,14 @@ void V_Core::PlainDMAWrite(u16 *pMem, u32 size)
if( Cores[i].IRQEnable && (Cores[i].IRQA >= TSA) && (Cores[i].IRQA < TDA) )
{
Spdif.Info = 4 << i;
Spdif.Info |= 4 << i;
SetIrqCall();
}
}
#else
if( IRQEnable && (IRQA >= TSA) && (IRQA < TDA) )
{
Spdif.Info = 4 << Index;
Spdif.Info |= 4 << Index;
SetIrqCall();
}
#endif
@ -358,7 +358,7 @@ void V_Core::DoDMAread(u16* pMem, u32 size)
{
if( Cores[i].IRQEnable && (Cores[i].IRQA >= TSA) || (Cores[i].IRQA < TDA) )
{
Spdif.Info = 4 << i;
Spdif.Info |= 4 << i;
SetIrqCall();
}
}
@ -377,7 +377,7 @@ void V_Core::DoDMAread(u16* pMem, u32 size)
{
if( Cores[i].IRQEnable && (Cores[i].IRQA >= TSA) && (Cores[i].IRQA < TDA) )
{
Spdif.Info = 4 << i;
Spdif.Info |= 4 << i;
SetIrqCall();
}
}
@ -472,7 +472,7 @@ s32 V_Core::NewDmaRead(u32* data, u32 bytesLeft, u32* bytesProcessed)
{
if( Cores[i].IRQEnable && (Cores[i].IRQA >= TSA) || (Cores[i].IRQA < TDA) )
{
Spdif.Info = 4 << i;
Spdif.Info |= 4 << i;
SetIrqCall();
}
}
@ -491,7 +491,7 @@ s32 V_Core::NewDmaRead(u32* data, u32 bytesLeft, u32* bytesProcessed)
{
if( Cores[i].IRQEnable && (Cores[i].IRQA >= TSA) && (Cores[i].IRQA < TDA) )
{
Spdif.Info = 4 << i;
Spdif.Info |= 4 << i;
SetIrqCall();
}
}
@ -554,16 +554,62 @@ s32 V_Core::NewDmaWrite(u32* data, u32 bytesLeft, u32* bytesProcessed)
{
memcpy((ADMATempBuffer+(InputPosWrite<<1)),mptr,0x400);
mptr+=0x200;
// Flag interrupt? If IRQA occurs between start and dest, flag it.
// Important: Test both core IRQ settings for either DMA!
int dummyTSA = 0x2000+(Index<<10)+InputPosWrite;
int dummyTDA = 0x2000+(Index<<10)+InputPosWrite+0x200;
for( int i=0; i<2; i++ )
{
if( Cores[i].IRQEnable && (Cores[i].IRQA >= dummyTSA) && (Cores[i].IRQA < dummyTDA) )
{
Spdif.Info |= 4 << i;
SetIrqCall();
}
}
}
else
{
memcpy((ADMATempBuffer+InputPosWrite),mptr,0x200);
//memcpy((spu2mem+0x2000+(core<<10)+InputPosWrite),mptr,0x200);
//memcpy((spu2mem+0x2000+(Index<<10)+InputPosWrite),mptr,0x200);
mptr+=0x100;
// Flag interrupt? If IRQA occurs between start and dest, flag it.
// Important: Test both core IRQ settings for either DMA!
int dummyTSA = 0x2000+(Index<<10)+InputPosWrite;
int dummyTDA = 0x2000+(Index<<10)+InputPosWrite+0x100;
for( int i=0; i<2; i++ )
{
if( Cores[i].IRQEnable && (Cores[i].IRQA >= dummyTSA) && (Cores[i].IRQA < dummyTDA) )
{
Spdif.Info |= 4 << i;
SetIrqCall();
}
}
memcpy((ADMATempBuffer+InputPosWrite+0x200),mptr,0x200);
//memcpy((spu2mem+0x2200+(core<<10)+InputPosWrite),mptr,0x200);
//memcpy((spu2mem+0x2200+(Index<<10)+InputPosWrite),mptr,0x200);
mptr+=0x100;
// Flag interrupt? If IRQA occurs between start and dest, flag it.
// Important: Test both core IRQ settings for either DMA!
dummyTSA = 0x2200+(Index<<10)+InputPosWrite;
dummyTDA = 0x2200+(Index<<10)+InputPosWrite+0x100;
for( int i=0; i<2; i++ )
{
if( Cores[i].IRQEnable && (Cores[i].IRQA >= dummyTSA) && (Cores[i].IRQA < dummyTDA) )
{
Spdif.Info |= 4 << i;
SetIrqCall();
}
}
}
// See ReadInput at mixer.cpp for explanation on the commented out lines
//

2
plugins/spu2-x/src/Mixer.cpp
View File

@ -155,7 +155,7 @@ static void __forceinline IncrementNextA( const V_Core& thiscore, V_Voice& vc )
if( IsDevBuild )
ConLog(" * SPU2 Core %d: IRQ Called (IRQ passed).\n", i);
Spdif.Info = 4 << i;
Spdif.Info |= 4 << i;
SetIrqCall();
}
}

4
plugins/spu2-x/src/spu2sys.cpp
View File

@ -836,7 +836,7 @@ static void __fastcall RegWrite_Core( u16 value )
{
if(Cores[i].IRQEnable && (Cores[i].IRQA == thiscore.TSA))
{
Spdif.Info = 4 << i;
Spdif.Info |= 4 << i;
SetIrqCall();
}
}
@ -894,7 +894,7 @@ static void __fastcall RegWrite_Core( u16 value )
{
ConLog(" * SPU2: IRQ %s\n",((thiscore.IRQEnable==0)?"disabled":"enabled"));
if(!thiscore.IRQEnable)
Spdif.Info=0;
Spdif.Info &= ~(4 << thiscore.Index);
}
}