summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorwwylele <wwylele@gmail.com>2017-01-16 08:59:16 +0100
committerwwylele <wwylele@gmail.com>2017-01-16 08:59:16 +0100
commit47960b065901f8aec53696535fb46fe20c0908e4 (patch)
treef40e211ce132a79fa9dbff5a74980d0a84bde3ff /src/core
parentHID: manages updating itself using correct ticks (diff)
downloadyuzu-47960b065901f8aec53696535fb46fe20c0908e4.tar
yuzu-47960b065901f8aec53696535fb46fe20c0908e4.tar.gz
yuzu-47960b065901f8aec53696535fb46fe20c0908e4.tar.bz2
yuzu-47960b065901f8aec53696535fb46fe20c0908e4.tar.lz
yuzu-47960b065901f8aec53696535fb46fe20c0908e4.tar.xz
yuzu-47960b065901f8aec53696535fb46fe20c0908e4.tar.zst
yuzu-47960b065901f8aec53696535fb46fe20c0908e4.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core_timing.cpp2
-rw-r--r--src/core/core_timing.h1
-rw-r--r--src/core/hle/service/hid/hid.cpp6
-rw-r--r--src/core/hw/gpu.cpp2
4 files changed, 6 insertions, 5 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index a437d0823..276ecfdf6 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 b72a1b500..d2f85cd4d 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 9e4a7f888..9bca97c1c 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 58c0d9908..fa8c13d36 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