diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-11-11 22:57:59 +0100 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-11-18 16:53:47 +0100 |
| commit | 3cf7246e376445320e2b55165265228736f65214 (patch) | |
| tree | 97c571a7968f41f09f36a2746f3888f00a5bd694 | |
| parent | am: Implement text check software keyboard mode (diff) | |
| download | yuzu-3cf7246e376445320e2b55165265228736f65214.tar yuzu-3cf7246e376445320e2b55165265228736f65214.tar.gz yuzu-3cf7246e376445320e2b55165265228736f65214.tar.bz2 yuzu-3cf7246e376445320e2b55165265228736f65214.tar.lz yuzu-3cf7246e376445320e2b55165265228736f65214.tar.xz yuzu-3cf7246e376445320e2b55165265228736f65214.tar.zst yuzu-3cf7246e376445320e2b55165265228736f65214.zip | |
| -rw-r--r-- | src/core/frontend/applets/software_keyboard.cpp | 1 | ||||
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 12 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/core/frontend/applets/software_keyboard.cpp b/src/core/frontend/applets/software_keyboard.cpp index 05e2dc6b7..cf5e2ea31 100644 --- a/src/core/frontend/applets/software_keyboard.cpp +++ b/src/core/frontend/applets/software_keyboard.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "common/logging/backend.h" +#include "common/string_util.h" #include "core/frontend/applets/software_keyboard.h" namespace Core::Frontend { diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index ea00c5c72..3201e2d4b 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -533,7 +533,7 @@ public: // clang-format off static const FunctionInfo functions[] = { {0, &ILibraryAppletAccessor::GetAppletStateChangedEvent, "GetAppletStateChangedEvent"}, - {1, nullptr, "IsCompleted"}, + {1, &ILibraryAppletAccessor::IsCompleted, "IsCompleted"}, {10, &ILibraryAppletAccessor::Start, "Start"}, {20, nullptr, "RequestExit"}, {25, nullptr, "Terminate"}, @@ -576,11 +576,15 @@ private: LOG_WARNING(Service_AM, "(STUBBED) called"); } - void GetResult(Kernel::HLERequestContext& ctx) { - IPC::ResponseBuilder rb{ctx, 2}; + void IsCompleted(Kernel::HLERequestContext& ctx) { + IPC::ResponseBuilder rb{ctx, 3}; rb.Push(RESULT_SUCCESS); + rb.Push<u32>(applet->TransactionComplete()); + } - LOG_WARNING(Service_AM, "(STUBBED) called"); + void GetResult(Kernel::HLERequestContext& ctx) { + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(applet->GetStatus()); } void Start(Kernel::HLERequestContext& ctx) { |