diff options
| author | 2021-04-14 14:25:51 -0700 | |
|---|---|---|
| committer | 2021-04-14 14:25:51 -0700 | |
| commit | eedbe8351ca544f68bd10c0d851dbafbb2875c2a (patch) | |
| tree | 7abad6611c7b5844e3c6972e1c4187881dd2a243 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #6195 from Morph1984/controller-applet-motion (diff) | |
| parent | k_resource_limit: Minor cleanup of member variables/headers (diff) | |
| download | yuzu-eedbe8351ca544f68bd10c0d851dbafbb2875c2a.tar.gz yuzu-eedbe8351ca544f68bd10c0d851dbafbb2875c2a.tar.xz yuzu-eedbe8351ca544f68bd10c0d851dbafbb2875c2a.zip | |
Merge pull request #6197 from ameerj/kreslimit-cleanup
k_resource_limit: Cleanup of member variables/headers
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index f7d3f218a..5c4f45ab4 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -72,7 +72,7 @@ struct KernelCore::Impl { | |||
| 72 | KMemoryLayout memory_layout; | 72 | KMemoryLayout memory_layout; |
| 73 | DeriveInitialMemoryLayout(memory_layout); | 73 | DeriveInitialMemoryLayout(memory_layout); |
| 74 | InitializeMemoryLayout(memory_layout); | 74 | InitializeMemoryLayout(memory_layout); |
| 75 | InitializeSystemResourceLimit(kernel, system, memory_layout); | 75 | InitializeSystemResourceLimit(kernel, system.CoreTiming(), memory_layout); |
| 76 | InitializeSlabHeaps(); | 76 | InitializeSlabHeaps(); |
| 77 | InitializeSchedulers(); | 77 | InitializeSchedulers(); |
| 78 | InitializeSuspendThreads(); | 78 | InitializeSuspendThreads(); |
| @@ -142,9 +142,10 @@ struct KernelCore::Impl { | |||
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | // Creates the default system resource limit | 144 | // Creates the default system resource limit |
| 145 | void InitializeSystemResourceLimit(KernelCore& kernel, Core::System& system, | 145 | void InitializeSystemResourceLimit(KernelCore& kernel, |
| 146 | const Core::Timing::CoreTiming& core_timing, | ||
| 146 | const KMemoryLayout& memory_layout) { | 147 | const KMemoryLayout& memory_layout) { |
| 147 | system_resource_limit = std::make_shared<KResourceLimit>(kernel, system); | 148 | system_resource_limit = std::make_shared<KResourceLimit>(kernel, core_timing); |
| 148 | const auto [total_size, kernel_size] = memory_layout.GetTotalAndKernelMemorySizes(); | 149 | const auto [total_size, kernel_size] = memory_layout.GetTotalAndKernelMemorySizes(); |
| 149 | 150 | ||
| 150 | // If setting the default system values fails, then something seriously wrong has occurred. | 151 | // If setting the default system values fails, then something seriously wrong has occurred. |