summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJohn Peterson <jpeterson57@gmail.com>2008-10-11 07:38:14 +0000
committerJohn Peterson <jpeterson57@gmail.com>2008-10-11 07:38:14 +0000
commitbe39c869ccf200d2219be4f06cf0edab1d9c2a86 (patch)
treee1ef9a3d3ba53ae28784d1aa2b7f641682b49513 /Source
parent3043bd6003747d69b11c62932ec045856076906e (diff)
Small change
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@835 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp2
-rw-r--r--Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp31
-rw-r--r--Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.h2
3 files changed, 19 insertions, 16 deletions
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
index 87ce0a59e0..cf1ab63037 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
@@ -263,7 +263,7 @@ void CUCode_AX::Logging(short* _pBuffer, int _iSize, int a)
{
AXParamBlock PBs[NUMBER_OF_PBS];
- int numberOfPBs = ReadOutPBs(PBs, NUMBER_OF_PBS);
+ int numberOfPBs = ReadOutPBs(0, PBs, NUMBER_OF_PBS);
// =======================================================================================
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
index 29ef3f5beb..e3ba0d4e45 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
@@ -171,7 +171,7 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
memset(temprbuffer, 0, _iSize * sizeof(int));
// read out pbs
- int numberOfPBs = ReadOutPBs(PBs, NUMBER_OF_PBS);
+ int numberOfPBs = ReadOutPBs(1, PBs, NUMBER_OF_PBS);
#ifdef _WIN32
ratioFactor = 32000.0f / (float)DSound::DSound_GetSampleRate();
@@ -694,7 +694,7 @@ bool CUCode_AX::AXTask(u32& _uMail)
return true;
}
-int CUCode_AX::ReadOutPBs(AXParamBlock* _pPBs, int _num)
+int CUCode_AX::ReadOutPBs(int a, AXParamBlock* _pPBs, int _num)
{
int count = 0;
u32 blockAddr = m_addressPBs;
@@ -719,19 +719,22 @@ int CUCode_AX::ReadOutPBs(AXParamBlock* _pPBs, int _num)
// ---------------------------------------------------------------------------------------
// Make the updates we are told to do
// ------------
- u16 upd_hi = pDest[39];
- u16 upd_lo = pDest[40];
- const u32 updaddr = (u32)(upd_hi << 16) | upd_lo;
- const u16 updpar = Memory_Read_U16(updaddr);
- const u16 upddata = Memory_Read_U16(updaddr + 2);
- // some safety checks, I hope it's enough, how long does the memory go?
- if(updaddr > 0x80000000 && updaddr < 0x82000000
- && updpar < 63 && updpar > 3 && upddata >= 0 // updpar > 3 because we don't want to change
- // 0-3, those are important
- && gSequenced) // on and off option
+ if(a) // only do this once every 5 ms
{
- pDest[updpar] = upddata;
- }
+ u16 upd_hi = pDest[39];
+ u16 upd_lo = pDest[40];
+ const u32 updaddr = (u32)(upd_hi << 16) | upd_lo;
+ const u16 updpar = Memory_Read_U16(updaddr);
+ const u16 upddata = Memory_Read_U16(updaddr + 2);
+ // some safety checks, I hope it's enough, how long does the memory go?
+ if(updaddr > 0x80000000 && updaddr < 0x82000000
+ && updpar < 63 && updpar > 3 && upddata >= 0 // updpar > 3 because we don't want to change
+ // 0-3, those are important
+ && gSequenced) // on and off option
+ {
+ pDest[updpar] = upddata;
+ }
+ }
//aprintf(1, "%08x %04x %04x\n", updaddr, updpar, upddata);
// ------------
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.h b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.h
index 68e00eb885..1ff81e1203 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.h
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.h
@@ -62,7 +62,7 @@ private:
bool AXTask(u32& _uMail);
void SendMail(u32 _uMail);
- int ReadOutPBs(AXParamBlock *_pPBs, int _num);
+ int ReadOutPBs(int a, AXParamBlock *_pPBs, int _num);
void WriteBackPBs(AXParamBlock *_pPBs, int _num);
s16 ADPCM_Step(AXParamBlock& pb, u32& samplePos, u32 newSamplePos, u16 frac);
};