diff --git a/src/core/hle/api_version.h b/src/core/hle/api_version.h index 6677849821..0317fa1c9f 100644 --- a/src/core/hle/api_version.h +++ b/src/core/hle/api_version.h @@ -16,7 +16,7 @@ namespace HLE::ApiVersion { constexpr u8 HOS_VERSION_MAJOR = 21; constexpr u8 HOS_VERSION_MINOR = 0; -constexpr u8 HOS_VERSION_MICRO = 1; +constexpr u8 HOS_VERSION_MICRO = 0; // NintendoSDK version constants. diff --git a/src/core/hle/service/audio/audio_device.cpp b/src/core/hle/service/audio/audio_device.cpp index 5a92290963..1f7c384846 100644 --- a/src/core/hle/service/audio/audio_device.cpp +++ b/src/core/hle/service/audio/audio_device.cpp @@ -37,8 +37,8 @@ IAudioDevice::IAudioDevice(Core::System& system_, u64 applet_resource_user_id, u {17, nullptr, "AcquireAudioOutputDeviceNotification"}, // 17.0.0+ {18, nullptr, "ReleaseAudioOutputDeviceNotification"}, // 17.0.0+ {19, nullptr, "SetAudioDeviceOutputVolumeAutoTuneEnabled"}, // 18.0.0+ - {20, nullptr, "IsAudioDeviceOutputVolumeAutoTuneEnabled"} // 18.0.0+ - {21, nullptr, "IsActiveOutputDeviceEstimatedLowLatency"} // 21.0.0+ + {20, nullptr, "IsAudioDeviceOutputVolumeAutoTuneEnabled"}, // 18.0.0+ + {21, nullptr, "IsActiveOutputDeviceEstimatedLowLatency"} // 21.0.0+ }; RegisterHandlers(functions); diff --git a/src/frontend_common/firmware_manager.cpp b/src/frontend_common/firmware_manager.cpp index be3014e3f2..6f3f409aa8 100644 --- a/src/frontend_common/firmware_manager.cpp +++ b/src/frontend_common/firmware_manager.cpp @@ -121,18 +121,12 @@ FirmwareManager::FirmwareCheckResult FirmwareManager::VerifyFirmware(Core::Syste return ErrorFirmwareMissing; } else { const auto pair = GetFirmwareVersion(system); - const auto firmware_data = pair.first; const auto result = pair.second; if (result.IsError()) { LOG_INFO(Frontend, "Unable to read firmware"); return ErrorFirmwareCorrupted; } - - // TODO: update this whenever newer firmware is properly supported - if (firmware_data.major > 20) { - return ErrorFirmwareTooNew; - } } return FirmwareGood; diff --git a/src/frontend_common/firmware_manager.h b/src/frontend_common/firmware_manager.h index 40814a11f8..5e02ad52f6 100644 --- a/src/frontend_common/firmware_manager.h +++ b/src/frontend_common/firmware_manager.h @@ -58,7 +58,6 @@ enum FirmwareCheckResult { FirmwareGood, ErrorFirmwareMissing, ErrorFirmwareCorrupted, - ErrorFirmwareTooNew, }; static constexpr std::array FIRMWARE_CHECK_STRINGS = { @@ -66,8 +65,7 @@ static constexpr std::array FIRMWARE_CHECK_STRINGS = { "Firmware missing. Firmware is required to run certain games and use the Home Menu. " "Eden only works with firmware 19.0.1 and earlier.", "Firmware reported as present, but was unable to be read. Check for decryption keys and " - "redump firmware if necessary.", - "Firmware is too new or could not be read. Eden only works with firmware 19.0.1 and earlier.", + "redump firmware if necessary." }; /** diff --git a/src/yuzu/main_window.cpp b/src/yuzu/main_window.cpp index 1547c96dd7..01397241eb 100644 --- a/src/yuzu/main_window.cpp +++ b/src/yuzu/main_window.cpp @@ -4067,26 +4067,7 @@ void MainWindow::OnHomeMenu() { QMessageBox::warning(this, tr("Firmware Corrupted"), tr(FirmwareManager::GetFirmwareCheckString(result))); return; - case FirmwareManager::ErrorFirmwareTooNew: { - if (!UISettings::values.show_fw_warning.GetValue()) break; - - QMessageBox box(QMessageBox::Warning, - tr("Firmware Too New"), - tr(FirmwareManager::GetFirmwareCheckString(result)) + tr("\nContinue anyways?"), - QMessageBox::Yes | QMessageBox::No, - this); - - QCheckBox *checkbox = new QCheckBox(tr("Don't show again")); - box.setCheckBox(checkbox); - - int button = box.exec(); - if (checkbox->isChecked()) { - UISettings::values.show_fw_warning.SetValue(false); - } - - if (button == static_cast(QMessageBox::No)) return; - break; - } default: + default: break; }