Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2196 from Subv/system_mode

Browse source 
Kernel/Loader: Grab the system mode from the NCCH ExHeader.
This commit is contained in:
Yuri Kunde Schlesner 2016-11-27 17:04:11 -08:00 • committed by GitHub
commit 3174bfd50c
10 changed files with 66 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/citra_qt/main.cpp
View file

@ -253,7 +253,7 @@ void GMainWindow::OnDisplayTitleBars(bool show) {
}
}
bool GMainWindow::InitializeSystem() {
bool GMainWindow::InitializeSystem(u32 system_mode) {
// Shutdown previous session if the emu thread is still active...
if (emu_thread != nullptr)
ShutdownGame();
@ -270,7 +270,7 @@ bool GMainWindow::InitializeSystem() {
}
// Initialize the core emulation
System::Result system_result = System::Init(render_window);
System::Result system_result = System::Init(render_window, system_mode);
if (System::Result::Success != system_result) {
switch (system_result) {
case System::Result::ErrorInitVideoCore:
@ -299,8 +299,20 @@ bool GMainWindow::LoadROM(const std::string& filename) {
return false;
}
boost::optional<u32> system_mode = app_loader->LoadKernelSystemMode();
if (!system_mode) {
LOG_CRITICAL(Frontend, "Failed to load ROM!");
QMessageBox::critical(this, tr("Error while loading ROM!"),
tr("Could not determine the system mode."));
return false;
}
if (!InitializeSystem(system_mode.get()))
return false;
Loader::ResultStatus result = app_loader->Load();
if (Loader::ResultStatus::Success != result) {
System::Shutdown();
LOG_CRITICAL(Frontend, "Failed to load ROM!");
switch (result) {
@ -338,14 +350,9 @@ void GMainWindow::BootGame(const std::string& filename) {
LOG_INFO(Frontend, "Citra starting...");
StoreRecentFile(filename); // Put the filename on top of the list
if (!InitializeSystem())
if (!LoadROM(filename))
return;
if (!LoadROM(filename)) {
System::Shutdown();
return;
}
// Create and start the emulation thread
emu_thread = std::make_unique<EmuThread>(render_window);
emit EmulationStarting(emu_thread.get());

7
src/citra_qt/main.h
View file

@ -60,7 +60,12 @@ signals:
void EmulationStopping();
private:
bool InitializeSystem();
/**
* Initializes the emulation system.
* @param system_mode The system mode with which to intialize the kernel.
* @returns Whether the system was properly initialized.
*/
bool InitializeSystem(u32 system_mode);
bool LoadROM(const std::string& filename);
void BootGame(const std::string& filename);
void ShutdownGame();