summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-06-05 02:11:04 +0200
committerLioncash <mathew1800@gmail.com>2019-06-05 02:31:46 +0200
commit2548661c08e006c6a56f976a4ef1c05653b3c6db (patch)
tree497a2ce65b806332ff7aa9106ed1673f6f600a14 /src
parentcore/core_timing_util: Use std::chrono types for specifying time units (diff)
downloadyuzu-2548661c08e006c6a56f976a4ef1c05653b3c6db.tar
yuzu-2548661c08e006c6a56f976a4ef1c05653b3c6db.tar.gz
yuzu-2548661c08e006c6a56f976a4ef1c05653b3c6db.tar.bz2
yuzu-2548661c08e006c6a56f976a4ef1c05653b3c6db.tar.lz
yuzu-2548661c08e006c6a56f976a4ef1c05653b3c6db.tar.xz
yuzu-2548661c08e006c6a56f976a4ef1c05653b3c6db.tar.zst
yuzu-2548661c08e006c6a56f976a4ef1c05653b3c6db.zip
Diffstat (limited to '')
-rw-r--r--src/core/core_timing_util.h6
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp2
-rw-r--r--src/core/hle/service/time/time.cpp4
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<u8>& input, std::vector<u8>& o
IoctlGetGpuTime params{};
std::memcpy(&params, 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<u64_le>(ns.count());
std::memcpy(output.data(), &params, 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<u64_le>(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<u64_le>(ms.count() / 1000), {}};
CalendarTime calendar_time{};