summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar bunnei2014-05-28 21:19:13 -0400
committerGravatar bunnei2014-05-28 21:19:13 -0400
commit46aef01d0431253a4aa17b31b85cb35603a036ec (patch)
tree76801e49e200c19a6c2d5a17bd300e64d759b077 /src/core
parentservice: changed interface to return 0 (no error) when a service method is u... (diff)
downloadyuzu-46aef01d0431253a4aa17b31b85cb35603a036ec.tar.gz
yuzu-46aef01d0431253a4aa17b31b85cb35603a036ec.tar.xz
yuzu-46aef01d0431253a4aa17b31b85cb35603a036ec.zip
lcd: moved kFrameTicks to lcd.h for use in other modules
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hw/lcd.cpp2
-rw-r--r--src/core/hw/lcd.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp
index b57563a73..6cbce14ed 100644
--- a/src/core/hw/lcd.cpp
+++ b/src/core/hw/lcd.cpp
@@ -17,8 +17,6 @@ namespace LCD {
17 17
18Registers g_regs; 18Registers g_regs;
19 19
20static const u32 kFrameTicks = 268123480 / 60; ///< 268MHz / 60 frames per second
21
22u64 g_last_ticks = 0; ///< Last CPU ticks 20u64 g_last_ticks = 0; ///< Last CPU ticks
23 21
24/** 22/**
diff --git a/src/core/hw/lcd.h b/src/core/hw/lcd.h
index 2dd3b4adc..41baa51d0 100644
--- a/src/core/hw/lcd.h
+++ b/src/core/hw/lcd.h
@@ -8,6 +8,8 @@
8 8
9namespace LCD { 9namespace LCD {
10 10
11static const u32 kFrameTicks = 268123480 / 60; ///< 268MHz / 60 frames per second
12
11struct Registers { 13struct Registers {
12 u32 framebuffer_top_left_1; 14 u32 framebuffer_top_left_1;
13 u32 framebuffer_top_left_2; 15 u32 framebuffer_top_left_2;