diff options
author | bunnei <bunneidev@gmail.com> | 2018-11-29 06:58:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-29 06:58:46 +0100 |
commit | 1e49a85106acdc596db9d1aeca31104fab9552a2 (patch) | |
tree | 7e295e2921c61866371ac52d63a807782b1094b6 /src/core/hle/service/sm | |
parent | Merge pull request #1808 from Tinob/master (diff) | |
parent | Added comment on Main memory size for more clarity (diff) | |
download | yuzu-1e49a85106acdc596db9d1aeca31104fab9552a2.tar yuzu-1e49a85106acdc596db9d1aeca31104fab9552a2.tar.gz yuzu-1e49a85106acdc596db9d1aeca31104fab9552a2.tar.bz2 yuzu-1e49a85106acdc596db9d1aeca31104fab9552a2.tar.lz yuzu-1e49a85106acdc596db9d1aeca31104fab9552a2.tar.xz yuzu-1e49a85106acdc596db9d1aeca31104fab9552a2.tar.zst yuzu-1e49a85106acdc596db9d1aeca31104fab9552a2.zip |
Diffstat (limited to 'src/core/hle/service/sm')
-rw-r--r-- | src/core/hle/service/sm/controller.cpp | 11 | ||||
-rw-r--r-- | src/core/hle/service/sm/sm.cpp | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/controller.cpp index 98f6e4111..74da4d5e6 100644 --- a/src/core/hle/service/sm/controller.cpp +++ b/src/core/hle/service/sm/controller.cpp @@ -14,25 +14,26 @@ namespace Service::SM { void Controller::ConvertSessionToDomain(Kernel::HLERequestContext& ctx) { ASSERT_MSG(ctx.Session()->IsSession(), "Session is already a domain"); + LOG_DEBUG(Service, "called, server_session={}", ctx.Session()->GetObjectId()); ctx.Session()->ConvertToDomain(); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(RESULT_SUCCESS); rb.Push<u32>(1); // Converted sessions start with 1 request handler - - LOG_DEBUG(Service, "called, server_session={}", ctx.Session()->GetObjectId()); } void Controller::DuplicateSession(Kernel::HLERequestContext& ctx) { // TODO(bunnei): This is just creating a new handle to the same Session. I assume this is wrong // and that we probably want to actually make an entirely new Session, but we still need to // verify this on hardware. + LOG_DEBUG(Service, "called"); + IPC::ResponseBuilder rb{ctx, 2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles}; rb.Push(RESULT_SUCCESS); Kernel::SharedPtr<Kernel::ClientSession> session{ctx.Session()->parent->client}; rb.PushMoveObjects(session); - LOG_DEBUG(Service, "called, session={}", session->GetObjectId()); + LOG_DEBUG(Service, "session={}", session->GetObjectId()); } void Controller::DuplicateSessionEx(Kernel::HLERequestContext& ctx) { @@ -42,11 +43,11 @@ void Controller::DuplicateSessionEx(Kernel::HLERequestContext& ctx) { } void Controller::QueryPointerBufferSize(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service, "(STUBBED) called"); + IPC::ResponseBuilder rb{ctx, 3}; rb.Push(RESULT_SUCCESS); rb.Push<u16>(0x500); - - LOG_WARNING(Service, "(STUBBED) called"); } Controller::Controller() : ServiceFramework("IpcController") { diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 9ca8483a5..0d0f63a78 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -103,9 +103,10 @@ SM::~SM() = default; * 0: ResultCode */ void SM::Initialize(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Service_SM, "called"); + IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); - LOG_DEBUG(Service_SM, "called"); } void SM::GetService(Kernel::HLERequestContext& ctx) { @@ -172,6 +173,7 @@ void SM::UnregisterService(Kernel::HLERequestContext& ctx) { const auto end = std::find(name_buf.begin(), name_buf.end(), '\0'); const std::string name(name_buf.begin(), end); + LOG_DEBUG(Service_SM, "called with name={}", name); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(service_manager->UnregisterService(name)); |