forked from ShuriZma/suyu
core/loader: Remove LoadKernelSystemMode
This is a hold-over from Citra and doesn't apply to yuzu.
This commit is contained in:
parent
b1a4ab2ccc
commit
84a8fb9264
|
@ -148,15 +148,6 @@ struct System::Impl {
|
||||||
LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath);
|
LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath);
|
||||||
return ResultStatus::ErrorGetLoader;
|
return ResultStatus::ErrorGetLoader;
|
||||||
}
|
}
|
||||||
std::pair<std::optional<u32>, Loader::ResultStatus> system_mode =
|
|
||||||
app_loader->LoadKernelSystemMode();
|
|
||||||
|
|
||||||
if (system_mode.second != Loader::ResultStatus::Success) {
|
|
||||||
LOG_CRITICAL(Core, "Failed to determine system mode (Error {})!",
|
|
||||||
static_cast<int>(system_mode.second));
|
|
||||||
|
|
||||||
return ResultStatus::ErrorSystemMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultStatus init_result{Init(system, emu_window)};
|
ResultStatus init_result{Init(system, emu_window)};
|
||||||
if (init_result != ResultStatus::Success) {
|
if (init_result != ResultStatus::Success) {
|
||||||
|
|
|
@ -98,7 +98,6 @@ public:
|
||||||
Success, ///< Succeeded
|
Success, ///< Succeeded
|
||||||
ErrorNotInitialized, ///< Error trying to use core prior to initialization
|
ErrorNotInitialized, ///< Error trying to use core prior to initialization
|
||||||
ErrorGetLoader, ///< Error finding the correct application loader
|
ErrorGetLoader, ///< Error finding the correct application loader
|
||||||
ErrorSystemMode, ///< Error determining the system mode
|
|
||||||
ErrorSystemFiles, ///< Error in finding system files
|
ErrorSystemFiles, ///< Error in finding system files
|
||||||
ErrorSharedFont, ///< Error in finding shared font
|
ErrorSharedFont, ///< Error in finding shared font
|
||||||
ErrorVideoCore, ///< Error in the video core
|
ErrorVideoCore, ///< Error in the video core
|
||||||
|
|
|
@ -153,17 +153,6 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual LoadResult Load(Kernel::Process& process) = 0;
|
virtual LoadResult Load(Kernel::Process& process) = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads the system mode that this application needs.
|
|
||||||
* This function defaults to 2 (96MB allocated to the application) if it can't read the
|
|
||||||
* information.
|
|
||||||
* @returns A pair with the optional system mode, and and the status.
|
|
||||||
*/
|
|
||||||
virtual std::pair<std::optional<u32>, ResultStatus> LoadKernelSystemMode() {
|
|
||||||
// 96MB allocated to the application.
|
|
||||||
return std::make_pair(2, ResultStatus::Success);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the code (typically .code section) of the application
|
* Get the code (typically .code section) of the application
|
||||||
* @param buffer Reference to buffer to store data
|
* @param buffer Reference to buffer to store data
|
||||||
|
|
|
@ -850,11 +850,6 @@ bool GMainWindow::LoadROM(const QString& filename) {
|
||||||
QMessageBox::critical(this, tr("Error while loading ROM!"),
|
QMessageBox::critical(this, tr("Error while loading ROM!"),
|
||||||
tr("The ROM format is not supported."));
|
tr("The ROM format is not supported."));
|
||||||
break;
|
break;
|
||||||
case Core::System::ResultStatus::ErrorSystemMode:
|
|
||||||
LOG_CRITICAL(Frontend, "Failed to load ROM!");
|
|
||||||
QMessageBox::critical(this, tr("Error while loading ROM!"),
|
|
||||||
tr("Could not determine the system mode."));
|
|
||||||
break;
|
|
||||||
case Core::System::ResultStatus::ErrorVideoCore:
|
case Core::System::ResultStatus::ErrorVideoCore:
|
||||||
QMessageBox::critical(
|
QMessageBox::critical(
|
||||||
this, tr("An error occurred initializing the video core."),
|
this, tr("An error occurred initializing the video core."),
|
||||||
|
|
|
@ -199,9 +199,6 @@ int main(int argc, char** argv) {
|
||||||
case Core::System::ResultStatus::ErrorNotInitialized:
|
case Core::System::ResultStatus::ErrorNotInitialized:
|
||||||
LOG_CRITICAL(Frontend, "CPUCore not initialized");
|
LOG_CRITICAL(Frontend, "CPUCore not initialized");
|
||||||
return -1;
|
return -1;
|
||||||
case Core::System::ResultStatus::ErrorSystemMode:
|
|
||||||
LOG_CRITICAL(Frontend, "Failed to determine system mode!");
|
|
||||||
return -1;
|
|
||||||
case Core::System::ResultStatus::ErrorVideoCore:
|
case Core::System::ResultStatus::ErrorVideoCore:
|
||||||
LOG_CRITICAL(Frontend, "Failed to initialize VideoCore!");
|
LOG_CRITICAL(Frontend, "Failed to initialize VideoCore!");
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in New Issue