From 6d556bf21309839bf49ffba608a6935952c7e890 Mon Sep 17 00:00:00 2001 From: Kostas Missos Date: Fri, 6 Jul 2018 16:11:51 +0300 Subject: [PATCH] Remove null term from "" as suggested Additionally rename the archive bits again ( :) ) to have a little better syntax. --- ipl/config.c | 8 ++++---- ipl/main.c | 12 ++++++------ ipl/se.c | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ipl/config.c b/ipl/config.c index 2951a55..7544832 100644 --- a/ipl/config.c +++ b/ipl/config.c @@ -272,7 +272,7 @@ void config_bootdelay() else delay_text[i * 32] = '*'; delay_text[i * 32 + 1] = i + '0'; - memcpy(delay_text + i * 32 + 2, " seconds\0", 9); + memcpy(delay_text + i * 32 + 2, " seconds", 9); ments[i + 2].type = MENT_CHOICE; ments[i + 2].caption = delay_text + i * 32; @@ -389,9 +389,9 @@ void config_verification() ments[1].type = MENT_CHGLINE; - memcpy(vr_text, " Disable\0", 9); - memcpy(vr_text + 64, " Sparse (Fast - Not reliable)\0", 31); - memcpy(vr_text + 128, " Full (Slow - 100% reliable)\0", 31); + memcpy(vr_text, " Disable", 9); + memcpy(vr_text + 64, " Sparse (Fast - Not reliable)", 31); + memcpy(vr_text + 128, " Full (Slow - 100% reliable)", 31); for (u32 i = 0; i < 3; i++) { diff --git a/ipl/main.c b/ipl/main.c index 85d6217..cc1467f 100755 --- a/ipl/main.c +++ b/ipl/main.c @@ -392,7 +392,7 @@ void print_fuseinfo() char fuseFilename[23]; f_mkdir("Backup"); f_mkdir("Backup/Dumps"); - memcpy(fuseFilename, "Backup/Dumps/fuses.bin\0", 23); + memcpy(fuseFilename, "Backup/Dumps/fuses.bin", 23); if (sd_save_to_file((u8 *)0x7000F900, 0x2FC, fuseFilename)) EPRINTF("\nError creating fuse.bin file."); @@ -427,7 +427,7 @@ void print_kfuseinfo() char kfuseFilename[24]; f_mkdir("Backup"); f_mkdir("Backup/Dumps"); - memcpy(kfuseFilename, "Backup/Dumps/kfuses.bin\0", 24); + memcpy(kfuseFilename, "Backup/Dumps/kfuses.bin", 24); if (sd_save_to_file((u8 *)buf, KFUSE_NUM_WORDS * 4, kfuseFilename)) EPRINTF("\nError creating kfuse.bin file."); @@ -845,7 +845,7 @@ int dump_emmc_part(char *sd_path, sdmmc_storage_t *storage, emmc_part_t *part) FIL partialIdxFp; char partialIdxFilename[12]; - memcpy(partialIdxFilename, "partial.idx\0", 12); + memcpy(partialIdxFilename, "partial.idx", 12); gfx_con.fntsz = 8; gfx_printf(&gfx_con, "\nSD Card free space: %d MiB, Total backup size %d MiB\n\n", @@ -2168,7 +2168,7 @@ void print_battery_info() char fuelFilename[28]; f_mkdir("Backup"); f_mkdir("Backup/Dumps"); - memcpy(fuelFilename, "Backup/Dumps/fuel_gauge.bin\0", 28); + memcpy(fuelFilename, "Backup/Dumps/fuel_gauge.bin", 28); if (sd_save_to_file((u8 *)buf, 0x200, fuelFilename)) EPRINTF("\nError creating fuel.bin file."); @@ -2446,8 +2446,8 @@ ment_t ment_tools[] = { MDEF_CAPTION("-------- Misc --------", 0xFF0AB9E6), MDEF_HANDLER("Dump package1", dump_package1), MDEF_HANDLER("Fix battery de-sync", fix_battery_desync), - MDEF_HANDLER("Unset switch archive attributes", fix_sd_switch_attr), - MDEF_HANDLER("Unset all archive attributes", fix_sd_all_attr), + MDEF_HANDLER("Unset archive bit (switch folder)", fix_sd_switch_attr), + MDEF_HANDLER("Unset archive bit (all sd files)", fix_sd_all_attr), //MDEF_HANDLER("Fix fuel gauge configuration", fix_fuel_gauge_configuration), //MDEF_HANDLER("Reset all battery cfg", reset_pmic_fuel_gauge_charger_config), MDEF_CHGLINE(), diff --git a/ipl/se.c b/ipl/se.c index 9d0f92d..805420b 100755 --- a/ipl/se.c +++ b/ipl/se.c @@ -259,7 +259,8 @@ int se_aes_xts_crypt(u32 ks1, u32 ks2, u32 enc, u64 sec, void *dst, void *src, u } // se_calc_sha256() was derived from Atmosphère's se_calculate_sha256. -int se_calc_sha256(void *dst, const void *src, u32 src_size) { +int se_calc_sha256(void *dst, const void *src, u32 src_size) +{ int res; // Setup config for SHA256, size = BITS(src_size). SE(SE_CONFIG_REG_OFFSET) = SE_CONFIG_ENC_MODE(MODE_SHA256) | SE_CONFIG_ENC_ALG(ALG_SHA) | SE_CONFIG_DST(DST_HASHREG);