summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/board
diff options
context:
space:
mode:
authorGravatar Wunkolo2021-06-23 14:18:27 -0700
committerGravatar Wunkolo2021-06-24 09:27:40 -0700
commit4569f39c7c1e3d7ce010f0b120e1f45dbba17b1c (patch)
tree591792bc47e26bc812e753b0891aab94a8a88352 /src/core/hle/kernel/board
parentMerge pull request #6504 from Kelebek1/samples-played (diff)
downloadyuzu-4569f39c7c1e3d7ce010f0b120e1f45dbba17b1c.tar.gz
yuzu-4569f39c7c1e3d7ce010f0b120e1f45dbba17b1c.tar.xz
yuzu-4569f39c7c1e3d7ce010f0b120e1f45dbba17b1c.zip
common: Replace common_sizes into user-literals
Removes common_sizes.h in favor of having `_KiB`, `_MiB`, `_GiB`, etc user-literals within literals.h. To keep the global namespace clean, users will have to use: ``` using namespace Common::Literals; ``` to access these literals.
Diffstat (limited to 'src/core/hle/kernel/board')
-rw-r--r--src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp37
1 files changed, 20 insertions, 17 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 86472b5ce..6f335c251 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
@@ -4,7 +4,8 @@
4 4
5#include <random> 5#include <random>
6 6
7#include "common/common_sizes.h" 7#include "common/literals.h"
8
8#include "core/hle/kernel/board/nintendo/nx/k_system_control.h" 9#include "core/hle/kernel/board/nintendo/nx/k_system_control.h"
9#include "core/hle/kernel/board/nintendo/nx/secure_monitor.h" 10#include "core/hle/kernel/board/nintendo/nx/secure_monitor.h"
10#include "core/hle/kernel/k_trace.h" 11#include "core/hle/kernel/k_trace.h"
@@ -25,6 +26,8 @@ constexpr const std::size_t RequiredNonSecureSystemMemorySize =
25 26
26namespace { 27namespace {
27 28
29using namespace Common::Literals;
30
28u32 GetMemoryModeForInit() { 31u32 GetMemoryModeForInit() {
29 return 0x01; 32 return 0x01;
30} 33}
@@ -57,11 +60,11 @@ size_t KSystemControl::Init::GetIntendedMemorySize() {
57 switch (GetMemorySizeForInit()) { 60 switch (GetMemorySizeForInit()) {
58 case Smc::MemorySize_4GB: 61 case Smc::MemorySize_4GB:
59 default: // All invalid modes should go to 4GB. 62 default: // All invalid modes should go to 4GB.
60 return Common::Size_4_GB; 63 return 4_GiB;
61 case Smc::MemorySize_6GB: 64 case Smc::MemorySize_6GB:
62 return Common::Size_6_GB; 65 return 6_GiB;
63 case Smc::MemorySize_8GB: 66 case Smc::MemorySize_8GB:
64 return Common::Size_8_GB; 67 return 8_GiB;
65 } 68 }
66} 69}
67 70
@@ -79,17 +82,17 @@ std::size_t KSystemControl::Init::GetApplicationPoolSize() {
79 switch (GetMemoryArrangeForInit()) { 82 switch (GetMemoryArrangeForInit()) {
80 case Smc::MemoryArrangement_4GB: 83 case Smc::MemoryArrangement_4GB:
81 default: 84 default:
82 return Common::Size_3285_MB; 85 return 3285_MiB;
83 case Smc::MemoryArrangement_4GBForAppletDev: 86 case Smc::MemoryArrangement_4GBForAppletDev:
84 return Common::Size_2048_MB; 87 return 2048_MiB;
85 case Smc::MemoryArrangement_4GBForSystemDev: 88 case Smc::MemoryArrangement_4GBForSystemDev:
86 return Common::Size_3285_MB; 89 return 3285_MiB;
87 case Smc::MemoryArrangement_6GB: 90 case Smc::MemoryArrangement_6GB:
88 return Common::Size_4916_MB; 91 return 4916_MiB;
89 case Smc::MemoryArrangement_6GBForAppletDev: 92 case Smc::MemoryArrangement_6GBForAppletDev:
90 return Common::Size_3285_MB; 93 return 3285_MiB;
91 case Smc::MemoryArrangement_8GB: 94 case Smc::MemoryArrangement_8GB:
92 return Common::Size_4916_MB; 95 return 4916_MiB;
93 } 96 }
94 }(); 97 }();
95 98
@@ -103,22 +106,22 @@ size_t KSystemControl::Init::GetAppletPoolSize() {
103 switch (GetMemoryArrangeForInit()) { 106 switch (GetMemoryArrangeForInit()) {
104 case Smc::MemoryArrangement_4GB: 107 case Smc::MemoryArrangement_4GB:
105 default: 108 default:
106 return Common::Size_507_MB; 109 return 507_MiB;
107 case Smc::MemoryArrangement_4GBForAppletDev: 110 case Smc::MemoryArrangement_4GBForAppletDev:
108 return Common::Size_1554_MB; 111 return 1554_MiB;
109 case Smc::MemoryArrangement_4GBForSystemDev: 112 case Smc::MemoryArrangement_4GBForSystemDev:
110 return Common::Size_448_MB; 113 return 448_MiB;
111 case Smc::MemoryArrangement_6GB: 114 case Smc::MemoryArrangement_6GB:
112 return Common::Size_562_MB; 115 return 562_MiB;
113 case Smc::MemoryArrangement_6GBForAppletDev: 116 case Smc::MemoryArrangement_6GBForAppletDev:
114 return Common::Size_2193_MB; 117 return 2193_MiB;
115 case Smc::MemoryArrangement_8GB: 118 case Smc::MemoryArrangement_8GB:
116 return Common::Size_2193_MB; 119 return 2193_MiB;
117 } 120 }
118 }(); 121 }();
119 122
120 // Return (possibly) adjusted size. 123 // Return (possibly) adjusted size.
121 constexpr size_t ExtraSystemMemoryForAtmosphere = Common::Size_33_MB; 124 constexpr size_t ExtraSystemMemoryForAtmosphere = 33_MiB;
122 return base_pool_size - ExtraSystemMemoryForAtmosphere - KTraceBufferSize; 125 return base_pool_size - ExtraSystemMemoryForAtmosphere - KTraceBufferSize;
123} 126}
124 127