Explorar el Código

core/yuzu: Remove enable_nfc setting

This was initially added to prevent problems from stubbed/not implemented NFC services, but as we never encountered such and as it's only used in a deprecated function anyway, I guess we can just remove it to prevent more clutter of the settings.
fearlessTobi hace 7 años
padre
commit
ff7e6a42c1

+ 1 - 1
src/core/hle/service/nfc/nfc.cpp

@@ -150,7 +150,7 @@ private:
 
 
         IPC::ResponseBuilder rb{ctx, 3};
         IPC::ResponseBuilder rb{ctx, 3};
         rb.Push(RESULT_SUCCESS);
         rb.Push(RESULT_SUCCESS);
-        rb.PushRaw<u8>(Settings::values.enable_nfc);
+        rb.PushRaw<u8>(true);
     }
     }
 
 
     void GetStateOld(Kernel::HLERequestContext& ctx) {
     void GetStateOld(Kernel::HLERequestContext& ctx) {

+ 0 - 1
src/core/settings.cpp

@@ -82,7 +82,6 @@ void LogSetting(const std::string& name, const T& value) {
 void LogSettings() {
 void LogSettings() {
     LOG_INFO(Config, "yuzu Configuration:");
     LOG_INFO(Config, "yuzu Configuration:");
     LogSetting("System_UseDockedMode", Settings::values.use_docked_mode);
     LogSetting("System_UseDockedMode", Settings::values.use_docked_mode);
-    LogSetting("System_EnableNfc", Settings::values.enable_nfc);
     LogSetting("System_RngSeed", Settings::values.rng_seed.value_or(0));
     LogSetting("System_RngSeed", Settings::values.rng_seed.value_or(0));
     LogSetting("System_CurrentUser", Settings::values.current_user);
     LogSetting("System_CurrentUser", Settings::values.current_user);
     LogSetting("System_LanguageIndex", Settings::values.language_index);
     LogSetting("System_LanguageIndex", Settings::values.language_index);

+ 0 - 1
src/core/settings.h

@@ -349,7 +349,6 @@ struct TouchscreenInput {
 struct Values {
 struct Values {
     // System
     // System
     bool use_docked_mode;
     bool use_docked_mode;
-    bool enable_nfc;
     std::optional<u32> rng_seed;
     std::optional<u32> rng_seed;
     // Measured in seconds since epoch
     // Measured in seconds since epoch
     std::optional<std::chrono::seconds> custom_rtc;
     std::optional<std::chrono::seconds> custom_rtc;

+ 0 - 2
src/yuzu/configuration/config.cpp

@@ -413,7 +413,6 @@ void Config::ReadValues() {
 
 
     qt_config->beginGroup("System");
     qt_config->beginGroup("System");
     Settings::values.use_docked_mode = ReadSetting("use_docked_mode", false).toBool();
     Settings::values.use_docked_mode = ReadSetting("use_docked_mode", false).toBool();
-    Settings::values.enable_nfc = ReadSetting("enable_nfc", true).toBool();
 
 
     Settings::values.current_user =
     Settings::values.current_user =
         std::clamp<int>(ReadSetting("current_user", 0).toInt(), 0, Service::Account::MAX_USERS - 1);
         std::clamp<int>(ReadSetting("current_user", 0).toInt(), 0, Service::Account::MAX_USERS - 1);
@@ -675,7 +674,6 @@ void Config::SaveValues() {
 
 
     qt_config->beginGroup("System");
     qt_config->beginGroup("System");
     WriteSetting("use_docked_mode", Settings::values.use_docked_mode, false);
     WriteSetting("use_docked_mode", Settings::values.use_docked_mode, false);
-    WriteSetting("enable_nfc", Settings::values.enable_nfc, true);
     WriteSetting("current_user", Settings::values.current_user, 0);
     WriteSetting("current_user", Settings::values.current_user, 0);
     WriteSetting("language_index", Settings::values.language_index, 1);
     WriteSetting("language_index", Settings::values.language_index, 1);
 
 

+ 0 - 2
src/yuzu/configuration/configure_general.cpp

@@ -33,7 +33,6 @@ void ConfigureGeneral::setConfiguration() {
     ui->toggle_user_on_boot->setChecked(UISettings::values.select_user_on_boot);
     ui->toggle_user_on_boot->setChecked(UISettings::values.select_user_on_boot);
     ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme));
     ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme));
     ui->use_cpu_jit->setChecked(Settings::values.use_cpu_jit);
     ui->use_cpu_jit->setChecked(Settings::values.use_cpu_jit);
-    ui->enable_nfc->setChecked(Settings::values.enable_nfc);
 }
 }
 
 
 void ConfigureGeneral::PopulateHotkeyList(const HotkeyRegistry& registry) {
 void ConfigureGeneral::PopulateHotkeyList(const HotkeyRegistry& registry) {
@@ -48,5 +47,4 @@ void ConfigureGeneral::applyConfiguration() {
         ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
         ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
 
 
     Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked();
     Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked();
-    Settings::values.enable_nfc = ui->enable_nfc->isChecked();
 }
 }

+ 0 - 20
src/yuzu/configuration/configure_general.ui

@@ -70,26 +70,6 @@
        </layout>
        </layout>
       </widget>
       </widget>
      </item>
      </item>
-     <item>
-      <widget class="QGroupBox" name="EmulationGroupBox">
-       <property name="title">
-        <string>Emulation</string>
-       </property>
-       <layout class="QHBoxLayout" name="EmulationHorizontalLayout">
-        <item>
-         <layout class="QVBoxLayout" name="EmulationVerticalLayout">
-          <item>
-           <widget class="QCheckBox" name="enable_nfc">
-            <property name="text">
-             <string>Enable NFC</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </widget>
-     </item>
      <item>
      <item>
       <widget class="QGroupBox" name="theme_group_box">
       <widget class="QGroupBox" name="theme_group_box">
        <property name="title">
        <property name="title">

+ 0 - 1
src/yuzu_cmd/config.cpp

@@ -319,7 +319,6 @@ void Config::ReadValues() {
 
 
     // System
     // System
     Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", false);
     Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", false);
-    Settings::values.enable_nfc = sdl2_config->GetBoolean("System", "enable_nfc", true);
     const auto size = sdl2_config->GetInteger("System", "users_size", 0);
     const auto size = sdl2_config->GetInteger("System", "users_size", 0);
 
 
     Settings::values.current_user = std::clamp<int>(
     Settings::values.current_user = std::clamp<int>(