summaryrefslogtreecommitdiff
path: root/src/core/core_timing.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/core_timing.h')
-rw-r--r--src/core/core_timing.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index 3d8a7d0c0..64fd8dcd0 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -61,12 +61,11 @@ inline u64 cyclesToMs(s64 cycles) {
61 return cycles / (g_clock_rate_arm11 / 1000); 61 return cycles / (g_clock_rate_arm11 / 1000);
62} 62}
63 63
64namespace CoreTiming 64namespace CoreTiming {
65{
66void Init(); 65void Init();
67void Shutdown(); 66void Shutdown();
68 67
69typedef void(*MHzChangeCallback)(); 68typedef void (*MHzChangeCallback)();
70typedef std::function<void(u64 userdata, int cycles_late)> TimedCallback; 69typedef std::function<void(u64 userdata, int cycles_late)> TimedCallback;
71 70
72u64 GetTicks(); 71u64 GetTicks();
@@ -81,7 +80,7 @@ u64 GetGlobalTimeUs();
81 */ 80 */
82int RegisterEvent(const char* name, TimedCallback callback); 81int RegisterEvent(const char* name, TimedCallback callback);
83/// For save states. 82/// For save states.
84void RestoreRegisterEvent(int event_type, const char *name, TimedCallback callback); 83void RestoreRegisterEvent(int event_type, const char* name, TimedCallback callback);
85void UnregisterAllEvents(); 84void UnregisterAllEvents();
86 85
87/// userdata MAY NOT CONTAIN POINTERS. userdata might get written and reloaded from disk, 86/// userdata MAY NOT CONTAIN POINTERS. userdata might get written and reloaded from disk,
@@ -128,7 +127,7 @@ void ClearPendingEvents();
128void LogPendingEvents(); 127void LogPendingEvents();
129 128
130/// Warning: not included in save states. 129/// Warning: not included in save states.
131void RegisterAdvanceCallback(void(*callback)(int cycles_executed)); 130void RegisterAdvanceCallback(void (*callback)(int cycles_executed));
132void RegisterMHzChangeCallback(MHzChangeCallback callback); 131void RegisterMHzChangeCallback(MHzChangeCallback callback);
133 132
134std::string GetScheduledEventsSummary(); 133std::string GetScheduledEventsSummary();