Merge branch 'master' of https://github.com/CTCaer/hekate
This commit is contained in:
@@ -52,7 +52,7 @@ char *emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_
|
||||
// Get actual eMMC S/N.
|
||||
if (!storage)
|
||||
{
|
||||
if (!emmc_initialize(false))
|
||||
if (emmc_initialize(false))
|
||||
strcpy(emmc_sn, "00000000");
|
||||
else
|
||||
{
|
||||
@@ -121,7 +121,7 @@ lv_res_t launch_payload(lv_obj_t *list)
|
||||
strcpy(path,"bootloader/payloads/");
|
||||
strcat(path, filename);
|
||||
|
||||
if (!sd_mount())
|
||||
if (sd_mount())
|
||||
goto out;
|
||||
|
||||
// Read payload.
|
||||
@@ -167,7 +167,7 @@ static void _load_saved_configuration()
|
||||
LIST_INIT(ini_sections);
|
||||
LIST_INIT(ini_nyx_sections);
|
||||
|
||||
if (!ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false))
|
||||
if (ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false))
|
||||
{
|
||||
create_config_entry();
|
||||
goto skip_main_cfg_parse;
|
||||
@@ -212,7 +212,7 @@ static void _load_saved_configuration()
|
||||
ini_free(&ini_sections);
|
||||
|
||||
skip_main_cfg_parse:
|
||||
if (!ini_parse(&ini_nyx_sections, "bootloader/nyx.ini", false))
|
||||
if (ini_parse(&ini_nyx_sections, "bootloader/nyx.ini", false))
|
||||
return;
|
||||
|
||||
// Load Nyx configuration.
|
||||
@@ -306,14 +306,14 @@ static void nyx_load_bg_icons()
|
||||
hekate_bg_etc = bmp_to_lvimg_obj("bootloader/res/background_etc.bmp");
|
||||
}
|
||||
|
||||
#define EXCP_EN_ADDR 0x4003FFFC
|
||||
#define EXCP_EN_ADDR 0x4003FF1C
|
||||
#define EXCP_MAGIC 0x30505645 // EVP0
|
||||
#define EXCP_TYPE_ADDR 0x4003FFF8
|
||||
#define EXCP_TYPE_ADDR 0x4003FF18
|
||||
#define EXCP_TYPE_RESET 0x545352 // RST
|
||||
#define EXCP_TYPE_UNDEF 0x464455 // UDF
|
||||
#define EXCP_TYPE_PABRT 0x54424150 // PABT
|
||||
#define EXCP_TYPE_DABRT 0x54424144 // DABT
|
||||
#define EXCP_LR_ADDR 0x4003FFF4
|
||||
#define EXCP_LR_ADDR 0x4003FF14
|
||||
|
||||
enum {
|
||||
SD_NO_ERROR = 0,
|
||||
@@ -427,13 +427,13 @@ void nyx_init_load_res()
|
||||
_show_errors(SD_NO_ERROR);
|
||||
|
||||
// Try 2 times to mount SD card.
|
||||
if (!sd_mount())
|
||||
if (sd_mount())
|
||||
{
|
||||
// Restore speed to SDR104.
|
||||
sd_end();
|
||||
|
||||
// Retry.
|
||||
if (!sd_mount())
|
||||
if (sd_mount())
|
||||
_show_errors(SD_MOUNT_ERROR); // Fatal.
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user