From e0cb54ea35a79ce0268be8a20c0a6d6fb10d608a Mon Sep 17 00:00:00 2001 From: ShizZy Date: Thu, 3 Oct 2013 17:47:31 -0400 Subject: [PATCH] moved some core functions over to system module --- src/citra/src/citra.cpp | 4 ++-- src/core/src/core.cpp | 6 ++---- src/core/src/core.h | 8 +------- src/core/src/system.cpp | 7 ++++++- src/core/src/system.h | 3 ++- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/citra/src/citra.cpp b/src/citra/src/citra.cpp index eb0290687..fc4610405 100644 --- a/src/citra/src/citra.cpp +++ b/src/citra/src/citra.cpp @@ -26,7 +26,7 @@ #include "log_manager.h" #include "file_util.h" -#include "core.h" +#include "system.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; - Core::Init(emu_window); + System::Init(emu_window); //if (E_OK != core::Init(emu_window)) { // LOG_ERROR(TMASTER, "core initialization failed, exiting..."); diff --git a/src/core/src/core.cpp b/src/core/src/core.cpp index 5b118d4fb..6ed7c5be8 100644 --- a/src/core/src/core.cpp +++ b/src/core/src/core.cpp @@ -22,8 +22,8 @@ * http://code.google.com/p/gekko-gc-emu/ */ +#include "log.h" #include "core.h" -#include "mem_map.h" namespace Core { @@ -52,9 +52,7 @@ void Stop() { } /// Initialize the core -int Init(EmuWindow* emu_window) { - Memory::Init(); - +int Init() { NOTICE_LOG(MASTER_LOG, "Core initialized OK"); return 0; } diff --git a/src/core/src/core.h b/src/core/src/core.h index 78ee3ff75..8021b762e 100644 --- a/src/core/src/core.h +++ b/src/core/src/core.h @@ -27,12 +27,6 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -#include "common.h" - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -class EmuWindow; - namespace Core { /// Start the core @@ -51,7 +45,7 @@ void Halt(const char *msg); void Stop(); /// Initialize the core -int Init(EmuWindow* emu_window); +int Init(); } // namespace diff --git a/src/core/src/system.cpp b/src/core/src/system.cpp index 36fdf028c..545362694 100644 --- a/src/core/src/system.cpp +++ b/src/core/src/system.cpp @@ -22,7 +22,9 @@ * http://code.google.com/p/gekko-gc-emu/ */ +#include "core.h" #include "core_timing.h" +#include "mem_map.h" #include "system.h" namespace System { @@ -33,7 +35,10 @@ extern MetaFileSystem g_ctr_file_system; void UpdateState(State state) { } -void Init() { +void Init(EmuWindow* emu_window) { + Core::Init(); + Memory::Init(); + CoreTiming::Init(); } void RunLoopFor(int cycles) { diff --git a/src/core/src/system.h b/src/core/src/system.h index b86a87164..e05413d86 100644 --- a/src/core/src/system.h +++ b/src/core/src/system.h @@ -25,6 +25,7 @@ #ifndef CORE_SYSTEM_H_ #define CORE_SYSTEM_H_ +#include "emu_window.h" #include "file_sys/meta_file_system.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -47,7 +48,7 @@ extern volatile State g_state; extern MetaFileSystem g_ctr_file_system; void UpdateState(State state); -void Init(); +void Init(EmuWindow* emu_window); void RunLoopFor(int cycles); void RunLoopUntil(u64 global_cycles); void Shutdown();