Procházet zdrojové kódy

Merge pull request #2789 from yuriks/misc-kernel

Trivial no-op additions
Weiyi Wang před 9 roky
rodič
revize
c4f0927a62
2 změnil soubory, kde provedl 5 přidání a 1 odebrání
  1. 2 0
      src/core/hle/kernel/process.cpp
  2. 3 1
      src/core/memory.h

+ 2 - 0
src/core/hle/kernel/process.cpp

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

+ 3 - 1
src/core/memory.h

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