diff options
| author | Narr the Reg <juangerman-13@hotmail.com> | 2021-11-23 05:15:34 +0100 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2021-11-25 03:30:29 +0100 |
| commit | 23bf2e3bb6fe0881e28767e768ad9c0a9f851d57 (patch) | |
| tree | 16a462ef05c12d1f5a420886e1b5452fdb999330 /src/core/hid | |
| parent | yuzu: Fix TAS from rebase (diff) | |
| download | yuzu-23bf2e3bb6fe0881e28767e768ad9c0a9f851d57.tar yuzu-23bf2e3bb6fe0881e28767e768ad9c0a9f851d57.tar.gz yuzu-23bf2e3bb6fe0881e28767e768ad9c0a9f851d57.tar.bz2 yuzu-23bf2e3bb6fe0881e28767e768ad9c0a9f851d57.tar.lz yuzu-23bf2e3bb6fe0881e28767e768ad9c0a9f851d57.tar.xz yuzu-23bf2e3bb6fe0881e28767e768ad9c0a9f851d57.tar.zst yuzu-23bf2e3bb6fe0881e28767e768ad9c0a9f851d57.zip | |
Diffstat (limited to 'src/core/hid')
| -rw-r--r-- | src/core/hid/emulated_controller.cpp | 2 | ||||
| -rw-r--r-- | src/core/hid/hid_types.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp index 54c1a2324..54d4ed93d 100644 --- a/src/core/hid/emulated_controller.cpp +++ b/src/core/hid/emulated_controller.cpp @@ -723,7 +723,7 @@ void EmulatedController::SetBattery(Common::Input::CallbackStatus callback, std: bool is_charging = false; bool is_powered = false; - BatteryLevel battery_level = 0; + NpadBatteryLevel battery_level = 0; switch (controller.battery_values[index]) { case Common::Input::BatteryLevel::Charging: is_charging = true; diff --git a/src/core/hid/hid_types.h b/src/core/hid/hid_types.h index 3cbe16260..acf54e233 100644 --- a/src/core/hid/hid_types.h +++ b/src/core/hid/hid_types.h @@ -346,15 +346,15 @@ struct NpadGcTriggerState { static_assert(sizeof(NpadGcTriggerState) == 0x10, "NpadGcTriggerState is an invalid size"); // This is nn::hid::system::NpadBatteryLevel -using BatteryLevel = u32; -static_assert(sizeof(BatteryLevel) == 0x4, "BatteryLevel is an invalid size"); +using NpadBatteryLevel = u32; +static_assert(sizeof(NpadBatteryLevel) == 0x4, "NpadBatteryLevel is an invalid size"); // This is nn::hid::system::NpadPowerInfo struct NpadPowerInfo { bool is_powered; bool is_charging; INSERT_PADDING_BYTES(0x6); - BatteryLevel battery_level; + NpadBatteryLevel battery_level; }; static_assert(sizeof(NpadPowerInfo) == 0xC, "NpadPowerInfo is an invalid size"); |