summaryrefslogtreecommitdiff
path: root/src/core/hle
diff options
context:
space:
mode:
authorGravatar bunnei2018-06-20 16:46:14 -0400
committerGravatar GitHub2018-06-20 16:46:14 -0400
commitc3e95086b66dfa4214892dcddb9fd6f865037c1e (patch)
tree859f41acecbdcfcbdf19df80903a045d6e2b0bcb /src/core/hle
parentImplement GetAvailableLanguageCodes2 (#575) (diff)
parentBuild: Fixed some MSVC warnings in various parts of the code. (diff)
downloadyuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.gz
yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.tar.xz
yuzu-c3e95086b66dfa4214892dcddb9fd6f865037c1e.zip
Merge pull request #576 from Subv/warnings1
Build: Fixed some MSVC warnings in various parts of the code.
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/kernel/svc.cpp4
-rw-r--r--src/core/hle/service/audio/audren_u.cpp2
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp3
3 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 097416e9e..69ba7b777 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -749,7 +749,7 @@ static ResultCode SetThreadCoreMask(Handle thread_handle, u32 core, u64 mask) {
749 ASSERT(thread->owner_process->ideal_processor != THREADPROCESSORID_DEFAULT); 749 ASSERT(thread->owner_process->ideal_processor != THREADPROCESSORID_DEFAULT);
750 // Set the target CPU to the one specified in the process' exheader. 750 // Set the target CPU to the one specified in the process' exheader.
751 core = thread->owner_process->ideal_processor; 751 core = thread->owner_process->ideal_processor;
752 mask = 1 << core; 752 mask = 1ull << core;
753 } 753 }
754 754
755 if (mask == 0) { 755 if (mask == 0) {
@@ -766,7 +766,7 @@ static ResultCode SetThreadCoreMask(Handle thread_handle, u32 core, u64 mask) {
766 } 766 }
767 767
768 // Error out if the input core isn't enabled in the input mask. 768 // Error out if the input core isn't enabled in the input mask.
769 if (core < Core::NUM_CPU_CORES && (mask & (1 << core)) == 0) { 769 if (core < Core::NUM_CPU_CORES && (mask & (1ull << core)) == 0) {
770 return ResultCode(ErrorModule::Kernel, ErrCodes::InvalidCombination); 770 return ResultCode(ErrorModule::Kernel, ErrCodes::InvalidCombination);
771 } 771 }
772 772
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp
index 6e8002bc9..c7653f654 100644
--- a/src/core/hle/service/audio/audren_u.cpp
+++ b/src/core/hle/service/audio/audren_u.cpp
@@ -328,7 +328,7 @@ bool AudRenU::IsFeatureSupported(AudioFeatures feature, u32_le revision) const {
328 u32_be version_num = (revision - Common::MakeMagic('R', 'E', 'V', '0')); // Byte swap 328 u32_be version_num = (revision - Common::MakeMagic('R', 'E', 'V', '0')); // Byte swap
329 switch (feature) { 329 switch (feature) {
330 case AudioFeatures::Splitter: 330 case AudioFeatures::Splitter:
331 return version_num >= 2; 331 return version_num >= 2u;
332 default: 332 default:
333 return false; 333 return false;
334 } 334 }
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
index 79aab87f9..ed7b6dc03 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
@@ -121,8 +121,9 @@ u32 nvhost_gpu::AllocateObjectContext(const std::vector<u8>& input, std::vector<
121} 121}
122 122
123u32 nvhost_gpu::SubmitGPFIFO(const std::vector<u8>& input, std::vector<u8>& output) { 123u32 nvhost_gpu::SubmitGPFIFO(const std::vector<u8>& input, std::vector<u8>& output) {
124 if (input.size() < sizeof(IoctlSubmitGpfifo)) 124 if (input.size() < sizeof(IoctlSubmitGpfifo)) {
125 UNIMPLEMENTED(); 125 UNIMPLEMENTED();
126 }
126 IoctlSubmitGpfifo params{}; 127 IoctlSubmitGpfifo params{};
127 std::memcpy(&params, input.data(), sizeof(IoctlSubmitGpfifo)); 128 std::memcpy(&params, input.data(), sizeof(IoctlSubmitGpfifo));
128 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, gpfifo={:X}, num_entries={:X}, flags={:X}", 129 NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, gpfifo={:X}, num_entries={:X}, flags={:X}",