emu-mirror/citra-nightly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WaitSynchronization: Added a result code for invalid result, fixed bug.

Browse Source
This commit is contained in:
bunnei 2015-01-21 18:27:01 -05:00
parent 68ddaaa2f5
commit 731154f79e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/hle/svc.cpp
View File

@ -29,6 +29,9 @@ using Kernel::SharedPtr;
namespace SVC { namespace SVC {
/// An invalid result code that is meant to be overwritten when a thread resumes from waiting
const ResultCode RESULT_INVALID(0xDEADC0DE);
enum ControlMemoryOperation { enum ControlMemoryOperation {
MEMORY_OPERATION_HEAP = 0x00000003, MEMORY_OPERATION_HEAP = 0x00000003,
MEMORY_OPERATION_GSP_HEAP = 0x00010003, MEMORY_OPERATION_GSP_HEAP = 0x00010003,
@ -132,10 +135,13 @@ static Result WaitSynchronization1(Handle handle, s64 nano_seconds) {
Kernel::WakeThreadAfterDelay(Kernel::GetCurrentThread(), nano_seconds); Kernel::WakeThreadAfterDelay(Kernel::GetCurrentThread(), nano_seconds);
HLE::Reschedule(__func__); HLE::Reschedule(__func__);
} else {
object->Acquire(); // NOTE: output of this SVC will be set later depending on how the thread resumes
return RESULT_INVALID.raw;
} }
object->Acquire();
return RESULT_SUCCESS.raw; return RESULT_SUCCESS.raw;
} }
@ -207,7 +213,7 @@ static Result WaitSynchronizationN(s32* out, Handle* handles, s32 handle_count,
HLE::Reschedule(__func__); HLE::Reschedule(__func__);
// NOTE: output of this SVC will be set later depending on how the thread resumes // NOTE: output of this SVC will be set later depending on how the thread resumes
return 0xDEADBEEF; return RESULT_INVALID.raw;
} }
// Acquire objects if we did not wait... // Acquire objects if we did not wait...