aboutsummaryrefslogtreecommitdiff
path: root/src/core/core_timing.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-04-30 10:15:27 -0400
committerGitHub <noreply@github.com>2018-04-30 10:15:27 -0400
commitf362cf46eed346db79c15ca195d652dff8c48c21 (patch)
treeed7367dd74a937809d9501b2d848e8e981b538ba /src/core/core_timing.h
parent81a0082f6bd4f2db9b09e56cce96351bb5084e46 (diff)
parent0197e28cc95e96e651eab555f512d0bb292e9215 (diff)
Merge pull request #425 from lioncash/namespace
core_timing: Namespace all functions and constants in core_timing's header
Diffstat (limited to 'src/core/core_timing.h')
-rw-r--r--src/core/core_timing.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index 26e4b1134..9d3c1d05c 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -23,6 +23,8 @@
#include "common/common_types.h"
#include "common/logging/log.h"
+namespace CoreTiming {
+
// The below clock rate is based on Switch's clockspeed being widely known as 1.020GHz
// The exact value used is of course unverified.
constexpr u64 BASE_CLOCK_RATE = 1019215872; // Switch clock speed is 1020MHz un/docked
@@ -117,8 +119,6 @@ inline u64 cyclesToMs(s64 cycles) {
return cycles * 1000 / BASE_CLOCK_RATE;
}
-namespace CoreTiming {
-
/**
* CoreTiming begins at the boundary of timing slice -1. An initial call to Advance() is
* required to end slice -1 and start slice 0 before the first cycle of code is executed.