diff options
| author | 2023-02-14 11:13:47 -0500 | |
|---|---|---|
| committer | 2023-02-14 12:35:39 -0500 | |
| commit | 683019878fc939b418a65e1c5d84b066596d7655 (patch) | |
| tree | 6b2a2e8ea34cb00a3fccf3613a52475550997035 /src/core/hle/kernel/init | |
| parent | apply clang-format (diff) | |
| download | yuzu-683019878fc939b418a65e1c5d84b066596d7655.tar.gz yuzu-683019878fc939b418a65e1c5d84b066596d7655.tar.xz yuzu-683019878fc939b418a65e1c5d84b066596d7655.zip | |
remove static from pointer sized or smaller types for aesthetics, change constexpr static to static constexpr for consistency
Signed-off-by: arades79 <scravers@protonmail.com>
Diffstat (limited to 'src/core/hle/kernel/init')
| -rw-r--r-- | src/core/hle/kernel/init/init_slab_setup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp index 951326a85..571acf4b2 100644 --- a/src/core/hle/kernel/init/init_slab_setup.cpp +++ b/src/core/hle/kernel/init/init_slab_setup.cpp | |||
| @@ -129,7 +129,7 @@ VAddr InitializeSlabHeap(Core::System& system, KMemoryLayout& memory_layout, VAd | |||
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | size_t CalculateSlabHeapGapSize() { | 131 | size_t CalculateSlabHeapGapSize() { |
| 132 | constexpr static size_t KernelSlabHeapGapSize = 2_MiB - 320_KiB; | 132 | constexpr size_t KernelSlabHeapGapSize = 2_MiB - 320_KiB; |
| 133 | static_assert(KernelSlabHeapGapSize <= KernelSlabHeapGapsSizeMax); | 133 | static_assert(KernelSlabHeapGapSize <= KernelSlabHeapGapsSizeMax); |
| 134 | return KernelSlabHeapGapSize; | 134 | return KernelSlabHeapGapSize; |
| 135 | } | 135 | } |
| @@ -272,7 +272,7 @@ void KPageBufferSlabHeap::Initialize(Core::System& system) { | |||
| 272 | kernel.GetSystemResourceLimit()->Reserve(LimitableResource::PhysicalMemoryMax, slab_size)); | 272 | kernel.GetSystemResourceLimit()->Reserve(LimitableResource::PhysicalMemoryMax, slab_size)); |
| 273 | 273 | ||
| 274 | // Allocate memory for the slab. | 274 | // Allocate memory for the slab. |
| 275 | constexpr static auto AllocateOption = KMemoryManager::EncodeOption( | 275 | constexpr auto AllocateOption = KMemoryManager::EncodeOption( |
| 276 | KMemoryManager::Pool::System, KMemoryManager::Direction::FromFront); | 276 | KMemoryManager::Pool::System, KMemoryManager::Direction::FromFront); |
| 277 | const PAddr slab_address = | 277 | const PAddr slab_address = |
| 278 | kernel.MemoryManager().AllocateAndOpenContinuous(num_pages, 1, AllocateOption); | 278 | kernel.MemoryManager().AllocateAndOpenContinuous(num_pages, 1, AllocateOption); |