diff options
| author | 2018-10-14 14:42:57 -0400 | |
|---|---|---|
| committer | 2018-10-14 14:42:57 -0400 | |
| commit | 0d2ba0a3208a2cdc432b325d2d190cfb6be32223 (patch) | |
| tree | d3c0b0783e840228ed3da89faa8a7ddf525cdf37 /src/core/hle/service/service.cpp | |
| parent | Merge pull request #1480 from FernandoS27/neue-swizzle (diff) | |
| parent | filesystem: Make CreateFactories() and InstallInterface() take a VfsFilesyste... (diff) | |
| download | yuzu-0d2ba0a3208a2cdc432b325d2d190cfb6be32223.tar.gz yuzu-0d2ba0a3208a2cdc432b325d2d190cfb6be32223.tar.xz yuzu-0d2ba0a3208a2cdc432b325d2d190cfb6be32223.zip | |
Merge pull request #1491 from lioncash/reference
filesystem: Make CreateFactories() and InstallInterface() take a VfsFilesystem by reference
Diffstat (limited to 'src/core/hle/service/service.cpp')
| -rw-r--r-- | src/core/hle/service/service.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 62f049660..a225cb4cb 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -197,7 +197,7 @@ ResultCode ServiceFrameworkBase::HandleSyncRequest(Kernel::HLERequestContext& co | |||
| 197 | // Module interface | 197 | // Module interface |
| 198 | 198 | ||
| 199 | /// Initialize ServiceManager | 199 | /// Initialize ServiceManager |
| 200 | void Init(std::shared_ptr<SM::ServiceManager>& sm, const FileSys::VirtualFilesystem& rfs) { | 200 | void Init(std::shared_ptr<SM::ServiceManager>& sm, FileSys::VfsFilesystem& vfs) { |
| 201 | // NVFlinger needs to be accessed by several services like Vi and AppletOE so we instantiate it | 201 | // NVFlinger needs to be accessed by several services like Vi and AppletOE so we instantiate it |
| 202 | // here and pass it into the respective InstallInterfaces functions. | 202 | // here and pass it into the respective InstallInterfaces functions. |
| 203 | auto nv_flinger = std::make_shared<NVFlinger::NVFlinger>(); | 203 | auto nv_flinger = std::make_shared<NVFlinger::NVFlinger>(); |
| @@ -220,7 +220,7 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm, const FileSys::VirtualFilesys | |||
| 220 | EUPLD::InstallInterfaces(*sm); | 220 | EUPLD::InstallInterfaces(*sm); |
| 221 | Fatal::InstallInterfaces(*sm); | 221 | Fatal::InstallInterfaces(*sm); |
| 222 | FGM::InstallInterfaces(*sm); | 222 | FGM::InstallInterfaces(*sm); |
| 223 | FileSystem::InstallInterfaces(*sm, rfs); | 223 | FileSystem::InstallInterfaces(*sm, vfs); |
| 224 | Friend::InstallInterfaces(*sm); | 224 | Friend::InstallInterfaces(*sm); |
| 225 | GRC::InstallInterfaces(*sm); | 225 | GRC::InstallInterfaces(*sm); |
| 226 | HID::InstallInterfaces(*sm); | 226 | HID::InstallInterfaces(*sm); |