From 3c13d353b06b02a7d14fce81ca4882e364993f41 Mon Sep 17 00:00:00 2001 From: yellows8 Date: Mon, 23 Nov 2020 00:50:56 -0500 Subject: [PATCH] hid: Updated _hidGetNpadPowerInfo(). --- nx/source/services/hid.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nx/source/services/hid.c b/nx/source/services/hid.c index 47e60741..cdaa5ae6 100644 --- a/nx/source/services/hid.c +++ b/nx/source/services/hid.c @@ -339,11 +339,12 @@ void hidGetNpadSystemButtonProperties(HidNpadIdType id, HidNpadSystemButtonPrope } static void _hidGetNpadPowerInfo(HidNpadInternalState *npad, HidPowerInfo *info, u64 is_charging, u64 is_powered, u32 i) { - info->battery_level = atomic_load_explicit(&npad->battery_level[i], memory_order_acquire); + *info = (HidPowerInfo){ + .battery_level = atomic_load_explicit(&npad->battery_level[i], memory_order_acquire), + .is_charging = (is_charging & BIT(i)) != 0, + .is_powered = (is_powered & BIT(i)) != 0, + }; if (info->battery_level > 4) info->battery_level = 4; // sdknso would Abort when this occurs. - - info->is_charging = (is_charging & BIT(i)) != 0; - info->is_powered = (is_powered & BIT(i)) != 0; } void hidGetNpadPowerInfoSingle(HidNpadIdType id, HidPowerInfo *info) {