OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-22 16:30:05 +00:00
Code Issues Projects Releases Wiki Activity

moved some core functions over to system module

Browse Source
This commit is contained in:
ShizZy 2013-10-03 17:47:31 -04:00
parent 9d79fc7aa6
commit e0cb54ea35
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/citra/src/citra.cpp
View File

@ -26,7 +26,7 @@
#include "log_manager.h" #include "log_manager.h"
#include "file_util.h" #include "file_util.h"
#include "core.h" #include "system.h"
#include "emu_window/emu_window_glfw.h" #include "emu_window/emu_window_glfw.h"
@ -46,7 +46,7 @@ int __cdecl main(int argc, char **argv) {
EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; EmuWindow_GLFW* emu_window = new EmuWindow_GLFW;
Core::Init(emu_window); System::Init(emu_window);
//if (E_OK != core::Init(emu_window)) { //if (E_OK != core::Init(emu_window)) {
// LOG_ERROR(TMASTER, "core initialization failed, exiting..."); // LOG_ERROR(TMASTER, "core initialization failed, exiting...");

6
src/core/src/core.cpp
View File

@ -22,8 +22,8 @@
* http://code.google.com/p/gekko-gc-emu/ * http://code.google.com/p/gekko-gc-emu/
*/ */
#include "log.h"
#include "core.h" #include "core.h"
#include "mem_map.h"
namespace Core { namespace Core {
@ -52,9 +52,7 @@ void Stop() {
} }
/// Initialize the core /// Initialize the core
int Init(EmuWindow* emu_window) { int Init() {
Memory::Init();
NOTICE_LOG(MASTER_LOG, "Core initialized OK"); NOTICE_LOG(MASTER_LOG, "Core initialized OK");
return 0; return 0;
} }

8
src/core/src/core.h
View File

@ -27,12 +27,6 @@
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
#include "common.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
class EmuWindow;
namespace Core { namespace Core {
/// Start the core /// Start the core
@ -51,7 +45,7 @@ void Halt(const char *msg);
void Stop(); void Stop();
/// Initialize the core /// Initialize the core
int Init(EmuWindow* emu_window); int Init();
} // namespace } // namespace

7
src/core/src/system.cpp
View File

@ -22,7 +22,9 @@
* http://code.google.com/p/gekko-gc-emu/ * http://code.google.com/p/gekko-gc-emu/
*/ */
#include "core.h"
#include "core_timing.h" #include "core_timing.h"
#include "mem_map.h"
#include "system.h" #include "system.h"
namespace System { namespace System {
@ -33,7 +35,10 @@ extern MetaFileSystem g_ctr_file_system;
void UpdateState(State state) { void UpdateState(State state) {
} }
void Init() { void Init(EmuWindow* emu_window) {
Core::Init();
Memory::Init();
CoreTiming::Init();
} }
void RunLoopFor(int cycles) { void RunLoopFor(int cycles) {

3
src/core/src/system.h
View File

@ -25,6 +25,7 @@
#ifndef CORE_SYSTEM_H_ #ifndef CORE_SYSTEM_H_
#define CORE_SYSTEM_H_ #define CORE_SYSTEM_H_
#include "emu_window.h"
#include "file_sys/meta_file_system.h" #include "file_sys/meta_file_system.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -47,7 +48,7 @@ extern volatile State g_state;
extern MetaFileSystem g_ctr_file_system; extern MetaFileSystem g_ctr_file_system;
void UpdateState(State state); void UpdateState(State state);
void Init(); void Init(EmuWindow* emu_window);
void RunLoopFor(int cycles); void RunLoopFor(int cycles);
void RunLoopUntil(u64 global_cycles); void RunLoopUntil(u64 global_cycles);
void Shutdown(); void Shutdown();