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

small fix for previous commit (prevents startup crash, if GC game was started after WII game) 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7469 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Marko Pusljar 2011-04-17 16:44:42 +00:00
parent 3983a8d22f
commit 7f745d67ce
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/Src/HW/DSP.cpp
View File

@ -274,7 +274,8 @@ void Init(bool hle)
g_ARAM.ptr = (u8 *)AllocateMemoryPages(g_ARAM.size); g_ARAM.ptr = (u8 *)AllocateMemoryPages(g_ARAM.size);
} }
g_audioDMA.AudioDMAControl.Hex = 0; memset(&g_audioDMA, 0, sizeof(g_audioDMA));
memset(&g_arDMA, 0, sizeof(g_arDMA));
g_dspState.DSPControl.Hex = 0; g_dspState.DSPControl.Hex = 0;
g_dspState.DSPControl.DSPHalt = 1; g_dspState.DSPControl.DSPHalt = 1;
@ -682,8 +683,7 @@ void Do_ARAM_DMA()
{ {
// Fake the DMA taking time to complete. The delay is not accurate, but // Fake the DMA taking time to complete. The delay is not accurate, but
// seems like a good estimate // seems like a good estimate
CoreTiming::ScheduleEvent_Threadsafe( //CoreTiming::ScheduleEvent_Threadsafe(g_arDMA.Cnt.count >> 1, et_GenerateDSPInterrupt, INT_ARAM | (1<<16));
g_arDMA.Cnt.count >> 1, et_GenerateDSPInterrupt, INT_ARAM | (1<<16));
// Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks // Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks
if (g_arDMA.Cnt.dir) if (g_arDMA.Cnt.dir)
@ -720,6 +720,7 @@ void Do_ARAM_DMA()
g_arDMA.Cnt.count -= 8; g_arDMA.Cnt.count -= 8;
} }
} }
GenerateDSPInterrupt(INT_ARAM);
} }