diff options
| author | 2018-04-30 03:24:27 -0400 | |
|---|---|---|
| committer | 2018-04-30 03:32:59 -0400 | |
| commit | 0197e28cc95e96e651eab555f512d0bb292e9215 (patch) | |
| tree | ed7367dd74a937809d9501b2d848e8e981b538ba /src/core/core_timing.h | |
| parent | Merge pull request #424 from lioncash/string (diff) | |
| download | yuzu-0197e28cc95e96e651eab555f512d0bb292e9215.tar.gz yuzu-0197e28cc95e96e651eab555f512d0bb292e9215.tar.xz yuzu-0197e28cc95e96e651eab555f512d0bb292e9215.zip | |
core_timing: Namespace all functions and constants in core_timing's header
All of these variables and functions are related to timings and should be within the namespace.
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 4 |
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 @@ | |||
| 23 | #include "common/common_types.h" | 23 | #include "common/common_types.h" |
| 24 | #include "common/logging/log.h" | 24 | #include "common/logging/log.h" |
| 25 | 25 | ||
| 26 | namespace CoreTiming { | ||
| 27 | |||
| 26 | // The below clock rate is based on Switch's clockspeed being widely known as 1.020GHz | 28 | // The below clock rate is based on Switch's clockspeed being widely known as 1.020GHz |
| 27 | // The exact value used is of course unverified. | 29 | // The exact value used is of course unverified. |
| 28 | constexpr u64 BASE_CLOCK_RATE = 1019215872; // Switch clock speed is 1020MHz un/docked | 30 | constexpr u64 BASE_CLOCK_RATE = 1019215872; // Switch clock speed is 1020MHz un/docked |
| @@ -117,8 +119,6 @@ inline u64 cyclesToMs(s64 cycles) { | |||
| 117 | return cycles * 1000 / BASE_CLOCK_RATE; | 119 | return cycles * 1000 / BASE_CLOCK_RATE; |
| 118 | } | 120 | } |
| 119 | 121 | ||
| 120 | namespace CoreTiming { | ||
| 121 | |||
| 122 | /** | 122 | /** |
| 123 | * CoreTiming begins at the boundary of timing slice -1. An initial call to Advance() is | 123 | * CoreTiming begins at the boundary of timing slice -1. An initial call to Advance() is |
| 124 | * required to end slice -1 and start slice 0 before the first cycle of code is executed. | 124 | * required to end slice -1 and start slice 0 before the first cycle of code is executed. |