From 432d4a4ffabe1e976383c9e55f7388da7fe916bf Mon Sep 17 00:00:00 2001 From: CTCaer Date: Tue, 8 Jun 2021 05:57:00 +0300 Subject: [PATCH] Use bit_count for burnt fuses counting --- bootloader/frontend/fe_info.c | 2 +- bootloader/hos/pkg1.c | 3 ++- nyx/nyx_gui/frontend/gui_info.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bootloader/frontend/fe_info.c b/bootloader/frontend/fe_info.c index a358b4f..693b0ea 100644 --- a/bootloader/frontend/fe_info.c +++ b/bootloader/frontend/fe_info.c @@ -61,7 +61,7 @@ void print_fuseinfo() break; } gfx_printf("Sdram ID: %d\n", fuse_read_dramid(true)); - gfx_printf("Burnt fuses: %d / 64\n", fuse_count_burnt(fuse_read_odm(7))); + gfx_printf("Burnt fuses: %d / 64\n", bit_count(fuse_read_odm(7))); gfx_printf("Secure key: %08X%08X%08X%08X\n\n\n", byte_swap_32(FUSE(FUSE_PRIVATE_KEY0)), byte_swap_32(FUSE(FUSE_PRIVATE_KEY1)), byte_swap_32(FUSE(FUSE_PRIVATE_KEY2)), byte_swap_32(FUSE(FUSE_PRIVATE_KEY3))); diff --git a/bootloader/hos/pkg1.c b/bootloader/hos/pkg1.c index b3f3996..72dc9e5 100644 --- a/bootloader/hos/pkg1.c +++ b/bootloader/hos/pkg1.c @@ -32,6 +32,7 @@ #include #include #include +#include extern hekate_config h_cfg; @@ -355,7 +356,7 @@ int pkg1_warmboot_config(void *hos_ctxt, u32 warmboot_base) u32 pa_id; u32 fuses_max = 32; // Current ODM7 max. u32 fuses_fw = ctxt->pkg1_id->fuses; - u8 burnt_fuses = fuse_count_burnt(fuse_read_odm(7)); + u8 burnt_fuses = bit_count(fuse_read_odm(7)); // Save current warmboot in storage cache (MWS) and check if another one is needed. if (!ctxt->warmboot) diff --git a/nyx/nyx_gui/frontend/gui_info.c b/nyx/nyx_gui/frontend/gui_info.c index deeddec..f3448e7 100644 --- a/nyx/nyx_gui/frontend/gui_info.c +++ b/nyx/nyx_gui/frontend/gui_info.c @@ -686,8 +686,8 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn) } // Count burnt fuses. - u8 burnt_fuses_7 = fuse_count_burnt(fuse_read_odm(7)); - u8 burnt_fuses_6 = fuse_count_burnt(fuse_read_odm(6)); + u8 burnt_fuses_7 = bit_count(fuse_read_odm(7)); + u8 burnt_fuses_6 = bit_count(fuse_read_odm(6)); switch (burnt_fuses_7) {