From 16fb1c8fe75338ef9848d9ed75247c3b869bea57 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 28 Dec 2017 15:24:59 -0500 Subject: [PATCH] service: Halt on ReportUnimplementedFunction and improve output log. --- src/core/hle/service/service.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 66125f52b4..3394ea414d 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -96,7 +96,7 @@ void ServiceFrameworkBase::RegisterHandlersBase(const FunctionInfoBase* function void ServiceFrameworkBase::ReportUnimplementedFunction(Kernel::HLERequestContext& ctx, const FunctionInfoBase* info) { auto cmd_buf = ctx.CommandBuffer(); - std::string function_name = info == nullptr ? fmt::format("{:#08x}", ctx.GetCommand()) : info->name; + std::string function_name = info == nullptr ? fmt::format("{}", ctx.GetCommand()) : info->name; fmt::MemoryWriter w; w.write("function '{}': port='{}' cmd_buf={{[0]={:#x}", function_name, service_name, @@ -107,9 +107,7 @@ void ServiceFrameworkBase::ReportUnimplementedFunction(Kernel::HLERequestContext w << '}'; LOG_ERROR(Service, "unknown / unimplemented %s", w.c_str()); - // TODO(bunnei): Hack - ignore error - IPC::RequestBuilder rb{ctx, 1}; - rb.Push(RESULT_SUCCESS); + UNIMPLEMENTED(); } void ServiceFrameworkBase::InvokeRequest(Kernel::HLERequestContext& ctx) {