INSANEMODE/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2025-06-18 15:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

hle: Integrate Domain handling into ServerSession.

Browse Source
This commit is contained in:
bunnei
2018-01-23 18:03:09 -05:00
parent 67758857e4
commit 27bad0598a
7 changed files with 74 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/hle/kernel/hle_ipc.h
View File

@ -86,7 +86,6 @@ protected:
*/
class HLERequestContext {
public:
HLERequestContext(SharedPtr<Kernel::Domain> domain);
HLERequestContext(SharedPtr<Kernel::ServerSession> session);
~HLERequestContext();
@ -95,18 +94,11 @@ public:
return cmd_buf.data();
}
/**
* 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