summaryrefslogtreecommitdiff
path: root/src/core/loader
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-05-06 21:40:39 -0300
committerGravatar Yuri Kunde Schlesner2015-05-08 22:11:03 -0300
commita5eba2f98466cd2788aab96f1ad93bcb32c5656c (patch)
tree231d164d039d2ae4cd69ae7cf44da2f16fc4be71 /src/core/loader
parentKernel: Introduce skeleton Process class to hold process data (diff)
downloadyuzu-a5eba2f98466cd2788aab96f1ad93bcb32c5656c.tar.gz
yuzu-a5eba2f98466cd2788aab96f1ad93bcb32c5656c.tar.xz
yuzu-a5eba2f98466cd2788aab96f1ad93bcb32c5656c.zip
Kernel: Remove g_program_id
This has been obsoleted by the field in Process.
Diffstat (limited to 'src/core/loader')
-rw-r--r--src/core/loader/loader.cpp1
-rw-r--r--src/core/loader/ncch.cpp4
-rw-r--r--src/core/loader/ncch.h6
3 files changed, 0 insertions, 11 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 97525fbeb..2718e88c1 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -131,7 +131,6 @@ ResultStatus LoadFile(const std::string& filename) {
131 131
132 // Load application and RomFS 132 // Load application and RomFS
133 if (ResultStatus::Success == app_loader.Load()) { 133 if (ResultStatus::Success == app_loader.Load()) {
134 Kernel::g_program_id = app_loader.GetProgramId();
135 Service::FS::RegisterArchiveType(Common::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS); 134 Service::FS::RegisterArchiveType(Common::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS);
136 return ResultStatus::Success; 135 return ResultStatus::Success;
137 } 136 }
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 531000137..0e2db2fbb 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -293,8 +293,4 @@ ResultStatus AppLoader_NCCH::ReadRomFS(std::vector<u8>& buffer) const {
293 return ResultStatus::ErrorNotUsed; 293 return ResultStatus::ErrorNotUsed;
294} 294}
295 295
296u64 AppLoader_NCCH::GetProgramId() const {
297 return *reinterpret_cast<u64 const*>(&ncch_header.program_id[0]);
298}
299
300} // namespace Loader 296} // namespace Loader
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index dec46e86c..1be941f19 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -213,12 +213,6 @@ public:
213 */ 213 */
214 ResultStatus ReadRomFS(std::vector<u8>& buffer) const override; 214 ResultStatus ReadRomFS(std::vector<u8>& buffer) const override;
215 215
216 /*
217 * Gets the program id from the NCCH header
218 * @return u64 Program id
219 */
220 u64 GetProgramId() const;
221
222private: 216private:
223 217
224 /** 218 /**