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

hekate/nyx: utilize emmc_end

Browse source
This commit is contained in:
CTCaer 2022-10-11 04:19:29 +03:00
parent 07695196cb
commit 5392971c2c
13 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootloader/frontend/fe_emmc_tools.c
View file

@ -557,7 +557,7 @@ static void _dump_emmc_selected(emmcPartType_t dumpType)
gfx_putc('\n'); gfx_putc('\n');
timer = get_tmr_s() - timer; timer = get_tmr_s() - timer;
gfx_printf("Time taken: %dm %ds.\n", timer / 60, timer % 60); gfx_printf("Time taken: %dm %ds.\n", timer / 60, timer % 60);
sdmmc_storage_end(&emmc_storage); emmc_end();
if (res) if (res)
gfx_printf("\n%kFinished and verified!%k\nPress any key...\n", TXT_CLR_GREENISH, TXT_CLR_DEFAULT); gfx_printf("\n%kFinished and verified!%k\nPress any key...\n", TXT_CLR_GREENISH, TXT_CLR_DEFAULT);
@ -892,7 +892,7 @@ static void _restore_emmc_selected(emmcPartType_t restoreType)
gfx_putc('\n'); gfx_putc('\n');
timer = get_tmr_s() - timer; timer = get_tmr_s() - timer;
gfx_printf("Time taken: %dm %ds.\n", timer / 60, timer % 60); gfx_printf("Time taken: %dm %ds.\n", timer / 60, timer % 60);
sdmmc_storage_end(&emmc_storage); emmc_end();
if (res) if (res)
gfx_printf("\n%kFinished and verified!%k\nPress any key...\n", TXT_CLR_GREENISH, TXT_CLR_DEFAULT); gfx_printf("\n%kFinished and verified!%k\nPress any key...\n", TXT_CLR_GREENISH, TXT_CLR_DEFAULT);

2
bootloader/frontend/fe_info.c
View file

@ -239,7 +239,7 @@ void print_mmc_info()
} }
out: out:
sdmmc_storage_end(&emmc_storage); emmc_end();
btn_wait(); btn_wait();
} }

6
bootloader/frontend/fe_tools.c
View file

@ -233,7 +233,7 @@ out_free:
free(warmboot); free(warmboot);
free(loader); free(loader);
free(pkg2); free(pkg2);
sdmmc_storage_end(&emmc_storage); emmc_end();
sd_end(); sd_end();
if (kb >= KB_FIRMWARE_VERSION_620) if (kb >= KB_FIRMWARE_VERSION_620)
@ -280,7 +280,7 @@ void _toggle_autorcm(bool enable)
} }
free(tempbuf); free(tempbuf);
sdmmc_storage_end(&emmc_storage); emmc_end();
if (enable) if (enable)
gfx_printf("%kAutoRCM mode enabled!%k", TXT_CLR_ORANGE, TXT_CLR_DEFAULT); gfx_printf("%kAutoRCM mode enabled!%k", TXT_CLR_ORANGE, TXT_CLR_DEFAULT);
@ -333,7 +333,7 @@ void menu_autorcm()
disabled = false; disabled = false;
free(tempbuf); free(tempbuf);
sdmmc_storage_end(&emmc_storage); emmc_end();
// Create AutoRCM menu. // Create AutoRCM menu.
ment_t *ments = (ment_t *)malloc(sizeof(ment_t) * 6); ment_t *ments = (ment_t *)malloc(sizeof(ment_t) * 6);

4
bootloader/hos/hos.c
View file

@ -1067,7 +1067,7 @@ int hos_launch(ini_sec_t *cfg)
// Unmount SD card and eMMC. // Unmount SD card and eMMC.
sd_end(); sd_end();
sdmmc_storage_end(&emmc_storage); emmc_end();
gfx_printf("Rebuilt & loaded pkg2\n\n%kBooting...%k\n", TXT_CLR_GREENISH, TXT_CLR_DEFAULT); gfx_printf("Rebuilt & loaded pkg2\n\n%kBooting...%k\n", TXT_CLR_GREENISH, TXT_CLR_DEFAULT);
@ -1176,7 +1176,7 @@ int hos_launch(ini_sec_t *cfg)
bpmp_halt(); bpmp_halt();
error: error:
sdmmc_storage_end(&emmc_storage); emmc_end();
return 0; return 0;
} }

