From 47960b065901f8aec53696535fb46fe20c0908e4 Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Mon, 16 Jan 2017 09:59:16 +0200
Subject: [PATCH] CoreTiming: use named constant for ARM11 clock rate

---
 src/core/core_timing.cpp         | 2 +-
 src/core/core_timing.h           | 1 +
 src/core/hle/service/hid/hid.cpp | 6 +++---
 src/core/hw/gpu.cpp              | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index a437d08233..276ecfdf68 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -13,7 +13,7 @@
 #include "core/core.h"
 #include "core/core_timing.h"
 
-int g_clock_rate_arm11 = 268123480;
+int g_clock_rate_arm11 = BASE_CLOCK_RATE_ARM11;
 
 // is this really necessary?
 #define INITIAL_SLICE_LENGTH 20000
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index b72a1b5001..d2f85cd4d6 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -21,6 +21,7 @@
 // inside callback:
 //   ScheduleEvent(periodInCycles - cycles_late, callback, "whatever")
 
+constexpr int BASE_CLOCK_RATE_ARM11 = 268123480;
 extern int g_clock_rate_arm11;
 
 inline s64 msToCycles(int ms) {
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 9e4a7f8889..9bca97c1c3 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -40,9 +40,9 @@ static int accelerometer_update_event;
 static int gyroscope_update_event;
 
 // Updating period for each HID device. These empirical values are measured from a 11.2 3DS.
-constexpr u64 pad_update_ticks = 268123480ull / 234;
-constexpr u64 accelerometer_update_ticks = 268123480ull / 104;
-constexpr u64 gyroscope_update_ticks = 268123480ull / 101;
+constexpr u64 pad_update_ticks = BASE_CLOCK_RATE_ARM11 / 234;
+constexpr u64 accelerometer_update_ticks = BASE_CLOCK_RATE_ARM11 / 104;
+constexpr u64 gyroscope_update_ticks = BASE_CLOCK_RATE_ARM11 / 101;
 
 static PadState GetCirclePadDirectionState(s16 circle_pad_x, s16 circle_pad_y) {
     // 30 degree and 60 degree are angular thresholds for directions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 58c0d9908f..fa8c13d366 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -32,7 +32,7 @@ namespace GPU {
 Regs g_regs;
 
 /// 268MHz CPU clocks / 60Hz frames per second
-const u64 frame_ticks = 268123480ull / 60;
+const u64 frame_ticks = BASE_CLOCK_RATE_ARM11 / 60;
 /// Event id for CoreTiming
 static int vblank_event;
 /// Total number of frames drawn