Răsfoiți Sursa

core/loader: Remove LoadKernelSystemMode

This is a hold-over from Citra and doesn't apply to yuzu.
Lioncash 7 ani în urmă
părinte
comite
84a8fb9264
5 a modificat fișierele cu 0 adăugiri și 29 ștergeri
  1. 0 9
      src/core/core.cpp
  2. 0 1
      src/core/core.h
  3. 0 11
      src/core/loader/loader.h
  4. 0 5
      src/yuzu/main.cpp
  5. 0 3
      src/yuzu_cmd/yuzu.cpp

+ 0 - 9
src/core/core.cpp

@@ -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) {

+ 0 - 1
src/core/core.h

@@ -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

+ 0 - 11
src/core/loader/loader.h

@@ -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

+ 0 - 5
src/yuzu/main.cpp

@@ -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."),

+ 0 - 3
src/yuzu_cmd/yuzu.cpp

@@ -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;