diff options
author | bunnei <bunneidev@gmail.com> | 2018-01-24 00:03:09 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-01-25 04:18:56 +0100 |
commit | 27bad0598a3ddce0417388c3945368200150d413 (patch) | |
tree | 8afc27be2a01d80cc592a698632b2fbcae71d8a5 /src/core/hle/kernel/hle_ipc.h | |
parent | hle: Remove Domain and SyncObject kernel objects. (diff) | |
download | yuzu-27bad0598a3ddce0417388c3945368200150d413.tar yuzu-27bad0598a3ddce0417388c3945368200150d413.tar.gz yuzu-27bad0598a3ddce0417388c3945368200150d413.tar.bz2 yuzu-27bad0598a3ddce0417388c3945368200150d413.tar.lz yuzu-27bad0598a3ddce0417388c3945368200150d413.tar.xz yuzu-27bad0598a3ddce0417388c3945368200150d413.tar.zst yuzu-27bad0598a3ddce0417388c3945368200150d413.zip |
Diffstat (limited to 'src/core/hle/kernel/hle_ipc.h')
-rw-r--r-- | src/core/hle/kernel/hle_ipc.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 80fa48d7f..71e5609b8 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -86,7 +86,6 @@ protected: */ class HLERequestContext { public: - HLERequestContext(SharedPtr<Kernel::Domain> domain); HLERequestContext(SharedPtr<Kernel::ServerSession> session); ~HLERequestContext(); @@ -96,17 +95,10 @@ public: } /** - * Returns the domain through which this request was made. - */ - const SharedPtr<Kernel::Domain>& Domain() const { - return domain; - } - - /** * Returns the session through which this request was made. This can be used as a map key to * access per-client data on services. */ - const SharedPtr<Kernel::ServerSession>& ServerSession() const { + const SharedPtr<Kernel::ServerSession>& Session() const { return server_session; } @@ -151,10 +143,6 @@ public: return domain_message_header; } - bool IsDomain() const { - return domain != nullptr; - } - template <typename T> SharedPtr<T> GetCopyObject(size_t index) { ASSERT(index < copy_objects.size()); @@ -189,7 +177,6 @@ public: private: std::array<u32, IPC::COMMAND_BUFFER_LENGTH> cmd_buf; - SharedPtr<Kernel::Domain> domain; SharedPtr<Kernel::ServerSession> server_session; // TODO(yuriks): Check common usage of this and optimize size accordingly boost::container::small_vector<SharedPtr<Object>, 8> move_objects; @@ -209,6 +196,7 @@ private: unsigned data_payload_offset{}; unsigned buffer_c_offset{}; u32_le command{}; + bool is_domain{}; }; } // namespace Kernel |