diff options
| author | 2019-06-04 20:11:04 -0400 | |
|---|---|---|
| committer | 2019-06-04 20:31:46 -0400 | |
| commit | 2548661c08e006c6a56f976a4ef1c05653b3c6db (patch) | |
| tree | 497a2ce65b806332ff7aa9106ed1673f6f600a14 /src | |
| parent | core/core_timing_util: Use std::chrono types for specifying time units (diff) | |
| download | yuzu-2548661c08e006c6a56f976a4ef1c05653b3c6db.tar.gz yuzu-2548661c08e006c6a56f976a4ef1c05653b3c6db.tar.xz yuzu-2548661c08e006c6a56f976a4ef1c05653b3c6db.zip | |
core/core_timing_util: Amend casing of cyclesTo* functions
Makes the casing consistent with all of our general function naming
conventions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/core_timing_util.h | 6 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/time/time.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/core_timing_util.h b/src/core/core_timing_util.h index 1dcd38dd1..cdd84d70f 100644 --- a/src/core/core_timing_util.h +++ b/src/core/core_timing_util.h | |||
| @@ -18,15 +18,15 @@ s64 msToCycles(std::chrono::milliseconds ms); | |||
| 18 | s64 usToCycles(std::chrono::microseconds us); | 18 | s64 usToCycles(std::chrono::microseconds us); |
| 19 | s64 nsToCycles(std::chrono::nanoseconds ns); | 19 | s64 nsToCycles(std::chrono::nanoseconds ns); |
| 20 | 20 | ||
| 21 | inline std::chrono::milliseconds cyclesToMs(s64 cycles) { | 21 | inline std::chrono::milliseconds CyclesToMs(s64 cycles) { |
| 22 | return std::chrono::milliseconds(cycles * 1000 / BASE_CLOCK_RATE); | 22 | return std::chrono::milliseconds(cycles * 1000 / BASE_CLOCK_RATE); |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | inline std::chrono::nanoseconds cyclesToNs(s64 cycles) { | 25 | inline std::chrono::nanoseconds CyclesToNs(s64 cycles) { |
| 26 | return std::chrono::nanoseconds(cycles * 1000000000 / BASE_CLOCK_RATE); | 26 | return std::chrono::nanoseconds(cycles * 1000000000 / BASE_CLOCK_RATE); |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | inline std::chrono::microseconds cyclesToUs(s64 cycles) { | 29 | inline std::chrono::microseconds CyclesToUs(s64 cycles) { |
| 30 | return std::chrono::microseconds(cycles * 1000000 / BASE_CLOCK_RATE); | 30 | return std::chrono::microseconds(cycles * 1000000 / BASE_CLOCK_RATE); |
| 31 | } | 31 | } |
| 32 | 32 | ||
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp index f425305d6..0e28755bd 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp | |||
| @@ -185,7 +185,7 @@ u32 nvhost_ctrl_gpu::GetGpuTime(const std::vector<u8>& input, std::vector<u8>& o | |||
| 185 | 185 | ||
| 186 | IoctlGetGpuTime params{}; | 186 | IoctlGetGpuTime params{}; |
| 187 | std::memcpy(¶ms, input.data(), input.size()); | 187 | std::memcpy(¶ms, input.data(), input.size()); |
| 188 | const auto ns = Core::Timing::cyclesToNs(Core::System::GetInstance().CoreTiming().GetTicks()); | 188 | const auto ns = Core::Timing::CyclesToNs(Core::System::GetInstance().CoreTiming().GetTicks()); |
| 189 | params.gpu_time = static_cast<u64_le>(ns.count()); | 189 | params.gpu_time = static_cast<u64_le>(ns.count()); |
| 190 | std::memcpy(output.data(), ¶ms, output.size()); | 190 | std::memcpy(output.data(), ¶ms, output.size()); |
| 191 | return 0; | 191 | return 0; |
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index a6bb3beb0..346bad80d 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp | |||
| @@ -108,7 +108,7 @@ private: | |||
| 108 | LOG_DEBUG(Service_Time, "called"); | 108 | LOG_DEBUG(Service_Time, "called"); |
| 109 | 109 | ||
| 110 | const auto& core_timing = Core::System::GetInstance().CoreTiming(); | 110 | const auto& core_timing = Core::System::GetInstance().CoreTiming(); |
| 111 | const auto ms = Core::Timing::cyclesToMs(core_timing.GetTicks()); | 111 | const auto ms = Core::Timing::CyclesToMs(core_timing.GetTicks()); |
| 112 | const SteadyClockTimePoint steady_clock_time_point{static_cast<u64_le>(ms.count() / 1000), | 112 | const SteadyClockTimePoint steady_clock_time_point{static_cast<u64_le>(ms.count() / 1000), |
| 113 | {}}; | 113 | {}}; |
| 114 | IPC::ResponseBuilder rb{ctx, (sizeof(SteadyClockTimePoint) / 4) + 2}; | 114 | IPC::ResponseBuilder rb{ctx, (sizeof(SteadyClockTimePoint) / 4) + 2}; |
| @@ -285,7 +285,7 @@ void Module::Interface::GetClockSnapshot(Kernel::HLERequestContext& ctx) { | |||
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | const auto& core_timing = Core::System::GetInstance().CoreTiming(); | 287 | const auto& core_timing = Core::System::GetInstance().CoreTiming(); |
| 288 | const auto ms = Core::Timing::cyclesToMs(core_timing.GetTicks()); | 288 | const auto ms = Core::Timing::CyclesToMs(core_timing.GetTicks()); |
| 289 | const SteadyClockTimePoint steady_clock_time_point{static_cast<u64_le>(ms.count() / 1000), {}}; | 289 | const SteadyClockTimePoint steady_clock_time_point{static_cast<u64_le>(ms.count() / 1000), {}}; |
| 290 | 290 | ||
| 291 | CalendarTime calendar_time{}; | 291 | CalendarTime calendar_time{}; |