1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-11-23 02:36:41 +00:00

Fix borked LAFW version checks.

This commit is contained in:
Pablo Curiel 2021-06-14 00:55:22 -04:00
parent df673f758d
commit d7081bbc1c
2 changed files with 4 additions and 4 deletions

View file

@ -683,10 +683,9 @@ static void gamecardLoadInfo(void)
if (!_gamecardGetDecryptedCardInfoArea()) goto end; if (!_gamecardGetDecryptedCardInfoArea()) goto end;
/* Check if we meet the Lotus ASIC firmware (LAFW) version requirement. */ /* Check if we meet the Lotus ASIC firmware (LAFW) version requirement. */
/* Lotus treats the GameCardFwVersion field as the maximum unsupported LAFW version, instead of treating it as the minimum supported version. */ if (g_lafwVersion < g_gameCardInfoArea.fw_version)
if (g_lafwVersion <= g_gameCardInfoArea.fw_version)
{ {
LOG_MSG("LAFW version doesn't meet gamecard requirement! (%lu <= %lu).", g_lafwVersion, g_gameCardInfoArea.fw_version); LOG_MSG("LAFW version doesn't meet gamecard requirement! (%lu < %lu).", g_lafwVersion, g_gameCardInfoArea.fw_version);
g_gameCardStatus = GameCardStatus_LotusAsicFirmwareUpdateRequired; g_gameCardStatus = GameCardStatus_LotusAsicFirmwareUpdateRequired;
goto end; goto end;
} }

View file

@ -49,6 +49,8 @@ namespace nxdt::views
/* List. */ /* List. */
this->list = new brls::List(); this->list = new brls::List();
this->list->setSpacing(this->list->getSpacing() / 2);
this->list->setMarginBottom(20);
/* Gamecard properties table. */ /* Gamecard properties table. */
this->list->addView(new brls::Header("gamecard_tab/list/properties_table/header"_i18n)); this->list->addView(new brls::Header("gamecard_tab/list/properties_table/header"_i18n));
@ -131,7 +133,6 @@ namespace nxdt::views
card_info.upp_version.major_relstep, card_info.upp_version.minor_relstep, card_info.upp_version.value); card_info.upp_version.major_relstep, card_info.upp_version.minor_relstep, card_info.upp_version.value);
this->update_version->setValue(std::string(strbuf)); this->update_version->setValue(std::string(strbuf));
card_info.fw_version++;
snprintf(strbuf, sizeof(strbuf), "gamecard_tab/list/properties_table/lafw_version_value"_i18n.c_str(), card_info.fw_version, \ snprintf(strbuf, sizeof(strbuf), "gamecard_tab/list/properties_table/lafw_version_value"_i18n.c_str(), card_info.fw_version, \
card_info.fw_version >= GameCardFwVersion_Count ? "gamecard_tab/list/properties_table/unknown"_i18n.c_str() : GameCardFwVersionStrings[card_info.fw_version]); card_info.fw_version >= GameCardFwVersion_Count ? "gamecard_tab/list/properties_table/unknown"_i18n.c_str() : GameCardFwVersionStrings[card_info.fw_version]);
this->lafw_version->setValue(std::string(strbuf)); this->lafw_version->setValue(std::string(strbuf));