summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-05-05 00:18:08 +0200
committerbunnei <bunneidev@gmail.com>2015-05-05 00:18:08 +0200
commit9cdfe5d864dcd6a45704fb76d20fe0a8929eabcc (patch)
tree7db02b0288c9dc911b8008489fe883889204d1b7 /src
parentMerge pull request #709 from linkmauve/rename-submodules (diff)
parentCore: Remove some unused functions and types (diff)
downloadyuzu-9cdfe5d864dcd6a45704fb76d20fe0a8929eabcc.tar
yuzu-9cdfe5d864dcd6a45704fb76d20fe0a8929eabcc.tar.gz
yuzu-9cdfe5d864dcd6a45704fb76d20fe0a8929eabcc.tar.bz2
yuzu-9cdfe5d864dcd6a45704fb76d20fe0a8929eabcc.tar.lz
yuzu-9cdfe5d864dcd6a45704fb76d20fe0a8929eabcc.tar.xz
yuzu-9cdfe5d864dcd6a45704fb76d20fe0a8929eabcc.tar.zst
yuzu-9cdfe5d864dcd6a45704fb76d20fe0a8929eabcc.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/system.cpp12
-rw-r--r--src/core/system.h21
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();
}