diff options
author | Liam <byteslice@airmail.cc> | 2023-12-25 01:20:43 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-12-25 01:20:43 +0100 |
commit | 5165ed9efd6e6593b969ce560c952e074f4d9e06 (patch) | |
tree | 59966aa2ac0bd9186f7358af41f3888cbf89ec16 /src/core/hle/service/hle_ipc.h | |
parent | Merge pull request #12394 from liamwhite/per-process-memory (diff) | |
download | yuzu-5165ed9efd6e6593b969ce560c952e074f4d9e06.tar yuzu-5165ed9efd6e6593b969ce560c952e074f4d9e06.tar.gz yuzu-5165ed9efd6e6593b969ce560c952e074f4d9e06.tar.bz2 yuzu-5165ed9efd6e6593b969ce560c952e074f4d9e06.tar.lz yuzu-5165ed9efd6e6593b969ce560c952e074f4d9e06.tar.xz yuzu-5165ed9efd6e6593b969ce560c952e074f4d9e06.tar.zst yuzu-5165ed9efd6e6593b969ce560c952e074f4d9e06.zip |
Diffstat (limited to 'src/core/hle/service/hle_ipc.h')
-rw-r--r-- | src/core/hle/service/hle_ipc.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/core/hle/service/hle_ipc.h b/src/core/hle/service/hle_ipc.h index 18d464c63..69a3cce36 100644 --- a/src/core/hle/service/hle_ipc.h +++ b/src/core/hle/service/hle_ipc.h @@ -17,6 +17,7 @@ #include "common/concepts.h" #include "common/swap.h" #include "core/hle/ipc.h" +#include "core/hle/kernel/k_handle_table.h" #include "core/hle/kernel/svc_common.h" union Result; @@ -196,10 +197,10 @@ public: } /// Populates this context with data from the requesting process/thread. - Result PopulateFromIncomingCommandBuffer(Kernel::KProcess& process, u32_le* src_cmdbuf); + Result PopulateFromIncomingCommandBuffer(u32_le* src_cmdbuf); /// Writes data from this context back to the requesting process/thread. - Result WriteToOutgoingCommandBuffer(Kernel::KThread& requesting_thread); + Result WriteToOutgoingCommandBuffer(); [[nodiscard]] u32_le GetHipcCommand() const { return command; @@ -359,8 +360,13 @@ public: return *thread; } - Kernel::KHandleTable& GetClientHandleTable() { - return *client_handle_table; + template <typename T> + Kernel::KScopedAutoObject<T> GetObjectFromHandle(u32 handle) { + auto obj = client_handle_table->GetObjectForIpc(handle, thread); + if (obj.IsNotNull()) { + return obj->DynamicCast<T*>(); + } + return nullptr; } [[nodiscard]] std::shared_ptr<SessionRequestManager> GetManager() const { @@ -378,7 +384,7 @@ public: private: friend class IPC::ResponseBuilder; - void ParseCommandBuffer(Kernel::KProcess& process, u32_le* src_cmdbuf, bool incoming); + void ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming); std::array<u32, IPC::COMMAND_BUFFER_LENGTH> cmd_buf; Kernel::KServerSession* server_session{}; |