diff options
Diffstat (limited to 'src/core/hle/service/service.cpp')
| -rw-r--r-- | src/core/hle/service/service.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 31021ea03..6415fc310 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include "common/settings.h" | 7 | #include "common/settings.h" |
| 8 | #include "core/core.h" | 8 | #include "core/core.h" |
| 9 | #include "core/hle/ipc.h" | 9 | #include "core/hle/ipc.h" |
| 10 | #include "core/hle/ipc_helpers.h" | ||
| 11 | #include "core/hle/kernel/k_process.h" | 10 | #include "core/hle/kernel/k_process.h" |
| 12 | #include "core/hle/kernel/k_server_port.h" | 11 | #include "core/hle/kernel/k_server_port.h" |
| 13 | #include "core/hle/kernel/kernel.h" | 12 | #include "core/hle/kernel/kernel.h" |
| @@ -31,6 +30,7 @@ | |||
| 31 | #include "core/hle/service/glue/glue.h" | 30 | #include "core/hle/service/glue/glue.h" |
| 32 | #include "core/hle/service/grc/grc.h" | 31 | #include "core/hle/service/grc/grc.h" |
| 33 | #include "core/hle/service/hid/hid.h" | 32 | #include "core/hle/service/hid/hid.h" |
| 33 | #include "core/hle/service/ipc_helpers.h" | ||
| 34 | #include "core/hle/service/jit/jit.h" | 34 | #include "core/hle/service/jit/jit.h" |
| 35 | #include "core/hle/service/lbl/lbl.h" | 35 | #include "core/hle/service/lbl/lbl.h" |
| 36 | #include "core/hle/service/ldn/ldn.h" | 36 | #include "core/hle/service/ldn/ldn.h" |
| @@ -117,7 +117,7 @@ void ServiceFrameworkBase::RegisterHandlersBaseTipc(const FunctionInfoBase* func | |||
| 117 | } | 117 | } |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | void ServiceFrameworkBase::ReportUnimplementedFunction(Kernel::HLERequestContext& ctx, | 120 | void ServiceFrameworkBase::ReportUnimplementedFunction(HLERequestContext& ctx, |
| 121 | const FunctionInfoBase* info) { | 121 | const FunctionInfoBase* info) { |
| 122 | auto cmd_buf = ctx.CommandBuffer(); | 122 | auto cmd_buf = ctx.CommandBuffer(); |
| 123 | std::string function_name = info == nullptr ? fmt::format("{}", ctx.GetCommand()) : info->name; | 123 | std::string function_name = info == nullptr ? fmt::format("{}", ctx.GetCommand()) : info->name; |
| @@ -140,7 +140,7 @@ void ServiceFrameworkBase::ReportUnimplementedFunction(Kernel::HLERequestContext | |||
| 140 | } | 140 | } |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | void ServiceFrameworkBase::InvokeRequest(Kernel::HLERequestContext& ctx) { | 143 | void ServiceFrameworkBase::InvokeRequest(HLERequestContext& ctx) { |
| 144 | auto itr = handlers.find(ctx.GetCommand()); | 144 | auto itr = handlers.find(ctx.GetCommand()); |
| 145 | const FunctionInfoBase* info = itr == handlers.end() ? nullptr : &itr->second; | 145 | const FunctionInfoBase* info = itr == handlers.end() ? nullptr : &itr->second; |
| 146 | if (info == nullptr || info->handler_callback == nullptr) { | 146 | if (info == nullptr || info->handler_callback == nullptr) { |
| @@ -151,7 +151,7 @@ void ServiceFrameworkBase::InvokeRequest(Kernel::HLERequestContext& ctx) { | |||
| 151 | handler_invoker(this, info->handler_callback, ctx); | 151 | handler_invoker(this, info->handler_callback, ctx); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | void ServiceFrameworkBase::InvokeRequestTipc(Kernel::HLERequestContext& ctx) { | 154 | void ServiceFrameworkBase::InvokeRequestTipc(HLERequestContext& ctx) { |
| 155 | boost::container::flat_map<u32, FunctionInfoBase>::iterator itr; | 155 | boost::container::flat_map<u32, FunctionInfoBase>::iterator itr; |
| 156 | 156 | ||
| 157 | itr = handlers_tipc.find(ctx.GetCommand()); | 157 | itr = handlers_tipc.find(ctx.GetCommand()); |
| @@ -166,7 +166,7 @@ void ServiceFrameworkBase::InvokeRequestTipc(Kernel::HLERequestContext& ctx) { | |||
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | Result ServiceFrameworkBase::HandleSyncRequest(Kernel::KServerSession& session, | 168 | Result ServiceFrameworkBase::HandleSyncRequest(Kernel::KServerSession& session, |
| 169 | Kernel::HLERequestContext& ctx) { | 169 | HLERequestContext& ctx) { |
| 170 | const auto guard = LockService(); | 170 | const auto guard = LockService(); |
| 171 | 171 | ||
| 172 | Result result = ResultSuccess; | 172 | Result result = ResultSuccess; |