mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-09-01 22:49:03 +00:00
moved some core functions over to system module
This commit is contained in:
parent
9d79fc7aa6
commit
e0cb54ea35
@ -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...");
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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
|
||||
|
||||
|
@ -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) {
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user