summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-01-07 05:19:42 +0100
committerbunnei <bunneidev@gmail.com>2018-01-07 23:11:45 +0100
commitb0ceb4df70c8a387e12e2df0d1031421493ad744 (patch)
treefbe37a5849d34de75250fd12bc7403cc3c1ea4ad /src/core/hle/service
parentIPC: Use the correct size when pushing raw data to the command buffer and fixed pushing domain objects. (diff)
downloadyuzu-b0ceb4df70c8a387e12e2df0d1031421493ad744.tar
yuzu-b0ceb4df70c8a387e12e2df0d1031421493ad744.tar.gz
yuzu-b0ceb4df70c8a387e12e2df0d1031421493ad744.tar.bz2
yuzu-b0ceb4df70c8a387e12e2df0d1031421493ad744.tar.lz
yuzu-b0ceb4df70c8a387e12e2df0d1031421493ad744.tar.xz
yuzu-b0ceb4df70c8a387e12e2df0d1031421493ad744.tar.zst
yuzu-b0ceb4df70c8a387e12e2df0d1031421493ad744.zip
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/sm/sm.cpp17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp
index a976385ac..279908cae 100644
--- a/src/core/hle/service/sm/sm.cpp
+++ b/src/core/hle/service/sm/sm.cpp
@@ -100,8 +100,6 @@ void SM::Initialize(Kernel::HLERequestContext& ctx) {
*/
void SM::GetService(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};
- u32 unk1 = rp.Pop<u32>();
- u32 unk2 = rp.Pop<u32>();
auto name_buf = rp.PopRaw<std::array<char, 9>>();
std::string name(name_buf.data());
@@ -117,22 +115,13 @@ void SM::GetService(Kernel::HLERequestContext& ctx) {
}
auto session = client_port.Unwrap()->Connect();
+ ASSERT(session.Succeeded());
if (session.Succeeded()) {
LOG_DEBUG(Service_SM, "called service=%s -> session=%u", name.c_str(),
(*session)->GetObjectId());
- IPC::RequestBuilder rb = rp.MakeBuilder(1, 0, 1);
- rb.Push(session.Code());
+ IPC::RequestBuilder rb = rp.MakeBuilder(2, 0, 1);
+ rb.Push<u64>(0);
rb.PushObjects(std::move(session).Unwrap());
- } else if (session.Code() == Kernel::ERR_MAX_CONNECTIONS_REACHED /*&& return_port_on_failure*/) {
- LOG_WARNING(Service_SM, "called service=%s -> ERR_MAX_CONNECTIONS_REACHED, *port*=%u",
- name.c_str(), (*client_port)->GetObjectId());
- IPC::RequestBuilder rb = rp.MakeBuilder(1, 0, 1);
- rb.Push(ERR_MAX_CONNECTIONS_REACHED);
- rb.PushObjects(std::move(client_port).Unwrap());
- } else {
- LOG_ERROR(Service_SM, "called service=%s -> error 0x%08X", name.c_str(), session.Code());
- IPC::RequestBuilder rb = rp.MakeBuilder(1, 0, 0);
- rb.Push(session.Code());
}
}