Merge pull request #10035 from liamwhite/long-long
kernel: switch extended memory setting to 8GB arrangement
This commit is contained in:
		| @@ -35,11 +35,11 @@ namespace { | ||||
| using namespace Common::Literals; | ||||
|  | ||||
| u32 GetMemorySizeForInit() { | ||||
|     return Settings::values.use_extended_memory_layout ? Smc::MemorySize_6GB : Smc::MemorySize_4GB; | ||||
|     return Settings::values.use_extended_memory_layout ? Smc::MemorySize_8GB : Smc::MemorySize_4GB; | ||||
| } | ||||
|  | ||||
| Smc::MemoryArrangement GetMemoryArrangeForInit() { | ||||
|     return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_6GB | ||||
|     return Settings::values.use_extended_memory_layout ? Smc::MemoryArrangement_8GB | ||||
|                                                        : Smc::MemoryArrangement_4GB; | ||||
| } | ||||
| } // namespace | ||||
| @@ -91,7 +91,8 @@ std::size_t KSystemControl::Init::GetApplicationPoolSize() { | ||||
|         case Smc::MemoryArrangement_6GBForAppletDev: | ||||
|             return 3285_MiB; | ||||
|         case Smc::MemoryArrangement_8GB: | ||||
|             return 4916_MiB; | ||||
|             // Real kernel sets this to 4916_MiB. We are not debugging applets. | ||||
|             return 6547_MiB; | ||||
|         } | ||||
|     }(); | ||||
|  | ||||
| @@ -115,7 +116,8 @@ size_t KSystemControl::Init::GetAppletPoolSize() { | ||||
|         case Smc::MemoryArrangement_6GBForAppletDev: | ||||
|             return 2193_MiB; | ||||
|         case Smc::MemoryArrangement_8GB: | ||||
|             return 2193_MiB; | ||||
|             //! Real kernel sets this to 2193_MiB. We are not debugging applets. | ||||
|             return 562_MiB; | ||||
|         } | ||||
|     }(); | ||||
|  | ||||
|   | ||||
| @@ -64,7 +64,7 @@ | ||||
|           <item> | ||||
|            <widget class="QCheckBox" name="use_extended_memory_layout"> | ||||
|             <property name="text"> | ||||
|              <string>Extended memory layout (6GB DRAM)</string> | ||||
|              <string>Extended memory layout (8GB DRAM)</string> | ||||
|             </property> | ||||
|            </widget> | ||||
|           </item> | ||||
|   | ||||
| @@ -163,7 +163,7 @@ keyboard_enabled = | ||||
| # 0: Disabled, 1 (default): Enabled | ||||
| use_multi_core = | ||||
|  | ||||
| # Enable extended guest system memory layout (6GB DRAM) | ||||
| # Enable extended guest system memory layout (8GB DRAM) | ||||
| # 0 (default): Disabled, 1: Enabled | ||||
| use_extended_memory_layout = | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user