diff options
| author | 2021-02-12 16:02:35 -0800 | |
|---|---|---|
| committer | 2021-02-18 16:16:25 -0800 | |
| commit | 1d162f28d139ffbffa6fb84945e3e8b668dc841e (patch) | |
| tree | a35c541d79c93e33c226b8e5a088297014b55805 /src/core/hle/kernel/kernel.cpp | |
| parent | hle: kernel: Migrate AddressSpaceInfo to KAddressSpaceInfo. (diff) | |
| download | yuzu-1d162f28d139ffbffa6fb84945e3e8b668dc841e.tar.gz yuzu-1d162f28d139ffbffa6fb84945e3e8b668dc841e.tar.xz yuzu-1d162f28d139ffbffa6fb84945e3e8b668dc841e.zip | |
hle: kernel: Migrate MemoryLayout to KMemoryLayout.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 5eb602843..98b3ec712 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -27,12 +27,12 @@ | |||
| 27 | #include "core/hardware_properties.h" | 27 | #include "core/hardware_properties.h" |
| 28 | #include "core/hle/kernel/client_port.h" | 28 | #include "core/hle/kernel/client_port.h" |
| 29 | #include "core/hle/kernel/handle_table.h" | 29 | #include "core/hle/kernel/handle_table.h" |
| 30 | #include "core/hle/kernel/k_memory_layout.h" | ||
| 30 | #include "core/hle/kernel/k_resource_limit.h" | 31 | #include "core/hle/kernel/k_resource_limit.h" |
| 31 | #include "core/hle/kernel/k_scheduler.h" | 32 | #include "core/hle/kernel/k_scheduler.h" |
| 32 | #include "core/hle/kernel/k_shared_memory.h" | 33 | #include "core/hle/kernel/k_shared_memory.h" |
| 33 | #include "core/hle/kernel/k_thread.h" | 34 | #include "core/hle/kernel/k_thread.h" |
| 34 | #include "core/hle/kernel/kernel.h" | 35 | #include "core/hle/kernel/kernel.h" |
| 35 | #include "core/hle/kernel/memory/memory_layout.h" | ||
| 36 | #include "core/hle/kernel/memory/memory_manager.h" | 36 | #include "core/hle/kernel/memory/memory_manager.h" |
| 37 | #include "core/hle/kernel/memory/slab_heap.h" | 37 | #include "core/hle/kernel/memory/slab_heap.h" |
| 38 | #include "core/hle/kernel/physical_core.h" | 38 | #include "core/hle/kernel/physical_core.h" |
| @@ -266,7 +266,7 @@ struct KernelCore::Impl { | |||
| 266 | 266 | ||
| 267 | void InitializeMemoryLayout() { | 267 | void InitializeMemoryLayout() { |
| 268 | // Initialize memory layout | 268 | // Initialize memory layout |
| 269 | constexpr Memory::MemoryLayout layout{Memory::MemoryLayout::GetDefaultLayout()}; | 269 | constexpr KMemoryLayout layout{KMemoryLayout::GetDefaultLayout()}; |
| 270 | constexpr std::size_t hid_size{0x40000}; | 270 | constexpr std::size_t hid_size{0x40000}; |
| 271 | constexpr std::size_t font_size{0x1100000}; | 271 | constexpr std::size_t font_size{0x1100000}; |
| 272 | constexpr std::size_t irs_size{0x8000}; | 272 | constexpr std::size_t irs_size{0x8000}; |