2
bootloader/main.c
View file

@ -80,7 +80,7 @@ void emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_t
memcpy(path + strlen(path), filename, filename_len + 1); memcpy(path + strlen(path), filename, filename_len + 1);
if (init_done) if (init_done)
sdmmc_storage_end(&emmc_storage); emmc_end();
} }
void render_default_bootlogo() void render_default_bootlogo()

2
bootloader/storage/emummc.c
View file

@ -177,7 +177,7 @@ out:
int emummc_storage_end() int emummc_storage_end()
{ {
if (!emu_cfg.enabled || h_cfg.emummc_force_disable) if (!emu_cfg.enabled || h_cfg.emummc_force_disable)
sdmmc_storage_end(&emmc_storage); emmc_end();
else else
sd_end(); sd_end();

4
nyx/nyx_gui/frontend/fe_emmc_tools.c
View file

@ -912,7 +912,7 @@ void dump_emmc_selected(emmcPartType_t dumpType, emmc_tool_gui_t *gui)
} }
timer = get_tmr_s() - timer; timer = get_tmr_s() - timer;
sdmmc_storage_end(&emmc_storage); emmc_end();
if (res && n_cfg.verification && !gui->raw_emummc) if (res && n_cfg.verification && !gui->raw_emummc)
s_printf(txt_buf, "Time taken: %dm %ds.\n#96FF00 Finished and verified!#", timer / 60, timer % 60); s_printf(txt_buf, "Time taken: %dm %ds.\n#96FF00 Finished and verified!#", timer / 60, timer % 60);
@ -1536,7 +1536,7 @@ void restore_emmc_selected(emmcPartType_t restoreType, emmc_tool_gui_t *gui)
} }
timer = get_tmr_s() - timer; timer = get_tmr_s() - timer;
sdmmc_storage_end(&emmc_storage); emmc_end();
if (res && n_cfg.verification && !gui->raw_emummc) if (res && n_cfg.verification && !gui->raw_emummc)
s_printf(txt_buf, "Time taken: %dm %ds.\n#96FF00 Finished and verified!#", timer / 60, timer % 60); s_printf(txt_buf, "Time taken: %dm %ds.\n#96FF00 Finished and verified!#", timer / 60, timer % 60);

6
nyx/nyx_gui/frontend/fe_emummc_tools.c
View file

