diff options
| author | 2014-05-26 22:17:49 -0400 | |
|---|---|---|
| committer | 2014-05-26 22:17:49 -0400 | |
| commit | a432dc8f39a866b7b523235d6d94531f93bb4aa1 (patch) | |
| tree | c716af0c8dba3581d164276c4f607ed7562637d8 | |
| parent | kernel: updated SyncRequest to take boolean thread wait result as a parameter (diff) | |
| download | yuzu-a432dc8f39a866b7b523235d6d94531f93bb4aa1.tar.gz yuzu-a432dc8f39a866b7b523235d6d94531f93bb4aa1.tar.xz yuzu-a432dc8f39a866b7b523235d6d94531f93bb4aa1.zip | |
kernel: added WaitSynchronization method to Kernel::Object
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 7 | ||||
| -rw-r--r-- | src/core/hle/kernel/mutex.cpp | 11 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 11 | ||||
| -rw-r--r-- | src/core/hle/service/service.h | 10 |
4 files changed, 39 insertions, 0 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 4acc9f220..620cd2d73 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -55,6 +55,13 @@ public: | |||
| 55 | */ | 55 | */ |
| 56 | virtual Result SyncRequest(bool* wait) = 0; | 56 | virtual Result SyncRequest(bool* wait) = 0; |
| 57 | 57 | ||
| 58 | /** | ||
| 59 | * Wait for kernel object to synchronize | ||
| 60 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 61 | * @return Result of operation, 0 on success, otherwise error code | ||
| 62 | */ | ||
| 63 | virtual Result WaitSynchronization(bool* wait) = 0; | ||
| 64 | |||
| 58 | }; | 65 | }; |
| 59 | 66 | ||
| 60 | class ObjectPool : NonCopyable { | 67 | class ObjectPool : NonCopyable { |
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index 5465b7a3c..17fd40acd 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp | |||
| @@ -30,6 +30,17 @@ public: | |||
| 30 | * @return Result of operation, 0 on success, otherwise error code | 30 | * @return Result of operation, 0 on success, otherwise error code |
| 31 | */ | 31 | */ |
| 32 | Result SyncRequest(bool* wait) { | 32 | Result SyncRequest(bool* wait) { |
| 33 | // TODO(bunnei): ImplementMe | ||
| 34 | return 0; | ||
| 35 | } | ||
| 36 | |||
| 37 | /** | ||
| 38 | * Wait for kernel object to synchronize | ||
| 39 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 40 | * @return Result of operation, 0 on success, otherwise error code | ||
| 41 | */ | ||
| 42 | Result WaitSynchronization(bool* wait) { | ||
| 43 | // TODO(bunnei): ImplementMe | ||
| 33 | return 0; | 44 | return 0; |
| 34 | } | 45 | } |
| 35 | }; | 46 | }; |
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 56c7755cf..6e8b53eb1 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -42,6 +42,17 @@ public: | |||
| 42 | * @return Result of operation, 0 on success, otherwise error code | 42 | * @return Result of operation, 0 on success, otherwise error code |
| 43 | */ | 43 | */ |
| 44 | Result SyncRequest(bool* wait) { | 44 | Result SyncRequest(bool* wait) { |
| 45 | // TODO(bunnei): ImplementMe | ||
| 46 | return 0; | ||
| 47 | } | ||
| 48 | |||
| 49 | /** | ||
| 50 | * Wait for kernel object to synchronize | ||
| 51 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 52 | * @return Result of operation, 0 on success, otherwise error code | ||
| 53 | */ | ||
| 54 | Result WaitSynchronization(bool* wait) { | ||
| 55 | // TODO(bunnei): ImplementMe | ||
| 45 | return 0; | 56 | return 0; |
| 46 | } | 57 | } |
| 47 | 58 | ||
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 12ef51b91..4671d4528 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h | |||
| @@ -100,6 +100,16 @@ public: | |||
| 100 | return 0; // TODO: Implement return from actual function | 100 | return 0; // TODO: Implement return from actual function |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | /** | ||
| 104 | * Wait for kernel object to synchronize | ||
| 105 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | ||
| 106 | * @return Result of operation, 0 on success, otherwise error code | ||
| 107 | */ | ||
| 108 | Result WaitSynchronization(bool* wait) { | ||
| 109 | // TODO(bunnei): ImplementMe | ||
| 110 | return 0; | ||
| 111 | } | ||
| 112 | |||
| 103 | protected: | 113 | protected: |
| 104 | 114 | ||
| 105 | /** | 115 | /** |