diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-09-16 17:40:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-16 17:40:35 +0200 |
commit | fe771b59f4b1d2bf30bfc665eef68518949fe7ad (patch) | |
tree | ec30d266f5f5e6f85ef137c9756c36b2523f78ab /src/core/hle/service/hid/controllers/npad.h | |
parent | Merge pull request #11517 from german77/amiibo-format (diff) | |
parent | hid: service: Remove outdated field from npad (diff) | |
download | yuzu-fe771b59f4b1d2bf30bfc665eef68518949fe7ad.tar yuzu-fe771b59f4b1d2bf30bfc665eef68518949fe7ad.tar.gz yuzu-fe771b59f4b1d2bf30bfc665eef68518949fe7ad.tar.bz2 yuzu-fe771b59f4b1d2bf30bfc665eef68518949fe7ad.tar.lz yuzu-fe771b59f4b1d2bf30bfc665eef68518949fe7ad.tar.xz yuzu-fe771b59f4b1d2bf30bfc665eef68518949fe7ad.tar.zst yuzu-fe771b59f4b1d2bf30bfc665eef68518949fe7ad.zip |
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.h')
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 776411261..09707d2f8 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -360,7 +360,7 @@ private: enum class AppletFooterUiType : u8 { None = 0, HandheldNone = 1, - HandheldJoyConLeftOnly = 1, + HandheldJoyConLeftOnly = 2, HandheldJoyConRightOnly = 3, HandheldJoyConLeftJoyConRight = 4, JoyDual = 5, @@ -382,13 +382,6 @@ private: Lagon = 21, }; - struct AppletFooterUi { - AppletFooterUiAttributes attributes{}; - AppletFooterUiType type{AppletFooterUiType::None}; - INSERT_PADDING_BYTES(0x5B); // Reserved - }; - static_assert(sizeof(AppletFooterUi) == 0x60, "AppletFooterUi is an invalid size"); - // This is nn::hid::NpadLarkType enum class NpadLarkType : u32 { Invalid, @@ -419,13 +412,6 @@ private: U, }; - struct AppletNfcXcd { - union { - AppletFooterUi applet_footer{}; - Lifo<NfcXcdDeviceHandleStateImpl, 0x2> nfc_xcd_device_lifo; - }; - }; - // This is nn::hid::detail::NpadInternalState struct NpadInternalState { Core::HID::NpadStyleTag style_tag{Core::HID::NpadStyleSet::None}; @@ -452,7 +438,9 @@ private: Core::HID::NpadBatteryLevel battery_level_dual{}; Core::HID::NpadBatteryLevel battery_level_left{}; Core::HID::NpadBatteryLevel battery_level_right{}; - AppletNfcXcd applet_nfc_xcd{}; + AppletFooterUiAttributes applet_footer_attributes{}; + AppletFooterUiType applet_footer_type{AppletFooterUiType::None}; + INSERT_PADDING_BYTES(0x5B); // Reserved INSERT_PADDING_BYTES(0x20); // Unknown Lifo<NpadGcTriggerState, hid_entry_count> gc_trigger_lifo{}; NpadLarkType lark_type_l_and_main{}; |