diff options
| author | 2018-12-30 21:09:00 -0500 | |
|---|---|---|
| committer | 2018-12-30 21:09:46 -0500 | |
| commit | 87696041442fdcb735f405f05ca4e3722b4f7128 (patch) | |
| tree | c56c54c4677de9d07be0a0e727f4a4d8d2ad5b26 /src | |
| parent | kernel/svc: Simplify thread core ID sanitizing in CreateThread (diff) | |
| download | yuzu-87696041442fdcb735f405f05ca4e3722b4f7128.tar.gz yuzu-87696041442fdcb735f405f05ca4e3722b4f7128.tar.xz yuzu-87696041442fdcb735f405f05ca4e3722b4f7128.zip | |
kernel/process: Rename GetAllowedProcessorMask() and GetAllowedThreadPriorityMask()
Makes them consistent with their kernel capability counterparts.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/process.h | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 450dc6eeb..b710104ab 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h | |||
| @@ -173,13 +173,13 @@ public: | |||
| 173 | return ideal_core; | 173 | return ideal_core; |
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | /// Gets the bitmask of allowed CPUs that this process' threads can run on. | 176 | /// Gets the bitmask of allowed cores that this process' threads can run on. |
| 177 | u64 GetAllowedProcessorMask() const { | 177 | u64 GetCoreMask() const { |
| 178 | return capabilities.GetCoreMask(); | 178 | return capabilities.GetCoreMask(); |
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | /// Gets the bitmask of allowed thread priorities. | 181 | /// Gets the bitmask of allowed thread priorities. |
| 182 | u64 GetAllowedThreadPriorityMask() const { | 182 | u64 GetPriorityMask() const { |
| 183 | return capabilities.GetPriorityMask(); | 183 | return capabilities.GetPriorityMask(); |
| 184 | } | 184 | } |
| 185 | 185 | ||
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 352ab2d14..8d8d4e0ab 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -715,8 +715,8 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id) | |||
| 715 | 715 | ||
| 716 | enum class GetInfoType : u64 { | 716 | enum class GetInfoType : u64 { |
| 717 | // 1.0.0+ | 717 | // 1.0.0+ |
| 718 | AllowedCpuIdBitmask = 0, | 718 | AllowedCPUCoreMask = 0, |
| 719 | AllowedThreadPrioBitmask = 1, | 719 | AllowedThreadPriorityMask = 1, |
| 720 | MapRegionBaseAddr = 2, | 720 | MapRegionBaseAddr = 2, |
| 721 | MapRegionSize = 3, | 721 | MapRegionSize = 3, |
| 722 | HeapRegionBaseAddr = 4, | 722 | HeapRegionBaseAddr = 4, |
| @@ -747,8 +747,8 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id) | |||
| 747 | const auto info_id_type = static_cast<GetInfoType>(info_id); | 747 | const auto info_id_type = static_cast<GetInfoType>(info_id); |
| 748 | 748 | ||
| 749 | switch (info_id_type) { | 749 | switch (info_id_type) { |
| 750 | case GetInfoType::AllowedCpuIdBitmask: | 750 | case GetInfoType::AllowedCPUCoreMask: |
| 751 | case GetInfoType::AllowedThreadPrioBitmask: | 751 | case GetInfoType::AllowedThreadPriorityMask: |
| 752 | case GetInfoType::MapRegionBaseAddr: | 752 | case GetInfoType::MapRegionBaseAddr: |
| 753 | case GetInfoType::MapRegionSize: | 753 | case GetInfoType::MapRegionSize: |
| 754 | case GetInfoType::HeapRegionBaseAddr: | 754 | case GetInfoType::HeapRegionBaseAddr: |
| @@ -774,12 +774,12 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id) | |||
| 774 | } | 774 | } |
| 775 | 775 | ||
| 776 | switch (info_id_type) { | 776 | switch (info_id_type) { |
| 777 | case GetInfoType::AllowedCpuIdBitmask: | 777 | case GetInfoType::AllowedCPUCoreMask: |
| 778 | *result = process->GetAllowedProcessorMask(); | 778 | *result = process->GetCoreMask(); |
| 779 | return RESULT_SUCCESS; | 779 | return RESULT_SUCCESS; |
| 780 | 780 | ||
| 781 | case GetInfoType::AllowedThreadPrioBitmask: | 781 | case GetInfoType::AllowedThreadPriorityMask: |
| 782 | *result = process->GetAllowedThreadPriorityMask(); | 782 | *result = process->GetPriorityMask(); |
| 783 | return RESULT_SUCCESS; | 783 | return RESULT_SUCCESS; |
| 784 | 784 | ||
| 785 | case GetInfoType::MapRegionBaseAddr: | 785 | case GetInfoType::MapRegionBaseAddr: |