summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-06-06 05:13:28 +0200
committerbunnei <ericbunnie@gmail.com>2014-06-13 15:51:08 +0200
commitaae9fcf4a4071a408af10ca1c72180cdc04687b8 (patch)
tree9d5bd2a270b9531a06adb59e3134c7224dd22c22
parentKernel: Added real support for thread and event blocking (diff)
downloadyuzu-aae9fcf4a4071a408af10ca1c72180cdc04687b8.tar
yuzu-aae9fcf4a4071a408af10ca1c72180cdc04687b8.tar.gz
yuzu-aae9fcf4a4071a408af10ca1c72180cdc04687b8.tar.bz2
yuzu-aae9fcf4a4071a408af10ca1c72180cdc04687b8.tar.lz
yuzu-aae9fcf4a4071a408af10ca1c72180cdc04687b8.tar.xz
yuzu-aae9fcf4a4071a408af10ca1c72180cdc04687b8.tar.zst
yuzu-aae9fcf4a4071a408af10ca1c72180cdc04687b8.zip
-rw-r--r--src/core/hle/kernel/event.cpp11
-rw-r--r--src/core/hle/kernel/kernel.h6
-rw-r--r--src/core/hle/kernel/thread.cpp10
3 files changed, 4 insertions, 23 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index 787e9f5fd..36c7dcbc8 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 c26071276..f1bb78801 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 d372df709..180c14928 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