mirrors/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate.git synced 2024-11-13 22:06:46 +00:00
Code Issues Releases Activity

Add payload/libtools launching prerequisites

Browse source
This commit is contained in:
Kostas Missos 2018-08-21 04:45:19 +03:00
parent 463383abca
commit c5a6ad823e
4 changed files with 177 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -37,6 +37,7 @@ There are four possible type of entries. "**[ ]**": Boot entry, "**{ }**": Capti
| fullsvcperm=1 | Disables SVC verification | | fullsvcperm=1 | Disables SVC verification |
| debugmode=1 | Enables Debug mode | | debugmode=1 | Enables Debug mode |
| atmosphere=1 | Enables Atmosphère patching | | atmosphere=1 | Enables Atmosphère patching |
| payload={SD path} | Payload launching. Tools, Linux, CFW bootloaders, etc. |
You can find a template [Here](./res/hekate_ipl_template.ini) You can find a template [Here](./res/hekate_ipl_template.ini)

30
bootloader/config/ini.c
View file

@ -236,3 +236,33 @@ void ini_free_section(ini_sec_t *cfg)
cfg = NULL; cfg = NULL;
} }
char *ini_check_payload_section(ini_sec_t *cfg)
{
char *path = NULL;
if (cfg == NULL)
return NULL;
LIST_FOREACH_ENTRY(ini_kv_t, kv, &cfg->kvs, link)
{
if (!strcmp("payload", kv->key))
{
if (!path)
path = _strdup(kv->val);
}
}
if (path)
{
if (strlen(path) > 1)
return path;
else
{
free(path);
return NULL;
}
}
else
return NULL;
}

1
bootloader/config/ini.h
View file

@ -47,6 +47,7 @@ int ini_parse(link_t *dst, char *ini_path, bool is_dir);
void ini_free(link_t *dst); void ini_free(link_t *dst);
ini_sec_t *ini_clone_section(ini_sec_t *cfg); ini_sec_t *ini_clone_section(ini_sec_t *cfg);
void ini_free_section(ini_sec_t *cfg); void ini_free_section(ini_sec_t *cfg);
char *ini_check_payload_section(ini_sec_t *cfg);
#endif #endif

164
bootloader/main.c
View file

