diff options
| author | Mai <mathew1800@gmail.com> | 2022-11-27 06:00:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 06:00:46 +0000 |
| commit | 44f8b8c1007f2ead8530d53c4aca3df8fee6d6af (patch) | |
| tree | c987c2ea4757dc9f79303f74de42dacf8620272b /Source/Core/InputCommon/GCAdapter.cpp | |
| parent | c8d30968f356afaec67d7ec2582c35857f7c77cb (diff) | |
| parent | daa70533cdb0de0a05b4341b499b4cd88e1a3368 (diff) | |
Merge pull request #11303 from AdmiralCurtiss/coretiming-class
CoreTiming: Refactor to class.
Diffstat (limited to 'Source/Core/InputCommon/GCAdapter.cpp')
| -rw-r--r-- | Source/Core/InputCommon/GCAdapter.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index 1e91a08eba..1ff134551c 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -33,6 +33,7 @@ #include "Core/HW/SI/SI.h" #include "Core/HW/SI/SI_Device.h" #include "Core/HW/SystemTimers.h" +#include "Core/System.h" #include "InputCommon/GCPadStatus.h" #if GCADAPTER_USE_LIBUSB_IMPLEMENTATION @@ -419,10 +420,12 @@ void Init() if (Core::GetState() != Core::State::Uninitialized && Core::GetState() != Core::State::Starting) { - if ((CoreTiming::GetTicks() - s_last_init) < SystemTimers::GetTicksPerSecond()) + auto& system = Core::System::GetInstance(); + auto& core_timing = system.GetCoreTiming(); + if ((core_timing.GetTicks() - s_last_init) < SystemTimers::GetTicksPerSecond()) return; - s_last_init = CoreTiming::GetTicks(); + s_last_init = core_timing.GetTicks(); } #if GCADAPTER_USE_LIBUSB_IMPLEMENTATION |