summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar David Marcec2018-10-20 00:01:10 +1100
committerGravatar David Marcec2018-10-20 00:01:10 +1100
commit7a7dad05c062ae7321bf4ece65c94bcf4b703386 (patch)
treed6977439ca40e3d595f36ce678da070f0652de62 /src
parentMerge pull request #1523 from lioncash/lock (diff)
downloadyuzu-7a7dad05c062ae7321bf4ece65c94bcf4b703386.tar.gz
yuzu-7a7dad05c062ae7321bf4ece65c94bcf4b703386.tar.xz
yuzu-7a7dad05c062ae7321bf4ece65c94bcf4b703386.zip
Stubbed home blocking
Needed by arms due to new hid rework
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/am/am.cpp36
-rw-r--r--src/core/hle/service/am/am.h4
2 files changed, 36 insertions, 4 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 69bfce1c1..4d1f83170 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -638,10 +638,12 @@ IApplicationFunctions::IApplicationFunctions() : ServiceFramework("IApplicationF
638 {24, nullptr, "GetLaunchStorageInfoForDebug"}, 638 {24, nullptr, "GetLaunchStorageInfoForDebug"},
639 {25, nullptr, "ExtendSaveData"}, 639 {25, nullptr, "ExtendSaveData"},
640 {26, nullptr, "GetSaveDataSize"}, 640 {26, nullptr, "GetSaveDataSize"},
641 {30, nullptr, "BeginBlockingHomeButtonShortAndLongPressed"}, 641 {30, &IApplicationFunctions::BeginBlockingHomeButtonShortAndLongPressed,
642 {31, nullptr, "EndBlockingHomeButtonShortAndLongPressed"}, 642 "BeginBlockingHomeButtonShortAndLongPressed"},
643 {32, nullptr, "BeginBlockingHomeButton"}, 643 {31, &IApplicationFunctions::EndBlockingHomeButtonShortAndLongPressed,
644 {33, nullptr, "EndBlockingHomeButton"}, 644 "EndBlockingHomeButtonShortAndLongPressed"},
645 {32, &IApplicationFunctions::BeginBlockingHomeButton, "BeginBlockingHomeButton"},
646 {33, &IApplicationFunctions::EndBlockingHomeButton, "EndBlockingHomeButton"},
645 {40, &IApplicationFunctions::NotifyRunning, "NotifyRunning"}, 647 {40, &IApplicationFunctions::NotifyRunning, "NotifyRunning"},
646 {50, &IApplicationFunctions::GetPseudoDeviceId, "GetPseudoDeviceId"}, 648 {50, &IApplicationFunctions::GetPseudoDeviceId, "GetPseudoDeviceId"},
647 {60, nullptr, "SetMediaPlaybackStateForApplication"}, 649 {60, nullptr, "SetMediaPlaybackStateForApplication"},
@@ -669,6 +671,32 @@ IApplicationFunctions::IApplicationFunctions() : ServiceFramework("IApplicationF
669 671
670IApplicationFunctions::~IApplicationFunctions() = default; 672IApplicationFunctions::~IApplicationFunctions() = default;
671 673
674void IApplicationFunctions::BeginBlockingHomeButtonShortAndLongPressed(
675 Kernel::HLERequestContext& ctx) {
676 IPC::ResponseBuilder rb{ctx, 2};
677 rb.Push(RESULT_SUCCESS);
678 LOG_WARNING(Service_AM, "(STUBBED) called");
679}
680
681void IApplicationFunctions::EndBlockingHomeButtonShortAndLongPressed(
682 Kernel::HLERequestContext& ctx) {
683 IPC::ResponseBuilder rb{ctx, 2};
684 rb.Push(RESULT_SUCCESS);
685 LOG_WARNING(Service_AM, "(STUBBED) called");
686}
687
688void IApplicationFunctions::BeginBlockingHomeButton(Kernel::HLERequestContext& ctx) {
689 IPC::ResponseBuilder rb{ctx, 2};
690 rb.Push(RESULT_SUCCESS);
691 LOG_WARNING(Service_AM, "(STUBBED) called");
692}
693
694void IApplicationFunctions::EndBlockingHomeButton(Kernel::HLERequestContext& ctx) {
695 IPC::ResponseBuilder rb{ctx, 2};
696 rb.Push(RESULT_SUCCESS);
697 LOG_WARNING(Service_AM, "(STUBBED) called");
698}
699
672void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) { 700void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) {
673 constexpr std::array<u8, 0x88> data{{ 701 constexpr std::array<u8, 0x88> data{{
674 0xca, 0x97, 0x94, 0xc7, // Magic 702 0xca, 0x97, 0x94, 0xc7, // Magic
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h
index b39b0d838..095f94851 100644
--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -154,6 +154,10 @@ private:
154 void SetGamePlayRecordingState(Kernel::HLERequestContext& ctx); 154 void SetGamePlayRecordingState(Kernel::HLERequestContext& ctx);
155 void NotifyRunning(Kernel::HLERequestContext& ctx); 155 void NotifyRunning(Kernel::HLERequestContext& ctx);
156 void GetPseudoDeviceId(Kernel::HLERequestContext& ctx); 156 void GetPseudoDeviceId(Kernel::HLERequestContext& ctx);
157 void BeginBlockingHomeButtonShortAndLongPressed(Kernel::HLERequestContext& ctx);
158 void EndBlockingHomeButtonShortAndLongPressed(Kernel::HLERequestContext& ctx);
159 void BeginBlockingHomeButton(Kernel::HLERequestContext& ctx);
160 void EndBlockingHomeButton(Kernel::HLERequestContext& ctx);
157}; 161};
158 162
159class IHomeMenuFunctions final : public ServiceFramework<IHomeMenuFunctions> { 163class IHomeMenuFunctions final : public ServiceFramework<IHomeMenuFunctions> {