nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-12-22 11:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mitigate a L4T Joy-Cond driver issue

Browse source
This commit is contained in:
CTCaer 2020-05-01 17:28:24 +03:00
parent dde3ca2d73
commit 3794c61ab2
5 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootloader/soc/uart.c
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018 naehrwert * Copyright (c) 2018 naehrwert
* Copyright (c) 2019-2020 CTCaer
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,

1
bootloader/soc/uart.h
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018 naehrwert * Copyright (c) 2018 naehrwert
* Copyright (c) 2019-2020 CTCaer
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,

20
nyx/nyx_gui/frontend/gui.c
View file

@ -787,7 +787,7 @@ static void _launch_hos(u8 autoboot, u8 autoboot_list)
b_cfg->boot_cfg = BOOT_CFG_AUTOBOOT_EN; b_cfg->boot_cfg = BOOT_CFG_AUTOBOOT_EN;
if (launch_logs_enable) if (launch_logs_enable)
b_cfg->boot_cfg |= BOOT_CFG_FROM_LAUNCH; b_cfg->boot_cfg |= BOOT_CFG_FROM_LAUNCH;
b_cfg->autoboot = autoboot; b_cfg->autoboot = autoboot & ~0x80;
b_cfg->autoboot_list = autoboot_list; b_cfg->autoboot_list = autoboot_list;
void (*main_ptr)() = (void *)nyx_str->hekate; void (*main_ptr)() = (void *)nyx_str->hekate;
@ -796,6 +796,10 @@ static void _launch_hos(u8 autoboot, u8 autoboot_list)
reconfig_hw_workaround(false, 0); reconfig_hw_workaround(false, 0);
// Mitigate L4T Joy-Con driver issue.
if ((autoboot & 0x80) && h_cfg.bootwait < 2)
msleep((2 - h_cfg.bootwait) * 1000);
(*main_ptr)(); (*main_ptr)();
} }
@ -1534,7 +1538,7 @@ ini_parsing:
continue; continue;
icon_path = NULL; icon_path = NULL;
bool payload = false; u32 payload = 0;
lv_img_dsc_t *bmp = NULL; lv_img_dsc_t *bmp = NULL;
lv_obj_t *img = NULL; lv_obj_t *img = NULL;
@ -1544,7 +1548,13 @@ ini_parsing:
if (!strcmp("icon", kv->key)) if (!strcmp("icon", kv->key))
icon_path = kv->val; icon_path = kv->val;
else if (!strcmp("payload", kv->key)) else if (!strcmp("payload", kv->key))
payload = true; {
payload = 1;
// Mitigate L4T Joy-Con driver issue.
if (!memcmp(kv->val + strlen(kv->val) - 3, "rom", 3))
payload = 2;
}
} }
// If icon not found, check res folder for section_name.bmp. // If icon not found, check res folder for section_name.bmp.
@ -1588,9 +1598,9 @@ ini_parsing:
// Set autoboot index. // Set autoboot index.
ext = lv_obj_get_ext_attr(btn); ext = lv_obj_get_ext_attr(btn);
ext->idx = i; ext->idx = payload != 2 ? i : (i | 0x80);
ext = lv_obj_get_ext_attr(launch_ctxt[curr_btn_idx]); // Redundancy. ext = lv_obj_get_ext_attr(launch_ctxt[curr_btn_idx]); // Redundancy.
ext->idx = i; ext->idx = payload != 2 ? i : (i | 0x80);
// Set action. // Set action.
if (!more_cfg) if (!more_cfg)

1
nyx/nyx_gui/soc/uart.c
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018 naehrwert * Copyright (c) 2018 naehrwert
* Copyright (c) 2019-2020 CTCaer
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,

1
nyx/nyx_gui/soc/uart.h
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2018 naehrwert * Copyright (c) 2018 naehrwert
* Copyright (c) 2019-2020 CTCaer
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,