From 2548661c08e006c6a56f976a4ef1c05653b3c6db Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 4 Jun 2019 20:11:04 -0400 Subject: [PATCH] core/core_timing_util: Amend casing of cyclesTo* functions Makes the casing consistent with all of our general function naming conventions. --- src/core/core_timing_util.h | 6 +++--- src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp | 2 +- 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); s64 usToCycles(std::chrono::microseconds us); s64 nsToCycles(std::chrono::nanoseconds ns); -inline std::chrono::milliseconds cyclesToMs(s64 cycles) { +inline std::chrono::milliseconds CyclesToMs(s64 cycles) { return std::chrono::milliseconds(cycles * 1000 / BASE_CLOCK_RATE); } -inline std::chrono::nanoseconds cyclesToNs(s64 cycles) { +inline std::chrono::nanoseconds CyclesToNs(s64 cycles) { return std::chrono::nanoseconds(cycles * 1000000000 / BASE_CLOCK_RATE); } -inline std::chrono::microseconds cyclesToUs(s64 cycles) { +inline std::chrono::microseconds CyclesToUs(s64 cycles) { return std::chrono::microseconds(cycles * 1000000 / BASE_CLOCK_RATE); } 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& input, std::vector& o IoctlGetGpuTime params{}; std::memcpy(¶ms, input.data(), input.size()); - const auto ns = Core::Timing::cyclesToNs(Core::System::GetInstance().CoreTiming().GetTicks()); + const auto ns = Core::Timing::CyclesToNs(Core::System::GetInstance().CoreTiming().GetTicks()); params.gpu_time = static_cast(ns.count()); std::memcpy(output.data(), ¶ms, output.size()); 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: LOG_DEBUG(Service_Time, "called"); const auto& core_timing = Core::System::GetInstance().CoreTiming(); - const auto ms = Core::Timing::cyclesToMs(core_timing.GetTicks()); + const auto ms = Core::Timing::CyclesToMs(core_timing.GetTicks()); const SteadyClockTimePoint steady_clock_time_point{static_cast(ms.count() / 1000), {}}; IPC::ResponseBuilder rb{ctx, (sizeof(SteadyClockTimePoint) / 4) + 2}; @@ -285,7 +285,7 @@ void Module::Interface::GetClockSnapshot(Kernel::HLERequestContext& ctx) { } const auto& core_timing = Core::System::GetInstance().CoreTiming(); - const auto ms = Core::Timing::cyclesToMs(core_timing.GetTicks()); + const auto ms = Core::Timing::CyclesToMs(core_timing.GetTicks()); const SteadyClockTimePoint steady_clock_time_point{static_cast(ms.count() / 1000), {}}; CalendarTime calendar_time{};