summaryrefslogtreecommitdiff
path: root/src/core/hle/svc.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-03-16 14:25:15 -0400
committerGravatar bunnei2015-03-16 14:25:15 -0400
commite4e2c929af8953fd9946d2556b112b80c9b0ffb5 (patch)
tree2ea2d84aac8e0226f8cc089c5752178473ba4030 /src/core/hle/svc.cpp
parentMerge pull request #657 from Subv/flip (diff)
parentarm_interface: Get rid of GetTicks. (diff)
downloadyuzu-e4e2c929af8953fd9946d2556b112b80c9b0ffb5.tar.gz
yuzu-e4e2c929af8953fd9946d2556b112b80c9b0ffb5.tar.xz
yuzu-e4e2c929af8953fd9946d2556b112b80c9b0ffb5.zip
Merge pull request #663 from lioncash/ticks
arm_interface: Get rid of GetTicks.
Diffstat (limited to 'src/core/hle/svc.cpp')
-rw-r--r--src/core/hle/svc.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 17385f9b2..bbb4eb9cd 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -7,8 +7,9 @@
7#include "common/string_util.h" 7#include "common/string_util.h"
8#include "common/symbols.h" 8#include "common/symbols.h"
9 9
10#include "core/arm/arm_interface.h" 10#include "core/core_timing.h"
11#include "core/mem_map.h" 11#include "core/mem_map.h"
12#include "core/arm/arm_interface.h"
12 13
13#include "core/hle/kernel/address_arbiter.h" 14#include "core/hle/kernel/address_arbiter.h"
14#include "core/hle/kernel/event.h" 15#include "core/hle/kernel/event.h"
@@ -551,7 +552,7 @@ static void SleepThread(s64 nanoseconds) {
551 552
552/// This returns the total CPU ticks elapsed since the CPU was powered-on 553/// This returns the total CPU ticks elapsed since the CPU was powered-on
553static s64 GetSystemTick() { 554static s64 GetSystemTick() {
554 return (s64)Core::g_app_core->GetTicks(); 555 return (s64)CoreTiming::GetTicks();
555} 556}
556 557
557/// Creates a memory block at the specified address with the specified permissions and size 558/// Creates a memory block at the specified address with the specified permissions and size