From 0368324f7925fe5568072299a0206ec71afee865 Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 7 Jan 2018 01:50:55 -0500 Subject: IPC Cleanup: Remove 3DS-specific code and translate copy, move and domain objects in IPC requests. Popping objects from the buffer is still not implemented. --- src/core/hle/service/sm/controller.cpp | 2 +- src/core/hle/service/sm/sm.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/hle/service/sm') diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/controller.cpp index 8d17e0ef6..7acc5c3b2 100644 --- a/src/core/hle/service/sm/controller.cpp +++ b/src/core/hle/service/sm/controller.cpp @@ -24,7 +24,7 @@ void Controller::ConvertSessionToDomain(Kernel::HLERequestContext& ctx) { void Controller::DuplicateSession(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb{ctx, 1, 0, 1}; rb.Push(RESULT_SUCCESS); - rb.PushObjects(ctx.ServerSession()); + rb.PushMoveObjects(ctx.ServerSession()); LOG_DEBUG(Service, "called"); } diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 279908cae..f1d93ea2b 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -121,7 +121,7 @@ void SM::GetService(Kernel::HLERequestContext& ctx) { (*session)->GetObjectId()); IPC::RequestBuilder rb = rp.MakeBuilder(2, 0, 1); rb.Push(0); - rb.PushObjects(std::move(session).Unwrap()); + rb.PushMoveObjects(std::move(session).Unwrap()); } } -- cgit v1.2.3