diff options
author | Zach Hilman <zachhilman@gmail.com> | 2019-05-26 17:40:41 +0200 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2019-05-26 17:40:46 +0200 |
commit | b77fde7c5c1f63aad9d4f01ea625805661870f3e (patch) | |
tree | 1a69520beebaac50ecd19d4c54828f7b8a498dd0 /src/core/hle | |
parent | prepo: Save reports from PlayReport service (diff) | |
download | yuzu-b77fde7c5c1f63aad9d4f01ea625805661870f3e.tar yuzu-b77fde7c5c1f63aad9d4f01ea625805661870f3e.tar.gz yuzu-b77fde7c5c1f63aad9d4f01ea625805661870f3e.tar.bz2 yuzu-b77fde7c5c1f63aad9d4f01ea625805661870f3e.tar.lz yuzu-b77fde7c5c1f63aad9d4f01ea625805661870f3e.tar.xz yuzu-b77fde7c5c1f63aad9d4f01ea625805661870f3e.tar.zst yuzu-b77fde7c5c1f63aad9d4f01ea625805661870f3e.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/service/am/applets/applets.cpp | 5 | ||||
-rw-r--r-- | src/core/hle/service/am/applets/general_backend.h | 2 | ||||
-rw-r--r-- | src/core/hle/service/prepo/prepo.cpp | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/core/hle/service/am/applets/applets.cpp index 2a945bc7b..d8ad0079a 100644 --- a/src/core/hle/service/am/applets/applets.cpp +++ b/src/core/hle/service/am/applets/applets.cpp @@ -37,17 +37,18 @@ AppletDataBroker::~AppletDataBroker() = default; AppletDataBroker::RawChannelData AppletDataBroker::PeekDataToAppletForDebug() const { std::vector<std::vector<u8>> out_normal; - std::vector<std::vector<u8>> out_interactive; for (const auto& storage : in_channel) { out_normal.push_back(storage->GetData()); } + std::vector<std::vector<u8>> out_interactive; + for (const auto& storage : in_interactive_channel) { out_interactive.push_back(storage->GetData()); } - return {out_normal, out_interactive}; + return {std::move(out_normal), std::move(out_interactive)}; } std::unique_ptr<IStorage> AppletDataBroker::PopNormalDataToGame() { diff --git a/src/core/hle/service/am/applets/general_backend.h b/src/core/hle/service/am/applets/general_backend.h index bc919a8dd..fb68a2543 100644 --- a/src/core/hle/service/am/applets/general_backend.h +++ b/src/core/hle/service/am/applets/general_backend.h @@ -34,7 +34,7 @@ private: class StubApplet final : public Applet { public: - StubApplet(AppletId id); + explicit StubApplet(AppletId id); ~StubApplet() override; void Initialize() override; diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index 961b8882d..7e134f5c1 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -50,7 +50,7 @@ private: void SaveReportWithUserOld(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto user_id = rp.PopRaw<u128>(); - const auto unk1 = rp.PopRaw<u64>(); + const auto process_id = rp.PopRaw<u64>(); const auto data1 = ctx.ReadBuffer(0); const auto data2 = ctx.ReadBuffer(1); @@ -58,10 +58,10 @@ private: LOG_DEBUG( Service_PREPO, "called, user_id={:016X}{:016X}, unk1={:016X}, data1_size={:016X}, data2_size={:016X}", - user_id[1], user_id[0], unk1, data1.size(), data2.size()); + user_id[1], user_id[0], process_id, data1.size(), data2.size()); const auto& reporter{Core::System::GetInstance().GetReporter()}; - reporter.SavePlayReport(Core::CurrentProcess()->GetTitleID(), unk1, {data1, data2}, + reporter.SavePlayReport(Core::CurrentProcess()->GetTitleID(), process_id, {data1, data2}, user_id); IPC::ResponseBuilder rb{ctx, 2}; |