diff options
author | ShizZy <shizzy@6bit.net> | 2013-10-03 17:47:31 -0400 |
---|---|---|
committer | ShizZy <shizzy@6bit.net> | 2013-10-03 17:47:31 -0400 |
commit | e0cb54ea35a79ce0268be8a20c0a6d6fb10d608a (patch) | |
tree | 65007fada1b869db926700b2f78eb4ff0546ad4c /src/core | |
parent | 9d79fc7aa690d3cbfbbca7df8ea0411145ee240c (diff) |
moved some core functions over to system module
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/src/core.cpp | 6 | ||||
-rw-r--r-- | src/core/src/core.h | 8 | ||||
-rw-r--r-- | src/core/src/system.cpp | 7 | ||||
-rw-r--r-- | src/core/src/system.h | 3 |
4 files changed, 11 insertions, 13 deletions
diff --git a/src/core/src/core.cpp b/src/core/src/core.cpp index 5b118d4f..6ed7c5be 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 78ee3ff7..8021b762 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 36fdf028..54536269 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 b86a8716..e05413d8 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(); |