mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #12327 from liamwhite/tipc

Browse source 
sm:: fix tipc deserialization
This commit is contained in:
liamwhite 2023-12-10 18:17:04 -05:00 committed by GitHub
parent 62586c1676 a529ef4c09
commit 24e7ace876
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/core/hle/service/sm/sm.cpp
View file

@ -121,7 +121,7 @@ void SM::Initialize(HLERequestContext& ctx) {
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
void SM::GetService(HLERequestContext& ctx) { void SM::GetServiceCmif(HLERequestContext& ctx) {
Kernel::KClientSession* client_session{}; Kernel::KClientSession* client_session{};
auto result = GetServiceImpl(&client_session, ctx); auto result = GetServiceImpl(&client_session, ctx);
if (ctx.GetIsDeferred()) { if (ctx.GetIsDeferred()) {
@ -196,13 +196,28 @@ Result SM::GetServiceImpl(Kernel::KClientSession** out_client_session, HLEReques
return ResultSuccess; return ResultSuccess;
} }
void SM::RegisterService(HLERequestContext& ctx) { void SM::RegisterServiceCmif(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
std::string name(PopServiceName(rp)); std::string name(PopServiceName(rp));
const auto is_light = static_cast<bool>(rp.PopRaw<u32>()); const auto is_light = static_cast<bool>(rp.PopRaw<u32>());
const auto max_session_count = rp.PopRaw<u32>(); const auto max_session_count = rp.PopRaw<u32>();
this->RegisterServiceImpl(ctx, name, max_session_count, is_light);
}
void SM::RegisterServiceTipc(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};
std::string name(PopServiceName(rp));
const auto max_session_count = rp.PopRaw<u32>();
const auto is_light = static_cast<bool>(rp.PopRaw<u32>());
this->RegisterServiceImpl(ctx, name, max_session_count, is_light);
}
void SM::RegisterServiceImpl(HLERequestContext& ctx, std::string name, u32 max_session_count,
bool is_light) {
LOG_DEBUG(Service_SM, "called with name={}, max_session_count={}, is_light={}", name, LOG_DEBUG(Service_SM, "called with name={}, max_session_count={}, is_light={}", name,
max_session_count, is_light); max_session_count, is_light);
@ -238,15 +253,15 @@ SM::SM(ServiceManager& service_manager_, Core::System& system_)
service_manager{service_manager_}, kernel{system_.Kernel()} { service_manager{service_manager_}, kernel{system_.Kernel()} {
RegisterHandlers({ RegisterHandlers({
{0, &SM::Initialize, "Initialize"}, {0, &SM::Initialize, "Initialize"},
{1, &SM::GetService, "GetService"}, {1, &SM::GetServiceCmif, "GetService"},
{2, &SM::RegisterService, "RegisterService"}, {2, &SM::RegisterServiceCmif, "RegisterService"},
{3, &SM::UnregisterService, "UnregisterService"}, {3, &SM::UnregisterService, "UnregisterService"},
{4, nullptr, "DetachClient"}, {4, nullptr, "DetachClient"},
}); });
RegisterHandlersTipc({ RegisterHandlersTipc({
{0, &SM::Initialize, "Initialize"}, {0, &SM::Initialize, "Initialize"},
{1, &SM::GetServiceTipc, "GetService"}, {1, &SM::GetServiceTipc, "GetService"},
{2, &SM::RegisterService, "RegisterService"}, {2, &SM::RegisterServiceTipc, "RegisterService"},
{3, &SM::UnregisterService, "UnregisterService"}, {3, &SM::UnregisterService, "UnregisterService"},
{4, nullptr, "DetachClient"}, {4, nullptr, "DetachClient"},
}); });

7
src/core/hle/service/sm/sm.h
View file

@ -37,12 +37,15 @@ public:
private: private:
void Initialize(HLERequestContext& ctx); void Initialize(HLERequestContext& ctx);
void GetService(HLERequestContext& ctx); void GetServiceCmif(HLERequestContext& ctx);
void GetServiceTipc(HLERequestContext& ctx); void GetServiceTipc(HLERequestContext& ctx);
void RegisterService(HLERequestContext& ctx); void RegisterServiceCmif(HLERequestContext& ctx);
void RegisterServiceTipc(HLERequestContext& ctx);
void UnregisterService(HLERequestContext& ctx); void UnregisterService(HLERequestContext& ctx);
Result GetServiceImpl(Kernel::KClientSession** out_client_session, HLERequestContext& ctx); Result GetServiceImpl(Kernel::KClientSession** out_client_session, HLERequestContext& ctx);
void RegisterServiceImpl(HLERequestContext& ctx, std::string name, u32 max_session_count,
bool is_light);
ServiceManager& service_manager; ServiceManager& service_manager;
Kernel::KernelCore& kernel; Kernel::KernelCore& kernel;