diff options
author | bunnei <bunneidev@gmail.com> | 2018-09-14 01:50:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-14 01:50:47 +0200 |
commit | df5a44a40b9d691f1e80f369c4aaa6ed89676955 (patch) | |
tree | 1bcfbb20ff18c0fa659646d9f472552965dca4be /src/core/hle | |
parent | Merge pull request #1309 from lioncash/nested (diff) | |
parent | kernel/thread: Include thread-related enums within the kernel namespace (diff) | |
download | yuzu-df5a44a40b9d691f1e80f369c4aaa6ed89676955.tar yuzu-df5a44a40b9d691f1e80f369c4aaa6ed89676955.tar.gz yuzu-df5a44a40b9d691f1e80f369c4aaa6ed89676955.tar.bz2 yuzu-df5a44a40b9d691f1e80f369c4aaa6ed89676955.tar.lz yuzu-df5a44a40b9d691f1e80f369c4aaa6ed89676955.tar.xz yuzu-df5a44a40b9d691f1e80f369c4aaa6ed89676955.tar.zst yuzu-df5a44a40b9d691f1e80f369c4aaa6ed89676955.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/thread.h | 12 | ||||
-rw-r--r-- | src/core/hle/service/vi/vi.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 20f50458b..cb57ee78a 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -15,6 +15,12 @@ #include "core/hle/kernel/wait_object.h" #include "core/hle/result.h" +namespace Kernel { + +class KernelCore; +class Process; +class Scheduler; + enum ThreadPriority : u32 { THREADPRIO_HIGHEST = 0, ///< Highest thread priority THREADPRIO_USERLAND_MAX = 24, ///< Highest thread priority for userland apps @@ -54,12 +60,6 @@ enum class ThreadWakeupReason { Timeout // The thread was woken up due to a wait timeout. }; -namespace Kernel { - -class KernelCore; -class Process; -class Scheduler; - class Thread final : public WaitObject { public: /** diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 85244ac3b..cf94b00e6 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -514,7 +514,7 @@ private: ctx.SleepClientThread( Kernel::GetCurrentThread(), "IHOSBinderDriver::DequeueBuffer", -1, [=](Kernel::SharedPtr<Kernel::Thread> thread, Kernel::HLERequestContext& ctx, - ThreadWakeupReason reason) { + Kernel::ThreadWakeupReason reason) { // Repeat TransactParcel DequeueBuffer when a buffer is available auto buffer_queue = nv_flinger->GetBufferQueue(id); boost::optional<u32> slot = buffer_queue->DequeueBuffer(width, height); |