diff options
| author | german77 <juangerman-13@hotmail.com> | 2022-05-22 00:21:45 +0200 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2022-05-27 17:22:37 +0200 |
| commit | a1f2610522dd7d66f370dacc821f2b30029a218e (patch) | |
| tree | 42684db4bc71578b13d8f301816e231e8c058391 /src/core/hle/service/hid/controllers/npad.h | |
| parent | service: hid: Implement LoadSixAxisSensorCalibrationParameter and GetSixAxisSensorIcInformation (diff) | |
| download | yuzu-a1f2610522dd7d66f370dacc821f2b30029a218e.tar yuzu-a1f2610522dd7d66f370dacc821f2b30029a218e.tar.gz yuzu-a1f2610522dd7d66f370dacc821f2b30029a218e.tar.bz2 yuzu-a1f2610522dd7d66f370dacc821f2b30029a218e.tar.lz yuzu-a1f2610522dd7d66f370dacc821f2b30029a218e.tar.xz yuzu-a1f2610522dd7d66f370dacc821f2b30029a218e.tar.zst yuzu-a1f2610522dd7d66f370dacc821f2b30029a218e.zip | |
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.h')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 2e2e1d07f..0b662b7f8 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -161,6 +161,8 @@ public: ResultCode GetSixAxisSensorIcInformation( const Core::HID::SixAxisSensorHandle& sixaxis_handle, Core::HID::SixAxisSensorIcInformation& ic_information) const; + ResultCode ResetIsSixAxisSensorDeviceNewlyAssigned( + const Core::HID::SixAxisSensorHandle& sixaxis_handle); ResultCode SetSixAxisEnabled(const Core::HID::SixAxisSensorHandle& sixaxis_handle, bool sixaxis_status); ResultCode IsSixAxisSensorFusionEnabled(const Core::HID::SixAxisSensorHandle& sixaxis_handle, @@ -464,9 +466,13 @@ private: NpadLuciaType lucia_type{}; NpadLagonType lagon_type{}; NpadLagerType lager_type{}; - // FW 13.x Investigate there is some sort of bitflag related to joycons - INSERT_PADDING_BYTES(0x4); - INSERT_PADDING_BYTES(0xc08); // Unknown + Core::HID::SixAxisSensorProperties sixaxis_fullkey_properties; + Core::HID::SixAxisSensorProperties sixaxis_handheld_properties; + Core::HID::SixAxisSensorProperties sixaxis_dual_left_properties; + Core::HID::SixAxisSensorProperties sixaxis_dual_right_properties; + Core::HID::SixAxisSensorProperties sixaxis_left_properties; + Core::HID::SixAxisSensorProperties sixaxis_right_properties; + INSERT_PADDING_BYTES(0xc06); // Unknown }; static_assert(sizeof(NpadInternalState) == 0x5000, "NpadInternalState is an invalid size"); @@ -539,6 +545,10 @@ private: NpadControllerData& GetControllerFromNpadIdType(Core::HID::NpadIdType npad_id); const NpadControllerData& GetControllerFromNpadIdType(Core::HID::NpadIdType npad_id) const; + Core::HID::SixAxisSensorProperties& GetSixaxisProperties( + const Core::HID::SixAxisSensorHandle& device_handle); + const Core::HID::SixAxisSensorProperties& GetSixaxisProperties( + const Core::HID::SixAxisSensorHandle& device_handle) const; SixaxisParameters& GetSixaxisState(const Core::HID::SixAxisSensorHandle& device_handle); const SixaxisParameters& GetSixaxisState( const Core::HID::SixAxisSensorHandle& device_handle) const; |