diff options
| author | 2016-11-19 20:40:04 -0500 | |
|---|---|---|
| committer | 2016-11-19 20:40:04 -0500 | |
| commit | 1323ab2f5f1627b39e48b6f970ad8208fa7af71e (patch) | |
| tree | 6b3257864d76a4cdd3d8bb9847e55a2a51ff7573 /src/core/system.cpp | |
| parent | Merge pull request #2172 from jroweboy/fix-mingw (diff) | |
| download | yuzu-1323ab2f5f1627b39e48b6f970ad8208fa7af71e.tar.gz yuzu-1323ab2f5f1627b39e48b6f970ad8208fa7af71e.tar.xz yuzu-1323ab2f5f1627b39e48b6f970ad8208fa7af71e.zip | |
Kernel/Loader: Grab the system mode from the NCCH ExHeader.
3dsx and elf files default to system mode 2 (96MB allocated to the application).
This allows Home Menu to boot without modifications.
Closes #1849
Diffstat (limited to 'src/core/system.cpp')
| -rw-r--r-- | src/core/system.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index 7d54811a0..a5f763805 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp | |||
| @@ -17,12 +17,12 @@ namespace System { | |||
| 17 | 17 | ||
| 18 | static bool is_powered_on{false}; | 18 | static bool is_powered_on{false}; |
| 19 | 19 | ||
| 20 | Result Init(EmuWindow* emu_window) { | 20 | Result Init(EmuWindow* emu_window, u32 system_mode) { |
| 21 | Core::Init(); | 21 | Core::Init(); |
| 22 | CoreTiming::Init(); | 22 | CoreTiming::Init(); |
| 23 | Memory::Init(); | 23 | Memory::Init(); |
| 24 | HW::Init(); | 24 | HW::Init(); |
| 25 | Kernel::Init(); | 25 | Kernel::Init(system_mode); |
| 26 | HLE::Init(); | 26 | HLE::Init(); |
| 27 | if (!VideoCore::Init(emu_window)) { | 27 | if (!VideoCore::Init(emu_window)) { |
| 28 | return Result::ErrorInitVideoCore; | 28 | return Result::ErrorInitVideoCore; |