mirror of
				https://github.com/yuzu-emu/yuzu.git
				synced 2025-11-04 06:23:42 +00:00 
			
		
		
		
	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.
This commit is contained in:
		
							parent
							
								
									47f2405ab1
								
							
						
					
					
						commit
						ff7e6a42c1
					
				@ -150,7 +150,7 @@ private:
 | 
			
		||||
 | 
			
		||||
        IPC::ResponseBuilder rb{ctx, 3};
 | 
			
		||||
        rb.Push(RESULT_SUCCESS);
 | 
			
		||||
        rb.PushRaw<u8>(Settings::values.enable_nfc);
 | 
			
		||||
        rb.PushRaw<u8>(true);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void GetStateOld(Kernel::HLERequestContext& ctx) {
 | 
			
		||||
 | 
			
		||||
@ -82,7 +82,6 @@ void LogSetting(const std::string& name, const T& value) {
 | 
			
		||||
void LogSettings() {
 | 
			
		||||
    LOG_INFO(Config, "yuzu Configuration:");
 | 
			
		||||
    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_CurrentUser", Settings::values.current_user);
 | 
			
		||||
    LogSetting("System_LanguageIndex", Settings::values.language_index);
 | 
			
		||||
 | 
			
		||||
@ -349,7 +349,6 @@ struct TouchscreenInput {
 | 
			
		||||
struct Values {
 | 
			
		||||
    // System
 | 
			
		||||
    bool use_docked_mode;
 | 
			
		||||
    bool enable_nfc;
 | 
			
		||||
    std::optional<u32> rng_seed;
 | 
			
		||||
    // Measured in seconds since epoch
 | 
			
		||||
    std::optional<std::chrono::seconds> custom_rtc;
 | 
			
		||||
 | 
			
		||||
@ -413,7 +413,6 @@ void Config::ReadValues() {
 | 
			
		||||
 | 
			
		||||
    qt_config->beginGroup("System");
 | 
			
		||||
    Settings::values.use_docked_mode = ReadSetting("use_docked_mode", false).toBool();
 | 
			
		||||
    Settings::values.enable_nfc = ReadSetting("enable_nfc", true).toBool();
 | 
			
		||||
 | 
			
		||||
    Settings::values.current_user =
 | 
			
		||||
        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");
 | 
			
		||||
    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("language_index", Settings::values.language_index, 1);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -33,7 +33,6 @@ void ConfigureGeneral::setConfiguration() {
 | 
			
		||||
    ui->toggle_user_on_boot->setChecked(UISettings::values.select_user_on_boot);
 | 
			
		||||
    ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme));
 | 
			
		||||
    ui->use_cpu_jit->setChecked(Settings::values.use_cpu_jit);
 | 
			
		||||
    ui->enable_nfc->setChecked(Settings::values.enable_nfc);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void ConfigureGeneral::PopulateHotkeyList(const HotkeyRegistry& registry) {
 | 
			
		||||
@ -48,5 +47,4 @@ void ConfigureGeneral::applyConfiguration() {
 | 
			
		||||
        ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
 | 
			
		||||
 | 
			
		||||
    Settings::values.use_cpu_jit = ui->use_cpu_jit->isChecked();
 | 
			
		||||
    Settings::values.enable_nfc = ui->enable_nfc->isChecked();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -70,26 +70,6 @@
 | 
			
		||||
       </layout>
 | 
			
		||||
      </widget>
 | 
			
		||||
     </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>
 | 
			
		||||
      <widget class="QGroupBox" name="theme_group_box">
 | 
			
		||||
       <property name="title">
 | 
			
		||||
 | 
			
		||||
@ -319,7 +319,6 @@ void Config::ReadValues() {
 | 
			
		||||
 | 
			
		||||
    // System
 | 
			
		||||
    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);
 | 
			
		||||
 | 
			
		||||
    Settings::values.current_user = std::clamp<int>(
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user