diff options
| author | 2014-12-13 21:16:13 -0200 | |
|---|---|---|
| committer | 2014-12-28 11:52:52 -0200 | |
| commit | 73fba22c019562687c6e14f20ca7422020f7e070 (patch) | |
| tree | 605504e9e6306752023ce8bfbff9599c2eab957e /src/core/hle/kernel/event.cpp | |
| parent | Merge pull request #349 from lioncash/uhdync (diff) | |
| download | yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.gz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.xz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.zip | |
Rename ObjectPool to HandleTable
Diffstat (limited to 'src/core/hle/kernel/event.cpp')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 4de3fab3c..0ff1515d2 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp | |||
| @@ -53,7 +53,7 @@ public: | |||
| 53 | * @return Result of operation, 0 on success, otherwise error code | 53 | * @return Result of operation, 0 on success, otherwise error code |
| 54 | */ | 54 | */ |
| 55 | ResultCode SetPermanentLock(Handle handle, const bool permanent_locked) { | 55 | ResultCode SetPermanentLock(Handle handle, const bool permanent_locked) { |
| 56 | Event* evt = g_object_pool.Get<Event>(handle); | 56 | Event* evt = g_handle_table.Get<Event>(handle); |
| 57 | if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel); | 57 | if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel); |
| 58 | 58 | ||
| 59 | evt->permanent_locked = permanent_locked; | 59 | evt->permanent_locked = permanent_locked; |
| @@ -67,7 +67,7 @@ ResultCode SetPermanentLock(Handle handle, const bool permanent_locked) { | |||
| 67 | * @return Result of operation, 0 on success, otherwise error code | 67 | * @return Result of operation, 0 on success, otherwise error code |
| 68 | */ | 68 | */ |
| 69 | ResultCode SetEventLocked(const Handle handle, const bool locked) { | 69 | ResultCode SetEventLocked(const Handle handle, const bool locked) { |
| 70 | Event* evt = g_object_pool.Get<Event>(handle); | 70 | Event* evt = g_handle_table.Get<Event>(handle); |
| 71 | if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel); | 71 | if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel); |
| 72 | 72 | ||
| 73 | if (!evt->permanent_locked) { | 73 | if (!evt->permanent_locked) { |
| @@ -82,7 +82,7 @@ ResultCode SetEventLocked(const Handle handle, const bool locked) { | |||
| 82 | * @return Result of operation, 0 on success, otherwise error code | 82 | * @return Result of operation, 0 on success, otherwise error code |
| 83 | */ | 83 | */ |
| 84 | ResultCode SignalEvent(const Handle handle) { | 84 | ResultCode SignalEvent(const Handle handle) { |
| 85 | Event* evt = g_object_pool.Get<Event>(handle); | 85 | Event* evt = g_handle_table.Get<Event>(handle); |
| 86 | if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel); | 86 | if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel); |
| 87 | 87 | ||
| 88 | // Resume threads waiting for event to signal | 88 | // Resume threads waiting for event to signal |
| @@ -110,7 +110,7 @@ ResultCode SignalEvent(const Handle handle) { | |||
| 110 | * @return Result of operation, 0 on success, otherwise error code | 110 | * @return Result of operation, 0 on success, otherwise error code |
| 111 | */ | 111 | */ |
| 112 | ResultCode ClearEvent(Handle handle) { | 112 | ResultCode ClearEvent(Handle handle) { |
| 113 | Event* evt = g_object_pool.Get<Event>(handle); | 113 | Event* evt = g_handle_table.Get<Event>(handle); |
| 114 | if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel); | 114 | if (evt == nullptr) return InvalidHandle(ErrorModule::Kernel); |
| 115 | 115 | ||
| 116 | if (!evt->permanent_locked) { | 116 | if (!evt->permanent_locked) { |
| @@ -129,7 +129,7 @@ ResultCode ClearEvent(Handle handle) { | |||
| 129 | Event* CreateEvent(Handle& handle, const ResetType reset_type, const std::string& name) { | 129 | Event* CreateEvent(Handle& handle, const ResetType reset_type, const std::string& name) { |
| 130 | Event* evt = new Event; | 130 | Event* evt = new Event; |
| 131 | 131 | ||
| 132 | handle = Kernel::g_object_pool.Create(evt); | 132 | handle = Kernel::g_handle_table.Create(evt); |
| 133 | 133 | ||
| 134 | evt->locked = true; | 134 | evt->locked = true; |
| 135 | evt->permanent_locked = false; | 135 | evt->permanent_locked = false; |