@ -1753,6 +1753,107 @@ void auto_launch_update()
} }
} }
void launch_tools(u8 type)
{
u8 max_entries = 61;
char *filelist = NULL;
char *file_sec = NULL;
char *dir;
ment_t *ments = (ment_t *)malloc(sizeof(ment_t) * (max_entries + 3));
gfx_clear_grey(&gfx_ctxt, 0x1B);
gfx_con_setpos(&gfx_con, 0, 0);
if (sd_mount())
{
dir = (char *)malloc(256);
if (!type)
memcpy(dir, "bootloader/payloads", 20);
else
memcpy(dir, "bootloader/libtools", 20);
filelist = dirlist(dir);
u32 i = 0;
if (filelist)
{
// Build configuration menu.
ments[0].type = MENT_BACK;
ments[0].caption = "Back";
ments[1].type = MENT_CHGLINE;
while (true)
{
if (i > max_entries || !filelist[i * 256])
break;
ments[i + 2].type = INI_CHOICE;
ments[i + 2].caption = &filelist[i * 256];
ments[i + 2].data = &filelist[i * 256];
i++;
}
}
if (i > 0)
{
memset(&ments[i + 2], 0, sizeof(ment_t));
menu_t menu = {
ments,
"Choose a file to launch", 0, 0
};
file_sec = (char *)tui_do_menu(&gfx_con, &menu);
if (!file_sec)
{
free(ments);
free(filelist);
sd_unmount();
return;
}
}
else
EPRINTF("No payloads or libraries found.");
free(ments);
free(filelist);
}
else
goto out;
if (file_sec)
{
#ifdef MENU_LOGO_ENABLE
free(Kc_MENU_LOGO);
#endif //MENU_LOGO_ENABLE
memcpy(dir + strlen(dir), "/", 2);
memcpy(dir + strlen(dir), file_sec, strlen(file_sec) + 1);
if (!type)
{
//if (launch_payload(dir, false))
EPRINTF("Failed to launch payload.");
}
else
ianos_loader(true, dir, DRAM_LIB, NULL);
#ifdef MENU_LOGO_ENABLE
Kc_MENU_LOGO = (u8 *)malloc(0x6000);
blz_uncompress_srcdest(Kc_MENU_LOGO_blz, SZ_MENU_LOGO_BLZ, Kc_MENU_LOGO, SZ_MENU_LOGO);
#endif //MENU_LOGO_ENABLE
}
out:
sd_unmount();
btn_wait();
}
void launch_tools_payload() { launch_tools(0); }
void launch_tools_library() { launch_tools(1); }
void ini_list_launcher() void ini_list_launcher()
{ {
u8 max_entries = 61; u8 max_entries = 61;
@ -1852,6 +1953,7 @@ out:
void launch_firmware() void launch_firmware()
{ {
u8 max_entries = 61; u8 max_entries = 61;
char *payload_path = NULL;
ini_sec_t *cfg_sec = NULL; ini_sec_t *cfg_sec = NULL;
LIST_INIT(ini_sections); LIST_INIT(ini_sections);
@ -1864,18 +1966,21 @@ void launch_firmware()
if (ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false)) if (ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false))
{ {
// Build configuration menu. // Build configuration menu.
ment_t *ments = (ment_t *)malloc(sizeof(ment_t) * (max_entries + 5)); ment_t *ments = (ment_t *)malloc(sizeof(ment_t) * (max_entries + 6));
ments[0].type = MENT_BACK; ments[0].type = MENT_BACK;
ments[0].caption = "Back"; ments[0].caption = "Back";
ments[1].type = MENT_CHGLINE; ments[1].type = MENT_CHGLINE;
ments[2].type = MENT_HANDLER; ments[2].type = MENT_HANDLER;
ments[2].caption = "More configs..."; ments[2].caption = "Payloads...";
ments[2].handler = ini_list_launcher; ments[2].handler = launch_tools_payload;
ments[3].type = MENT_HANDLER;
ments[3].caption = "More configs...";
ments[3].handler = ini_list_launcher;
ments[3].type = MENT_CHGLINE; ments[4].type = MENT_CHGLINE;
u32 i = 4; u32 i = 5;
LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link) LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link)
{ {
if (!strcmp(ini_sec->name, "config") || if (!strcmp(ini_sec->name, "config") ||
@ -1888,10 +1993,10 @@ void launch_firmware()
ments[i].color = ini_sec->color; ments[i].color = ini_sec->color;
i++; i++;
if ((i - 3) > max_entries) if ((i - 4) > max_entries)
break; break;
} }
if (i > 4) if (i > 5)
{ {
memset(&ments[i], 0, sizeof(ment_t)); memset(&ments[i], 0, sizeof(ment_t));
menu_t menu = { menu_t menu = {
@ -1927,14 +2032,25 @@ void launch_firmware()
#ifdef MENU_LOGO_ENABLE #ifdef MENU_LOGO_ENABLE
free(Kc_MENU_LOGO); free(Kc_MENU_LOGO);
#endif //MENU_LOGO_ENABLE #endif //MENU_LOGO_ENABLE
if (!hos_launch(cfg_sec))
payload_path = ini_check_payload_section(cfg_sec);
if (payload_path)
{ {
#ifdef MENU_LOGO_ENABLE ini_free_section(cfg_sec);
Kc_MENU_LOGO = (u8 *)malloc(0x6000); //if (launch_payload(payload_path, false))
blz_uncompress_srcdest(Kc_MENU_LOGO_blz, SZ_MENU_LOGO_BLZ, Kc_MENU_LOGO, SZ_MENU_LOGO); //{
#endif //MENU_LOGO_ENABLE EPRINTF("Failed to launch payload.");
EPRINTF("Failed to launch firmware."); free(payload_path);
//}
} }
else if (!hos_launch(cfg_sec))
EPRINTF("Failed to launch firmware.");
#ifdef MENU_LOGO_ENABLE
Kc_MENU_LOGO = (u8 *)malloc(0x6000);
blz_uncompress_srcdest(Kc_MENU_LOGO_blz, SZ_MENU_LOGO_BLZ, Kc_MENU_LOGO, SZ_MENU_LOGO);
#endif //MENU_LOGO_ENABLE
out: out:
ini_free_section(cfg_sec); ini_free_section(cfg_sec);
@ -1946,6 +2062,8 @@ out:
void auto_launch_firmware() void auto_launch_firmware()
{ {
u8 *BOOTLOGO = NULL; u8 *BOOTLOGO = NULL;
char *payload_path = NULL;
struct _bmp_data struct _bmp_data
{ {
u32 size; u32 size;
@ -2153,14 +2271,22 @@ void auto_launch_firmware()
#ifdef MENU_LOGO_ENABLE #ifdef MENU_LOGO_ENABLE
free(Kc_MENU_LOGO); free(Kc_MENU_LOGO);
#endif //MENU_LOGO_ENABLE #endif //MENU_LOGO_ENABLE
if (!hos_launch(cfg_sec))
payload_path = ini_check_payload_section(cfg_sec);
if (payload_path)
{ {
// Failed to launch firmware. ini_free_section(cfg_sec);
#ifdef MENU_LOGO_ENABLE //if (launch_payload(payload_path, false))
Kc_MENU_LOGO = (u8 *)malloc(ALIGN(SZ_MENU_LOGO, 0x10)); free(payload_path);
blz_uncompress_srcdest(Kc_MENU_LOGO_blz, SZ_MENU_LOGO_BLZ, Kc_MENU_LOGO, SZ_MENU_LOGO);
#endif //MENU_LOGO_ENABLE
} }
else
hos_launch(cfg_sec);
#ifdef MENU_LOGO_ENABLE
Kc_MENU_LOGO = (u8 *)malloc(ALIGN(SZ_MENU_LOGO, 0x10));
blz_uncompress_srcdest(Kc_MENU_LOGO_blz, SZ_MENU_LOGO_BLZ, Kc_MENU_LOGO, SZ_MENU_LOGO);
#endif //MENU_LOGO_ENABLE
out: out:
gfx_clear_grey(&gfx_ctxt, 0x1B); gfx_clear_grey(&gfx_ctxt, 0x1B);