yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #443 from ogniK5377/ipc-500 

Added IPC RequestWithContext & ControlWithContext
This commit is contained in:
Sebastian Valle 2018-05-19 17:03:30 -05:00 committed by GitHub
parent a215f63235 fd86cdb2e2
commit 353e1dd7e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/ipc.h
View File

@ -32,6 +32,8 @@ enum class CommandType : u32 {
Close = 2, Close = 2,
Request = 4, Request = 4,
Control = 5, Control = 5,
RequestWithContext = 6,
ControlWithContext = 7,
Unspecified, Unspecified,
}; };

4
src/core/hle/kernel/hle_ipc.cpp
View File

@ -110,7 +110,9 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) {
// Padding to align to 16 bytes // Padding to align to 16 bytes
rp.AlignWithPadding(); rp.AlignWithPadding();
if (Session()->IsDomain() && (command_header->type == IPC::CommandType::Request || !incoming)) { if (Session()->IsDomain() && ((command_header->type == IPC::CommandType::Request ||
command_header->type == IPC::CommandType::RequestWithContext) ||
!incoming)) {
// If this is an incoming message, only CommandType "Request" has a domain header // If this is an incoming message, only CommandType "Request" has a domain header
// All outgoing domain messages have the domain header, if only incoming has it // All outgoing domain messages have the domain header, if only incoming has it
if (incoming || domain_message_header) { if (incoming || domain_message_header) {

2
src/core/hle/service/service.cpp
View File

@ -144,10 +144,12 @@ ResultCode ServiceFrameworkBase::HandleSyncRequest(Kernel::HLERequestContext& co
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
return ResultCode(ErrorModule::HIPC, ErrorDescription::RemoteProcessDead); return ResultCode(ErrorModule::HIPC, ErrorDescription::RemoteProcessDead);
} }
case IPC::CommandType::ControlWithContext:
case IPC::CommandType::Control: { case IPC::CommandType::Control: {
Core::System::GetInstance().ServiceManager().InvokeControlRequest(context); Core::System::GetInstance().ServiceManager().InvokeControlRequest(context);
break; break;
} }
case IPC::CommandType::RequestWithContext:
case IPC::CommandType::Request: { case IPC::CommandType::Request: {
InvokeRequest(context); InvokeRequest(context);
break; break;