diff options
| author | 2014-05-26 21:01:27 -0400 | |
|---|---|---|
| committer | 2014-05-26 21:01:27 -0400 | |
| commit | d73d782ba7ea6f3f2dd9c4f70d34c1004397dacb (patch) | |
| tree | 6eb4c55468938b7d2a95f029c15dd9f6be913748 /src | |
| parent | svc: added stub for DuplicateHandle SVC call (diff) | |
| download | yuzu-d73d782ba7ea6f3f2dd9c4f70d34c1004397dacb.tar.gz yuzu-d73d782ba7ea6f3f2dd9c4f70d34c1004397dacb.tar.xz yuzu-d73d782ba7ea6f3f2dd9c4f70d34c1004397dacb.zip | |
kernel: add a SyncRequest method to KernelObject for use with svcSendSyncRequest
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 1 | ||||
| -rw-r--r-- | src/core/hle/kernel/mutex.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/service/srv.h | 6 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 7cd79c2c4..046d583cb 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -42,6 +42,7 @@ public: | |||
| 42 | virtual const char *GetTypeName() { return "[BAD KERNEL OBJECT TYPE]"; } | 42 | virtual const char *GetTypeName() { return "[BAD KERNEL OBJECT TYPE]"; } |
| 43 | virtual const char *GetName() { return "[UNKNOWN KERNEL OBJECT]"; } | 43 | virtual const char *GetName() { return "[UNKNOWN KERNEL OBJECT]"; } |
| 44 | virtual Kernel::HandleType GetHandleType() const = 0; | 44 | virtual Kernel::HandleType GetHandleType() const = 0; |
| 45 | virtual Result SyncRequest() = 0; | ||
| 45 | }; | 46 | }; |
| 46 | 47 | ||
| 47 | class ObjectPool : NonCopyable { | 48 | class ObjectPool : NonCopyable { |
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index 019efbc78..fa924404d 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp | |||
| @@ -23,6 +23,11 @@ public: | |||
| 23 | bool locked; ///< Current locked state | 23 | bool locked; ///< Current locked state |
| 24 | Handle lock_thread; ///< Handle to thread that currently has mutex | 24 | Handle lock_thread; ///< Handle to thread that currently has mutex |
| 25 | std::vector<Handle> waiting_threads; ///< Threads that are waiting for the mutex | 25 | std::vector<Handle> waiting_threads; ///< Threads that are waiting for the mutex |
| 26 | |||
| 27 | /// Synchronize kernel object | ||
| 28 | Result SyncRequest() { | ||
| 29 | return 0; | ||
| 30 | } | ||
| 26 | }; | 31 | }; |
| 27 | 32 | ||
| 28 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 33 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index bf4c8353c..b9dd9fac4 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -36,6 +36,11 @@ public: | |||
| 36 | inline bool IsWaiting() const { return (status & THREADSTATUS_WAIT) != 0; } | 36 | inline bool IsWaiting() const { return (status & THREADSTATUS_WAIT) != 0; } |
| 37 | inline bool IsSuspended() const { return (status & THREADSTATUS_SUSPEND) != 0; } | 37 | inline bool IsSuspended() const { return (status & THREADSTATUS_SUSPEND) != 0; } |
| 38 | 38 | ||
| 39 | /// Synchronize kernel object | ||
| 40 | Result SyncRequest() { | ||
| 41 | return 0; | ||
| 42 | } | ||
| 43 | |||
| 39 | ThreadContext context; | 44 | ThreadContext context; |
| 40 | 45 | ||
| 41 | u32 status; | 46 | u32 status; |
diff --git a/src/core/hle/service/srv.h b/src/core/hle/service/srv.h index 1e35032ba..81109a2a8 100644 --- a/src/core/hle/service/srv.h +++ b/src/core/hle/service/srv.h | |||
| @@ -26,12 +26,6 @@ public: | |||
| 26 | return "srv:"; | 26 | return "srv:"; |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | /** | ||
| 30 | * Called when svcSendSyncRequest is called, loads command buffer and executes comand | ||
| 31 | * @return Return result of svcSendSyncRequest passed back to user app | ||
| 32 | */ | ||
| 33 | Result Sync(); | ||
| 34 | |||
| 35 | }; | 29 | }; |
| 36 | 30 | ||
| 37 | } // namespace | 31 | } // namespace |