citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #2789 from yuriks/misc-kernel 

Trivial no-op additions
This commit is contained in:
Weiyi Wang 2017-06-21 20:34:12 +03:00 committed by GitHub
parent b21dfbb295 42b198eb0a
commit c4f0927a62
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/kernel/process.cpp
View File

@ -151,6 +151,8 @@ void Process::Run(s32 main_thread_priority, u32 stack_size) {
} }
VAddr Process::GetLinearHeapAreaAddress() const { VAddr Process::GetLinearHeapAreaAddress() const {
// Starting from system version 8.0.0 a new linear heap layout is supported to allow usage of
// the extra RAM in the n3DS.
return kernel_version < 0x22C ? Memory::LINEAR_HEAP_VADDR : Memory::NEW_LINEAR_HEAP_VADDR; return kernel_version < 0x22C ? Memory::LINEAR_HEAP_VADDR : Memory::NEW_LINEAR_HEAP_VADDR;
} }

4
src/core/memory.h
View File

@ -55,8 +55,10 @@ enum : PAddr {
/// Main FCRAM /// Main FCRAM
FCRAM_PADDR = 0x20000000, FCRAM_PADDR = 0x20000000,
FCRAM_SIZE = 0x08000000, ///< FCRAM size (128MB) FCRAM_SIZE = 0x08000000, ///< FCRAM size on the Old 3DS (128MB)
FCRAM_N3DS_SIZE = 0x10000000, ///< FCRAM size on the New 3DS (256MB)
FCRAM_PADDR_END = FCRAM_PADDR + FCRAM_SIZE, FCRAM_PADDR_END = FCRAM_PADDR + FCRAM_SIZE,
FCRAM_N3DS_PADDR_END = FCRAM_PADDR + FCRAM_N3DS_SIZE,
}; };
/// Virtual user-space memory regions /// Virtual user-space memory regions