nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-07-06 16:33:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes

Browse source
This commit is contained in:
CTCaer 2020-06-14 12:50:54 +03:00
parent 31f90a0a47
commit 87ce09f4b1
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootloader/config/config.c
View file

@ -22,6 +22,7 @@
#include "../gfx/gfx.h" #include "../gfx/gfx.h"
#include "../gfx/tui.h" #include "../gfx/tui.h"
#include "../libs/fatfs/ff.h" #include "../libs/fatfs/ff.h"
#include "../soc/fuse.h"
#include "../soc/t210.h" #include "../soc/t210.h"
#include "../storage/nx_sd.h" #include "../storage/nx_sd.h"
#include "../storage/sdmmc.h" #include "../storage/sdmmc.h"

9
bootloader/frontend/fe_emmc_tools.c
View file

@ -48,7 +48,6 @@ static int _dump_emmc_verify(sdmmc_storage_t *storage, u32 lba_curr, char *outFi
{ {
FIL fp; FIL fp;
u8 sparseShouldVerify = 4; u8 sparseShouldVerify = 4;
u32 btn = 0;
u32 prevPct = 200; u32 prevPct = 200;
u32 sdFileSector = 0; u32 sdFileSector = 0;
int res = 0; int res = 0;
@ -121,8 +120,7 @@ static int _dump_emmc_verify(sdmmc_storage_t *storage, u32 lba_curr, char *outFi
sdFileSector += num; sdFileSector += num;
sparseShouldVerify++; sparseShouldVerify++;
btn = btn_wait_timeout(0, BTN_VOL_DOWN | BTN_VOL_UP); if (btn_read_vol() == (BTN_VOL_UP | BTN_VOL_DOWN))
if ((btn & BTN_VOL_DOWN) && (btn & BTN_VOL_UP))
{ {
gfx_con.fntsz = 16; gfx_con.fntsz = 16;
WPRINTF("\n\nVerification was cancelled!"); WPRINTF("\n\nVerification was cancelled!");
@ -169,7 +167,6 @@ static int _dump_emmc_part(char *sd_path, sdmmc_storage_t *storage, emmc_part_t
u32 currPartIdx = 0; u32 currPartIdx = 0;
u32 numSplitParts = 0; u32 numSplitParts = 0;
u32 maxSplitParts = 0; u32 maxSplitParts = 0;
u32 btn = 0;
bool isSmallSdCard = false; bool isSmallSdCard = false;
bool partialDumpInProgress = false; bool partialDumpInProgress = false;
int res = 0; int res = 0;
@ -415,8 +412,8 @@ static int _dump_emmc_part(char *sd_path, sdmmc_storage_t *storage, emmc_part_t
bytesWritten = 0; bytesWritten = 0;
} }
btn = btn_wait_timeout(0, BTN_VOL_DOWN | BTN_VOL_UP); // Check for cancellation combo.
if ((btn & BTN_VOL_DOWN) && (btn & BTN_VOL_UP)) if (btn_read_vol() == (BTN_VOL_UP | BTN_VOL_DOWN))
{ {
gfx_con.fntsz = 16; gfx_con.fntsz = 16;
WPRINTF("\n\nThe backup was cancelled!"); WPRINTF("\n\nThe backup was cancelled!");

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

@ -378,7 +378,7 @@ static void _migrate_sd_raw_based()
f_close(&fp); f_close(&fp);
save_emummc_cfg(1, mbr_ctx.sector_start, "emuMMC/ER00"); save_emummc_cfg(1, mbr_ctx.sector_start, "emuMMC/ER00");
sd_unmount(false); sd_unmount();
} }
static void _migrate_sd_raw_emummc_based() static void _migrate_sd_raw_emummc_based()