summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers/console_sixaxis.h
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2021-11-29 19:40:29 +0100
committergerman77 <juangerman-13@hotmail.com>2021-12-13 06:26:04 +0100
commit316f80af87c3290ad3ceda99fe9cf02f1d935b0c (patch)
tree6b933d2399f02ff42c077d0f2f342b9ffbb21cf5 /src/core/hle/service/hid/controllers/console_sixaxis.h
parentMerge pull request #7488 from vonchenplus/support_multiple_videos_playing (diff)
downloadyuzu-316f80af87c3290ad3ceda99fe9cf02f1d935b0c.tar
yuzu-316f80af87c3290ad3ceda99fe9cf02f1d935b0c.tar.gz
yuzu-316f80af87c3290ad3ceda99fe9cf02f1d935b0c.tar.bz2
yuzu-316f80af87c3290ad3ceda99fe9cf02f1d935b0c.tar.lz
yuzu-316f80af87c3290ad3ceda99fe9cf02f1d935b0c.tar.xz
yuzu-316f80af87c3290ad3ceda99fe9cf02f1d935b0c.tar.zst
yuzu-316f80af87c3290ad3ceda99fe9cf02f1d935b0c.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/hid/controllers/console_sixaxis.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.h b/src/core/hle/service/hid/controllers/console_sixaxis.h
index 279241858..26d153f0c 100644
--- a/src/core/hle/service/hid/controllers/console_sixaxis.h
+++ b/src/core/hle/service/hid/controllers/console_sixaxis.h
@@ -39,8 +39,9 @@ public:
private:
struct SevenSixAxisState {
- INSERT_PADDING_WORDS(4); // unused
- s64 sampling_number{};
+ INSERT_PADDING_WORDS(2); // unused
+ u64 timestamp{};
+ u64 sampling_number{};
u64 unknown{};
Common::Vec3f accel{};
Common::Vec3f gyro{};
@@ -52,9 +53,10 @@ private:
struct ConsoleSharedMemory {
u64 sampling_number{};
bool is_seven_six_axis_sensor_at_rest{};
- INSERT_PADDING_BYTES(4); // padding
+ INSERT_PADDING_BYTES(3); // padding
f32 verticalization_error{};
Common::Vec3f gyro_bias{};
+ INSERT_PADDING_BYTES(4); // padding
};
static_assert(sizeof(ConsoleSharedMemory) == 0x20, "ConsoleSharedMemory is an invalid size");
@@ -64,6 +66,8 @@ private:
Core::HID::EmulatedConsole* console;
u8* transfer_memory = nullptr;
bool is_transfer_memory_set = false;
+ u64 last_saved_timestamp{};
+ u64 last_global_timestamp{};
ConsoleSharedMemory console_six_axis{};
SevenSixAxisState next_seven_sixaxis_state{};
};