CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Core: pass down Core::System reference to all services (#4272)

Browse Source 
* Core: pass down Core::System reference to all services

This has to be done at once due to unified interface used by HLE/LLE switcher

* apt: eliminate Core::System::GetInstance

* gpu_gsp: eliminate Core::System::GetInstance in service

* hid: eliminate Core::System::GetInstance

* nwm: eliminate Core::System::GetInstance

* err_f: eliminate Core::System::GetInstance
This commit is contained in:
Weiyi Wang
2018-10-05 10:59:43 -04:00
committed by GitHub
parent 008242c5f3
commit b163502744
77 changed files with 329 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/hle/service/cfg/cfg.cpp
View File

@@ -11,6 +11,7 @@
#include "common/logging/log.h"
#include "common/string_util.h"
#include "common/swap.h"
#include "core/core.h"
#include "core/file_sys/archive_systemsavedata.h"
#include "core/file_sys/errors.h"
#include "core/file_sys/file_backend.h"
@@ -721,7 +722,8 @@ u64 Module::GetConsoleUniqueId() {
return console_id_le;
}
void InstallInterfaces(SM::ServiceManager& service_manager) {
void InstallInterfaces(Core::System& system) {
auto& service_manager = system.ServiceManager();
auto cfg = std::make_shared<Module>();
std::make_shared<CFG_I>(cfg)->InstallAsService(service_manager);
std::make_shared<CFG_S>(cfg)->InstallAsService(service_manager);

6
src/core/hle/service/cfg/cfg.h
View File

@@ -15,6 +15,10 @@ namespace FileSys {
class ArchiveBackend;
}
namespace Core {
class System;
}
namespace Service::CFG {
enum SystemModel {
@@ -407,7 +411,7 @@ private:
u32 preferred_region_code = 0;
};
void InstallInterfaces(SM::ServiceManager& service_manager);
void InstallInterfaces(Core::System& system);
std::shared_ptr<Module> GetCurrentModule();
} // namespace Service::CFG