summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar german772024-02-24 11:16:02 -0600
committerGravatar german772024-02-24 11:19:51 -0600
commit4741e5004713695e04e726ab54f7204b4fce5db9 (patch)
treed3326831453b6da9dc5b7807088f70e108c7c425
parentMerge pull request #13142 from t895/vibration-queue (diff)
downloadyuzu-4741e5004713695e04e726ab54f7204b4fce5db9.tar.gz
yuzu-4741e5004713695e04e726ab54f7204b4fce5db9.tar.xz
yuzu-4741e5004713695e04e726ab54f7204b4fce5db9.zip
service: set: Enable nfc and others by default and bump version
-rw-r--r--src/core/hle/service/set/setting_formats/system_settings.cpp4
-rw-r--r--src/core/hle/service/set/system_settings_server.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/hle/service/set/setting_formats/system_settings.cpp b/src/core/hle/service/set/setting_formats/system_settings.cpp
index 7231ff78e..caa30c2d5 100644
--- a/src/core/hle/service/set/setting_formats/system_settings.cpp
+++ b/src/core/hle/service/set/setting_formats/system_settings.cpp
@@ -52,6 +52,10 @@ SystemSettings DefaultSystemSettings() {
52 settings.battery_percentage_flag = true; 52 settings.battery_percentage_flag = true;
53 settings.chinese_traditional_input_method = ChineseTraditionalInputMethod::Unknown0; 53 settings.chinese_traditional_input_method = ChineseTraditionalInputMethod::Unknown0;
54 settings.vibration_master_volume = 1.0f; 54 settings.vibration_master_volume = 1.0f;
55 settings.touch_screen_mode = TouchScreenMode::Standard;
56 settings.nfc_enable_flag = true;
57 settings.bluetooth_enable_flag = true;
58 settings.wireless_lan_enable_flag = true;
55 59
56 const auto language_code = 60 const auto language_code =
57 available_language_codes[static_cast<s32>(::Settings::values.language_index.GetValue())]; 61 available_language_codes[static_cast<s32>(::Settings::values.language_index.GetValue())];
diff --git a/src/core/hle/service/set/system_settings_server.cpp b/src/core/hle/service/set/system_settings_server.cpp
index 45def67db..f514519bb 100644
--- a/src/core/hle/service/set/system_settings_server.cpp
+++ b/src/core/hle/service/set/system_settings_server.cpp
@@ -26,7 +26,7 @@
26namespace Service::Set { 26namespace Service::Set {
27 27
28namespace { 28namespace {
29constexpr u32 SETTINGS_VERSION{3u}; 29constexpr u32 SETTINGS_VERSION{4u};
30constexpr auto SETTINGS_MAGIC = Common::MakeMagic('y', 'u', 'z', 'u', '_', 's', 'e', 't'); 30constexpr auto SETTINGS_MAGIC = Common::MakeMagic('y', 'u', 'z', 'u', '_', 's', 'e', 't');
31struct SettingsHeader { 31struct SettingsHeader {
32 u64 magic; 32 u64 magic;