diff options
| author |  bunnei <ericbunnie@gmail.com> | 2014-06-05 23:13:28 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-06-13 09:51:08 -0400 |
| commit | aae9fcf4a4071a408af10ca1c72180cdc04687b8 (patch) | |
| tree | 9d5bd2a270b9531a06adb59e3134c7224dd22c22 /src/core/hle/kernel | |
| parent | f5c7c1543434e25a215286e6db5e71c055ba48cf (diff) | |
Kernel: Made SyncRequest not pure virtual, with a default implementation of error (as this is not required for all kernel objects)
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 11 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 10 |
3 files changed, 4 insertions, 23 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 787e9f5f..36c7dcbc 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp @@ -31,17 +31,6 @@ public: std::string name; ///< Name of event (optional) /** - * Synchronize kernel object - * @param wait Boolean wait set if current thread should wait as a result of sync operation - * @return Result of operation, 0 on success, otherwise error code - */ - Result SyncRequest(bool* wait) { - // TODO(bunnei): ImplementMe - ERROR_LOG(KERNEL, "(UMIMPLEMENTED) call"); - return 0; - } - - /** * Wait for kernel object to synchronize * @param wait Boolean wait set if current thread should wait as a result of sync operation * @return Result of operation, 0 on success, otherwise error code diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index c2607127..f1bb7880 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -53,7 +53,10 @@ public: * @param wait Boolean wait set if current thread should wait as a result of sync operation * @return Result of operation, 0 on success, otherwise error code */ - virtual Result SyncRequest(bool* wait) = 0; + virtual Result SyncRequest(bool* wait) { + ERROR_LOG(KERNEL, "(UNIMPLEMENTED)"); + return -1; + } /** * Wait for kernel object to synchronize @@ -61,7 +64,6 @@ public: * @return Result of operation, 0 on success, otherwise error code */ virtual Result WaitSynchronization(bool* wait) = 0; - }; class ObjectPool : NonCopyable { diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index d372df70..180c1492 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -38,16 +38,6 @@ public: inline bool IsSuspended() const { return (status & THREADSTATUS_SUSPEND) != 0; } /** - * Synchronize kernel object - * @param wait Boolean wait set if current thread should wait as a result of sync operation - * @return Result of operation, 0 on success, otherwise error code - */ - Result SyncRequest(bool* wait) { - // TODO(bunnei): ImplementMe - return 0; - } - - /** * Wait for kernel object to synchronize * @param wait Boolean wait set if current thread should wait as a result of sync operation * @return Result of operation, 0 on success, otherwise error code |