diff options
| author | bunnei <bunneidev@gmail.com> | 2015-05-04 18:18:08 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-05-04 18:18:08 -0400 |
| commit | 9cdfe5d864dcd6a45704fb76d20fe0a8929eabcc (patch) | |
| tree | 7db02b0288c9dc911b8008489fe883889204d1b7 | |
| parent | 3edbdee17d4455fc6111379d1d1736743569ef8d (diff) | |
| parent | 0749687b8d0faad1a5f263ff666078788e7350bc (diff) | |
Merge pull request #719 from yuriks/unused-stuff
Core: Remove some unused functions and types
| -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 f4c2df1cde..561ff82f05 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 05d836530a..59a75ca127 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(); } |