summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Viktor Szépe2024-01-16 00:09:25 +0000
committerGravatar Viktor Szépe2024-01-16 00:09:25 +0000
commit16abda59be449484898fdcc55f8f0682ff1cff7d (patch)
treee5552e7f82ccb37b611a3a577f94c91f9c813320 /src
parentMerge remote-tracking branch 'origin/master' into typos3 (diff)
downloadyuzu-16abda59be449484898fdcc55f8f0682ff1cff7d.tar.gz
yuzu-16abda59be449484898fdcc55f8f0682ff1cff7d.tar.xz
yuzu-16abda59be449484898fdcc55f8f0682ff1cff7d.zip
Fix typos in master
Diffstat (limited to 'src')
-rw-r--r--src/hid_core/resources/npad/npad_types.h2
-rw-r--r--src/hid_core/resources/npad/npad_vibration.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/hid_core/resources/npad/npad_types.h b/src/hid_core/resources/npad/npad_types.h
index 074dd40cf..fd86c8e40 100644
--- a/src/hid_core/resources/npad/npad_types.h
+++ b/src/hid_core/resources/npad/npad_types.h
@@ -318,7 +318,7 @@ struct InternalFlags {
318 BitField<1, 1, u32> is_connected; 318 BitField<1, 1, u32> is_connected;
319 BitField<2, 1, u32> is_battery_low_ovln_required; 319 BitField<2, 1, u32> is_battery_low_ovln_required;
320 BitField<3, 1, u32> is_battery_low_ovln_delay_required; 320 BitField<3, 1, u32> is_battery_low_ovln_delay_required;
321 BitField<4, 1, u32> is_sample_recieved; 321 BitField<4, 1, u32> is_sample_received;
322 BitField<5, 1, u32> is_virtual_input; 322 BitField<5, 1, u32> is_virtual_input;
323 BitField<6, 1, u32> is_wired; 323 BitField<6, 1, u32> is_wired;
324 BitField<8, 1, u32> use_center_clamp; 324 BitField<8, 1, u32> use_center_clamp;
diff --git a/src/hid_core/resources/npad/npad_vibration.cpp b/src/hid_core/resources/npad/npad_vibration.cpp
index 3bdd55dec..7056e8eab 100644
--- a/src/hid_core/resources/npad/npad_vibration.cpp
+++ b/src/hid_core/resources/npad/npad_vibration.cpp
@@ -15,7 +15,7 @@ Result NpadVibration::Activate() {
15 15
16 const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume(); 16 const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume();
17 // if (master_volume < 0.0f || master_volume > 1.0f) { 17 // if (master_volume < 0.0f || master_volume > 1.0f) {
18 // return ResultVibrationStrenghtOutOfRange; 18 // return ResultVibrationStrengthOutOfRange;
19 // } 19 // }
20 20
21 volume = master_volume; 21 volume = master_volume;
@@ -30,7 +30,7 @@ Result NpadVibration::SetVibrationMasterVolume(f32 master_volume) {
30 std::scoped_lock lock{mutex}; 30 std::scoped_lock lock{mutex};
31 31
32 if (master_volume < 0.0f && master_volume > 1.0f) { 32 if (master_volume < 0.0f && master_volume > 1.0f) {
33 return ResultVibrationStrenghtOutOfRange; 33 return ResultVibrationStrengthOutOfRange;
34 } 34 }
35 35
36 volume = master_volume; 36 volume = master_volume;
@@ -50,7 +50,7 @@ Result NpadVibration::GetVibrationMasterVolume(f32& out_volume) const {
50 50
51 const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume(); 51 const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume();
52 // if (master_volume < 0.0f || master_volume > 1.0f) { 52 // if (master_volume < 0.0f || master_volume > 1.0f) {
53 // return ResultVibrationStrenghtOutOfRange; 53 // return ResultVibrationStrengthOutOfRange;
54 // } 54 // }
55 55
56 out_volume = master_volume; 56 out_volume = master_volume;
@@ -69,7 +69,7 @@ Result NpadVibration::EndPermitVibrationSession() {
69 69
70 const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume(); 70 const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume();
71 // if (master_volume < 0.0f || master_volume > 1.0f) { 71 // if (master_volume < 0.0f || master_volume > 1.0f) {
72 // return ResultVibrationStrenghtOutOfRange; 72 // return ResultVibrationStrengthOutOfRange;
73 // } 73 // }
74 74
75 volume = master_volume; 75 volume = master_volume;
HIC SVNT DRACONES