@ -474,7 +474,7 @@ void dump_emummc_file(emmc_tool_gui_t *gui)
out_failed: out_failed:
timer = get_tmr_s() - timer; timer = get_tmr_s() - timer;
sdmmc_storage_end(&emmc_storage); emmc_end();
if (res) if (res)
{ {
@ -864,7 +864,7 @@ void dump_emummc_raw(emmc_tool_gui_t *gui, int part_idx, u32 sector_start, u32 r
{ {
s_printf(gui->txt_buf, "#FFDD00 For formatting USER partition,#\n#FFDD00 BIS keys are needed!#\n"); s_printf(gui->txt_buf, "#FFDD00 For formatting USER partition,#\n#FFDD00 BIS keys are needed!#\n");
lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf); lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf);
sdmmc_storage_end(&emmc_storage); emmc_end();
goto out; goto out;
} }
@ -952,7 +952,7 @@ void dump_emummc_raw(emmc_tool_gui_t *gui, int part_idx, u32 sector_start, u32 r
out_failed: out_failed:
timer = get_tmr_s() - timer; timer = get_tmr_s() - timer;
sdmmc_storage_end(&emmc_storage); emmc_end();
if (res) if (res)
{ {

2
nyx/nyx_gui/frontend/gui_emmc_tools.c
View file

@ -33,8 +33,6 @@ extern hekate_config h_cfg;
extern char *emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_t *storage); extern char *emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_t *storage);
lv_obj_t *ums_mbox;
typedef struct _emmc_backup_buttons_t typedef struct _emmc_backup_buttons_t
{ {
lv_obj_t *emmc_boot; lv_obj_t *emmc_boot;

4
nyx/nyx_gui/frontend/gui_emummc_tools.c
View file

@ -221,7 +221,7 @@ static void _create_mbox_emummc_raw()
u32 emmc_size_safe = emmc_storage.sec_cnt + 0xC000; // eMMC GPP size + BOOT0/1. u32 emmc_size_safe = emmc_storage.sec_cnt + 0xC000; // eMMC GPP size + BOOT0/1.
sdmmc_storage_end(&emmc_storage); emmc_end();
for (int i = 1; i < 4; i++) for (int i = 1; i < 4; i++)
{ {
@ -838,7 +838,7 @@ static lv_res_t _create_mbox_emummc_migrate(lv_obj_t *btn)
backup = backup && rawnand_backup; backup = backup && rawnand_backup;
sd_unmount(); sd_unmount();
sdmmc_storage_end(&emmc_storage); emmc_end();
// Check available types and enable the corresponding buttons. // Check available types and enable the corresponding buttons.
if (backup) if (backup)

8
nyx/nyx_gui/frontend/gui_info.c
View file

@ -376,7 +376,7 @@ static lv_res_t _create_mbox_cal0(lv_obj_t *btn)
out: out:
free(txt_buf); free(txt_buf);
sd_unmount(); sd_unmount();
sdmmc_storage_end(&emmc_storage); emmc_end();
lv_mbox_add_btns(mbox, mbox_btn_map, _cal0_dump_window_action); lv_mbox_add_btns(mbox, mbox_btn_map, _cal0_dump_window_action);
@ -1132,7 +1132,7 @@ static lv_res_t _create_mbox_emmc_sandisk_report(lv_obj_t * btn)
} }
int res = sdmmc_storage_vendor_sandisk_report(&emmc_storage, buf); int res = sdmmc_storage_vendor_sandisk_report(&emmc_storage, buf);
sdmmc_storage_end(&emmc_storage); emmc_end();
if (!res) if (!res)
{ {
@ -1516,7 +1516,7 @@ error:
if (sd_bench) if (sd_bench)
sd_unmount(); sd_unmount();
else else
sdmmc_storage_end(&emmc_storage); emmc_end();
out: out:
free(txt_buf); free(txt_buf);
@ -1789,7 +1789,7 @@ static lv_res_t _create_window_emmc_info_status(lv_obj_t *btn)
} }
out: out:
sdmmc_storage_end(&emmc_storage); emmc_end();
free(txt_buf); free(txt_buf);
return LV_RES_OK; return LV_RES_OK;

4
nyx/nyx_gui/frontend/gui_tools.c
View file

@ -124,7 +124,7 @@ bool get_autorcm_status(bool toggle)
out: out:
free(tempbuf); free(tempbuf);
sdmmc_storage_end(&emmc_storage); emmc_end();
return enabled; return enabled;
} }
@ -1422,7 +1422,7 @@ out_free:
free(loader); free(loader);
free(pkg2); free(pkg2);
free(txt_buf); free(txt_buf);
sdmmc_storage_end(&emmc_storage); emmc_end();
sd_unmount(); sd_unmount();
if (kb >= KB_FIRMWARE_VERSION_620) if (kb >= KB_FIRMWARE_VERSION_620)

2
nyx/nyx_gui/nyx.c
View file

@ -63,7 +63,7 @@ char *emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_
else else
{ {
itoa(emmc_storage.cid.serial, emmc_sn, 16); itoa(emmc_storage.cid.serial, emmc_sn, 16);
sdmmc_storage_end(&emmc_storage); emmc_end();
} }
} }
else else