mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-05 19:51:45 +00:00
Code Issues Releases Activity

loader/ams_mitm: Change Down -> Held in API

Browse source
This commit is contained in:
Michael Scire 2019-03-15 21:28:38 -07:00
parent 35167da6dd
commit 51fa778fb2
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
stratosphere/ams_mitm/source/utils.cpp
View file

@ -446,7 +446,7 @@ bool Utils::HasSdDisableMitMFlag(u64 tid) {
return false; return false;
} }
Result Utils::GetKeysDown(u64 *keys) { Result Utils::GetKeysHeld(u64 *keys) {
if (!Utils::IsHidAvailable()) { if (!Utils::IsHidAvailable()) {
return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID); return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID);
} }
@ -459,7 +459,7 @@ Result Utils::GetKeysDown(u64 *keys) {
static bool HasOverrideKey(OverrideKey *cfg) { static bool HasOverrideKey(OverrideKey *cfg) {
u64 kDown = 0; 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); return Utils::IsSdInitialized() && (cfg->override_by_default ^ keys_triggered);
} }

2
stratosphere/ams_mitm/source/utils.hpp
View file

@ -76,7 +76,7 @@ class Utils {
static bool IsHidAvailable(); static bool IsHidAvailable();
static Result GetKeysDown(u64 *keys); static Result GetKeysHeld(u64 *keys);
static OverrideKey GetTitleOverrideKey(u64 tid); static OverrideKey GetTitleOverrideKey(u64 tid);
static bool HasOverrideButton(u64 tid); static bool HasOverrideButton(u64 tid);

2
stratosphere/loader/source/ldr_content_management.cpp
View file

@ -376,7 +376,7 @@ OverrideKey ContentManagement::GetTitleOverrideKey(u64 tid) {
static bool ShouldOverrideContents(OverrideKey *cfg) { static bool ShouldOverrideContents(OverrideKey *cfg) {
u64 kDown = 0; 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); return g_has_initialized_fs_dev && (cfg->override_by_default ^ keys_triggered);
} }

2
stratosphere/loader/source/ldr_hid.cpp
View file

@ -20,7 +20,7 @@
#include "ldr_content_management.hpp" #include "ldr_content_management.hpp"
#include "ldr_hid.hpp" #include "ldr_hid.hpp"
Result HidManagement::GetKeysDown(u64 *keys) { Result HidManagement::GetKeysHeld(u64 *keys) {
if (!ContentManagement::HasCreatedTitle(0x0100000000000013)) { if (!ContentManagement::HasCreatedTitle(0x0100000000000013)) {
return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID); return MAKERESULT(Module_Libnx, LibnxError_InitFail_HID);
} }

2
stratosphere/loader/source/ldr_hid.hpp
View file

@ -19,5 +19,5 @@
class HidManagement { class HidManagement {
public: public:
static Result GetKeysDown(u64 *keys); static Result GetKeysHeld(u64 *keys);
}; };