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

SPU2-X: Completely removed the concept of core resets. We were unable to find any evidence supporting their existence. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4720 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
sudonim1@gmail.com 2011-06-08 20:14:14 +00:00
parent 6b2ba33dd9
commit f423da573f
2 changed files with 0 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/spu2-x/src/defs.h
View File

@ -422,7 +422,6 @@ struct V_Core
// from this for the odd Ts. // from this for the odd Ts.
StereoOut32 LastEffect; StereoOut32 LastEffect;
u8 InitDelay;
u8 CoreEnabled; u8 CoreEnabled;
u8 AttrBit0; u8 AttrBit0;
@ -456,7 +455,6 @@ struct V_Core
V_Core( int idx ); // our badass constructor V_Core( int idx ); // our badass constructor
~V_Core() throw(); ~V_Core() throw();
void Reset( int index );
void Init( int index ); void Init( int index );
void UpdateEffectsBufferSize(); void UpdateEffectsBufferSize();
void AnalyzeReverbPreset(); void AnalyzeReverbPreset();

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

@ -174,72 +174,6 @@ void V_Core::Init( int index )
Regs.ENDX = 0xffffff; // PS2 confirmed Regs.ENDX = 0xffffff; // PS2 confirmed
} }
// Most values are confirmed on a PS2
void V_Core::Reset( int index )
{
ConLog( "* SPU2-X: Reset SPU2 core %d \n", index );
u32 prev_IRQA = Cores[index].IRQA;
memset( this, 0, sizeof(V_Core) );
const int c = Index = index;
Regs.STATX = 0;
Regs.ATTR = 0;
ExtVol = V_VolumeLR::Max;
InpVol = V_VolumeLR::Max;
FxVol = V_VolumeLR(0);
MasterVol = V_VolumeSlideLR(0,0);
#if 0
memset( &DryGate, -1, sizeof(DryGate) );
memset( &WetGate, -1, sizeof(WetGate) );
Regs.MMIX = 0xFFF;
#endif
Regs.VMIXL = 0xFFFFFF;
Regs.VMIXR = 0xFFFFFF;
Regs.VMIXEL = 0xFFFFFF;
Regs.VMIXER = 0xFFFFFF;
EffectsStartA = c ? 0xFFFF8 : 0xEC810; // (After rom0:PS2LOGO)
EffectsEndA = c ? 0xFFFFF : 0xEFFFF; // (After rom0:PS2LOGO)
// Uninitialized it's 0 for both cores. Resetting libs however may set this to 0 or 1 depending on a flag.
// DDS has strange reverb on voiceovers if this is reset to 0
// Formula1 2005 seemingly needs a Reverb Interrupt to boot.
// rom0:PS2LOGO leaves it at 1.
// BoF:DQ has ugly noise with this at 1. << therefore settling with "0" for now.
FxEnable = 0;
IRQA = prev_IRQA; // IRQA isn't reset by sdinit or the BIOS
IRQEnable = 0;
for( uint v=0; v<NumVoices; ++v )
{
VoiceGates[v].DryL = -1;
VoiceGates[v].DryR = -1;
VoiceGates[v].WetL = -1;
VoiceGates[v].WetR = -1;
Voices[v].Volume = V_VolumeSlideLR(0,0); // V_VolumeSlideLR::Max;
Voices[v].SCurrent = 28;
Voices[v].ADSR.Value = 0;
Voices[v].ADSR.Phase = 0;
Voices[v].Pitch = 0x3FFF;
Voices[v].NextA = 0x2800;
Voices[v].StartA = 0x2800;
Voices[v].LoopStartA = 0x2800;
}
DMAICounter = 0;
AdmaInProgress = 0;
Regs.STATX = 0x80;
Regs.ENDX = 0xffffff; // PS2 confirmed
}
void V_Core::AnalyzeReverbPreset() void V_Core::AnalyzeReverbPreset()
{ {
ConLog("Reverb Parameter Update for Core %d:\n", Index); ConLog("Reverb Parameter Update for Core %d:\n", Index);
@ -446,24 +380,6 @@ __forceinline void TimeUpdate(u32 cClocks)
if(_irqcallback) _irqcallback(); if(_irqcallback) _irqcallback();
} }
if(Cores[0].InitDelay>0)
{
Cores[0].InitDelay--;
if(Cores[0].InitDelay==0)
{
Cores[0].Reset(0);
}
}
if(Cores[1].InitDelay>0)
{
Cores[1].InitDelay--;
if(Cores[1].InitDelay==0)
{
Cores[1].Reset(1);
}
}
#ifndef ENABLE_NEW_IOPDMA_SPU2 #ifndef ENABLE_NEW_IOPDMA_SPU2
//Update DMA4 interrupt delay counter //Update DMA4 interrupt delay counter
if(Cores[0].DMAICounter>0) if(Cores[0].DMAICounter>0)
@ -985,29 +901,6 @@ static void __fastcall RegWrite_Core( u16 value )
int bit0 = thiscore.AttrBit0; int bit0 = thiscore.AttrBit0;
u8 oldDmaMode = thiscore.DmaMode; u8 oldDmaMode = thiscore.DmaMode;
if( ((value>>15)&1) && (!thiscore.CoreEnabled) && (thiscore.InitDelay==0) ) // on init/reset
{
// When we have exact cycle update info from the Pcsx2 IOP unit, then use
// the more accurate delayed initialization system.
ConLog( "* SPU2-X: Core%d reset bit set\n", core );
// Async mixing can cause a scheduled reset to happen untimely, ff12 hates it and dies.
// So do the next best thing and reset the core directly.
if(cyclePtr != NULL && SynchMode != 1) // !AsyncMix
{
// InitDelay = 1 has ugly noise in Grandia 3 bootup (maybe ingame as well).
// InitDelay = 2 would fix that but it breaks Eternal Ring booting.
thiscore.InitDelay = 1;
thiscore.Regs.STATX = 0;
}
else
{
thiscore.Reset(thiscore.Index);
return;
}
}
thiscore.AttrBit0 =(value>> 0) & 0x01; //1 bit thiscore.AttrBit0 =(value>> 0) & 0x01; //1 bit
thiscore.DMABits =(value>> 1) & 0x07; //3 bits thiscore.DMABits =(value>> 1) & 0x07; //3 bits
thiscore.DmaMode =(value>> 4) & 0x03; //2 bit (not necessary, we get the direction from the iop) thiscore.DmaMode =(value>> 4) & 0x03; //2 bit (not necessary, we get the direction from the iop)