citra-emu
/
citra
Archived
1
0
Fork 0
Code

event: added support for ClearEvent, fixed a bug with CreateEvent, fixed some comments

This commit is contained in:
bunnei 2014-05-29 20:00:44 -04:00
parent 545e6919ce
commit d51c84dde2
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/hle/kernel/event.cpp
View File

@ -54,11 +54,16 @@ public:
* Changes whether an event is locked or not * Changes whether an event is locked or not
* @param handle Handle to event to change * @param handle Handle to event to change
* @param locked Boolean locked value to set event * @param locked Boolean locked value to set event
* @return Result of operation, 0 on success, otherwise error code
*/ */
void SetEventLocked(const Handle handle, const bool locked) { Result SetEventLocked(const Handle handle, const bool locked) {
Event* evt = g_object_pool.GetFast<Event>(handle); Event* evt = g_object_pool.GetFast<Event>(handle);
if (!evt) {
ERROR_LOG(KERNEL, "SetEventLocked called with unknown handle=0x%08X", handle);
return -1;
}
evt->locked = locked; evt->locked = locked;
return; return 0;
} }
/** /**
@ -67,23 +72,22 @@ void SetEventLocked(const Handle handle, const bool locked) {
* @return Result of operation, 0 on success, otherwise error code * @return Result of operation, 0 on success, otherwise error code
*/ */
Result ClearEvent(Handle handle) { Result ClearEvent(Handle handle) {
ERROR_LOG(KERNEL, "Unimplemented function ClearEvent"); return SetEventLocked(handle, true);
return 0;
} }
/** /**
* Creates an event * Creates an event
* @param handle Reference to handle for the newly created mutex * @param handle Reference to handle for the newly created mutex
* @param reset_type ResetType describing how to create event * @param reset_type ResetType describing how to create event
* @return Handle to newly created object * @return Newly created Event object
*/ */
Event* CreateEvent(Handle& handle, const ResetType reset_type) { Event* CreateEvent(Handle& handle, const ResetType reset_type) {
Event* evt = new Event; Event* evt = new Event;
handle = Kernel::g_object_pool.Create(evt); handle = Kernel::g_object_pool.Create(evt);
evt->locked = true;
evt->reset_type = evt->intitial_reset_type = reset_type; evt->reset_type = evt->intitial_reset_type = reset_type;
evt->locked = false;
return evt; return evt;
} }
@ -91,7 +95,7 @@ Event* CreateEvent(Handle& handle, const ResetType reset_type) {
/** /**
* Creates an event * Creates an event
* @param reset_type ResetType describing how to create event * @param reset_type ResetType describing how to create event
* @return Handle to newly created object * @return Handle to newly created Event object
*/ */
Handle CreateEvent(const ResetType reset_type) { Handle CreateEvent(const ResetType reset_type) {
Handle handle; Handle handle;

5
src/core/hle/kernel/event.h
View File

@ -15,8 +15,9 @@ namespace Kernel {
* Changes whether an event is locked or not * Changes whether an event is locked or not
* @param handle Handle to event to change * @param handle Handle to event to change
* @param locked Boolean locked value to set event * @param locked Boolean locked value to set event
* @return Result of operation, 0 on success, otherwise error code
*/ */
void SetEventLocked(const Handle handle, const bool locked); Result SetEventLocked(const Handle handle, const bool locked);
/** /**
* Clears an event * Clears an event
@ -28,7 +29,7 @@ Result ClearEvent(Handle handle);
/** /**
* Creates an event * Creates an event
* @param reset_type ResetType describing how to create event * @param reset_type ResetType describing how to create event
* @return Handle to newly created object * @return Handle to newly created Event object
*/ */
Handle CreateEvent(const ResetType reset_type); Handle CreateEvent(const ResetType reset_type);