Bump hekate to v5.1.3 and Nyx to v0.8.6

Bugfixes
The fan driver change ensures power off in any situation where a chainload software re-enables the 5V regulator.
2020-03-21 22:30:39 +02:00 · 2020-03-21 22:28:50 +02:00 · 2020-03-21 22:27:17 +02:00 · 2020-03-21 22:18:40 +02:00 · 2020-03-21 22:13:18 +02:00 · 2020-03-21 22:10:06 +02:00
62 changed files with 515 additions and 218 deletions
--- a/8
+++ b/8
@@ -16,7 +16,7 @@ TARGET := hekate
 BUILDDIR := build
 OUTPUTDIR := output
 SOURCEDIR = bootloader
-VPATH = $(dir $(wildcard ./$(SOURCEDIR)/*/)) $(dir $(wildcard ./$(SOURCEDIR)/*/*/))
+VPATH = $(dir ./$(SOURCEDIR)/) $(dir $(wildcard ./$(SOURCEDIR)/*/)) $(dir $(wildcard ./$(SOURCEDIR)/*/*/))

 # Main and graphics.
 OBJS = $(addprefix $(BUILDDIR)/$(TARGET)/, \
@@ -103,7 +103,11 @@ $(BUILDDIR)/$(TARGET)/%.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@

 $(BUILDDIR)/$(TARGET)/%.o: %.S
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJS): $(BUILDDIR)/$(TARGET)
+
+$(BUILDDIR)/$(TARGET):
 	@mkdir -p "$(BUILDDIR)"
 	@mkdir -p "$(BUILDDIR)/$(TARGET)"
 	@mkdir -p "$(OUTPUTDIR)"
