VERY experimental Nintendo Switch 2 emulator
C++
hid: Use nanosecond timestamps instead of ticks
Morph5a46ea4b4e4d
diff --git a/src/core/hle/service/hid/controllers/stubbed.cpp b/src/core/hle/service/hid/controllers/stubbed.cppindex df9ee0c3f4..9e2f3ab212 100644--- a/src/core/hle/service/hid/controllers/stubbed.cpp+++ b/src/core/hle/service/hid/controllers/stubbed.cpp@@ -26,7 +26,7 @@ void Controller_Stubbed::OnUpdate(const Core::Timing::CoreTiming& core_timing) {}CommonHeader header{};- header.timestamp = core_timing.GetCPUTicks();+ header.timestamp = core_timing.GetGlobalTimeNs().count();header.total_entry_count = 17;header.entry_count = 0;header.last_entry_index = 0;diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cppindex d90a4e732d..3ef91df4bc 100644--- a/src/core/hle/service/hid/controllers/touchscreen.cpp+++ b/src/core/hle/service/hid/controllers/touchscreen.cpp@@ -32,7 +32,7 @@ void Controller_Touchscreen::OnInit() {}void Controller_Touchscreen::OnRelease() {}void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) {- shared_memory->touch_screen_lifo.timestamp = core_timing.GetCPUTicks();+ shared_memory->touch_screen_lifo.timestamp = core_timing.GetGlobalTimeNs().count();if (!IsControllerActivated()) {shared_memory->touch_screen_lifo.buffer_count = 0;@@ -85,7 +85,7 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timinconst auto active_fingers_count =static_cast<std::size_t>(std::distance(active_fingers.begin(), end_iter));- const u64 tick = core_timing.GetCPUTicks();+ const u64 timestamp = static_cast<u64>(core_timing.GetGlobalTimeNs().count());const auto& last_entry = shared_memory->touch_screen_lifo.ReadCurrentEntry().state;next_state.sampling_number = last_entry.sampling_number + 1;@@ -102,8 +102,8 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timintouch_entry.diameter_x = Settings::values.touchscreen.diameter_x;touch_entry.diameter_y = Settings::values.touchscreen.diameter_y;touch_entry.rotation_angle = Settings::values.touchscreen.rotation_angle;- touch_entry.delta_time = tick - active_fingers[id].last_touch;- fingers[active_fingers[id].id].last_touch = tick;+ touch_entry.delta_time = timestamp - active_fingers[id].last_touch;+ fingers[active_fingers[id].id].last_touch = timestamp;touch_entry.finger = active_fingers[id].id;touch_entry.attribute.raw = active_fingers[id].attribute.raw;} else {