From ed816a44c9b44d78e3a4f88ead04c7402b112623 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Wed, 19 Jun 2024 21:54:14 +0300 Subject: [PATCH] hos: secmon exo: fix system_settings.ini parsing A previous change guarded the setting with exosphere.ini parsing succeeding. Correct this, so it always gets parsed. --- bootloader/hos/secmon_exo.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/bootloader/hos/secmon_exo.c b/bootloader/hos/secmon_exo.c index f0b04ee..3b337a8 100644 --- a/bootloader/hos/secmon_exo.c +++ b/bootloader/hos/secmon_exo.c @@ -241,29 +241,29 @@ void config_exosphere(launch_ctxt_t *ctxt, u32 warmboot_base) } break; } + } - // Parse usb mtim settings. Avoid parsing if it's overridden. - if (!ctxt->exo_ctx.usb3_force) + // Parse usb mtim settings. Avoid parsing if it's overridden. + if (!ctxt->exo_ctx.usb3_force) + { + LIST_INIT(ini_sys_sections); + if (ini_parse(&ini_sys_sections, "atmosphere/config/system_settings.ini", false)) { - LIST_INIT(ini_sys_sections); - if (ini_parse(&ini_sys_sections, "atmosphere/config/system_settings.ini", false)) + LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sys_sections, link) { - LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sys_sections, link) - { - // Only parse usb section. - if (!(ini_sec->type == INI_CHOICE) || strcmp(ini_sec->name, "usb")) - continue; + // Only parse usb section. + if (!(ini_sec->type == INI_CHOICE) || strcmp(ini_sec->name, "usb")) + continue; - LIST_FOREACH_ENTRY(ini_kv_t, kv, &ini_sec->kvs, link) + LIST_FOREACH_ENTRY(ini_kv_t, kv, &ini_sec->kvs, link) + { + if (!strcmp("usb30_force_enabled", kv->key)) { - if (!strcmp("usb30_force_enabled", kv->key)) - { - usb3_force = !strcmp("u8!0x1", kv->val); - break; // Only parse usb30_force_enabled key. - } + usb3_force = !strcmp("u8!0x1", kv->val); + break; // Only parse usb30_force_enabled key. } - break; } + break; } } }