From 44beeecc9ead283fd3eef8cb4bccfc537faf0d28 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 7 Sep 2021 04:34:52 -0700 Subject: [PATCH] fusee: fix prodinfo blanking flag detection for sysmmc (closes #1610) --- fusee/program/source/fusee_setup_horizon.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/fusee/program/source/fusee_setup_horizon.cpp b/fusee/program/source/fusee_setup_horizon.cpp index d279e2f5c..067090e38 100644 --- a/fusee/program/source/fusee_setup_horizon.cpp +++ b/fusee/program/source/fusee_setup_horizon.cpp @@ -622,16 +622,20 @@ namespace ams::nxboot { storage_ctx.flags[0] &= ~secmon::SecureMonitorConfigurationFlag_EnableUserModePerformanceCounterAccess; } } else if (std::strcmp(entry.key, "blank_prodinfo_sysmmc") == 0) { - if (entry.value[0] == '1' && !emummc_enabled) { - storage_ctx.flags[0] |= secmon::SecureMonitorConfigurationFlag_ShouldUseBlankCalibrationBinary; - } else { - storage_ctx.flags[0] &= ~secmon::SecureMonitorConfigurationFlag_ShouldUseBlankCalibrationBinary; + if (!emummc_enabled) { + if (entry.value[0] == '1') { + storage_ctx.flags[0] |= secmon::SecureMonitorConfigurationFlag_ShouldUseBlankCalibrationBinary; + } else { + storage_ctx.flags[0] &= ~secmon::SecureMonitorConfigurationFlag_ShouldUseBlankCalibrationBinary; + } } } else if (std::strcmp(entry.key, "blank_prodinfo_emummc") == 0) { - if (entry.value[0] == '1' && emummc_enabled) { - storage_ctx.flags[0] |= secmon::SecureMonitorConfigurationFlag_ShouldUseBlankCalibrationBinary; - } else { - storage_ctx.flags[0] &= ~secmon::SecureMonitorConfigurationFlag_ShouldUseBlankCalibrationBinary; + if (emummc_enabled) { + if (entry.value[0] == '1') { + storage_ctx.flags[0] |= secmon::SecureMonitorConfigurationFlag_ShouldUseBlankCalibrationBinary; + } else { + storage_ctx.flags[0] &= ~secmon::SecureMonitorConfigurationFlag_ShouldUseBlankCalibrationBinary; + } } } else if (std::strcmp(entry.key, "allow_writing_to_cal_sysmmc") == 0) { if (entry.value[0] == '1') {