diff options
| author | 2021-03-23 18:31:46 -0700 | |
|---|---|---|
| committer | 2021-03-23 18:31:46 -0700 | |
| commit | ab5995c7ae878fcf3b9a0c537f0e37377f206d76 (patch) | |
| tree | e48ed1c0a30a0ce2fe5365023934030e68ac9379 /src/core/hle/kernel/board | |
| parent | hle: kernel: Merge KMemoryRegionAttr and KMemoryRegionType. (diff) | |
| download | yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.tar.gz yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.tar.xz yuzu-ab5995c7ae878fcf3b9a0c537f0e37377f206d76.zip | |
common: common_sizes: Move sizes to the Common namespace.
Diffstat (limited to 'src/core/hle/kernel/board')
| -rw-r--r-- | src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp index a48d0c11e..919a6b943 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp +++ b/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp | |||
| @@ -57,11 +57,11 @@ size_t KSystemControl::Init::GetIntendedMemorySize() { | |||
| 57 | switch (GetMemorySizeForInit()) { | 57 | switch (GetMemorySizeForInit()) { |
| 58 | case Smc::MemorySize_4GB: | 58 | case Smc::MemorySize_4GB: |
| 59 | default: // All invalid modes should go to 4GB. | 59 | default: // All invalid modes should go to 4GB. |
| 60 | return Size_4_GB; | 60 | return Common::Size_4_GB; |
| 61 | case Smc::MemorySize_6GB: | 61 | case Smc::MemorySize_6GB: |
| 62 | return Size_6_GB; | 62 | return Common::Size_6_GB; |
| 63 | case Smc::MemorySize_8GB: | 63 | case Smc::MemorySize_8GB: |
| 64 | return Size_8_GB; | 64 | return Common::Size_8_GB; |
| 65 | } | 65 | } |
| 66 | } | 66 | } |
| 67 | 67 | ||
| @@ -79,17 +79,17 @@ std::size_t KSystemControl::Init::GetApplicationPoolSize() { | |||
| 79 | switch (GetMemoryArrangeForInit()) { | 79 | switch (GetMemoryArrangeForInit()) { |
| 80 | case Smc::MemoryArrangement_4GB: | 80 | case Smc::MemoryArrangement_4GB: |
| 81 | default: | 81 | default: |
| 82 | return Size_3285_MB; | 82 | return Common::Size_3285_MB; |
| 83 | case Smc::MemoryArrangement_4GBForAppletDev: | 83 | case Smc::MemoryArrangement_4GBForAppletDev: |
| 84 | return Size_2048_MB; | 84 | return Common::Size_2048_MB; |
| 85 | case Smc::MemoryArrangement_4GBForSystemDev: | 85 | case Smc::MemoryArrangement_4GBForSystemDev: |
| 86 | return Size_3285_MB; | 86 | return Common::Size_3285_MB; |
| 87 | case Smc::MemoryArrangement_6GB: | 87 | case Smc::MemoryArrangement_6GB: |
| 88 | return Size_4916_MB; | 88 | return Common::Size_4916_MB; |
| 89 | case Smc::MemoryArrangement_6GBForAppletDev: | 89 | case Smc::MemoryArrangement_6GBForAppletDev: |
| 90 | return Size_3285_MB; | 90 | return Common::Size_3285_MB; |
| 91 | case Smc::MemoryArrangement_8GB: | 91 | case Smc::MemoryArrangement_8GB: |
| 92 | return Size_4916_MB; | 92 | return Common::Size_4916_MB; |
| 93 | } | 93 | } |
| 94 | }(); | 94 | }(); |
| 95 | 95 | ||
| @@ -103,22 +103,22 @@ size_t KSystemControl::Init::GetAppletPoolSize() { | |||
| 103 | switch (GetMemoryArrangeForInit()) { | 103 | switch (GetMemoryArrangeForInit()) { |
| 104 | case Smc::MemoryArrangement_4GB: | 104 | case Smc::MemoryArrangement_4GB: |
| 105 | default: | 105 | default: |
| 106 | return Size_507_MB; | 106 | return Common::Size_507_MB; |
| 107 | case Smc::MemoryArrangement_4GBForAppletDev: | 107 | case Smc::MemoryArrangement_4GBForAppletDev: |
| 108 | return Size_1554_MB; | 108 | return Common::Size_1554_MB; |
| 109 | case Smc::MemoryArrangement_4GBForSystemDev: | 109 | case Smc::MemoryArrangement_4GBForSystemDev: |
| 110 | return Size_448_MB; | 110 | return Common::Size_448_MB; |
| 111 | case Smc::MemoryArrangement_6GB: | 111 | case Smc::MemoryArrangement_6GB: |
| 112 | return Size_562_MB; | 112 | return Common::Size_562_MB; |
| 113 | case Smc::MemoryArrangement_6GBForAppletDev: | 113 | case Smc::MemoryArrangement_6GBForAppletDev: |
| 114 | return Size_2193_MB; | 114 | return Common::Size_2193_MB; |
| 115 | case Smc::MemoryArrangement_8GB: | 115 | case Smc::MemoryArrangement_8GB: |
| 116 | return Size_2193_MB; | 116 | return Common::Size_2193_MB; |
| 117 | } | 117 | } |
| 118 | }(); | 118 | }(); |
| 119 | 119 | ||
| 120 | // Return (possibly) adjusted size. | 120 | // Return (possibly) adjusted size. |
| 121 | constexpr size_t ExtraSystemMemoryForAtmosphere = Size_33_MB; | 121 | constexpr size_t ExtraSystemMemoryForAtmosphere = Common::Size_33_MB; |
| 122 | return base_pool_size - ExtraSystemMemoryForAtmosphere - KTraceBufferSize; | 122 | return base_pool_size - ExtraSystemMemoryForAtmosphere - KTraceBufferSize; |
| 123 | } | 123 | } |
| 124 | 124 | ||