exo: Fix prodinfo blanking overriding

This commit is contained in:
CTCaer 2020-05-05 18:58:53 +03:00
parent e8f41a03f3
commit c7ab404fc1
2 changed files with 4 additions and 4 deletions

View file

@ -223,7 +223,7 @@ static int _config_exo_user_pmu_access(launch_ctxt_t *ctxt, const char *value)
static int _config_exo_cal0_blanking(launch_ctxt_t *ctxt, const char *value) static int _config_exo_cal0_blanking(launch_ctxt_t *ctxt, const char *value)
{ {
// Override key found. // Override key found.
ctxt->exo_cfg.cal0_blank = calloc(1, 1); ctxt->exo_cfg.cal0_blank = calloc(sizeof(bool), 1);
if (*value == '1') if (*value == '1')
{ {
@ -236,7 +236,7 @@ static int _config_exo_cal0_blanking(launch_ctxt_t *ctxt, const char *value)
static int _config_exo_cal0_writes_enable(launch_ctxt_t *ctxt, const char *value) static int _config_exo_cal0_writes_enable(launch_ctxt_t *ctxt, const char *value)
{ {
// Override key found. // Override key found.
ctxt->exo_cfg.cal0_allow_writes_sys = calloc(1, 1); ctxt->exo_cfg.cal0_allow_writes_sys = calloc(sizeof(bool), 1);
if (*value == '1') if (*value == '1')
{ {

View file

@ -221,12 +221,12 @@ void config_exosphere(launch_ctxt_t *ctxt)
if (ctxt->exo_cfg.user_pmu) if (ctxt->exo_cfg.user_pmu)
exoFlags |= EXO_FLAG_USER_PMU; exoFlags |= EXO_FLAG_USER_PMU;
// Check if exo ini value is overridden and enable prodinfo blanking. // Enable prodinfo blanking. Check if exo ini value is overridden. If not, check if enabled in exo ini.
if ((ctxt->exo_cfg.cal0_blank && *ctxt->exo_cfg.cal0_blank) if ((ctxt->exo_cfg.cal0_blank && *ctxt->exo_cfg.cal0_blank)
|| (!ctxt->exo_cfg.cal0_blank && cal0_blanking)) || (!ctxt->exo_cfg.cal0_blank && cal0_blanking))
exoFlags |= EXO_FLAG_CAL0_BLANKING; exoFlags |= EXO_FLAG_CAL0_BLANKING;
// Check if exo ini value is overridden and allow prodinfo writes. // Allow prodinfo writes. Check if exo ini value is overridden. If not, check if enabled in exo ini.
if ((ctxt->exo_cfg.cal0_allow_writes_sys && *ctxt->exo_cfg.cal0_allow_writes_sys) if ((ctxt->exo_cfg.cal0_allow_writes_sys && *ctxt->exo_cfg.cal0_allow_writes_sys)
|| (!ctxt->exo_cfg.cal0_allow_writes_sys && cal0_allow_writes_sys)) || (!ctxt->exo_cfg.cal0_allow_writes_sys && cal0_allow_writes_sys))
exoFlags |= EXO_FLAG_CAL0_WRITES_SYS; exoFlags |= EXO_FLAG_CAL0_WRITES_SYS;