summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
14 14
15namespace System { 15namespace System {
16 16
17volatile State g_state;
18
19void UpdateState(State state) {
20}
21
22void Init(EmuWindow* emu_window) { 17void Init(EmuWindow* emu_window) {
23 Core::Init(); 18 Core::Init();
24 CoreTiming::Init(); 19 CoreTiming::Init();
@@ -29,13 +24,6 @@ void Init(EmuWindow* emu_window) {
29 VideoCore::Init(emu_window); 24 VideoCore::Init(emu_window);
30} 25}
31 26
32void RunLoopFor(int cycles) {
33 RunLoopUntil(CoreTiming::GetTicks() + cycles);
34}
35
36void RunLoopUntil(u64 global_cycles) {
37}
38
39void Shutdown() { 27void Shutdown() {
40 VideoCore::Shutdown(); 28 VideoCore::Shutdown();
41 HLE::Shutdown(); 29 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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include "common/emu_window.h" 7class EmuWindow;
8
9////////////////////////////////////////////////////////////////////////////////////////////////////
10 8
11namespace System { 9namespace System {
12 10
13// State of the full emulator
14enum State {
15 STATE_NULL = 0, ///< System is in null state, nothing initialized
16 STATE_IDLE, ///< System is in an initialized state, but not running
17 STATE_RUNNING, ///< System is running
18 STATE_LOADING, ///< System is loading a ROM
19 STATE_HALTED, ///< System is halted (error)
20 STATE_STALLED, ///< System is stalled (unused)
21 STATE_DEBUG, ///< System is in a special debug mode (unused)
22 STATE_DIE ///< System is shutting down
23};
24
25extern volatile State g_state;
26
27void UpdateState(State state);
28void Init(EmuWindow* emu_window); 11void Init(EmuWindow* emu_window);
29void RunLoopFor(int cycles);
30void RunLoopUntil(u64 global_cycles);
31void Shutdown(); 12void Shutdown();
32 13
33} 14}