citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #719 from yuriks/unused-stuff 

Core: Remove some unused functions and types
This commit is contained in:
bunnei 2015-05-04 18:18:08 -04:00
parent 3edbdee17d 0749687b8d
commit 9cdfe5d864
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/system.cpp
View File

@ -14,11 +14,6 @@
namespace System { namespace System {
volatile State g_state;
void UpdateState(State state) {
}
void Init(EmuWindow* emu_window) { void Init(EmuWindow* emu_window) {
Core::Init(); Core::Init();
CoreTiming::Init(); CoreTiming::Init();
@ -29,13 +24,6 @@ void Init(EmuWindow* emu_window) {
VideoCore::Init(emu_window); VideoCore::Init(emu_window);
} }
void RunLoopFor(int cycles) {
RunLoopUntil(CoreTiming::GetTicks() + cycles);
}
void RunLoopUntil(u64 global_cycles) {
}
void Shutdown() { void Shutdown() {
VideoCore::Shutdown(); VideoCore::Shutdown();
HLE::Shutdown(); HLE::Shutdown();

21
src/core/system.h
View File

@ -4,30 +4,11 @@
#pragma once #pragma once
#include "common/emu_window.h" class EmuWindow;
////////////////////////////////////////////////////////////////////////////////////////////////////
namespace System { 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 Init(EmuWindow* emu_window);
void RunLoopFor(int cycles);
void RunLoopUntil(u64 global_cycles);
void Shutdown(); void Shutdown();
} }