diff options
author | Lioncash <mathew1800@gmail.com> | 2019-04-01 22:46:00 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-04-01 22:49:28 +0200 |
commit | d09e98f566e6c0c6363bc881c4f40e50a9de3ff8 (patch) | |
tree | 84c668276510fe0301950f84a782902c7673e662 /src/core/hle/kernel | |
parent | Merge pull request #2301 from FearlessTobi/remove-amiibo-setting (diff) | |
download | yuzu-d09e98f566e6c0c6363bc881c4f40e50a9de3ff8.tar yuzu-d09e98f566e6c0c6363bc881c4f40e50a9de3ff8.tar.gz yuzu-d09e98f566e6c0c6363bc881c4f40e50a9de3ff8.tar.bz2 yuzu-d09e98f566e6c0c6363bc881c4f40e50a9de3ff8.tar.lz yuzu-d09e98f566e6c0c6363bc881c4f40e50a9de3ff8.tar.xz yuzu-d09e98f566e6c0c6363bc881c4f40e50a9de3ff8.tar.zst yuzu-d09e98f566e6c0c6363bc881c4f40e50a9de3ff8.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/resource_limit.cpp | 7 | ||||
-rw-r--r-- | src/core/hle/kernel/resource_limit.h | 11 |
3 files changed, 6 insertions, 14 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 6baeb3494..f4339a5cd 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -115,7 +115,7 @@ struct KernelCore::Impl { // Creates the default system resource limit void InitializeSystemResourceLimit(KernelCore& kernel) { - system_resource_limit = ResourceLimit::Create(kernel, "System"); + system_resource_limit = ResourceLimit::Create(kernel); // If setting the default system values fails, then something seriously wrong has occurred. ASSERT(system_resource_limit->SetLimitValue(ResourceType::PhysicalMemory, 0x200000000) diff --git a/src/core/hle/kernel/resource_limit.cpp b/src/core/hle/kernel/resource_limit.cpp index 2f9695005..173f69915 100644 --- a/src/core/hle/kernel/resource_limit.cpp +++ b/src/core/hle/kernel/resource_limit.cpp @@ -16,11 +16,8 @@ constexpr std::size_t ResourceTypeToIndex(ResourceType type) { ResourceLimit::ResourceLimit(KernelCore& kernel) : Object{kernel} {} ResourceLimit::~ResourceLimit() = default; -SharedPtr<ResourceLimit> ResourceLimit::Create(KernelCore& kernel, std::string name) { - SharedPtr<ResourceLimit> resource_limit(new ResourceLimit(kernel)); - - resource_limit->name = std::move(name); - return resource_limit; +SharedPtr<ResourceLimit> ResourceLimit::Create(KernelCore& kernel) { + return new ResourceLimit(kernel); } s64 ResourceLimit::GetCurrentResourceValue(ResourceType resource) const { diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h index 59dc11c22..70e09858a 100644 --- a/src/core/hle/kernel/resource_limit.h +++ b/src/core/hle/kernel/resource_limit.h @@ -31,16 +31,14 @@ constexpr bool IsValidResourceType(ResourceType type) { class ResourceLimit final : public Object { public: - /** - * Creates a resource limit object. - */ - static SharedPtr<ResourceLimit> Create(KernelCore& kernel, std::string name = "Unknown"); + /// Creates a resource limit object. + static SharedPtr<ResourceLimit> Create(KernelCore& kernel); std::string GetTypeName() const override { return "ResourceLimit"; } std::string GetName() const override { - return name; + return GetTypeName(); } static const HandleType HANDLE_TYPE = HandleType::ResourceLimit; @@ -95,9 +93,6 @@ private: ResourceArray limits{}; /// Current resource limit values. ResourceArray values{}; - - /// Name of resource limit object. - std::string name; }; } // namespace Kernel |