mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-12-19 17:02:14 +00:00
Code Issues Releases Activity

fatal: fix usage of removed bpc api in 14.0.0

Browse source
This commit is contained in:
Michael Scire 2022-03-23 19:11:37 -07:00
parent 0da15a30fd
commit b69fa13576
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
stratosphere/fatal/source/fatal_task_power.cpp
View file

@ -146,6 +146,18 @@ namespace ams::fatal::srv {
} }
} }
bool IsPowerButtonHeld() {
if (hos::GetVersion() >= hos::Version_14_0_0) {
bool held = false;
return R_SUCCEEDED(bpcGetPowerButton(std::addressof(held))) && held;
} else if (hos::GetVersion() >= hos::Version_2_0_0) {
BpcSleepButtonState state;
return R_SUCCEEDED(bpcGetSleepButtonState(std::addressof(state))) && state == BpcSleepButtonState_Held;
} else {
return false;
}
}
void PowerButtonObserveTask::WaitForPowerButton() { void PowerButtonObserveTask::WaitForPowerButton() {
/* Wait up to a second for error report generation to finish. */ /* Wait up to a second for error report generation to finish. */
m_context->erpt_event->TimedWait(TimeSpan::FromSeconds(1)); m_context->erpt_event->TimedWait(TimeSpan::FromSeconds(1));
@ -176,12 +188,11 @@ namespace ams::fatal::srv {
gpio::SetDirection(std::addressof(vol_down_btn), gpio::Direction_Input); gpio::SetDirection(std::addressof(vol_down_btn), gpio::Direction_Input);
} }
BpcSleepButtonState state;
while (true) { while (true) {
if (fatal_reboot_helper.IsRebootTiming() || (quest_reboot_helper.IsRebootTiming()) || if (fatal_reboot_helper.IsRebootTiming() || (quest_reboot_helper.IsRebootTiming()) ||
(check_vol_up && gpio::GetValue(std::addressof(vol_up_btn)) == gpio::GpioValue_Low) || (check_vol_up && gpio::GetValue(std::addressof(vol_up_btn)) == gpio::GpioValue_Low) ||
(check_vol_down && gpio::GetValue(std::addressof(vol_down_btn)) == gpio::GpioValue_Low) || (check_vol_down && gpio::GetValue(std::addressof(vol_down_btn)) == gpio::GpioValue_Low) ||
(R_SUCCEEDED(bpcGetSleepButtonState(std::addressof(state))) && state == BpcSleepButtonState_Held)) IsPowerButtonHeld())
{ {
/* If any of the above conditions succeeded, we should reboot. */ /* If any of the above conditions succeeded, we should reboot. */
bpcRebootSystem(); bpcRebootSystem();