lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-12-11 13:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

event: added a hackish ability to set an event as "locked" to its current state, cleaned up some comments

Browse source
This commit is contained in:
bunnei 2014-06-01 10:33:55 -04:00
parent 55325dea4c
commit f7cececc5c
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/core/hle/kernel/event.cpp
View file

@ -23,6 +23,7 @@ public:
ResetType reset_type; ///< Current ResetType ResetType reset_type; ///< Current ResetType
bool locked; ///< Current locked state bool locked; ///< Current locked state
bool permanent_locked; ///< Hack - to set event permanent state (for easy passthrough)
/** /**
* Synchronize kernel object * Synchronize kernel object
@ -31,7 +32,7 @@ public:
*/ */
Result SyncRequest(bool* wait) { Result SyncRequest(bool* wait) {
// TODO(bunnei): ImplementMe // TODO(bunnei): ImplementMe
ERROR_LOG(KERNEL, "Unimplemented function Event::SyncRequest"); ERROR_LOG(KERNEL, "(UMIMPLEMENTED) call");
return 0; return 0;
} }
@ -43,7 +44,7 @@ public:
Result WaitSynchronization(bool* wait) { Result WaitSynchronization(bool* wait) {
// TODO(bunnei): ImplementMe // TODO(bunnei): ImplementMe
*wait = locked; *wait = locked;
if (reset_type != RESETTYPE_STICKY) { if (reset_type != RESETTYPE_STICKY && !permanent_locked) {
locked = true; locked = true;
} }
return 0; return 0;
@ -59,10 +60,28 @@ public:
Result 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) { if (!evt) {
ERROR_LOG(KERNEL, "SetEventLocked called with unknown handle=0x%08X", handle); ERROR_LOG(KERNEL, "called with unknown handle=0x%08X", handle);
return -1; return -1;
} }
evt->locked = locked; if (!evt->permanent_locked) {
evt->locked = locked;
}
return 0;
}
/**
* Hackish function to set an events permanent lock state, used to pass through synch blocks
* @param handle Handle to event to change
* @param permanent_locked Boolean permanent locked value to set event
* @return Result of operation, 0 on success, otherwise error code
*/
Result SetPermanentLock(Handle handle, const bool permanent_locked) {
Event* evt = g_object_pool.GetFast<Event>(handle);
if (!evt) {
ERROR_LOG(KERNEL, "called with unknown handle=0x%08X", handle);
return -1;
}
evt->permanent_locked = permanent_locked;
return 0; return 0;
} }
@ -87,6 +106,7 @@ Event* CreateEvent(Handle& handle, const ResetType reset_type) {
handle = Kernel::g_object_pool.Create(evt); handle = Kernel::g_object_pool.Create(evt);
evt->locked = true; evt->locked = true;
evt->permanent_locked = false;
evt->reset_type = evt->intitial_reset_type = reset_type; evt->reset_type = evt->intitial_reset_type = reset_type;
return evt; return evt;

8
src/core/hle/kernel/event.h
View file

@ -19,6 +19,14 @@ namespace Kernel {
*/ */
Result SetEventLocked(const Handle handle, const bool locked); Result SetEventLocked(const Handle handle, const bool locked);
/**
* Hackish function to set an events permanent lock state, used to pass through synch blocks
* @param handle Handle to event to change
* @param permanent_locked Boolean permanent locked value to set event
* @return Result of operation, 0 on success, otherwise error code
*/
Result SetPermanentLock(Handle handle, const bool permanent_locked);
/** /**
* Clears an event * Clears an event
* @param handle Handle to event to clear * @param handle Handle to event to clear