summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Lioncash2019-05-28 21:42:50 -0400
committerGravatar Lioncash2019-05-28 22:28:44 -0400
commit84a8fb9264b5018d97e487f3e473b5ebb43b48f1 (patch)
treee8870936df26b17ea3008978489ceb238fc8683a /src/core
parentcore/telemetry_session: Remove unnecessary web service nulling out in destructor (diff)
downloadyuzu-84a8fb9264b5018d97e487f3e473b5ebb43b48f1.tar.gz
yuzu-84a8fb9264b5018d97e487f3e473b5ebb43b48f1.tar.xz
yuzu-84a8fb9264b5018d97e487f3e473b5ebb43b48f1.zip
core/loader: Remove LoadKernelSystemMode
This is a hold-over from Citra and doesn't apply to yuzu.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core.cpp9
-rw-r--r--src/core/core.h1
-rw-r--r--src/core/loader/loader.h11
3 files changed, 0 insertions, 21 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 9f9356f53..5098bdcff 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -148,15 +148,6 @@ struct System::Impl {
148 LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath); 148 LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath);
149 return ResultStatus::ErrorGetLoader; 149 return ResultStatus::ErrorGetLoader;
150 } 150 }
151 std::pair<std::optional<u32>, Loader::ResultStatus> system_mode =
152 app_loader->LoadKernelSystemMode();
153
154 if (system_mode.second != Loader::ResultStatus::Success) {
155 LOG_CRITICAL(Core, "Failed to determine system mode (Error {})!",
156 static_cast<int>(system_mode.second));
157
158 return ResultStatus::ErrorSystemMode;
159 }
160 151
161 ResultStatus init_result{Init(system, emu_window)}; 152 ResultStatus init_result{Init(system, emu_window)};
162 if (init_result != ResultStatus::Success) { 153 if (init_result != ResultStatus::Success) {
diff --git a/src/core/core.h b/src/core/core.h
index a9a756a4c..20959de54 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -98,7 +98,6 @@ public:
98 Success, ///< Succeeded 98 Success, ///< Succeeded
99 ErrorNotInitialized, ///< Error trying to use core prior to initialization 99 ErrorNotInitialized, ///< Error trying to use core prior to initialization
100 ErrorGetLoader, ///< Error finding the correct application loader 100 ErrorGetLoader, ///< Error finding the correct application loader
101 ErrorSystemMode, ///< Error determining the system mode
102 ErrorSystemFiles, ///< Error in finding system files 101 ErrorSystemFiles, ///< Error in finding system files
103 ErrorSharedFont, ///< Error in finding shared font 102 ErrorSharedFont, ///< Error in finding shared font
104 ErrorVideoCore, ///< Error in the video core 103 ErrorVideoCore, ///< Error in the video core
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index f7846db52..869406b75 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -154,17 +154,6 @@ public:
154 virtual LoadResult Load(Kernel::Process& process) = 0; 154 virtual LoadResult Load(Kernel::Process& process) = 0;
155 155
156 /** 156 /**
157 * Loads the system mode that this application needs.
158 * This function defaults to 2 (96MB allocated to the application) if it can't read the
159 * information.
160 * @returns A pair with the optional system mode, and and the status.
161 */
162 virtual std::pair<std::optional<u32>, ResultStatus> LoadKernelSystemMode() {
163 // 96MB allocated to the application.
164 return std::make_pair(2, ResultStatus::Success);
165 }
166
167 /**
168 * Get the code (typically .code section) of the application 157 * Get the code (typically .code section) of the application
169 * @param buffer Reference to buffer to store data 158 * @param buffer Reference to buffer to store data
170 * @return ResultStatus result of function 159 * @return ResultStatus result of function