diff options
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 9 |
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 | ||
| 64 | namespace CoreTiming | 64 | namespace CoreTiming { |
| 65 | { | ||
| 66 | void Init(); | 65 | void Init(); |
| 67 | void Shutdown(); | 66 | void Shutdown(); |
| 68 | 67 | ||
| 69 | typedef void(*MHzChangeCallback)(); | 68 | typedef void (*MHzChangeCallback)(); |
| 70 | typedef std::function<void(u64 userdata, int cycles_late)> TimedCallback; | 69 | typedef std::function<void(u64 userdata, int cycles_late)> TimedCallback; |
| 71 | 70 | ||
| 72 | u64 GetTicks(); | 71 | u64 GetTicks(); |
| @@ -81,7 +80,7 @@ u64 GetGlobalTimeUs(); | |||
| 81 | */ | 80 | */ |
| 82 | int RegisterEvent(const char* name, TimedCallback callback); | 81 | int RegisterEvent(const char* name, TimedCallback callback); |
| 83 | /// For save states. | 82 | /// For save states. |
| 84 | void RestoreRegisterEvent(int event_type, const char *name, TimedCallback callback); | 83 | void RestoreRegisterEvent(int event_type, const char* name, TimedCallback callback); |
| 85 | void UnregisterAllEvents(); | 84 | void 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(); | |||
| 128 | void LogPendingEvents(); | 127 | void LogPendingEvents(); |
| 129 | 128 | ||
| 130 | /// Warning: not included in save states. | 129 | /// Warning: not included in save states. |
| 131 | void RegisterAdvanceCallback(void(*callback)(int cycles_executed)); | 130 | void RegisterAdvanceCallback(void (*callback)(int cycles_executed)); |
| 132 | void RegisterMHzChangeCallback(MHzChangeCallback callback); | 131 | void RegisterMHzChangeCallback(MHzChangeCallback callback); |
| 133 | 132 | ||
| 134 | std::string GetScheduledEventsSummary(); | 133 | std::string GetScheduledEventsSummary(); |