diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-20 17:59:18 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-20 17:59:18 +0100 |
| commit | 2b0d7a1d293ca28f6a9022b220720bf8b57a47e8 (patch) | |
| tree | 363f962b88f1b3c8b4f9f36ad46dd3b10addde6b /src/core/hle/kernel | |
| parent | Merge pull request #317 from yuriks/make_unique (diff) | |
| parent | Clean up some warnings (diff) | |
| download | yuzu-2b0d7a1d293ca28f6a9022b220720bf8b57a47e8.tar yuzu-2b0d7a1d293ca28f6a9022b220720bf8b57a47e8.tar.gz yuzu-2b0d7a1d293ca28f6a9022b220720bf8b57a47e8.tar.bz2 yuzu-2b0d7a1d293ca28f6a9022b220720bf8b57a47e8.tar.lz yuzu-2b0d7a1d293ca28f6a9022b220720bf8b57a47e8.tar.xz yuzu-2b0d7a1d293ca28f6a9022b220720bf8b57a47e8.tar.zst yuzu-2b0d7a1d293ca28f6a9022b220720bf8b57a47e8.zip | |
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/semaphore.cpp | 8 | ||||
| -rw-r--r-- | src/core/hle/kernel/semaphore.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp index 6f56da8a9..f955d1957 100644 --- a/src/core/hle/kernel/semaphore.cpp +++ b/src/core/hle/kernel/semaphore.cpp @@ -20,8 +20,8 @@ public: static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Semaphore; } Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Semaphore; } - u32 max_count; ///< Maximum number of simultaneous holders the semaphore can have - u32 available_count; ///< Number of free slots left in the semaphore + s32 max_count; ///< Maximum number of simultaneous holders the semaphore can have + s32 available_count; ///< Number of free slots left in the semaphore std::queue<Handle> waiting_threads; ///< Threads that are waiting for the semaphore std::string name; ///< Name of semaphore (optional) @@ -49,8 +49,8 @@ public: //////////////////////////////////////////////////////////////////////////////////////////////////// -ResultCode CreateSemaphore(Handle* handle, u32 initial_count, - u32 max_count, const std::string& name) { +ResultCode CreateSemaphore(Handle* handle, s32 initial_count, + s32 max_count, const std::string& name) { if (initial_count > max_count) return ResultCode(ErrorDescription::InvalidCombination, ErrorModule::Kernel, diff --git a/src/core/hle/kernel/semaphore.h b/src/core/hle/kernel/semaphore.h index f0075fdb8..ad474b875 100644 --- a/src/core/hle/kernel/semaphore.h +++ b/src/core/hle/kernel/semaphore.h @@ -18,7 +18,7 @@ namespace Kernel { * @param name Optional name of semaphore * @return ResultCode of the error */ -ResultCode CreateSemaphore(Handle* handle, u32 initial_count, u32 max_count, const std::string& name = "Unknown"); +ResultCode CreateSemaphore(Handle* handle, s32 initial_count, s32 max_count, const std::string& name = "Unknown"); /** * Releases a certain number of slots from a semaphore. |