sept: Correct bct buffer pointer and turn on backlight on error

CTCaer · Feb 6, 2021 · b6e458e · b6e458e
1 parent c5152f6
commit b6e458e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/bootloader/hos/sept.c b/bootloader/hos/sept.c
@@ -33,6 +33,7 @@
 #include <storage/sdmmc.h>
 #include <utils/btn.h>
 #include <utils/types.h>
+#include <utils/util.h>
 
 #include <gfx_utils.h>
 
@@ -129,13 +130,17 @@ void check_sept(ini_sec_t *cfg_sec)
 		}
 
 		u8 *bct_bldr = (u8 *)calloc(1, 512);
-		sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, &bct_bldr);
+		sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, bct_bldr);
 		u32 bootloader_entrypoint = *(u32 *)&bct_bldr[0x144];
 		free(bct_bldr);
 		if (bootloader_entrypoint > SEPT_PRI_ENTRY)
 		{
 			gfx_con.mute = false;
 			EPRINTF("Failed to run sept\n""Main BCT is improper!\nRun sept with proper BCT at least once\nto cache keys.");
+			gfx_printf("\nPress any key...\n");
+			display_backlight_brightness(h_cfg.backlight, 1000);
+			msleep(500);
+			btn_wait();
 			goto out_free;
 		}
 

diff --git a/bootloader/hos/sept.h b/bootloader/hos/sept.h
@@ -20,6 +20,6 @@
 #include <utils/types.h>
 
 void check_sept(ini_sec_t *cfg_sec);
-int reboot_to_sept(const u8 *tsec_fw, u32 kb, ini_sec_t *cfg_sec);
+int  reboot_to_sept(const u8 *tsec_fw, u32 kb, ini_sec_t *cfg_sec);
 
 #endif
diff --git a/nyx/nyx_gui/frontend/gui_info.c b/nyx/nyx_gui/frontend/gui_info.c
@@ -371,13 +371,13 @@ static lv_res_t _create_mbox_cal0(lv_obj_t *btn)
 		{
 			// Check that BCT is proper so sept can run.
 			u8 *bct_bldr = (u8 *)calloc(1, 512);
-			sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, &bct_bldr);
+			sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, bct_bldr);
 			u32 bootloader_entrypoint = *(u32 *)&bct_bldr[0x144];
 			free(bct_bldr);
 			if (bootloader_entrypoint > SEPT_PRI_ENTRY)
 			{
-				lv_label_set_text(lb_desc, "#FFDD00 Failed to run sept because main BCT is improper!#\n"
-					"#FFDD00 Run sept with proper BCT at least once to cache keys.#\n");
+				lv_label_set_text(lb_desc, "#FFDD00 Main BCT is improper! Failed to run sept.#\n"
+					"#FFDD00 Run sept with proper BCT at least once#\n#FFDD00 to cache keys.#\n");
 				goto out;
 			}
 

diff --git a/nyx/nyx_gui/frontend/gui_tools.c b/nyx/nyx_gui/frontend/gui_tools.c
@@ -1160,7 +1160,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
 			{
 				// Check that BCT is proper so sept can run.
 				u8 *bct_bldr = (u8 *)calloc(1, 512);
-				sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, &bct_bldr);
+				sdmmc_storage_read(&emmc_storage, 0x2200 / NX_EMMC_BLOCKSIZE, 1, bct_bldr);
 				u32 bootloader_entrypoint = *(u32 *)&bct_bldr[0x144];
 				free(bct_bldr);
 				if (bootloader_entrypoint > SEPT_PRI_ENTRY)