summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/thread.h
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-03-03 18:02:50 +0100
committerFernando Sahmkow <fsahmkow27@gmail.com>2020-06-27 17:35:22 +0200
commit75e10578f12cf64bd734388ba80b5f5a46ca6133 (patch)
tree4ba3fa4053193e03407dbfdd6d9d742537406000 /src/core/hle/kernel/thread.h
parentProcess: Protect TLS region and Modules. (diff)
downloadyuzu-75e10578f12cf64bd734388ba80b5f5a46ca6133.tar
yuzu-75e10578f12cf64bd734388ba80b5f5a46ca6133.tar.gz
yuzu-75e10578f12cf64bd734388ba80b5f5a46ca6133.tar.bz2
yuzu-75e10578f12cf64bd734388ba80b5f5a46ca6133.tar.lz
yuzu-75e10578f12cf64bd734388ba80b5f5a46ca6133.tar.xz
yuzu-75e10578f12cf64bd734388ba80b5f5a46ca6133.tar.zst
yuzu-75e10578f12cf64bd734388ba80b5f5a46ca6133.zip
Diffstat (limited to 'src/core/hle/kernel/thread.h')
-rw-r--r--src/core/hle/kernel/thread.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 04496f96e..c4c9d69ec 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -448,7 +448,7 @@ public:
}
bool HasWakeupCallback() const {
- return hle_callback != nullptr;
+ return wakeup_callback != nullptr;
}
bool HasHLECallback() const {
@@ -456,10 +456,10 @@ public:
}
void SetWakeupCallback(WakeupCallback callback) {
- hle_callback = std::move(callback);
+ wakeup_callback = std::move(callback);
}
- void SetHLECallback(WakeupCallback callback) {
+ void SetHLECallback(HLECallback callback) {
hle_callback = std::move(callback);
}
@@ -487,8 +487,7 @@ public:
*/
bool InvokeWakeupCallback(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
std::shared_ptr<SynchronizationObject> object, std::size_t index);
- bool InvokeHLECallback(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
- std::shared_ptr<SynchronizationObject> object, std::size_t index);
+ bool InvokeHLECallback(std::shared_ptr<Thread> thread);
u32 GetIdealCore() const {
return ideal_core;
@@ -622,8 +621,11 @@ private:
/// Callback that will be invoked when the thread is resumed from a waiting state. If the thread
/// was waiting via WaitSynchronization then the object will be the last object that became
- /// available. In case of a timeout, the object will be nullptr.
- WakeupCallback hle_callback;
+ /// available. In case of a timeout, the object will be nullptr. DEPRECATED
+ WakeupCallback wakeup_callback;
+
+ /// Callback for HLE Events
+ HLECallback hle_callback;
Handle hle_time_event;
Scheduler* scheduler = nullptr;