summaryrefslogtreecommitdiff
path: root/src/core/hle/service/filesystem
diff options
context:
space:
mode:
authorGravatar Morph2021-11-03 14:15:51 -0400
committerGravatar Morph2021-11-04 16:57:16 -0400
commit64275dfbf4e852f6cc55d6a4cec3b92743cdaf7e (patch)
tree2d5901f0a26f16175cfd629a2a4503c368e4b88c /src/core/hle/service/filesystem
parentMerge pull request #7282 from ameerj/core-includes (diff)
downloadyuzu-64275dfbf4e852f6cc55d6a4cec3b92743cdaf7e.tar.gz
yuzu-64275dfbf4e852f6cc55d6a4cec3b92743cdaf7e.tar.xz
yuzu-64275dfbf4e852f6cc55d6a4cec3b92743cdaf7e.zip
general: Rename GetTitleID to GetProgramID
Diffstat (limited to 'src/core/hle/service/filesystem')
-rw-r--r--src/core/hle/service/filesystem/filesystem.cpp4
-rw-r--r--src/core/hle/service/filesystem/fsp_srv.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp
index 6422dec4e..194562f37 100644
--- a/src/core/hle/service/filesystem/filesystem.cpp
+++ b/src/core/hle/service/filesystem/filesystem.cpp
@@ -320,7 +320,7 @@ ResultVal<FileSys::VirtualFile> FileSystemController::OpenRomFSCurrentProcess()
320 return ResultUnknown; 320 return ResultUnknown;
321 } 321 }
322 322
323 return romfs_factory->OpenCurrentProcess(system.CurrentProcess()->GetTitleID()); 323 return romfs_factory->OpenCurrentProcess(system.CurrentProcess()->GetProgramID());
324} 324}
325 325
326ResultVal<FileSys::VirtualFile> FileSystemController::OpenPatchedRomFS( 326ResultVal<FileSys::VirtualFile> FileSystemController::OpenPatchedRomFS(
@@ -505,7 +505,7 @@ FileSys::SaveDataSize FileSystemController::ReadSaveDataSize(FileSys::SaveDataTy
505 const auto res = system.GetAppLoader().ReadControlData(nacp); 505 const auto res = system.GetAppLoader().ReadControlData(nacp);
506 506
507 if (res != Loader::ResultStatus::Success) { 507 if (res != Loader::ResultStatus::Success) {
508 const FileSys::PatchManager pm{system.CurrentProcess()->GetTitleID(), 508 const FileSys::PatchManager pm{system.CurrentProcess()->GetProgramID(),
509 system.GetFileSystemController(), 509 system.GetFileSystemController(),
510 system.GetContentProvider()}; 510 system.GetContentProvider()};
511 const auto metadata = pm.GetControlMetadata(); 511 const auto metadata = pm.GetControlMetadata();
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp
index 50c788dd6..5082530fa 100644
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@@ -1034,8 +1034,9 @@ void FSP_SRV::OpenDataStorageWithProgramIndex(Kernel::HLERequestContext& ctx) {
1034 1034
1035 LOG_DEBUG(Service_FS, "called, program_index={}", program_index); 1035 LOG_DEBUG(Service_FS, "called, program_index={}", program_index);
1036 1036
1037 auto patched_romfs = fsc.OpenPatchedRomFSWithProgramIndex( 1037 auto patched_romfs =
1038 system.CurrentProcess()->GetTitleID(), program_index, FileSys::ContentRecordType::Program); 1038 fsc.OpenPatchedRomFSWithProgramIndex(system.CurrentProcess()->GetProgramID(), program_index,
1039 FileSys::ContentRecordType::Program);
1039 1040
1040 if (patched_romfs.Failed()) { 1041 if (patched_romfs.Failed()) {
1041 // TODO: Find the right error code to use here 1042 // TODO: Find the right error code to use here