-	$(CC) $(CFLAGS) -c $< -o $@
--- a/README.md
+++ b/README.md
@@ -70,6 +70,7 @@ You can find a template [Here](./res/hekate_ipl_template.ini)
 | kip1={SD path}         | Replaces/Adds kernel initial process. Multiple can be set. |
 | kip1={SD folder}/*     | Loads every .kip/.kip1 inside a folder. Compatible with single kip1 keys. |
 | fss0={SD path}         | Takes a fusee-secondary binary and `extracts` all needed parts from it. kips, exosphere, warmboot and sept. |
+| fss0experimental=1     | Enables loading of experimental content from a FSS0 storage |
 | kip1patch=patchname    | Enables a kip1 patch. Specify with multiple lines and/or as CSV. If not found, an error will show up |
 | fullsvcperm=1          | Disables SVC verification (full services permission)       |
 | debugmode=1            | Enables Debug mode. Obsolete when used with exosphere as secmon. |
--- a/Versions.inc
+++ b/Versions.inc
@@ -1,11 +1,11 @@
 # IPL Version.
 BLVERSION_MAJOR := 5
 BLVERSION_MINOR := 1
-BLVERSION_HOTFX := 2
+BLVERSION_HOTFX := 3
 BLVERSION_RSVD := 0

 # Nyx Version.
 NYXVERSION_MAJOR := 0
 NYXVERSION_MINOR := 8
-NYXVERSION_HOTFX := 5
+NYXVERSION_HOTFX := 6
 NYXVERSION_RSVD := 0
--- a/bootloader/config/config.c
+++ b/bootloader/config/config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/bootloader/config/ini.c
+++ b/bootloader/config/ini.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/bootloader/frontend/fe_info.c
+++ b/bootloader/frontend/fe_info.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 * Copyright (c) 2018 balika011
 *
 * This program is free software; you can redistribute it and/or modify it
--- a/bootloader/gfx/gfx.c
+++ b/bootloader/gfx/gfx.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/bootloader/gfx/gfx.h
+++ b/bootloader/gfx/gfx.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 * Copyright (c) 2018 M4xw
 *
 * This program is free software; you can redistribute it and/or modify it
--- a/bootloader/hos/fss.c
+++ b/bootloader/hos/fss.c
@@ -1,7 +1,7 @@
 /*
 * Atmosphère Fusée Secondary Storage parser.
 *
- * Copyright (c) 2019 CTCaer
+ * Copyright (c) 2019-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -44,6 +44,8 @@ extern bool is_ipl_updated(void *buf, char *path, bool force);
 #define CNT_TYPE_BMP 7
 #define CNT_TYPE_EMC 8

+#define CNT_FLAG0_EXPERIMENTAL (1 << 0)
+
 typedef struct _fss_t
 {
 	u32 magic;
@@ -60,7 +62,10 @@ typedef struct _fss_content_t
 {
 	u32 offset;
 	u32 size;
-	u32 type;
+	u8 type;
+	u8 flags0;
+	u8 flags1;
+	u8 flags2;
 	u32 rsvd1;
 	char name[0x10];
 } fss_content_t;
@@ -106,7 +111,7 @@ int parse_fss(launch_ctxt_t *ctxt, const char *path, fss0_sept_t *sept_ctxt)
 					stock = true;
 		}

-		if (ctxt->pkg1_id->kb <= KB_FIRMWARE_VERSION_620 && (!emu_cfg.enabled || h_cfg.emummc_force_disable))
+		if (stock && ctxt->pkg1_id->kb <= KB_FIRMWARE_VERSION_620 && (!emu_cfg.enabled || h_cfg.emummc_force_disable))
 			return 1;
 	}

@@ -142,6 +147,9 @@ int parse_fss(launch_ctxt_t *ctxt, const char *path, fss0_sept_t *sept_ctxt)
 			if ((curr_fss_cnt[i].offset + curr_fss_cnt[i].size) > fss_meta->size)
 				continue;

+			if ((curr_fss_cnt[i].flags0 & CNT_FLAG0_EXPERIMENTAL) && !ctxt->fss0_enable_experimental)
+				continue;
+
 			// Load content to launch context.
 			if (!sept_ctxt)
 			{
--- a/bootloader/hos/hos.h
+++ b/bootloader/hos/hos.h
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -67,6 +68,7 @@ typedef struct _launch_ctxt_t
 	bool atmosphere;
 	bool exo_no_user_exceptions;
 	bool exo_user_pmu;
+	bool fss0_enable_experimental;
 	bool emuMMC;

 	ini_sec_t *cfg;
--- a/bootloader/hos/hos_config.c
+++ b/bootloader/hos/hos_config.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -213,6 +213,15 @@ static int _config_exo_user_pmu_access(launch_ctxt_t *ctxt, const char *value)

 static int _config_fss(launch_ctxt_t *ctxt, const char *value)
 {
+	LIST_FOREACH_ENTRY(ini_kv_t, kv, &ctxt->cfg->kvs, link)
+	{
+		if (!strcmp("fss0experimental", kv->key))
+		{
+			ctxt->fss0_enable_experimental = *kv->val == '1';
+			break;
+		}
+	}
+
 	return parse_fss(ctxt, value, NULL);
 }

--- a/bootloader/hos/pkg2.c
+++ b/bootloader/hos/pkg2.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 * Copyright (c) 2018 Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
--- a/bootloader/hos/secmon_exo.c
+++ b/bootloader/hos/secmon_exo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 * Copyright (c) 2019 Atmosphère-NX
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -121,10 +121,11 @@ typedef struct _atm_fatal_error_ctx
 	u64 stack_dump_size;
 	u64 stack_trace[0x20];
 	u8  stack_dump[0x100];
+	u8  tls[0x100];
 } atm_fatal_error_ctx;

 #define ATM_FATAL_ERR_CTX_ADDR 0x4003E000
-#define  ATM_FATAL_MAGIC 0x31454641 // AFE1
+#define  ATM_FATAL_MAGIC 0x30454641 // AFE0

 #define ATM_WB_HEADER_OFF 0x244
 #define  ATM_WB_MAGIC 0x30544257
@@ -261,7 +262,8 @@ void secmon_exo_check_panic()
 {
 	volatile atm_fatal_error_ctx *rpt = (atm_fatal_error_ctx *)ATM_FATAL_ERR_CTX_ADDR;

-	if (rpt->magic != ATM_FATAL_MAGIC)
+	// Mask magic to maintain compatibility with any AFE version, thanks to additive struct members.
+	if ((rpt->magic & 0xF0FFFFFF) != ATM_FATAL_MAGIC)
 		return;

 	gfx_clear_grey(0x1B);
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2018 naehrwert
 *
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -228,12 +228,14 @@ void check_power_off_from_hos()
 #define PATCHED_RELOC_SZ    0x94
 #define PATCHED_RELOC_STACK 0x40007000
 #define PATCHED_RELOC_ENTRY 0x40010000
-#define EXT_PAYLOAD_ADDR    0xC03C0000
+#define EXT_PAYLOAD_ADDR    0xC0000000
 #define RCM_PAYLOAD_ADDR    (EXT_PAYLOAD_ADDR + ALIGN(PATCHED_RELOC_SZ, 0x10))
-#define COREBOOT_ADDR       (0xD0000000 - 0x100000)
+#define COREBOOT_END_ADDR   0xD0000000
 #define CBFS_DRAM_EN_ADDR   0x4003e000
 #define  CBFS_DRAM_MAGIC    0x4452414D // "DRAM"

+static void *coreboot_addr;
+
 void reloc_patcher(u32 payload_dst, u32 payload_src, u32 payload_size)
 {
 	memcpy((u8 *)payload_src, (u8 *)IPL_LOAD_ADDR, PATCHED_RELOC_SZ);
@@ -247,7 +249,7 @@ void reloc_patcher(u32 payload_dst, u32 payload_src, u32 payload_size)

 	if (payload_size == 0x7000)
 	{
-		memcpy((u8 *)(payload_src + ALIGN(PATCHED_RELOC_SZ, 0x10)), (u8 *)COREBOOT_ADDR, 0x7000); //Bootblock
+		memcpy((u8 *)(payload_src + ALIGN(PATCHED_RELOC_SZ, 0x10)), coreboot_addr, 0x7000); //Bootblock
 		*(vu32 *)CBFS_DRAM_EN_ADDR = CBFS_DRAM_MAGIC;
 	}
 }
@@ -313,7 +315,10 @@ int launch_payload(char *path, bool update)
 		if (size < 0x30000)
 			buf = (void *)RCM_PAYLOAD_ADDR;
 		else
-			buf = (void *)COREBOOT_ADDR;
+		{
+			coreboot_addr = (void *)(COREBOOT_END_ADDR - size);
+			buf = coreboot_addr;
+		}

 		if (f_read(&fp, buf, size, NULL))
 		{
@@ -1296,7 +1301,7 @@ ment_t ment_top[] = {
 	MDEF_END()
 };

-menu_t menu_top = { ment_top, "hekate - CTCaer mod v5.1.2", 0, 0 };
+menu_t menu_top = { ment_top, "hekate - CTCaer mod v5.1.3", 0, 0 };

 extern void pivot_stack(u32 stack_top);

@@ -1312,7 +1317,7 @@ void ipl_main()
 	heap_init(IPL_HEAP_START);

 #ifdef DEBUG_UART_PORT
-	uart_send(DEBUG_UART_PORT, (u8 *)"Hekate: Hello!\r\n", 16);
+	uart_send(DEBUG_UART_PORT, (u8 *)"hekate: Hello!\r\n", 16);
 	uart_wait_idle(DEBUG_UART_PORT, UART_TX_IDLE);
 #endif

--- a/bootloader/mem/heap.c
+++ b/bootloader/mem/heap.c
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 * Copyright (c) 2018 M4xw
 *
 * This program is free software; you can redistribute it and/or modify it
--- a/bootloader/mem/heap.h
+++ b/bootloader/mem/heap.h
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/bootloader/mem/minerva.c
+++ b/bootloader/mem/minerva.c
@@ -34,18 +34,21 @@ u32 minerva_init()

 	minerva_cfg = NULL;
 	mtc_config_t *mtc_cfg = (mtc_config_t *)&nyx_str->mtc_cfg;
+	memset(mtc_cfg, 0, sizeof(mtc_config_t));

 	// Set table to nyx storage.
 	mtc_cfg->mtc_table = (emc_table_t *)&nyx_str->mtc_table;

 	mtc_cfg->sdram_id = (fuse_read_odm(4) >> 3) & 0x1F;
 	mtc_cfg->init_done = MTC_NEW_MAGIC; // Initialize mtc table.
-	
+
 	u32 ep_addr = ianos_loader(false, "bootloader/sys/libsys_minerva.bso", DRAM_LIB, (void *)mtc_cfg);

 	// Ensure that Minerva is new.
 	if (mtc_cfg->init_done == MTC_INIT_MAGIC)
 		minerva_cfg = (void *)ep_addr;
+	else
+		mtc_cfg->init_done = 0;

 	if (!minerva_cfg)
 		return 1;
--- a/bootloader/mem/sdram.c
+++ b/bootloader/mem/sdram.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2018 naehrwert
 * Copyright (c) 2018 balika011
- * Copyright (c) 2019 CTCaer
+ * Copyright (c) 2019-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/bootloader/power/max17050.h
+++ b/bootloader/power/max17050.h
@@ -4,7 +4,7 @@
 *
 * Copyright (c) 2011 Samsung Electronics
 * MyungJoo Ham <myungjoo.ham@samsung.com>
- * Copyright (c) 2018 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/bootloader/soc/bpmp.c
+++ b/bootloader/soc/bpmp.c
@@ -1,7 +1,7 @@
 /*
 * BPMP-Lite Cache/MMU and Frequency driver for Tegra X1
 *
- * Copyright (c) 2019 CTCaer
+ * Copyright (c) 2019-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/bootloader/soc/bpmp.h
+++ b/bootloader/soc/bpmp.h
@@ -1,7 +1,7 @@
 /*
 * BPMP-Lite Cache/MMU and Frequency driver for Tegra X1
 *
- * Copyright (c) 2019 CTCaer
+ * Copyright (c) 2019-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/bootloader/soc/clock.c
+++ b/bootloader/soc/clock.c
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/bootloader/soc/clock.h
+++ b/bootloader/soc/clock.h
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/bootloader/soc/hw_init.c
+++ b/bootloader/soc/hw_init.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -186,6 +186,9 @@ void _mbist_workaround()

 void _config_se_brom()
 {
+	// Enable fuse clock.
+	clock_enable_fuse(true);
+
 	// Skip SBK/SSK if sept was run.
 	if (!(b_cfg.boot_cfg & BOOT_CFG_SEPT_RUN))
 	{
@@ -219,6 +222,11 @@ void _config_se_brom()

 void _config_regulators()
 {
+	// Disable SDMMC1 IO power.
+	gpio_output_enable(GPIO_PORT_E, GPIO_PIN_4, GPIO_OUTPUT_DISABLE);
+	max77620_regulator_enable(REGULATOR_LDO2, 0);
+	sd_power_cycle_time_start = get_tmr_ms();
+
 	i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_CNFGBBC, MAX77620_CNFGBBC_RESISTOR_1K);
 	i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_ONOFFCNFG1,
 		(1 << 6) | (3 << MAX77620_ONOFFCNFG1_MRT_SHIFT)); // PWR delay for forced shutdown off.
--- a/bootloader/soc/i2c.c
+++ b/bootloader/soc/i2c.c
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -19,7 +20,7 @@
 #include "i2c.h"
 #include "../utils/util.h"

-static u32 i2c_addrs[] = {
+static const u32 i2c_addrs[] = {
 	0x7000C000, 0x7000C400, 0x7000C500,
 	0x7000C700, 0x7000D000, 0x7000D100
 };
@@ -121,6 +122,11 @@ int i2c_send_buf_small(u32 idx, u32 x, u32 y, u8 *buf, u32 size)
 	return _i2c_send_pkt(idx, x, tmp, size + 1);
 }

+int i2c_recv_buf(u8 *buf, u32 size, u32 idx, u32 x)
+{
+	return _i2c_recv_pkt(idx, buf, size, x);
+}
+
 int i2c_recv_buf_small(u8 *buf, u32 size, u32 idx, u32 x, u32 y)
 {
 	int res = _i2c_send_pkt(idx, x, (u8 *)&y, 1);
--- a/bootloader/soc/i2c.h
+++ b/bootloader/soc/i2c.h
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -39,6 +40,7 @@

 void i2c_init(u32 idx);
 int i2c_send_buf_small(u32 idx, u32 x, u32 y, u8 *buf, u32 size);
+int i2c_recv_buf(u8 *buf, u32 size, u32 idx, u32 x);
 int i2c_recv_buf_small(u8 *buf, u32 size, u32 idx, u32 x, u32 y);
 int i2c_send_byte(u32 idx, u32 x, u32 y, u8 b);
 u8 i2c_recv_byte(u32 idx, u32 x, u32 y);
--- a/bootloader/storage/nx_emmc.c
+++ b/bootloader/storage/nx_emmc.c
@@ -31,7 +31,7 @@ void nx_emmc_gpt_parse(link_t *gpt, sdmmc_storage_t *storage)
 	for (u32 i = 0; i < hdr->num_part_ents; i++)
 	{
 		gpt_entry_t *ent = (gpt_entry_t *)(buf + (hdr->part_ent_lba - 1) * NX_EMMC_BLOCKSIZE + i * sizeof(gpt_entry_t));
-		emmc_part_t *part = (emmc_part_t *)malloc(sizeof(emmc_part_t));
+		emmc_part_t *part = (emmc_part_t *)calloc(sizeof(emmc_part_t), 1);
 		part->lba_start = ent->lba_start;
 		part->lba_end = ent->lba_end;
 		part->attrs = ent->attrs;
--- a/bootloader/utils/list.h
+++ b/bootloader/utils/list.h
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/bootloader/utils/util.h
+++ b/bootloader/utils/util.h
@@ -57,7 +57,7 @@ typedef struct _nyx_storage_t
 	u8  rsvd[0x800000 - sizeof(nyx_info_t)];
 	nyx_info_t info;
 	mtc_config_t mtc_cfg;
-	emc_table_t mtc_table;
+	emc_table_t mtc_table[10];
 } nyx_storage_t;

 u32 get_tmr_us();
--- a/modules/hekate_libsys_lp0/Makefile
+++ b/modules/hekate_libsys_lp0/Makefile
@@ -7,7 +7,6 @@ include $(DEVKITARM)/base_rules
 TARGET := libsys_lp0
 BUILD := ../../build/$(TARGET)
 OUTPUT := ../../output
-VPATH = $(dir $(wildcard ./*/)) $(dir $(wildcard ./*/*/))

 OBJS = $(addprefix $(BUILD)/,\
 	sys_sdramlp0.o \
--- a/modules/hekate_libsys_minerva/Makefile
+++ b/modules/hekate_libsys_minerva/Makefile
@@ -7,7 +7,6 @@ include $(DEVKITARM)/base_rules
 TARGET := libsys_minerva
 BUILD := ../../build/$(TARGET)
 OUTPUT := ../../output
-VPATH = $(dir $(wildcard ./*/)) $(dir $(wildcard ./*/*/))

 OBJS = $(addprefix $(BUILD)/,\
 	sys_sdrammtc.o \
--- a/modules/simple_sample/Makefile
+++ b/modules/simple_sample/Makefile
@@ -7,7 +7,7 @@ include $(DEVKITARM)/base_rules
 TARGET := module_sample
 BUILD := ../../build/$(TARGET)
 OUTPUT := ../../output
-VPATH = $(dir $(wildcard ./*/)) $(dir $(wildcard ./*/*/))
+VPATH = $(dir ./) $(dir $(wildcard ./*/))

 OBJS = $(addprefix $(BUILD)/,\
 	module_sample.o \
--- a/nyx/Makefile
+++ b/nyx/Makefile
@@ -16,7 +16,7 @@ TARGET := nyx
 BUILDDIR := ./../build
 OUTPUTDIR := ./../output
 SOURCEDIR = nyx_gui
-VPATH = $(dir $(wildcard ./$(SOURCEDIR)/*/)) $(dir $(wildcard ./$(SOURCEDIR)/*/*/))
+VPATH = $(dir $(wildcard ./$(SOURCEDIR)/)) $(dir $(wildcard ./$(SOURCEDIR)/*/)) $(dir $(wildcard ./$(SOURCEDIR)/*/*/))
 VPATH += $(dir $(wildcard ./$(SOURCEDIR)/*/*/*/)) $(dir $(wildcard ./$(SOURCEDIR)/*/*/*/*/))

 # Main and graphics.
@@ -104,7 +104,11 @@ $(BUILDDIR)/$(TARGET)/%.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@

 $(BUILDDIR)/$(TARGET)/%.o: %.S
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJS): $(BUILDDIR)/$(TARGET)
+
+$(BUILDDIR)/$(TARGET):
 	@mkdir -p "$(BUILDDIR)"
 	@mkdir -p "$(BUILDDIR)/$(TARGET)"
 	@mkdir -p "$(OUTPUTDIR)"
-	$(CC) $(CFLAGS) -c $< -o $@
--- a/nyx/nyx_gui/config/config.c
+++ b/nyx/nyx_gui/config/config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/config/ini.c
+++ b/nyx/nyx_gui/config/ini.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/frontend/fe_emmc_tools.c
+++ b/nyx/nyx_gui/frontend/fe_emmc_tools.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2018 naehrwert
 * Copyright (c) 2018 Rajko Stojadinovic
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -112,7 +112,7 @@ static lv_obj_t *create_mbox_text(char *text, bool button_ok)
 	lv_obj_set_style(dark_bg, &mbox_darken);
 	lv_obj_set_size(dark_bg, LV_HOR_RES, LV_VER_RES);

-	static const char * mbox_btn_map[] = { "\211", "\222OK", "\211", "" };
+	static const char *mbox_btn_map[] = { "\211", "\222OK", "\211", "" };
 	lv_obj_t *mbox = lv_mbox_create(dark_bg, NULL);
 	lv_mbox_set_recolor_text(mbox, true);
 	lv_obj_set_width(mbox, LV_HOR_RES / 9 * 6);
@@ -194,7 +194,7 @@ static int _dump_emmc_verify(emmc_tool_gui_t *gui, sdmmc_storage_t *storage, u32
 		lv_bar_set_style(gui->bar, LV_BAR_STYLE_BG, gui->bar_teal_bg);
 		lv_bar_set_style(gui->bar, LV_BAR_STYLE_INDIC, lv_theme_get_current()->bar.indic);
 		s_printf(gui->txt_buf, " "SYMBOL_DOT" %d%%", pct);
-		lv_label_set_array_text(gui->label_pct, gui->txt_buf, 32);
+		lv_label_set_text(gui->label_pct, gui->txt_buf);
 		manual_system_maintenance(true);

 		clmt = f_expand_cltbl(&fp, 0x400000, 0);
@@ -225,7 +225,7 @@ static int _dump_emmc_verify(emmc_tool_gui_t *gui, sdmmc_storage_t *storage, u32

 					return 1;
 				}
-
+				manual_system_maintenance(false);
 				se_calc_sha256(hashEm, NULL, bufEm, num << 9, 0, SHA_INIT_HASH, false);

 				f_lseek(&fp, (u64)sdFileSector << (u64)9);
@@ -245,7 +245,7 @@ static int _dump_emmc_verify(emmc_tool_gui_t *gui, sdmmc_storage_t *storage, u32

 					return 1;
 				}
-
+				manual_system_maintenance(false);
 				se_calc_sha256_finalize(hashEm, NULL);
 				se_calc_sha256(hashSd, NULL, bufSd, num << 9, 0, SHA_INIT_HASH, true);
 				res = memcmp(hashEm, hashSd, 0x10);
@@ -289,16 +289,18 @@ static int _dump_emmc_verify(emmc_tool_gui_t *gui, sdmmc_storage_t *storage, u32
 			{
 				lv_bar_set_value(gui->bar, pct);
 				s_printf(gui->txt_buf, " "SYMBOL_DOT" %d%%", pct);
-				lv_label_set_array_text(gui->label_pct, gui->txt_buf, 32);
-				manual_system_maintenance(true);
+				lv_label_set_text(gui->label_pct, gui->txt_buf);
 				prevPct = pct;
 			}

+			manual_system_maintenance(false);
+
 			lba_curr += num;
 			totalSectorsVer -= num;
 			sdFileSector += num;
 			sparseShouldVerify++;

+			// Check for cancellation combo.
 			btn = btn_wait_timeout(0, BTN_VOL_DOWN | BTN_VOL_UP);
 			if ((btn & BTN_VOL_DOWN) && (btn & BTN_VOL_UP))
 			{
@@ -321,7 +323,7 @@ static int _dump_emmc_verify(emmc_tool_gui_t *gui, sdmmc_storage_t *storage, u32

 		lv_bar_set_value(gui->bar, pct);
 		s_printf(gui->txt_buf, " "SYMBOL_DOT" %d%%", pct);
-		lv_label_set_array_text(gui->label_pct, gui->txt_buf, 32);
+		lv_label_set_text(gui->label_pct, gui->txt_buf);
 		manual_system_maintenance(true);

 		return 0;
@@ -565,12 +567,10 @@ static int _dump_emmc_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_storage_t

 			// Create next part.
 			s_printf(gui->txt_buf, "%s#", outFilename + strlen(gui->base_path));
-			lv_label_ins_text(gui->label_info,
-				strlen(lv_label_get_text(gui->label_info)) - strlen(outFilename + strlen(gui->base_path) - 1),
-				gui->txt_buf);
 			lv_label_cut_text(gui->label_info,
-				strlen(lv_label_get_text(gui->label_info)) - strlen(outFilename + strlen(gui->base_path) - 1),
+				strlen(lv_label_get_text(gui->label_info)) - strlen(outFilename + strlen(gui->base_path)) - 1,
 				strlen(outFilename + strlen(gui->base_path)) + 1);
+			lv_label_ins_text(gui->label_info, LV_LABEL_POS_LAST, gui->txt_buf);
 			manual_system_maintenance(true);
 			lbaStartPart = lba_curr;
 			res = f_open(&fp, outFilename, FA_CREATE_ALWAYS | FA_WRITE);
@@ -620,6 +620,7 @@ static int _dump_emmc_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_storage_t
 				manual_system_maintenance(true);
 			}
 		}
+		manual_system_maintenance(false);

 		res = f_write_fast(&fp, buf, NX_EMMC_BLOCKSIZE * num);

@@ -635,12 +636,15 @@ static int _dump_emmc_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_storage_t

 			return 0;
 		}
+
+		manual_system_maintenance(false);
+
 		pct = (u64)((u64)(lba_curr - part->lba_start) * 100u) / (u64)(part->lba_end - part->lba_start);
 		if (pct != prevPct)
 		{
 			lv_bar_set_value(gui->bar, pct);
 			s_printf(gui->txt_buf, " "SYMBOL_DOT" %d%%", pct);
-			lv_label_set_array_text(gui->label_pct, gui->txt_buf, 32);
+			lv_label_set_text(gui->label_pct, gui->txt_buf);
 			manual_system_maintenance(true);

 			prevPct = pct;
@@ -657,6 +661,7 @@ static int _dump_emmc_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_storage_t
 			bytesWritten = 0;
 		}

+		// Check for cancellation combo.
 		btn = btn_wait_timeout(0, BTN_VOL_DOWN | BTN_VOL_UP);
 		if ((btn & BTN_VOL_DOWN) && (btn & BTN_VOL_UP))
 		{
@@ -719,15 +724,13 @@ void dump_emmc_selected(emmcPartType_t dumpType, emmc_tool_gui_t *gui)

 	char *txt_buf = (char *)malloc(0x1000);
 	gui->txt_buf = txt_buf;
+
 	s_printf(txt_buf, "");
-	lv_label_set_array_text(gui->label_log, txt_buf, 0x1000);
+	lv_label_set_text(gui->label_log, txt_buf);

 	lv_label_set_static_text(gui->label_info, "Checking for available free space...");
 	manual_system_maintenance(true);

-	// Do a reinit to refresh tuning.
-	sd_unmount(true);
-
 	if (!sd_mount())
 	{
 		lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init SD!#");
@@ -771,7 +774,7 @@ void dump_emmc_selected(emmcPartType_t dumpType, emmc_tool_gui_t *gui)

 			s_printf(txt_buf, "#00DDFF %02d: %s#\n#00DDFF Range: 0x%08X - 0x%08X#\n\n",
 				i, bootPart.name, bootPart.lba_start, bootPart.lba_end);
-			lv_label_set_array_text(gui->label_info, txt_buf, 0x1000);
+			lv_label_set_text(gui->label_info, txt_buf);
 			s_printf(txt_buf, "%02d: %s... ", i, bootPart.name);
 			lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, txt_buf);
 			manual_system_maintenance(true);
@@ -812,7 +815,7 @@ void dump_emmc_selected(emmcPartType_t dumpType, emmc_tool_gui_t *gui)

 				s_printf(txt_buf, "#00DDFF %02d: %s#\n#00DDFF Range: 0x%08X - 0x%08X#\n\n",
 					i, part->name, part->lba_start, part->lba_end);
-				lv_label_set_array_text(gui->label_info, txt_buf, 0x1000);
+				lv_label_set_text(gui->label_info, txt_buf);
 				s_printf(txt_buf, "%02d: %s... ", i, part->name);
 				lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, txt_buf);
 				manual_system_maintenance(true);
@@ -849,7 +852,7 @@ void dump_emmc_selected(emmcPartType_t dumpType, emmc_tool_gui_t *gui)
 			{
 				s_printf(txt_buf, "#00DDFF %02d: %s#\n#00DDFF Range: 0x%08X - 0x%08X#\n\n",
 					i, rawPart.name, rawPart.lba_start, rawPart.lba_end);
-				lv_label_set_array_text(gui->label_info, txt_buf, 0x1000);
+				lv_label_set_text(gui->label_info, txt_buf);
 				s_printf(txt_buf, "%02d: %s... ", i, rawPart.name);
 				lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, txt_buf);
 				manual_system_maintenance(true);
@@ -880,7 +883,7 @@ void dump_emmc_selected(emmcPartType_t dumpType, emmc_tool_gui_t *gui)
 	else
 		s_printf(txt_buf, "Time taken: %dm %ds.", timer / 60, timer % 60);

-	lv_label_set_array_text(gui->label_finish, txt_buf, 0x1000);
+	lv_label_set_text(gui->label_finish, txt_buf);

 out:
 	free(txt_buf);
@@ -944,12 +947,10 @@ static int _restore_emmc_part(emmc_tool_gui_t *gui, char *sd_path, int active_pa
 				_update_filename(outFilename, sdPathLen, numSplitParts);

 				s_printf(gui->txt_buf, "%s#", outFilename + strlen(gui->base_path));
-				lv_label_ins_text(gui->label_info,
-					strlen(lv_label_get_text(gui->label_info)) - strlen(outFilename + strlen(gui->base_path)) - 1,
-					gui->txt_buf);
 				lv_label_cut_text(gui->label_info,
 					strlen(lv_label_get_text(gui->label_info)) - strlen(outFilename + strlen(gui->base_path)) - 1,
 					strlen(outFilename + strlen(gui->base_path)) + 1);
+				lv_label_ins_text(gui->label_info, LV_LABEL_POS_LAST, gui->txt_buf);
 				manual_system_maintenance(true);

 				if (f_stat(outFilename, &fno) && !gui->raw_emummc)
@@ -1007,12 +1008,10 @@ static int _restore_emmc_part(emmc_tool_gui_t *gui, char *sd_path, int active_pa
 	if (use_multipart)
 	{
 		s_printf(gui->txt_buf, "%s#", outFilename + strlen(gui->base_path));
-		lv_label_ins_text(gui->label_info,
-			strlen(lv_label_get_text(gui->label_info)) - strlen(outFilename + strlen(gui->base_path)) - 1,
-			gui->txt_buf);
 		lv_label_cut_text(gui->label_info,
 			strlen(lv_label_get_text(gui->label_info)) - strlen(outFilename + strlen(gui->base_path)) - 1,
 			strlen(outFilename + strlen(gui->base_path)) + 1);
+		lv_label_ins_text(gui->label_info, LV_LABEL_POS_LAST, gui->txt_buf);
 		manual_system_maintenance(true);
 	}
 	else
@@ -1123,12 +1122,10 @@ static int _restore_emmc_part(emmc_tool_gui_t *gui, char *sd_path, int active_pa

 			// Read from next part.
 			s_printf(gui->txt_buf, "%s#", outFilename + strlen(gui->base_path));
-			lv_label_ins_text(gui->label_info,
-				strlen(lv_label_get_text(gui->label_info)) - strlen(outFilename + strlen(gui->base_path)) - 1,
-				gui->txt_buf);
 			lv_label_cut_text(gui->label_info,
 				strlen(lv_label_get_text(gui->label_info)) - strlen(outFilename + strlen(gui->base_path)) - 1,
 				strlen(outFilename + strlen(gui->base_path)) + 1);
+			lv_label_ins_text(gui->label_info, LV_LABEL_POS_LAST, gui->txt_buf);
 			manual_system_maintenance(true);

 			lbaStartPart = lba_curr;
@@ -1152,6 +1149,7 @@ static int _restore_emmc_part(emmc_tool_gui_t *gui, char *sd_path, int active_pa
 		num = MIN(totalSectors, NUM_SECTORS_PER_ITER);

 		res = f_read_fast(&fp, buf, num << 9);
+		manual_system_maintenance(false);

 		if (res)
 		{
@@ -1170,6 +1168,9 @@ static int _restore_emmc_part(emmc_tool_gui_t *gui, char *sd_path, int active_pa
 			res = !sdmmc_storage_write(storage, lba_curr, num, buf);
 		else
 			res = !sdmmc_storage_write(&sd_storage, lba_curr + sd_sector_off, num, buf);
+
+		manual_system_maintenance(false);
+
 		while (res)
 		{
 			s_printf(gui->txt_buf,
@@ -1202,13 +1203,14 @@ static int _restore_emmc_part(emmc_tool_gui_t *gui, char *sd_path, int active_pa
 				res = !sdmmc_storage_write(storage, lba_curr, num, buf);
 			else
 				res = !sdmmc_storage_write(&sd_storage, lba_curr + sd_sector_off, num, buf);
+			manual_system_maintenance(false);
 		}
 		pct = (u64)((u64)(lba_curr - part->lba_start) * 100u) / (u64)(part->lba_end - part->lba_start);
 		if (pct != prevPct)
 		{
 			lv_bar_set_value(gui->bar, pct);
 			s_printf(gui->txt_buf, " "SYMBOL_DOT" %d%%", pct);
-			lv_label_set_array_text(gui->label_pct, gui->txt_buf, 32);
+			lv_label_set_text(gui->label_pct, gui->txt_buf);
 			manual_system_maintenance(true);
 			prevPct = pct;
 		}
@@ -1268,11 +1270,11 @@ void restore_emmc_selected(emmcPartType_t restoreType, emmc_tool_gui_t *gui)

 	char *txt_buf = (char *)malloc(0x1000);
 	gui->txt_buf = txt_buf;
+
 	s_printf(txt_buf, "");
-	lv_label_set_array_text(gui->label_log, txt_buf, 0x1000);
+	lv_label_set_text(gui->label_log, txt_buf);

 	manual_system_maintenance(true);
-	sd_unmount(true);

 	s_printf(txt_buf,
 		"#FFDD00 This may render your device inoperative!#\n\n"
@@ -1351,7 +1353,7 @@ void restore_emmc_selected(emmcPartType_t restoreType, emmc_tool_gui_t *gui)

 			s_printf(txt_buf, "#00DDFF %02d: %s#\n#00DDFF Range: 0x%08X - 0x%08X#\n\n\n\n\n",
 				i, bootPart.name, bootPart.lba_start, bootPart.lba_end);
-			lv_label_set_array_text(gui->label_info, txt_buf, 0x1000);
+			lv_label_set_text(gui->label_info, txt_buf);
 			s_printf(txt_buf, "%02d: %s... ", i, bootPart.name);
 			lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, txt_buf);
 			manual_system_maintenance(true);
@@ -1385,7 +1387,7 @@ void restore_emmc_selected(emmcPartType_t restoreType, emmc_tool_gui_t *gui)
 		{
 			s_printf(txt_buf, "#00DDFF %02d: %s#\n#00DDFF Range: 0x%08X - 0x%08X#\n\n\n\n\n",
 				i, part->name, part->lba_start, part->lba_end);
-			lv_label_set_array_text(gui->label_info, txt_buf, 0x1000);
+			lv_label_set_text(gui->label_info, txt_buf);
 			s_printf(txt_buf, "%02d: %s... ", i, part->name);
 			lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, txt_buf);
 			manual_system_maintenance(true);
@@ -1418,7 +1420,7 @@ void restore_emmc_selected(emmcPartType_t restoreType, emmc_tool_gui_t *gui)
 		{
 			s_printf(txt_buf, "#00DDFF %02d: %s#\n#00DDFF Range: 0x%08X - 0x%08X#\n\n\n\n\n",
 				i, rawPart.name, rawPart.lba_start, rawPart.lba_end);
-			lv_label_set_array_text(gui->label_info, txt_buf, 0x1000);
+			lv_label_set_text(gui->label_info, txt_buf);
 			s_printf(txt_buf, "%02d: %s... ", i, rawPart.name);
 			lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, txt_buf);
 			manual_system_maintenance(true);
@@ -1447,7 +1449,7 @@ void restore_emmc_selected(emmcPartType_t restoreType, emmc_tool_gui_t *gui)
 	else
 		s_printf(txt_buf, "Time taken: %dm %ds.", timer / 60, timer % 60);

-	lv_label_set_array_text(gui->label_finish, txt_buf, 0x1000);
+	lv_label_set_text(gui->label_finish, txt_buf);

 out:
 	free(txt_buf);
--- a/nyx/nyx_gui/frontend/fe_emummc_tools.c
+++ b/nyx/nyx_gui/frontend/fe_emummc_tools.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2018 naehrwert
 * Copyright (c) 2018 Rajko Stojadinovic
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -29,6 +29,7 @@
 #include "../sec/se.h"
 #include "../storage/nx_emmc.h"
 #include "../storage/sdmmc.h"
+#include "../utils/btn.h"
 #include "../utils/sprintf.h"
 #include "../utils/util.h"

@@ -195,8 +196,8 @@ static int _dump_emummc_file_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_sto

 			// Create next part.
 			s_printf(gui->txt_buf, "%s#", outFilename + strlen(gui->base_path));
-			lv_label_ins_text(gui->label_info, strlen(lv_label_get_text(gui->label_info)) - 3, gui->txt_buf);
 			lv_label_cut_text(gui->label_info, strlen(lv_label_get_text(gui->label_info)) - 3, 3);
+			lv_label_ins_text(gui->label_info, LV_LABEL_POS_LAST, gui->txt_buf);
 			manual_system_maintenance(true);

 			res = f_open(&fp, outFilename, FA_CREATE_ALWAYS | FA_WRITE);
@@ -215,6 +216,23 @@ static int _dump_emummc_file_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_sto
 			clmt = f_expand_cltbl(&fp, 0x400000, MIN(totalSize, multipartSplitSize));
 		}

+		// Check for cancellation combo.
+		u32 btn = btn_wait_timeout(0, BTN_VOL_DOWN | BTN_VOL_UP);
+		if ((btn & BTN_VOL_DOWN) && (btn & BTN_VOL_UP))
+		{
+			s_printf(gui->txt_buf, "#FFDD00 The emuMMC was cancelled!#\n");
+			lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf);
+			manual_system_maintenance(true);
+
+			f_close(&fp);
+			free(clmt);
+			f_unlink(outFilename);
+
+			msleep(1000);
+
+			return 0;
+		}
+
 		retryCount = 0;
 		num = MIN(totalSectors, NUM_SECTORS_PER_ITER);
 		while (!sdmmc_storage_read(storage, lba_curr, num, buf))
@@ -246,8 +264,13 @@ static int _dump_emummc_file_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_sto
 				manual_system_maintenance(true);
 			}
 		}
+
+		manual_system_maintenance(false);
+
 		res = f_write_fast(&fp, buf, NX_EMMC_BLOCKSIZE * num);

+		manual_system_maintenance(false);
+
 		if (res)
 		{
 			s_printf(gui->txt_buf, "\n#FF0000 Fatal error (%d) when writing to SD Card#\nPlease try again...\n", res);
@@ -265,7 +288,7 @@ static int _dump_emummc_file_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_sto
 		{
 			lv_bar_set_value(gui->bar, pct);
 			s_printf(gui->txt_buf, " "SYMBOL_DOT" %d%%", pct);
-			lv_label_set_array_text(gui->label_pct, gui->txt_buf, 32);
+			lv_label_set_text(gui->label_pct, gui->txt_buf);
 			manual_system_maintenance(true);

 			prevPct = pct;
@@ -281,6 +304,8 @@ static int _dump_emummc_file_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_sto
 			f_sync(&fp);
 			bytesWritten = 0;
 		}
+
+		manual_system_maintenance(false);
 	}
 	lv_bar_set_value(gui->bar, 100);
 	lv_label_set_text(gui->label_pct, " "SYMBOL_DOT" 100%");
@@ -301,13 +326,12 @@ void dump_emummc_file(emmc_tool_gui_t *gui)

 	char *txt_buf = (char *)malloc(0x1000);
 	gui->txt_buf = txt_buf;
+
 	s_printf(txt_buf, "");
-	lv_label_set_array_text(gui->label_log, txt_buf, 0x1000);
+	lv_label_set_text(gui->label_log, txt_buf);

 	manual_system_maintenance(true);

-	sd_unmount(true);
-
 	if (!sd_mount())
 	{
 		lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init SD!#");
@@ -364,7 +388,7 @@ void dump_emummc_file(emmc_tool_gui_t *gui)

 		s_printf(txt_buf, "#00DDFF %02d: %s#\n#00DDFF Range: 0x%08X - 0x%08X#\n\n",
 			i, bootPart.name, bootPart.lba_start, bootPart.lba_end);
-		lv_label_set_array_text(gui->label_info, txt_buf, 0x1000);
+		lv_label_set_text(gui->label_info, txt_buf);
 		s_printf(txt_buf, "%02d: %s... ", i, bootPart.name);
 		lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, txt_buf);
 		manual_system_maintenance(true);
@@ -402,7 +426,7 @@ void dump_emummc_file(emmc_tool_gui_t *gui)
 	{
 		s_printf(txt_buf, "#00DDFF %02d: %s#\n#00DDFF Range: 0x%08X - 0x%08X#\n\n",
 			i, rawPart.name, rawPart.lba_start, rawPart.lba_end);
-		lv_label_set_array_text(gui->label_info, txt_buf, 0x1000);
+		lv_label_set_text(gui->label_info, txt_buf);
 		s_printf(txt_buf, "%02d: %s... ", i, rawPart.name);
 		lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, txt_buf);
 		manual_system_maintenance(true);
@@ -438,7 +462,7 @@ out_failed:
 	else
 		s_printf(txt_buf, "Time taken: %dm %ds.", timer / 60, timer % 60);

-	lv_label_set_array_text(gui->label_finish, txt_buf, 0x1000);
+	lv_label_set_text(gui->label_finish, txt_buf);

 out:
 	free(txt_buf);
@@ -478,6 +502,19 @@ static int _dump_emummc_raw_part(emmc_tool_gui_t *gui, int active_part, int part

 	while (totalSectors > 0)
 	{
+		// Check for cancellation combo.
+		u32 btn = btn_wait_timeout(0, BTN_VOL_DOWN | BTN_VOL_UP);
+		if ((btn & BTN_VOL_DOWN) && (btn & BTN_VOL_UP))
+		{
+			s_printf(gui->txt_buf, "#FFDD00 The emuMMC was cancelled!#\n");
+			lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf);
+			manual_system_maintenance(true);
+
+			msleep(1000);
+
+			return 0;
+		}
+
 		retryCount = 0;
 		num = MIN(totalSectors, NUM_SECTORS_PER_ITER);

@@ -507,6 +544,9 @@ static int _dump_emummc_raw_part(emmc_tool_gui_t *gui, int active_part, int part
 				manual_system_maintenance(true);
 			}
 		}
+
+		manual_system_maintenance(false);
+
 		retryCount = 0;

 		// Write data to SD card.
@@ -535,12 +575,15 @@ static int _dump_emummc_raw_part(emmc_tool_gui_t *gui, int active_part, int part
 				manual_system_maintenance(true);
 			}
 		}
+
+		manual_system_maintenance(false);
+
 		pct = (u64)((u64)(lba_curr - part->lba_start) * 100u) / (u64)(part->lba_end - part->lba_start);
 		if (pct != prevPct)
 		{
 			lv_bar_set_value(gui->bar, pct);
 			s_printf(gui->txt_buf, " "SYMBOL_DOT" %d%%", pct);
-			lv_label_set_array_text(gui->label_pct, gui->txt_buf, 32);
+			lv_label_set_text(gui->label_pct, gui->txt_buf);
 			manual_system_maintenance(true);

 			prevPct = pct;
@@ -573,13 +616,12 @@ void dump_emummc_raw(emmc_tool_gui_t *gui, int part_idx, u32 sector_start)

 	char *txt_buf = (char *)malloc(0x1000);
 	gui->txt_buf = txt_buf;
+
 	s_printf(txt_buf, "");
-	lv_label_set_array_text(gui->label_log, txt_buf, 0x1000);
+	lv_label_set_text(gui->label_log, txt_buf);

 	manual_system_maintenance(true);

-	sd_unmount(true);
-
 	if (!sd_mount())
 	{
 		lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init SD!#");
@@ -619,7 +661,7 @@ void dump_emummc_raw(emmc_tool_gui_t *gui, int part_idx, u32 sector_start)

 		s_printf(txt_buf, "#00DDFF %02d: %s#\n#00DDFF Range: 0x%08X - 0x%08X#\n\n",
 			i, bootPart.name, bootPart.lba_start, bootPart.lba_end);
-		lv_label_set_array_text(gui->label_info, txt_buf, 0x1000);
+		lv_label_set_text(gui->label_info, txt_buf);
 		s_printf(txt_buf, "%02d: %s... ", i, bootPart.name);
 		lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, txt_buf);
 		manual_system_maintenance(true);
@@ -656,7 +698,7 @@ void dump_emummc_raw(emmc_tool_gui_t *gui, int part_idx, u32 sector_start)
 	{
 		s_printf(txt_buf, "#00DDFF %02d: %s#\n#00DDFF Range: 0x%08X - 0x%08X#\n\n",
 			i, rawPart.name, rawPart.lba_start, rawPart.lba_end);
-		lv_label_set_array_text(gui->label_info, txt_buf, 0x1000);
+		lv_label_set_text(gui->label_info, txt_buf);
 		s_printf(txt_buf, "%02d: %s... ", i, rawPart.name);
 		lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, txt_buf);
 		manual_system_maintenance(true);
@@ -692,7 +734,7 @@ out_failed:
 	else
 		s_printf(txt_buf, "Time taken: %dm %ds.", timer / 60, timer % 60);

-	lv_label_set_array_text(gui->label_finish, txt_buf, 0x1000);
+	lv_label_set_text(gui->label_finish, txt_buf);

 out:
 	free(txt_buf);
--- a/nyx/nyx_gui/frontend/gui.c
+++ b/nyx/nyx_gui/frontend/gui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -342,12 +342,12 @@ lv_res_t nyx_generic_onoff_toggle(lv_obj_t *btn)
 		if (!(lv_btn_get_state(btn) & LV_BTN_STATE_TGL_REL))
 		{
 			strcat(label_text, "#D0D0D0    OFF#");
-			lv_label_set_array_text(label_btn, label_text, 64);
+			lv_label_set_text(label_btn, label_text);
 		}
 		else
 		{
 			strcat(label_text, "#00FFC9    ON #");
-			lv_label_set_array_text(label_btn, label_text, 64);
+			lv_label_set_text(label_btn, label_text);
 		}
 	}
 	else
@@ -796,7 +796,7 @@ static void _update_status_bar(void *params)
 	s_printf(label, "%02d:%02d "SYMBOL_DOT" "SYMBOL_TEMPERATURE" %02d.%d",
 		time.hour, time.min, soc_temp_dec, (soc_temp & 0xFF) / 10);

-	lv_label_set_array_text(status_bar.time_temp, label, 64);
+	lv_label_set_text(status_bar.time_temp, label);

 	lv_obj_realign(status_bar.temp_symbol);
 	lv_obj_realign(status_bar.temp_degrees);
@@ -819,7 +819,7 @@ static void _update_status_bar(void *params)
 	if (charge_status)
 		s_printf(label + strlen(label), " #FFDD00 "SYMBOL_CHARGE"#");

-	lv_label_set_array_text(status_bar.battery, label, 64);
+	lv_label_set_text(status_bar.battery, label);
 	lv_obj_realign(status_bar.battery);

 	// Set battery current draw and voltage.
@@ -832,7 +832,7 @@ static void _update_status_bar(void *params)
 	s_printf(label + strlen(label), " mA# (%s%d mV%s)",
 		voltage_empty ? "#FF8000 " : "", batt_volt,  voltage_empty ? " "SYMBOL_WARNING"#" : "");

-	lv_label_set_array_text(status_bar.battery_more, label, 64);
+	lv_label_set_text(status_bar.battery_more, label);
 	lv_obj_realign(status_bar.battery_more);

 	free(label);
@@ -971,12 +971,12 @@ static lv_res_t logs_onoff_toggle(lv_obj_t *btn)
 	if (!launch_logs_enable)
 	{
 		strcat(label_text, "#D0D0D0 OFF#");
-		lv_label_set_array_text(label_btn, label_text, 64);
+		lv_label_set_text(label_btn, label_text);
 	}
 	else
 	{
 		strcat(label_text, "#00FFC9 ON #");
-		lv_label_set_array_text(label_btn, label_text, 64);
+		lv_label_set_text(label_btn, label_text);
 	}

 	return LV_RES_OK;
@@ -1170,7 +1170,7 @@ static lv_res_t _create_window_home_launch(lv_obj_t *btn)
 					lv_btn_set_action(btn, LV_BTN_ACTION_CLICK, _launch_more_cfg_action);

 				// Set button's label text.
-				lv_label_set_array_text(launch_ctxt[x + 1], ini_sec->name, strlen(ini_sec->name));
+				lv_label_set_text(launch_ctxt[x + 1], ini_sec->name);
 				lv_obj_set_opa_scale(launch_ctxt[x + 1], LV_OPA_COVER);

 				// Set rolling text if name is big.
--- a/nyx/nyx_gui/frontend/gui_emummc_tools.c
+++ b/nyx/nyx_gui/frontend/gui_emummc_tools.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 CTCaer
+ * Copyright (c) 2019-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -877,7 +877,7 @@ out0:;
 		if (emummc_img->part_type[raw_btn_idx] != 0x83)
 		{
 			s_printf(txt_buf, "SD RAW %d", raw_btn_idx + 1);
-			lv_label_set_array_text(btn_label, txt_buf, 32);
+			lv_label_set_text(btn_label, txt_buf);
 		}

 		if (!emummc_img->part_sector[raw_btn_idx] || emummc_img->part_type[raw_btn_idx] == 0x83 || !emummc_img->part_path[raw_btn_idx * 128])
@@ -905,7 +905,7 @@ out0:;
 		lv_obj_set_style(lv_desc, &hint_small_style);

 		s_printf(txt_buf, "Sector start: 0x%08X\nFolder: %s", emummc_img->part_sector[raw_btn_idx], &emummc_img->part_path[raw_btn_idx * 128]);
-		lv_label_set_array_text(lv_desc, txt_buf, 0x500);
+		lv_label_set_text(lv_desc, txt_buf);
 		lv_obj_align(lv_desc, btn, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 5);
 	}

@@ -1059,7 +1059,7 @@ lv_res_t create_win_emummc_tools(lv_obj_t *btn)
 			s_printf(txt_buf, "#00DDFF Type:# SD File\n#00DDFF Base folder:# %s\n#00DDFF Nintendo folder:# %s",
 				emu_info.path ? emu_info.path : "", emu_info.nintendo_path ? emu_info.nintendo_path : "");

-		lv_label_set_array_text(label_txt2, txt_buf, 0x200);
+		lv_label_set_text(label_txt2, txt_buf);
 	}
 	else
 	{
--- a/nyx/nyx_gui/frontend/gui_info.c
+++ b/nyx/nyx_gui/frontend/gui_info.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 * Copyright (c) 2018 balika011
 *
 * This program is free software; you can redistribute it and/or modify it
@@ -337,7 +337,7 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn)
 		FUSE(FUSE_OPT_VENDOR_CODE), FUSE(FUSE_OPT_FAB_CODE), lot_bin, FUSE(FUSE_OPT_LOT_CODE_0),
 		FUSE(FUSE_OPT_LOT_CODE_1), FUSE(FUSE_OPT_WAFER_ID), FUSE(FUSE_OPT_X_COORDINATE), FUSE(FUSE_OPT_Y_COORDINATE));

-	lv_label_set_array_text(lb_val, txt_buf, 0x1000);
+	lv_label_set_text(lb_val, txt_buf);

 	free(txt_buf);

@@ -402,7 +402,7 @@ static lv_res_t _create_window_bootrom_info_status(lv_obj_t *btn)
 	if (res != 0)
 		s_printf(txt_buf + strlen(txt_buf), "#FFDD00 Failed to read ipatches. Error: %d#", res);

-	lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+	lv_label_set_text(lb_desc, txt_buf);

 	free(txt_buf);

@@ -450,12 +450,12 @@ static lv_res_t _create_window_tsec_keys_status(lv_obj_t *btn)
 	if (!pkg1_id)
 	{
 		s_printf(txt_buf + strlen(txt_buf), "#FFDD00 Unknown pkg1 version for reading#\n#FFDD00 TSEC firmware!#");
-		lv_label_set_array_text(lb_desc, txt_buf, 0x500);
+		lv_label_set_text(lb_desc, txt_buf);
 		lv_obj_set_width(lb_desc, lv_obj_get_width(desc));

 		goto out;
 	}
-	lv_label_set_array_text(lb_desc, txt_buf, 0x500);
+	lv_label_set_text(lb_desc, txt_buf);
 	lv_obj_set_width(lb_desc, lv_obj_get_width(desc));

 	lv_obj_t *val = lv_cont_create(win, NULL);
@@ -528,9 +528,9 @@ static lv_res_t _create_window_tsec_keys_status(lv_obj_t *btn)
 		s_printf(txt_buf2, "Error: %x", res);
 	}

-	lv_label_set_array_text(lb_desc, txt_buf, 0x500);
+	lv_label_set_text(lb_desc, txt_buf);

-	lv_label_set_array_text(lb_val, txt_buf2, 0x500);
+	lv_label_set_text(lb_val, txt_buf2);

 out:
 	free(pkg1);
@@ -634,7 +634,7 @@ static lv_res_t _create_window_emmc_info_status(lv_obj_t *btn)

 		lv_obj_t * lb_val = lv_label_create(val, lb_desc);

-		lv_label_set_array_text(lb_val, txt_buf, 0x1000);
+		lv_label_set_text(lb_val, txt_buf);

 		lv_obj_set_width(lb_val, lv_obj_get_width(val));
 		lv_obj_align(val, desc, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
@@ -679,7 +679,7 @@ static lv_res_t _create_window_emmc_info_status(lv_obj_t *btn)
 		}
 		nx_emmc_gpt_free(&gpt);

-		lv_label_set_array_text(lb_desc2, txt_buf, 0x1000);
+		lv_label_set_text(lb_desc2, txt_buf);
 		lv_obj_set_width(lb_desc2, lv_obj_get_width(desc2));
 		lv_obj_align(desc2, val, LV_ALIGN_OUT_RIGHT_MID, LV_DPI / 6, 0);
 	}
@@ -738,7 +738,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
 			sd_storage.cid.hwrev, sd_storage.cid.fwrev, sd_storage.cid.serial,
 			sd_storage.cid.month, sd_storage.cid.year);

-		lv_label_set_array_text(lb_val, txt_buf, 0x1000);
+		lv_label_set_text(lb_val, txt_buf);

 		lv_obj_set_width(lb_val, lv_obj_get_width(val));
 		lv_obj_align(val, desc, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
@@ -777,7 +777,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
 			sd_storage.ssr.speed_class, sd_storage.ssr.uhs_grade, sd_storage.ssr.video_class,
 			sd_storage.ssr.app_class, sd_storage.csd.write_protect);

-		lv_label_set_array_text(lb_val2, txt_buf, 0x1000);
+		lv_label_set_text(lb_val2, txt_buf);

 		lv_obj_set_width(lb_val2, lv_obj_get_width(val2));
 		lv_obj_align(val2, desc2, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
@@ -822,7 +822,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
 			(sd_fs.csize > 1) ? (sd_fs.csize >> 1) : 512,
 			sd_fs.free_clst * sd_fs.csize >> SECTORS_TO_MIB_COEFF);

-		lv_label_set_array_text(lb_val3, txt_buf, 0x1000);
+		lv_label_set_text(lb_val3, txt_buf);

 		lv_obj_set_width(lb_val3, lv_obj_get_width(val3));
 		lv_obj_align(val3, desc3, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
@@ -920,7 +920,7 @@ static lv_res_t _create_window_battery_status(lv_obj_t *btn)
 	else
 		s_printf(txt_buf + strlen(txt_buf), "-%d.%d oC\n", (~value + 1) / 10, (~value + 1) % 10);

-	lv_label_set_array_text(lb_val, txt_buf, 0x1000);
+	lv_label_set_text(lb_val, txt_buf);

 	lv_obj_set_width(lb_val, lv_obj_get_width(val));
 	lv_obj_align(val, desc, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
@@ -1006,7 +1006,7 @@ static lv_res_t _create_window_battery_status(lv_obj_t *btn)
 		break;
 	}

-	lv_label_set_array_text(lb_val2, txt_buf, 0x1000);
+	lv_label_set_text(lb_val2, txt_buf);

 	lv_obj_set_width(lb_val2, lv_obj_get_width(val2));
 	lv_obj_align(val2, desc2, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
--- a/nyx/nyx_gui/frontend/gui_tools.c
+++ b/nyx/nyx_gui/frontend/gui_tools.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -190,7 +190,7 @@ static int _fix_attributes(u32 *ufidx, lv_obj_t *lb_val, char *path, u32 *total,
 			f_chmod(path, 0, AM_ARC);

 			if (*ufidx == 0)
-				lv_label_set_array_text(lb_val, path, 256);
+				lv_label_set_text(lb_val, path);
 			*ufidx += 1;
 			if (*ufidx > 9)
 				*ufidx = 0;
@@ -207,7 +207,7 @@ static int _fix_attributes(u32 *ufidx, lv_obj_t *lb_val, char *path, u32 *total,
 				*total = *total + 1;
 				f_chmod(path, AM_ARC, AM_ARC);
 			}
-			lv_label_set_array_text(lb_val, path, 256);
+			lv_label_set_text(lb_val, path);
 			manual_system_maintenance(true);

 			// Enter the directory.
@@ -264,7 +264,7 @@ static lv_res_t _create_window_unset_abit_tool(lv_obj_t *btn)

 		lv_obj_t * lb_val = lv_label_create(val, lb_desc);

-		char path[256];
+		char *path = malloc(1024);
 		path[0] = 0;

 		lv_label_set_static_text(lb_val, "");
@@ -299,9 +299,11 @@ static lv_res_t _create_window_unset_abit_tool(lv_obj_t *btn)

 		s_printf(txt_buf, "#96FF00 Total archive bits fixed:# #FF8000 %d!#", total);

-		lv_label_set_array_text(lb_desc2, txt_buf, 0x500);
+		lv_label_set_text(lb_desc2, txt_buf);
 		lv_obj_set_width(lb_desc2, lv_obj_get_width(desc2));
 		lv_obj_align(desc2, val, LV_ALIGN_OUT_BOTTOM_RIGHT, 0, 0);
+
+		free(path);
 	}

 	// Enable buttons.
@@ -366,7 +368,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)

 	s_printf(txt_buf, "#00DDFF Found pkg1 ('%s')#\n\n", build_date);
 	free(build_date);
-	lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+	lv_label_set_text(lb_desc, txt_buf);
 	manual_system_maintenance(true);

 	// Dump package1 in its encrypted state if unknown.
@@ -374,7 +376,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 	{
 		s_printf(txt_buf + strlen(txt_buf),
 			"#FFDD00 Unknown pkg1 version for reading#\n#FFDD00 TSEC firmware!#");
-		lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+		lv_label_set_text(lb_desc, txt_buf);
 		manual_system_maintenance(true);

 		emmcsn_path_impl(path, "/pkg1", "pkg1_enc.bin", &storage);
@@ -382,7 +384,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 			goto out_free;

 		s_printf(txt_buf + strlen(txt_buf), "\nEncrypted pkg1 dumped to pkg1_enc.bin");
-		lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+		lv_label_set_text(lb_desc, txt_buf);
 		manual_system_maintenance(true);

 		goto out_free;
@@ -438,7 +440,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 			"#C7EA46 Warmboot size:       #0x%05X\n\n",
 			hdr->ldr_size, pkg1_id->secmon_base, hdr->sm_size, pkg1_id->warmboot_base, hdr->wb_size);

-		lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+		lv_label_set_text(lb_desc, txt_buf);
 		manual_system_maintenance(true);

 		// Dump package1.1.
@@ -446,7 +448,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 		if (sd_save_to_file(pkg1, 0x40000, path))
 			goto out_free;
 		s_printf(txt_buf + strlen(txt_buf), "pkg1 dumped to pkg1_decr.bin\n");
-		lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+		lv_label_set_text(lb_desc, txt_buf);
 		manual_system_maintenance(true);

 		// Dump nxbootloader.
@@ -454,7 +456,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 		if (sd_save_to_file(loader, hdr->ldr_size, path))
 			goto out_free;
 		s_printf(txt_buf + strlen(txt_buf), "NX Bootloader dumped to nxloader.bin\n");
-		lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+		lv_label_set_text(lb_desc, txt_buf);
 		manual_system_maintenance(true);

 		// Dump secmon.
@@ -462,7 +464,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 		if (sd_save_to_file(secmon, hdr->sm_size, path))
 			goto out_free;
 		s_printf(txt_buf + strlen(txt_buf), "Secure Monitor dumped to secmon.bin\n");
-		lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+		lv_label_set_text(lb_desc, txt_buf);
 		manual_system_maintenance(true);

 		// Dump warmboot.
@@ -470,7 +472,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 		if (sd_save_to_file(warmboot, hdr->wb_size, path))
 			goto out_free;
 		s_printf(txt_buf + strlen(txt_buf), "Warmboot dumped to warmboot.bin\n\n");
-		lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+		lv_label_set_text(lb_desc, txt_buf);
 		manual_system_maintenance(true);
 	}

@@ -507,7 +509,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 	if (!pkg2_hdr)
 	{
 		s_printf(txt_buf + strlen(txt_buf), "#FFDD00 Pkg2 decryption failed!#");
-		lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+		lv_label_set_text(lb_desc, txt_buf);
 		manual_system_maintenance(true);

 		goto out;
@@ -519,7 +521,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 		"#C7EA46 INI1 size:     #0x%05X\n\n",
 		pkg2_hdr->sec_size[PKG2_SEC_KERNEL], pkg2_hdr->sec_size[PKG2_SEC_INI1]);

-	lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+	lv_label_set_text(lb_desc, txt_buf);
 	manual_system_maintenance(true);

 	// Dump pkg2.1.
@@ -527,7 +529,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 	if (sd_save_to_file(pkg2, pkg2_hdr->sec_size[PKG2_SEC_KERNEL] + pkg2_hdr->sec_size[PKG2_SEC_INI1], path))
 		goto out;
 	s_printf(txt_buf + strlen(txt_buf), "pkg2 dumped to pkg2_decr.bin\n");
-	lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+	lv_label_set_text(lb_desc, txt_buf);
 	manual_system_maintenance(true);

 	// Dump kernel.
@@ -535,7 +537,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 	if (sd_save_to_file(pkg2_hdr->data, pkg2_hdr->sec_size[PKG2_SEC_KERNEL], path))
 		goto out;
 	s_printf(txt_buf + strlen(txt_buf), "Kernel dumped to kernel.bin\n");
-	lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+	lv_label_set_text(lb_desc, txt_buf);
 	manual_system_maintenance(true);

 	// Dump INI1.
@@ -553,7 +555,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 		goto out;

 	s_printf(txt_buf + strlen(txt_buf), "INI1 dumped to ini1.bin\n\n");
-	lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+	lv_label_set_text(lb_desc, txt_buf);
 	manual_system_maintenance(true);

 	char filename[32];
@@ -583,7 +585,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 		}

 		s_printf(txt_buf + strlen(txt_buf), "%s kip dumped to %s.kip1\n", kip1->name, kip1->name);
-		lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
+		lv_label_set_text(lb_desc, txt_buf);
 		manual_system_maintenance(true);

 		ptr += kip1_size;
@@ -852,7 +854,7 @@ static void _create_tab_tools_arc_autorcm(lv_theme_t *th, lv_obj_t *parent)

 	lv_obj_t *label_txt4 = lv_label_create(h2, NULL);
 	lv_label_set_recolor(label_txt4, true);
-	lv_label_set_array_text(label_txt4, txt_buf, 0x1000);
+	lv_label_set_text(label_txt4, txt_buf);
 	free(txt_buf);

 	lv_obj_set_style(label_txt4, &hint_small_style);
--- a/nyx/nyx_gui/input/touch.c
+++ b/nyx/nyx_gui/input/touch.c
@@ -1,8 +1,8 @@
 /*
- * Touch driver for Nintendo Switch's STMicroelectronics FingerTip touch controller
+ * Touch driver for Nintendo Switch's STM FingerTip S (4cd60d) touch controller
 *
 * Copyright (c) 2018 langerhans
- * Copyright (c) 2018 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -26,6 +26,7 @@
 #include "../power/max77620.h"
 #include "../soc/gpio.h"
 #include "../soc/t210.h"
+#include "../utils/btn.h"
 #include "../utils/util.h"
 #include "touch.h"

@@ -33,17 +34,40 @@
 #include "../gfx/gfx.h"
 #define DPRINTF(...) gfx_printf(__VA_ARGS__)

-static int touch_command(u8 cmd)
+static int touch_command(u8 cmd, u8 *buf, u8 size)
 {
-	int err = i2c_send_byte(I2C_3, STMFTS_I2C_ADDR, cmd, 0);
-	if (!err)
+	int res = i2c_send_buf_small(I2C_3, STMFTS_I2C_ADDR, cmd, buf, size);
+	if (!res)
+		return 1;
+	return 0;
+}
+
+static int touch_read_reg(u8 *cmd, u32 csize, u8 *buf, u32 size)
+{
+	int res = i2c_send_buf_small(I2C_3, STMFTS_I2C_ADDR, cmd[0], &cmd[1], csize - 1);
+	if (res)
+		res = i2c_recv_buf(buf, size, I2C_3, STMFTS_I2C_ADDR);
+	if (!res)
 		return 1;

-	// TODO: Check for completion in event loop
-	msleep(1);
 	return 0;
 }

+static int touch_wait_event(u8 event, u8 status, u32 timeout)
+{
+	u32 timer = get_tmr_ms() + timeout;
+	while (true)
+	{
+		u8 tmp[8] = {0};
+		i2c_recv_buf_small(tmp, 8, I2C_3, STMFTS_I2C_ADDR, STMFTS_READ_ONE_EVENT);
+		if (tmp[1] == event && tmp[2] == status)
+			return 0;
+
+		if (get_tmr_ms() > timer)
+			return 1;
+	}
+}
+
 #define X_REAL_MAX 1264
 #define Y_REAL_MAX 704
 #define EDGE_OFFSET 15
@@ -75,7 +99,14 @@ static void _touch_process_contact_event(touch_event *event, bool touching)
 	if (touching)
 	{
 		event->y = (event->raw[3] << 4) | (event->raw[4] & STMFTS_MASK_X_MSB);
-		event->z = event->raw[5];
+
+		event->z = event->raw[5] | (event->raw[6] << 8);
+		event->z = event->z << 6;
+		u16 tmp = 0x40;
+		if ((event->raw[7] & 0x3F) != 1 && (event->raw[7] & 0x3F) != 0x3F)
+			tmp = event->raw[7] & 0x3F;
+		event->z /= tmp + 0x40;
+
 		event->fingers = ((event->raw[1] & STMFTS_MASK_TOUCH_ID) >> 4) + 1;
 	}
 	else
@@ -93,7 +124,7 @@ static void _touch_parse_event(touch_event *event)
 	case STMFTS_EV_MULTI_TOUCH_ENTER:
 	case STMFTS_EV_MULTI_TOUCH_MOTION:
 		_touch_process_contact_event(event, true);
-		if (event->z > 52) // Discard noisy hover touch.
+		if (event->z < 255) // Reject palm rest.
 			event->touch = true;
 		else
 		{
@@ -158,8 +189,122 @@ touch_info touch_get_info()
 	return info;
 }

+int touch_get_fw_info(touch_fw_info_t *fw)
+{
+	u8 buf[8] = {0};
+
+	// Get fw address info.
+	u8 cmd[3] = { STMFTS_RW_FRAMEBUFFER_REG, 0, 0x60 };
+	int res = touch_read_reg(cmd, 3, buf, 3);
+	if (!res)
+	{
+		// Get fw info.
+		cmd[1] = buf[2]; cmd[2] = buf[1];
+		res = touch_read_reg(cmd, 3, buf, 8);
+		if (!res)
+		{
+			fw->fw_id = (buf[1] << 24) | (buf[2] << 16) | (buf[3] << 8) | buf[4];
+			fw->ftb_ver = (buf[6] << 8) | buf[5];
+		}
+
+		cmd[2]++;
+		res = touch_read_reg(cmd, 3, buf, 8);
+		if (!res)
+			fw->fw_rev = (buf[7] << 8) | buf[6];
+	}
+
+	return res;
+}
+
+int touch_sys_reset()
+{
+	u8 cmd[3] = { 0, 0x28, 0x80 }; // System reset cmd.
+	for (u8 retries = 0; retries < 3; retries++)
+	{
+		if (touch_command(STMFTS_WRITE_REG, cmd, 3))
+		{
+			msleep(10);
+			continue;
+		}
+		msleep(10);
+		if (touch_wait_event(STMFTS_EV_CONTROLLER_READY, 0, 20))
+			continue;
+		else
+			return 0;
+	}
+
+	return 1;
+}
+
+int touch_execute_autotune()
+{
+	// Reset touchscreen module.
+	if (touch_sys_reset())
+		return 0;
+
+	// Trim low power oscillator.
+	touch_command(STMFTS_LP_TIMER_CALIB, NULL, 0);
+	msleep(200);
+
+	// Apply Mutual Sense Compensation tuning.
+	if (touch_command(STMFTS_MS_CX_TUNING, NULL, 0))
+		return 0;
+	if (touch_wait_event(STMFTS_EV_STATUS, 1, 2000))
+		return 0;
+
+	// Apply Self Sense Compensation tuning.
+	if (touch_command(STMFTS_SS_CX_TUNING, NULL, 0))
+		return 0;
+	if (touch_wait_event(STMFTS_EV_STATUS, 2, 2000))
+		return 0;
+
+	// Save Compensation data to EEPROM.
+	if (touch_command(STMFTS_SAVE_CX_TUNING, NULL, 0))
+		return 0;
+	if (touch_wait_event(STMFTS_EV_STATUS, 4, 2000))
+		return 0;
+
+	// Enable auto tuning calibration and multi-touch sensing.
+	u8 cmd = 1;
+	if (touch_command(STMFTS_AUTO_CALIBRATION, &cmd, 1))
+		return 0;
+
+	if (touch_command(STMFTS_MS_MT_SENSE_ON, NULL, 0))
+		return 0;
+
+	if (touch_command(STMFTS_CLEAR_EVENT_STACK, NULL, 0))
+		return 0;
+
+	return 1;
+}
+
+static int touch_init()
+{
+	// Initialize touchscreen module.
+	if (touch_sys_reset())
+		return 0;
+
+	// Enable auto tuning calibration and multi-touch sensing.
+	u8 cmd = 1;
+	if (touch_command(STMFTS_AUTO_CALIBRATION, &cmd, 1))
+		return 0;
+
+	if (touch_command(STMFTS_MS_MT_SENSE_ON, NULL, 0))
+		return 0;
+
+	if (touch_command(STMFTS_CLEAR_EVENT_STACK, NULL, 0))
+		return 0;
+
+	return 1;
+}
+
 int touch_power_on()
 {
+	// Enables LDO6 for touchscreen VDD/AVDD supply
+	max77620_regulator_set_volt_and_flags(REGULATOR_LDO6, 2900000, MAX77620_POWER_MODE_NORMAL);
+	i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_LDO6_CFG2,
+		MAX77620_LDO_CFG2_ADE_ENABLE | (3 << 3) | (MAX77620_POWER_MODE_NORMAL << MAX77620_LDO_POWER_MODE_SHIFT));
+
 	// Configure touchscreen GPIO.
 	PINMUX_AUX(PINMUX_AUX_DAP4_SCLK) = PINMUX_PULL_DOWN | 1;
 	gpio_config(GPIO_PORT_J, GPIO_PIN_7, GPIO_MODE_GPIO);
@@ -181,45 +326,18 @@ int touch_power_on()
 	clock_enable_i2c(I2C_3);
 	i2c_init(I2C_3);

-	// Enables LDO6 for touchscreen VDD/AVDD supply
-	max77620_regulator_set_volt_and_flags(REGULATOR_LDO6, 2900000, MAX77620_POWER_MODE_NORMAL);
-	i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_LDO6_CFG2,
-		MAX77620_LDO_CFG2_ADE_ENABLE | (3 << 3) | (MAX77620_POWER_MODE_NORMAL << MAX77620_LDO_POWER_MODE_SHIFT));
+	// Wait for the touchscreen module to get ready.
+	touch_wait_event(STMFTS_EV_CONTROLLER_READY, 0, 20);

-	msleep(20);
-
-	// Initialize touchscreen module.
-	if (touch_command(STMFTS_SYSTEM_RESET))
-		return 0;
-
-	if (touch_command(STMFTS_SLEEP_OUT))
-		return 0;
-
-	if (touch_command(STMFTS_MS_CX_TUNING))
-		return 0;
-
-	if (touch_command(STMFTS_SS_CX_TUNING))
-		return 0;
-
-	if (touch_command(STMFTS_FULL_FORCE_CALIBRATION))
-		return 0;
-
-	if (touch_command(STMFTS_MS_MT_SENSE_ON))
-		return 0;
-
-	if (touch_command(STMFTS_SS_HOVER_SENSE_OFF))
-		return 0;
-
-	if (touch_command(STMFTS_MS_KEY_SENSE_OFF))
-		return 0;
-
-	return 1;
+	u32 btn = btn_wait_timeout(0, BTN_VOL_DOWN | BTN_VOL_UP);
+	if ((btn & BTN_VOL_DOWN) && (btn & BTN_VOL_UP))
+		return touch_execute_autotune();
+	else
+		return touch_init();	
 }

 void touch_power_off()
 {
-	touch_command(STMFTS_SLEEP_IN);
-
 	// Disable touchscreen power.
 	gpio_write(GPIO_PORT_J, GPIO_PIN_7, GPIO_LOW);

--- a/nyx/nyx_gui/input/touch.h
+++ b/nyx/nyx_gui/input/touch.h
@@ -1,8 +1,8 @@
 /*
- * Touch driver for Nintendo Switch's STMicroelectronics FingerTip S touch controller
+ * Touch driver for Nintendo Switch's STM FingerTip S (4cd60d) touch controller
 *
 * Copyright (c) 2018 langerhans
- * Copyright (c) 2018 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -46,9 +46,10 @@
 #define STMFTS_SS_CX_TUNING            0xA4
 #define STMFTS_RELEASEINFO             0xAA
 #define STMFTS_WRITE_REG               0xB6
+#define STMFTS_AUTO_CALIBRATION        0xC3
 #define STMFTS_NOISE_WRITE             0xC7
 #define STMFTS_NOISE_READ              0xC8
-#define STMFTS_RW_FB_REG               0xD0 // read data
+#define STMFTS_RW_FRAMEBUFFER_REG      0xD0
 #define STMFTS_SAVE_CX_TUNING          0xFC

 #define STMFTS_UNK0 0xB8 //Request compensation
@@ -100,7 +101,7 @@ typedef struct _touch_event {
 	u16  type; // Event type.
 	u16  x;    // Horizontal coordinates.
 	u16  y;    // Vertical coordinates.
-	u8   z;
+	u32  z;
 	u8   fingers;
 	bool touch;
 } touch_event;
@@ -112,10 +113,18 @@ typedef struct _touch_info {
 	u16 config_ver;
 } touch_info;

-int touch_power_on();
-void touch_power_off();
+typedef struct _touch_fw_info_t {
+	u32 fw_id;
+	u16 ftb_ver;
+	u16 fw_rev;
+} touch_fw_info_t;
+
 void touch_poll(touch_event *event);
 touch_event touch_poll_wait();
+int touch_get_fw_info(touch_fw_info_t *fw);
 touch_info touch_get_info();
+int touch_execute_autotune();
+int touch_power_on();
+void touch_power_off();

 #endif /* __TOUCH_H_ */
--- a/nyx/nyx_gui/libs/lvgl/lv_misc/lv_mem.c
+++ b/nyx/nyx_gui/libs/lvgl/lv_misc/lv_mem.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2019-2020 CTCaer
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 /**
 * @file lv_mem.c
 * General and portable implementation of malloc and free.
@@ -11,6 +27,8 @@
 #include "lv_math.h"
 #include <string.h>

+#include <assert.h>
+
 #if LV_MEM_CUSTOM != 0
 #include LV_MEM_CUSTOM_INCLUDE
 #endif
@@ -41,9 +59,11 @@ typedef union {
        MEM_UNIT d_size: 31;    //Size off the data (1 means 4 bytes)
    };
    MEM_UNIT header;            //The header (used + d_size)
-    uint32_t align[7];          //Align header size to 32 bytes
+    uint32_t align[8];          //Align header size to 32 bytes
 } lv_mem_header_t;

+static_assert(sizeof(lv_mem_header_t) == 32, "Node header must be 32 bytes!");
+
 typedef struct {
    lv_mem_header_t header;
    uint8_t first_data;        /*First data byte in the allocated data (Just for easily create a pointer)*/
--- a/nyx/nyx_gui/mem/heap.c
+++ b/nyx/nyx_gui/mem/heap.c
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 * Copyright (c) 2018 M4xw
 *
 * This program is free software; you can redistribute it and/or modify it
--- a/nyx/nyx_gui/mem/heap.h
+++ b/nyx/nyx_gui/mem/heap.h
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/mem/minerva.c
+++ b/nyx/nyx_gui/mem/minerva.c
@@ -36,7 +36,7 @@ u32 minerva_init()
 	mtc_config_t *mtc_cfg = (mtc_config_t *)&nyx_str->mtc_cfg;

 	// Set table to nyx storage.
-	mtc_cfg->mtc_table = (emc_table_t *)&nyx_str->mtc_table;
+	mtc_cfg->mtc_table = (emc_table_t *)nyx_str->mtc_table;

 	// Check if Minerva is already initialized.
 	if (mtc_cfg->init_done == MTC_INIT_MAGIC)
@@ -60,6 +60,8 @@ u32 minerva_init()
 		// Ensure that Minerva is new.
 		if (mtc_tmp.init_done == MTC_INIT_MAGIC)
 			minerva_cfg = (void *)ep_addr;
+		else
+			mtc_cfg->init_done = 0;

 		// Copy Minerva context to Nyx storage.
 		if (minerva_cfg)
--- a/nyx/nyx_gui/mem/sdram.c
+++ b/nyx/nyx_gui/mem/sdram.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2018 naehrwert
 * Copyright (c) 2018 balika011
- * Copyright (c) 2019 CTCaer
+ * Copyright (c) 2019-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/nyx.c
+++ b/nyx/nyx_gui/nyx.c
@@ -217,10 +217,12 @@ void emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_t
 #define PATCHED_RELOC_ENTRY 0x40010000
 #define EXT_PAYLOAD_ADDR    0xC0000000
 #define RCM_PAYLOAD_ADDR    (EXT_PAYLOAD_ADDR + ALIGN(PATCHED_RELOC_SZ, 0x10))
-#define COREBOOT_ADDR       (0xD0000000 - 0x100000)
+#define COREBOOT_END_ADDR   0xD0000000
 #define CBFS_DRAM_EN_ADDR   0x4003e000
 #define  CBFS_DRAM_MAGIC    0x4452414D // "DRAM"

+static void *coreboot_addr;
+
 void reloc_patcher(u32 payload_dst, u32 payload_src, u32 payload_size)
 {
 	memcpy((u8 *)payload_src, (u8 *)NYX_LOAD_ADDR, PATCHED_RELOC_SZ);
@@ -234,7 +236,7 @@ void reloc_patcher(u32 payload_dst, u32 payload_src, u32 payload_size)

 	if (payload_size == 0x7000)
 	{
-		memcpy((u8 *)(payload_src + ALIGN(PATCHED_RELOC_SZ, 0x10)), (u8 *)COREBOOT_ADDR, 0x7000); //Bootblock
+		memcpy((u8 *)(payload_src + ALIGN(PATCHED_RELOC_SZ, 0x10)), coreboot_addr, 0x7000); //Bootblock
 		*(vu32 *)CBFS_DRAM_EN_ADDR = CBFS_DRAM_MAGIC;
 	}
 }
@@ -257,7 +259,6 @@ lv_res_t launch_payload(lv_obj_t *list)
 		if (f_open(&fp, path, FA_READ))
 		{
 			EPRINTFARGS("Payload file is missing!\n(%s)", path);
-			sd_unmount(false);

 			goto out;
 		}
@@ -269,13 +270,15 @@ lv_res_t launch_payload(lv_obj_t *list)
 		if (size < 0x30000)
 			buf = (void *)RCM_PAYLOAD_ADDR;
 		else
-			buf = (void *)COREBOOT_ADDR;
+		{
+			coreboot_addr = (void *)(COREBOOT_END_ADDR - size);
+			buf = coreboot_addr;
+		}

 		if (f_read(&fp, buf, size, NULL))
 		{
 			f_close(&fp);
-			sd_unmount(false);
-
+			
 			goto out;
 		}

@@ -304,6 +307,8 @@ lv_res_t launch_payload(lv_obj_t *list)
 	}

 out:
+	sd_unmount(false);
+
 	return LV_RES_OK;
 }

@@ -395,8 +400,6 @@ void nyx_init_load_res()
 	h_cfg.rcm_patched = fuse_check_patched_rcm();
 }

-extern void pivot_stack(u32 stack_top);
-
 #if (LV_LOG_PRINTF == 1)
 	#include "soc/clock.h"
 	#include "soc/gpio.h"
@@ -422,7 +425,7 @@ void ipl_main()
 	clock_enable_uart(UART_B);
 	uart_init(UART_B, 115200);

-	uart_send(UART_B, (u8 *)"Hekate-NYX: Hello!\r\n", 20);
+	uart_send(UART_B, (u8 *)"hekate-NYX: Hello!\r\n", 20);
 	uart_wait_idle(UART_B, UART_TX_IDLE);
 #endif

--- a/nyx/nyx_gui/power/max17050.h
+++ b/nyx/nyx_gui/power/max17050.h
@@ -4,7 +4,7 @@
 *
 * Copyright (c) 2011 Samsung Electronics
 * MyungJoo Ham <myungjoo.ham@samsung.com>
- * Copyright (c) 2018 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
--- a/nyx/nyx_gui/soc/bpmp.c
+++ b/nyx/nyx_gui/soc/bpmp.c
@@ -1,7 +1,7 @@
 /*
 * BPMP-Lite Cache/MMU and Frequency driver for Tegra X1
 *
- * Copyright (c) 2019 CTCaer
+ * Copyright (c) 2019-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/soc/bpmp.h
+++ b/nyx/nyx_gui/soc/bpmp.h
@@ -1,7 +1,7 @@
 /*
 * BPMP-Lite Cache/MMU and Frequency driver for Tegra X1
 *
- * Copyright (c) 2019 CTCaer
+ * Copyright (c) 2019-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/soc/clock.c
+++ b/nyx/nyx_gui/soc/clock.c
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/soc/clock.h
+++ b/nyx/nyx_gui/soc/clock.h
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/soc/hw_init.c
+++ b/nyx/nyx_gui/soc/hw_init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/soc/i2c.c
+++ b/nyx/nyx_gui/soc/i2c.c
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -19,7 +20,7 @@
 #include "i2c.h"
 #include "../utils/util.h"

-static u32 i2c_addrs[] = {
+static const u32 i2c_addrs[] = {
 	0x7000C000, 0x7000C400, 0x7000C500,
 	0x7000C700, 0x7000D000, 0x7000D100
 };
@@ -37,21 +38,39 @@ static void _i2c_wait(vu32 *base)

 static int _i2c_send_pkt(u32 idx, u32 x, u8 *buf, u32 size)
 {
-	if (size > 4)
+	if (size > 8)
 		return 0;

 	u32 tmp = 0;
-	memcpy(&tmp, buf, size);

 	vu32 *base = (vu32 *)i2c_addrs[idx];
-	base[I2C_CMD_ADDR0] = x << 1;                //Set x (send mode).
-	base[I2C_CMD_DATA1] = tmp;                   //Set value.
+	base[I2C_CMD_ADDR0] = x << 1; //Set x (send mode).
+
+	if (size > 4)
+	{
+		memcpy(&tmp, buf, 4);
+		base[I2C_CMD_DATA1] = tmp; //Set value.
+		tmp = 0;
+		memcpy(&tmp, buf + 4, size - 4);
+		base[I2C_CMD_DATA2] = tmp;
+	}
+	else
+	{
+		memcpy(&tmp, buf, size);
+		base[I2C_CMD_DATA1] = tmp; //Set value.
+	}
+
 	base[I2C_CNFG] = ((size - 1) << 1) | 0x2800; //Set size and send mode.
 	_i2c_wait(base);                             //Kick transaction.

 	base[I2C_CNFG] = (base[I2C_CNFG] & 0xFFFFFDFF) | 0x200;
+
+	u32 timeout = get_tmr_ms() + 1500;
 	while (base[I2C_STATUS] & 0x100)
-		;
+	{
+		if (get_tmr_ms() > timeout)
+			return 0;
+	}

 	if (base[I2C_STATUS] << 28)
 		return 0;
@@ -70,8 +89,13 @@ static int _i2c_recv_pkt(u32 idx, u8 *buf, u32 size, u32 x)
 	_i2c_wait(base);                             // Kick transaction.

 	base[I2C_CNFG] = (base[I2C_CNFG] & 0xFFFFFDFF) | 0x200;
+
+	u32 timeout = get_tmr_ms() + 1500;
 	while (base[I2C_STATUS] & 0x100)
-		;
+	{
+		if (get_tmr_ms() > timeout)
+			return 0;
+	}

 	if (base[I2C_STATUS] << 28)
 		return 0;
@@ -112,7 +136,7 @@ int i2c_send_buf_small(u32 idx, u32 x, u32 y, u8 *buf, u32 size)
 {
 	u8 tmp[4];

-	if (size > 3)
+	if (size > 7)
 		return 0;

 	tmp[0] = y;
@@ -121,6 +145,11 @@ int i2c_send_buf_small(u32 idx, u32 x, u32 y, u8 *buf, u32 size)
 	return _i2c_send_pkt(idx, x, tmp, size + 1);
 }

+int i2c_recv_buf(u8 *buf, u32 size, u32 idx, u32 x)
+{
+	return _i2c_recv_pkt(idx, buf, size, x);
+}
+
 int i2c_recv_buf_small(u8 *buf, u32 size, u32 idx, u32 x, u32 y)
 {
 	int res = _i2c_send_pkt(idx, x, (u8 *)&y, 1);
--- a/nyx/nyx_gui/soc/i2c.h
+++ b/nyx/nyx_gui/soc/i2c.h
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -39,6 +40,7 @@

 void i2c_init(u32 idx);
 int i2c_send_buf_small(u32 idx, u32 x, u32 y, u8 *buf, u32 size);
+int i2c_recv_buf(u8 *buf, u32 size, u32 idx, u32 x);
 int i2c_recv_buf_small(u8 *buf, u32 size, u32 idx, u32 x, u32 y);
 int i2c_send_byte(u32 idx, u32 x, u32 y, u8 b);
 u8 i2c_recv_byte(u32 idx, u32 x, u32 y);
--- a/nyx/nyx_gui/storage/nx_emmc.c
+++ b/nyx/nyx_gui/storage/nx_emmc.c
@@ -30,7 +30,7 @@ void nx_emmc_gpt_parse(link_t *gpt, sdmmc_storage_t *storage)
 	for (u32 i = 0; i < hdr->num_part_ents; i++)
 	{
 		gpt_entry_t *ent = (gpt_entry_t *)(buf + (hdr->part_ent_lba - 1) * NX_EMMC_BLOCKSIZE + i * sizeof(gpt_entry_t));
-		emmc_part_t *part = (emmc_part_t *)malloc(sizeof(emmc_part_t));
+		emmc_part_t *part = (emmc_part_t *)calloc(sizeof(emmc_part_t), 1);
 		part->lba_start = ent->lba_start;
 		part->lba_end = ent->lba_end;
 		part->attrs = ent->attrs;
--- a/nyx/nyx_gui/thermal/fan.c
+++ b/nyx/nyx_gui/thermal/fan.c
@@ -1,7 +1,7 @@
 /*
 * Fan driver for Nintendo Switch
 *
- * Copyright (c) 2018 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -37,7 +37,6 @@ void set_fan_duty(u32 duty)
 		PINMUX_AUX(PINMUX_AUX_CAM1_PWDN) = PINMUX_TRISTATE | PINMUX_INPUT_ENABLE | PINMUX_PULL_UP | 1;
 		gpio_config(GPIO_PORT_S, GPIO_PIN_7, GPIO_MODE_GPIO);
 		gpio_output_enable(GPIO_PORT_S, GPIO_PIN_7, GPIO_OUTPUT_DISABLE);
-		gpio_write(GPIO_PORT_S, GPIO_PIN_7, GPIO_LOW);

 		PWM(PWM_CONTROLLER_PWM_CSR_1) = PWM_CSR_EN | (1 << 24); // Max PWM to disable fan.

@@ -58,12 +57,19 @@ void set_fan_duty(u32 duty)
 	{
 		PWM(PWM_CONTROLLER_PWM_CSR_1) = PWM_CSR_EN | (1 << 24); // Bit 24 is absolute 0%.
 		regulator_disable_5v(REGULATOR_5V_FAN);
+
+		// Disable fan.
+		PINMUX_AUX(PINMUX_AUX_LCD_GPIO2) =
+				PINMUX_INPUT_ENABLE | PINMUX_PARKED |  PINMUX_TRISTATE | PINMUX_PULL_DOWN; // Set source to PWM1.
 	}
 	else // Set PWM duty.
 	{
 		// Fan power supply.
 		regulator_enable_5v(REGULATOR_5V_FAN);
 		PWM(PWM_CONTROLLER_PWM_CSR_1) = PWM_CSR_EN | (inv_duty << 16);
+
+		// Enable fan.
+		PINMUX_AUX(PINMUX_AUX_LCD_GPIO2) = 1; // Set source to PWM1.
 	}

 	curr_duty = duty;
--- a/nyx/nyx_gui/utils/list.h
+++ b/nyx/nyx_gui/utils/list.h
@@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/utils/sprintf.c
+++ b/nyx/nyx_gui/utils/sprintf.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2018 naehrwert
-* Copyright (c) 2019 CTCaer
+* Copyright (c) 2019-2020 CTCaer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
--- a/nyx/nyx_gui/utils/util.h
+++ b/nyx/nyx_gui/utils/util.h
@@ -57,7 +57,7 @@ typedef struct _nyx_storage_t
 	u8  rsvd[0x800000 - sizeof(nyx_info_t)];
 	nyx_info_t info;
 	mtc_config_t mtc_cfg;
-	emc_table_t mtc_table;
+	emc_table_t mtc_table[10];
 } nyx_storage_t;

 u32 get_tmr_us();
Author	SHA1	Message	Date
CTCaer	9c2202fa39	Bump hekate to v5.1.3 and Nyx to v0.8.6	2020-03-21 22:30:39 +02:00
CTCaer	9c6931a17c	Bugfixes The fan driver change ensures power off in any situation where a chainload software re-enables the 5V regulator.	2020-03-21 22:28:50 +02:00
CTCaer	976925c697	nyx: Allow cancellation of emuMMC creation	2020-03-21 22:27:17 +02:00
CTCaer	d50af46b03	chnldr: Support variable sizes of coreboot.rom	2020-03-21 22:18:40 +02:00
CTCaer	3405910f4c	hwinit: Disable SD Card power on boot Fixes issues with warmboot based reboots.	2020-03-21 22:13:18 +02:00
CTCaer	52874f9113	minerva: More protections	2020-03-21 22:10:06 +02:00
CTCaer	91a241dafa	touch: Add Tuning Calibration This, for now, can be done at Nyx boot by holding VOL- and VOL+. Make sure that you don't touch the touchscreen.	2020-03-21 22:03:51 +02:00
CTCaer	a8db070755	fss: Fix launching CFW on sys for < 7.0.0	2020-03-21 13:15:24 +02:00
CTCaer	76676f3a2e	nyx: Allow for big filepaths for archive bit fixer It also fixes corruptions/hangs when path is bigger than 255 chars	2020-03-18 06:30:11 +02:00
CTCaer	f5040f1e41	Update and add missing copyrights Probably more need to change.	2020-03-14 09:24:24 +02:00
CTCaer	c9c3c8f716	touch: Add context based ready checks on init	2020-03-13 17:36:44 +02:00
CTCaer	144d6fd3f6	i2c: Update drivers Adds support for 8 byte transfers needed by touch driver changes.	2020-03-13 10:25:27 +02:00
CTCaer	9697067466	touch: Add fw info	2020-03-13 08:48:20 +02:00
CTCaer	8539095bdb	touch: Proper init This patch applies the simpler init from HOS driver. The most important change is enabling a feature that the fw supports: Automatic tuning and calibration based on saved tuning values (running HOS only once saves these).	2020-03-13 08:39:38 +02:00
CTCaer	95e3159fe9	touch: Correct pressure calculation Fingertip S for Nintendo Switch uses a custom spatial calculation. It now allows to identify area of touch.	2020-03-13 08:34:16 +02:00
CTCaer	8b74c487eb	exo: Add support for fatal version AFE2	2020-03-09 09:09:25 +02:00
CTCaer	8abda7f259	fss0: Support experimental content Use key `fss0experimental=1` in a boot entry with `fss0=` defined to enable experimental content. (Older versions of hekate will just skip any experimental content.)	2020-03-09 08:58:12 +02:00
CTCaer	8d5c52f087	lvgl heap: Fix critical issue with node header size This fixes a critical issue where the node header was 28 bytes instead of 32, causing misalignment and heap corruption.	2020-03-09 08:39:31 +02:00
CTCaer	e6c1d9bf66	nyx: Simplify label sets - Use only lv_label_set_text to simplify label sets - Fix an issue with a label cut - Add more maintenance functions for DRAM training	2020-03-09 08:37:41 +02:00
CTCaer	a52af1bf41	Fix building on make 4.3	2020-03-04 01:34:35 +02:00