From 51fa778fb2a046697b14453ba0b4bc50cd6fa586 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Fri, 15 Mar 2019 21:28:38 -0700 Subject: [PATCH] loader/ams_mitm: Change Down -> Held in API --- stratosphere/ams_mitm/source/utils.cpp | 4 ++-- stratosphere/ams_mitm/source/utils.hpp | 2 +- stratosphere/loader/source/ldr_content_management.cpp | 2 +- stratosphere/loader/source/ldr_hid.cpp | 2 +- stratosphere/loader/source/ldr_hid.hpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stratosphere/ams_mitm/source/utils.cpp b/stratosphere/ams_mitm/source/utils.cpp index 67250a980..1d5142fc2 100644 --- a/stratosphere/ams_mitm/source/utils.cpp +++ b/stratosphere/ams_mitm/source/utils.cpp @@ -446,7 +446,7 @@ bool Utils::HasSdDisableMitMFlag(u64 tid) { return false; } -Result Utils::GetKeysDown(u64 *keys) { +Result Utils::GetKeysHeld(u64 *keys) { if (!Utils::IsHidAvailable()) { return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID); } @@ -459,7 +459,7 @@ Result Utils::GetKeysDown(u64 *keys) { static bool HasOverrideKey(OverrideKey *cfg) { u64 kDown = 0; - bool keys_triggered = (R_SUCCEEDED(Utils::GetKeysDown(&kDown)) && ((kDown & cfg->key_combination) != 0)); + bool keys_triggered = (R_SUCCEEDED(Utils::GetKeysHeld(&kDown)) && ((kDown & cfg->key_combination) != 0)); return Utils::IsSdInitialized() && (cfg->override_by_default ^ keys_triggered); } diff --git a/stratosphere/ams_mitm/source/utils.hpp b/stratosphere/ams_mitm/source/utils.hpp index db9e84f6a..e8e9155d8 100644 --- a/stratosphere/ams_mitm/source/utils.hpp +++ b/stratosphere/ams_mitm/source/utils.hpp @@ -76,7 +76,7 @@ class Utils { static bool IsHidAvailable(); - static Result GetKeysDown(u64 *keys); + static Result GetKeysHeld(u64 *keys); static OverrideKey GetTitleOverrideKey(u64 tid); static bool HasOverrideButton(u64 tid); diff --git a/stratosphere/loader/source/ldr_content_management.cpp b/stratosphere/loader/source/ldr_content_management.cpp index 4b121c948..257f92d6a 100644 --- a/stratosphere/loader/source/ldr_content_management.cpp +++ b/stratosphere/loader/source/ldr_content_management.cpp @@ -376,7 +376,7 @@ OverrideKey ContentManagement::GetTitleOverrideKey(u64 tid) { static bool ShouldOverrideContents(OverrideKey *cfg) { u64 kDown = 0; - bool keys_triggered = (R_SUCCEEDED(HidManagement::GetKeysDown(&kDown)) && ((kDown & cfg->key_combination) != 0)); + bool keys_triggered = (R_SUCCEEDED(HidManagement::GetKeysHeld(&kDown)) && ((kDown & cfg->key_combination) != 0)); return g_has_initialized_fs_dev && (cfg->override_by_default ^ keys_triggered); } diff --git a/stratosphere/loader/source/ldr_hid.cpp b/stratosphere/loader/source/ldr_hid.cpp index 9c580161e..65dd9627d 100644 --- a/stratosphere/loader/source/ldr_hid.cpp +++ b/stratosphere/loader/source/ldr_hid.cpp @@ -20,7 +20,7 @@ #include "ldr_content_management.hpp" #include "ldr_hid.hpp" -Result HidManagement::GetKeysDown(u64 *keys) { +Result HidManagement::GetKeysHeld(u64 *keys) { if (!ContentManagement::HasCreatedTitle(0x0100000000000013)) { return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID); } diff --git a/stratosphere/loader/source/ldr_hid.hpp b/stratosphere/loader/source/ldr_hid.hpp index b5529fd20..588600624 100644 --- a/stratosphere/loader/source/ldr_hid.hpp +++ b/stratosphere/loader/source/ldr_hid.hpp @@ -19,5 +19,5 @@ class HidManagement { public: - static Result GetKeysDown(u64 *keys); + static Result GetKeysHeld(u64 *keys); };