diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-04 05:16:25 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-04 05:16:43 +0200 |
commit | 0749687b8d0faad1a5f263ff666078788e7350bc (patch) | |
tree | 7db02b0288c9dc911b8008489fe883889204d1b7 /src/core | |
parent | Merge pull request #709 from linkmauve/rename-submodules (diff) | |
download | yuzu-0749687b8d0faad1a5f263ff666078788e7350bc.tar yuzu-0749687b8d0faad1a5f263ff666078788e7350bc.tar.gz yuzu-0749687b8d0faad1a5f263ff666078788e7350bc.tar.bz2 yuzu-0749687b8d0faad1a5f263ff666078788e7350bc.tar.lz yuzu-0749687b8d0faad1a5f263ff666078788e7350bc.tar.xz yuzu-0749687b8d0faad1a5f263ff666078788e7350bc.tar.zst yuzu-0749687b8d0faad1a5f263ff666078788e7350bc.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/system.cpp | 12 | ||||
-rw-r--r-- | src/core/system.h | 21 |
2 files changed, 1 insertions, 32 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index f4c2df1cd..561ff82f0 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -14,11 +14,6 @@ namespace System { -volatile State g_state; - -void UpdateState(State state) { -} - void Init(EmuWindow* emu_window) { Core::Init(); CoreTiming::Init(); @@ -29,13 +24,6 @@ void Init(EmuWindow* emu_window) { VideoCore::Init(emu_window); } -void RunLoopFor(int cycles) { - RunLoopUntil(CoreTiming::GetTicks() + cycles); -} - -void RunLoopUntil(u64 global_cycles) { -} - void Shutdown() { VideoCore::Shutdown(); HLE::Shutdown(); diff --git a/src/core/system.h b/src/core/system.h index 05d836530..59a75ca12 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -4,30 +4,11 @@ #pragma once -#include "common/emu_window.h" - -//////////////////////////////////////////////////////////////////////////////////////////////////// +class EmuWindow; namespace System { -// State of the full emulator -enum State { - STATE_NULL = 0, ///< System is in null state, nothing initialized - STATE_IDLE, ///< System is in an initialized state, but not running - STATE_RUNNING, ///< System is running - STATE_LOADING, ///< System is loading a ROM - STATE_HALTED, ///< System is halted (error) - STATE_STALLED, ///< System is stalled (unused) - STATE_DEBUG, ///< System is in a special debug mode (unused) - STATE_DIE ///< System is shutting down -}; - -extern volatile State g_state; - -void UpdateState(State state); void Init(EmuWindow* emu_window); -void RunLoopFor(int cycles); -void RunLoopUntil(u64 global_cycles); void Shutdown(); } |