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

Windows build fix

This commit is contained in:
skidau 2013-03-26 18:48:57 +11:00
parent b8b5afa323
commit 6a6c086b50
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/DSP/DSPAccelerator.cpp
View File

@ -21,8 +21,6 @@
#include "DSPHost.h"
#include "DSPHWInterface.h"
#include "DSPInterpreter.h"
#include "CoreTiming.h"
#include "Core.h"
// The hardware adpcm decoder :)
static s16 ADPCM_Step(u32& _rSamplePos)
@ -170,7 +168,7 @@ u16 dsp_read_accelerator()
if (Address >= EndAddress)
{
// Set address back to start address.
if (Core::g_CoreStartupParameter.bWii || Address == EndAddress)
if (DSPHost_Wii() || (Address == EndAddress))
{
Address = (g_dsp.ifx_regs[DSP_ACSAH] << 16) | g_dsp.ifx_regs[DSP_ACSAL];
DSPCore_SetException(EXP_ACCOV);

1
Source/Core/Core/Src/DSP/DSPHost.h
View File

@ -26,6 +26,7 @@
u8 DSPHost_ReadHostMemory(u32 addr);
void DSPHost_WriteHostMemory(u8 value, u32 addr);
bool DSPHost_OnThread();
bool DSPHost_Wii();
void DSPHost_InterruptRequest();
u32 DSPHost_CodeLoaded(const u8 *ptr, int size);
void DSPHost_UpdateDebugger();

6
Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
View File

@ -46,6 +46,12 @@ bool DSPHost_OnThread()
return _CoreParameter.bDSPThread;
}
bool DSPHost_Wii()
{
const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
return _CoreParameter.bWii;
}
void DSPHost_InterruptRequest()
{
// Fire an interrupt on the PPC ASAP.