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/cam/cam.cpp
View File

@@ -5,6 +5,7 @@
#include <algorithm>
#include "common/bit_set.h"
#include "common/logging/log.h"
#include "core/core.h"
#include "core/core_timing.h"
#include "core/frontend/camera/factory.h"
#include "core/hle/ipc.h"
@@ -1054,7 +1055,8 @@ void ReloadCameraDevices() {
cam->ReloadCameraDevices();
}
void InstallInterfaces(SM::ServiceManager& service_manager) {
void InstallInterfaces(Core::System& system) {
auto& service_manager = system.ServiceManager();
auto cam = std::make_shared<Module>();
current_cam = cam;

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

@@ -13,6 +13,10 @@
#include "core/hle/result.h"
#include "core/hle/service/service.h"
namespace Core {
class System;
}
namespace Camera {
class CameraInterface;
}
@@ -782,6 +786,6 @@ private:
/// Reload camera devices. Used when input configuration changed
void ReloadCameraDevices();
void InstallInterfaces(SM::ServiceManager& service_manager);
void InstallInterfaces(Core::System& system);
} // namespace Service::CAM