Browse Source

remove fw warning + fix build

Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3004/head
crueter 3 months ago
parent
commit
b28648f234
  1. 2
      src/core/hle/api_version.h
  2. 4
      src/core/hle/service/audio/audio_device.cpp
  3. 6
      src/frontend_common/firmware_manager.cpp
  4. 4
      src/frontend_common/firmware_manager.h
  5. 21
      src/yuzu/main_window.cpp

2
src/core/hle/api_version.h

@ -16,7 +16,7 @@ namespace HLE::ApiVersion {
constexpr u8 HOS_VERSION_MAJOR = 21; constexpr u8 HOS_VERSION_MAJOR = 21;
constexpr u8 HOS_VERSION_MINOR = 0; constexpr u8 HOS_VERSION_MINOR = 0;
constexpr u8 HOS_VERSION_MICRO = 1;
constexpr u8 HOS_VERSION_MICRO = 0;
// NintendoSDK version constants. // NintendoSDK version constants.

4
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+ {17, nullptr, "AcquireAudioOutputDeviceNotification"}, // 17.0.0+
{18, nullptr, "ReleaseAudioOutputDeviceNotification"}, // 17.0.0+ {18, nullptr, "ReleaseAudioOutputDeviceNotification"}, // 17.0.0+
{19, nullptr, "SetAudioDeviceOutputVolumeAutoTuneEnabled"}, // 18.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); RegisterHandlers(functions);

6
src/frontend_common/firmware_manager.cpp

@ -121,18 +121,12 @@ FirmwareManager::FirmwareCheckResult FirmwareManager::VerifyFirmware(Core::Syste
return ErrorFirmwareMissing; return ErrorFirmwareMissing;
} else { } else {
const auto pair = GetFirmwareVersion(system); const auto pair = GetFirmwareVersion(system);
const auto firmware_data = pair.first;
const auto result = pair.second; const auto result = pair.second;
if (result.IsError()) { if (result.IsError()) {
LOG_INFO(Frontend, "Unable to read firmware"); LOG_INFO(Frontend, "Unable to read firmware");
return ErrorFirmwareCorrupted; return ErrorFirmwareCorrupted;
} }
// TODO: update this whenever newer firmware is properly supported
if (firmware_data.major > 20) {
return ErrorFirmwareTooNew;
}
} }
return FirmwareGood; return FirmwareGood;

4
src/frontend_common/firmware_manager.h

@ -58,7 +58,6 @@ enum FirmwareCheckResult {
FirmwareGood, FirmwareGood,
ErrorFirmwareMissing, ErrorFirmwareMissing,
ErrorFirmwareCorrupted, ErrorFirmwareCorrupted,
ErrorFirmwareTooNew,
}; };
static constexpr std::array<const char *, 4> FIRMWARE_CHECK_STRINGS = { static constexpr std::array<const char *, 4> FIRMWARE_CHECK_STRINGS = {
@ -66,8 +65,7 @@ static constexpr std::array<const char *, 4> FIRMWARE_CHECK_STRINGS = {
"Firmware missing. Firmware is required to run certain games and use the Home Menu. " "Firmware missing. Firmware is required to run certain games and use the Home Menu. "
"Eden only works with firmware 19.0.1 and earlier.", "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 " "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."
}; };
/** /**

21
src/yuzu/main_window.cpp

@ -4067,26 +4067,7 @@ void MainWindow::OnHomeMenu() {
QMessageBox::warning(this, tr("Firmware Corrupted"), QMessageBox::warning(this, tr("Firmware Corrupted"),
tr(FirmwareManager::GetFirmwareCheckString(result))); tr(FirmwareManager::GetFirmwareCheckString(result)));
return; 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<int>(QMessageBox::No)) return;
break;
} default:
default:
break; break;
} }

Loading…
Cancel
Save