OmniNX/hekate
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CTCaer/hekate
All checks were successful
Build / Build (push) Successful in 26s
Details

Browse Source
This commit is contained in:
Niklas Friesen
2026-06-17 00:36:24 +02:00
parent e57b287c0d e487de8fdd
commit 064681928f
10 changed files with 948 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

257
nyx/nyx_gui/frontend/gui_info.c
View File

@@ -413,7 +413,7 @@ hw_info_t *hw_info = NULL;
//! TODO: Limits assumed based on known samples.
#define WAFER_20NM_X_MIN -9
#define WAFER_20NM_X_MAX 15
#define WAFER_20NM_X_MAX 16
#define WAFER_20NM_Y_MIN 1
#define WAFER_20NM_Y_MAX 24
@@ -1618,8 +1618,171 @@ static lv_res_t _create_mbox_emmc_sandisk_report(lv_obj_t * btn)
out:
free(buf);
free (txt_buf);
free (txt_buf2);
free(txt_buf);
free(txt_buf2);
lv_mbox_add_btns(mbox, mbox_btn_map, nyx_mbox_action); // Important. After set_text.
lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0);
lv_obj_set_top(mbox, true);
return LV_RES_OK;
}
static lv_res_t _create_mbox_sd_vendor_info(lv_obj_t * btn)
{
lv_obj_t *dark_bg = lv_obj_create(lv_layer_top(), NULL);
lv_obj_set_style(dark_bg, &mbox_darken);
lv_obj_set_size(dark_bg, LV_HOR_RES, LV_VER_RES);
static const char * mbox_btn_map[] = { "\251", "\222Close", "\251", "" };
lv_obj_t * mbox = lv_mbox_create(dark_bg, NULL);
lv_mbox_set_recolor_text(mbox, true);
lv_obj_set_width(mbox, LV_HOR_RES / 9 * 5);
lv_mbox_set_text(mbox, "#C7EA46 SD Vendor/Reserved Data#\nPlease wait..");
manual_system_maintenance(true);
u8 *buf = zalloc(EMMC_BLOCKSIZE);
char *txt_buf = (char *)malloc(SZ_32K);
char *txt_buf2 = (char *)malloc(SZ_32K);
txt_buf[0] = 0;
txt_buf2[0] = 0;
// Create SoC Info container.
lv_obj_t *h1 = lv_cont_create(mbox, NULL);
lv_cont_set_style(h1, &lv_style_transp_tight);
lv_cont_set_fit(h1, false, true);
lv_obj_set_width(h1, (LV_HOR_RES / 9) * 4);
lv_obj_set_click(h1, false);
lv_cont_set_layout(h1, LV_LAYOUT_OFF);
lv_obj_t * lb_desc = lv_label_create(h1, NULL);
lv_label_set_long_mode(lb_desc, LV_LABEL_LONG_BREAK);
lv_label_set_recolor(lb_desc, true);
lv_label_set_style(lb_desc, &monospace_text);
lv_obj_set_width(lb_desc, LV_HOR_RES / 9 * 2);
lv_obj_t * lb_desc2 = lv_label_create(h1, NULL);
lv_label_set_long_mode(lb_desc2, LV_LABEL_LONG_BREAK);
lv_label_set_recolor(lb_desc2, true);
lv_label_set_style(lb_desc2, &monospace_text);
lv_obj_set_width(lb_desc2, LV_HOR_RES / 9 * 2);
lv_obj_align(lb_desc2, lb_desc, LV_ALIGN_OUT_RIGHT_TOP, 0, 0);
if (sd_mount())
{
lv_label_set_text(lb_desc, "#FFDD00 Failed to init SD!#");
goto out;
}
sd_vendor_info_t sd_info;
sd_storage_get_vendor_info(&sd_storage, &sd_info);
s_printf(txt_buf,
"#00DDFF Vendor/Reserved Registers#\n"
"#FF8000 CID[023:020]:# %X\n\n"
"#FF8000 CSD[009:008]:# %X\n"
"#FF8000 CSD[020:016]:# %02X\n"
"#FF8000 CSD[030:029]:# %X\n"
"#FF8000 CSD[125:120]:# %02X\n"
"#FF8000 SCR Vendor:# %08X\n"
"#FF8000 SCR[037:036]:# %X\n\n"
"#FF8000 SSR[031:000]:# %08X\n"
"#FF8000 SSR[063:032]:# %08X\n"
"#FF8000 SSR[095:064]:# %08X\n"
"#FF8000 SSR[127:096]:# %08X\n"
"#FF8000 SSR[159:128]:# %08X\n"
"#FF8000 SSR[191:160]:# %08X\n"
"#FF8000 SSR[223:192]:# %08X\n"
"#FF8000 SSR[255:224]:# %08X\n"
"#FF8000 SSR[287:256]:# %08X\n"
"#FF8000 SSR[311:288]:# %06X",
sd_info.cid_rsvd,
sd_info.csd_rsvd8_9,
sd_info.csd_rsvd16_20,
sd_info.csd_rsvd29_30,
sd_info.csd_rsvd120_125,
sd_info.scr_vendor,
sd_info.scr_rsvd,
sd_info.ssr_vendor0_31,
sd_info.ssr_vendor32_63,
sd_info.ssr_vendor64_95,
sd_info.ssr_vendor96_127,
sd_info.ssr_vendor128_159,
sd_info.ssr_vendor160_191,
sd_info.ssr_vendor192_223,
sd_info.ssr_vendor224_255,
sd_info.ssr_vendor256_287,
sd_info.ssr_vendor288_311);
s_printf(txt_buf2,
"#FF8000 SSR[327:314]:# %04X\n"
"#FF8000 SSR[345:340]:# %02X\n"
"#FF8000 SSR[383:378]:# %02X\n"
"#FF8000 SSR[427:424]:# %X\n"
"#FF8000 SSR[501:496]:# %02X\n\n",
sd_info.ssr_rsvd314_327,
sd_info.ssr_rsvd340_345,
sd_info.ssr_rsvd378_383,
sd_info.ssr_rsvd424_427,
sd_info.ssr_rsvd496_501);
if (!sdmmc_storage_gen_cmd(&sd_storage, 0x00000001, buf))
{
const u32 health_rpt_args[] = {
0x00000001, // Sandisk.
0x11000001, // ATP.
0x110005F1, // AData.
0x110005F3,
0x110005F5,
0x110005F7,
0x110005F9, // Transcend.
0x110005FB, // Micron.
0x110005FD, // Innodisk.
0x110005FF,
(sd_storage.rca << 16) | 1,
(sd_storage.cid.oemid << 16) | 1, // 0x53420001: Swissbit.
// 0x00000010, // Apacer, 2-Step.
// 0x00000021,
};
strcpy(txt_buf2 + strlen(txt_buf2), "#00DDFF Health Report Data#");
for (u32 i = 0; i < ARRAY_SIZE(health_rpt_args); i++)
{
sdmmc_storage_gen_cmd(&sd_storage, health_rpt_args[i], buf);
u8 test = 0;
for (u32 i = 0; i < 512; i++)
test |= buf[i];
if (test)
s_printf(txt_buf2 + strlen(txt_buf2), "\n#FF8000 %08X:# Has data!", health_rpt_args[i]);
else
s_printf(txt_buf2 + strlen(txt_buf2), "\n#FF8000 %08X:# Empty", health_rpt_args[i]);
}
}
else
strcpy(txt_buf2 + strlen(txt_buf2), "#00DDFF Health Report Data#\n#FFDD00 Not supported!#");
lv_mbox_set_text(mbox, "#C7EA46 SD Vendor/Reserved Data#");
lv_label_set_text(lb_desc, txt_buf);
lv_label_set_text(lb_desc2, txt_buf2);
sd_unmount();
out:
free(buf);
free(txt_buf);
free(txt_buf2);
lv_mbox_add_btns(mbox, mbox_btn_map, nyx_mbox_action); // Important. After set_text.
lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0);
@@ -2278,6 +2441,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
{
lv_obj_t *win = nyx_create_standard_window(SYMBOL_SD" microSD Card Info", NULL);
lv_win_add_btn(win, NULL, SYMBOL_SD" Benchmark", _create_mbox_sd_bench);
lv_win_add_btn(win, NULL, SYMBOL_FILE_ALT" Vendor Registers", _create_mbox_sd_vendor_info);
lv_obj_t *desc = lv_cont_create(win, NULL);
lv_obj_set_size(desc, LV_HOR_RES / 2 / 6 * 2, LV_VER_RES - (LV_DPI * 11 / 8) * 5 / 2);
@@ -2301,7 +2465,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
}
lv_label_set_text(lb_desc,
"#00DDFF Card ID:#\n"
"#00DDFF Card ID#\n"
"Vendor ID:\n"
"Model:\n"
"OEM ID:\n"
@@ -2319,8 +2483,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
lv_obj_t * lb_val = lv_label_create(val, lb_desc);
char *txt_buf = (char *)malloc(SZ_16K);
txt_buf[0] = '\n';
txt_buf[1] = 0;
s_printf(txt_buf, "#00DDFF v%d.00#\n", sd_storage_get_scr_sda_ver(&sd_storage));
// Identify manufacturer.
switch (sd_storage.cid.manfid)
@@ -2361,6 +2524,9 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
case 0x1D:
strcat(txt_buf, "AData ");
break;
case 0x22:
strcat(txt_buf, "Kowin"); // #E: Digiera.
break;
case 0x27:
strcat(txt_buf, "Phison ");
break;
@@ -2389,7 +2555,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
strcat(txt_buf, "Bongiovi ");
break;
case 0x74:
strcat(txt_buf, "Jiaelec ");
strcat(txt_buf, "Jiaelec "); // Transcend.
break;
case 0x76:
strcat(txt_buf, "Patriot ");
@@ -2413,7 +2579,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
strcat(txt_buf, "Taishin ");
break;
case 0xAD:
strcat(txt_buf, "Longsys ");
strcat(txt_buf, "Longsys "); // Lexar/FORESEE.
break;
default:
strcat(txt_buf, "Unknown ");
@@ -2423,13 +2589,38 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
// UHS-I max power limit is 400mA, no matter what the card says.
u32 max_power_nominal = sd_storage.max_power > 400 ? 400 : sd_storage.max_power;
s_printf(txt_buf + strlen(txt_buf), "(%02X)\n%c%c%c%c%c\n%c%c (%04X)\n%X\n%X\n%08x\n%02d/%04d\n\n%d mW (%d mA)\n",
// Check for secret bits.
bool secret_bits = false;
sd_vendor_info_t sd_info = { 0 };
sd_storage_get_vendor_info(&sd_storage, &sd_info);
// Partially known bits.
if (sd_info.cid_rsvd && sd_info.cid_rsvd != 0x7 && sd_info.cid_rsvd != 0xA)
secret_bits = true;
if (sd_info.scr_vendor &&
sd_info.scr_vendor != 0x33333039 &&
sd_info.scr_vendor != 0x01196432 &&
sd_info.scr_vendor != 0x01006432 &&
sd_info.scr_vendor != 0x01000000)
secret_bits = true;
// Unknown bits.
sd_info.cid_rsvd = 0;
sd_info.scr_vendor = 0;
u8 *sd_info8 = (u8 *)&sd_info;
for (u32 i = 0; i < sizeof(sd_vendor_info_t); i++)
secret_bits |= !!sd_info8[i];
gfx_hexdump(0, sd_info8, sizeof(sd_vendor_info_t));
s_printf(txt_buf + strlen(txt_buf), "(%02X)\n%c%c%c%c%c\n%c%c (%04X)\n%X\n%X\n%08x\n%02d/%04d\n%s\n%d mW (%d mA)\n",
sd_storage.cid.manfid,
sd_storage.cid.prod_name[0], sd_storage.cid.prod_name[1], sd_storage.cid.prod_name[2],
sd_storage.cid.prod_name[3], sd_storage.cid.prod_name[4],
(sd_storage.cid.oemid >> 8) & 0xFF, sd_storage.cid.oemid & 0xFF, sd_storage.cid.oemid,
sd_storage.cid.hwrev, sd_storage.cid.fwrev, sd_storage.cid.serial,
sd_storage.cid.month, sd_storage.cid.year,
secret_bits ? "#FF8000 Contact me#" : "",
max_power_nominal * 3600 / 1000, sd_storage.max_power);
switch (nyx_str->info.sd_init)
@@ -2467,10 +2658,11 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
"Capacity (LBA):\n"
"Bus Width:\n"
"Current Rate:\n"
"Max Bus Speed:\n"
"Speed Class:\n"
"UHS Classes:\n"
"Max Bus Speed:\n\n"
"Write Protect:"
"Write Protect:\n"
"Vendor Info:"
);
lv_obj_set_width(lb_desc2, lv_obj_get_width(desc2));
lv_obj_align(desc2, val, LV_ALIGN_OUT_RIGHT_MID, LV_DPI / 5 * 3, 0);
@@ -2483,15 +2675,15 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
char *wp_info;
switch (sd_storage.csd.write_protect)
{
case 0:
wp_info = "Inactive";
break;
case 1:
wp_info = "Temporary";
break;
case 2:
case 3:
wp_info = "Permanent";
break;
case 2 ... 3:
default:
wp_info = "None";
wp_info = "Permanent";
break;
}
@@ -2507,7 +2699,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
sd_storage_get_fmodes(&sd_storage, NULL, &fmodes);
char *bus_speed;
if (fmodes.cmd_system & SD_MODE_UHS_DDR200)
if (sd_storage_get_ddr200_support(&sd_storage))
bus_speed = "DDR200";
else if (fmodes.access_mode & SD_MODE_UHS_SDR104)
bus_speed = "SDR104";
@@ -2563,10 +2755,11 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
"%X (CP %X)\n"
"%d\n"
"%d MB/s (%d MHz)\n"
"%s%s\n"
"%d (AU: %d %s\n"
"U%d V%d %sA%d%s\n"
"%s\n\n"
"%s",
"%s\n"
"%X %08X",
sd_storage.csd.structure + 1,
sd_storage.csd.cmdclass,
sd_storage.sec_cnt >> 11,
@@ -2574,10 +2767,11 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn)
sd_storage.ssr.bus_width,
sd_storage.csd.busspeed,
(sd_storage.csd.busspeed > 10) ? (sd_storage.csd.busspeed * 2) : 50,
bus_speed, sd_storage.has_pcie ? " | SDE985" : "", // PCIe G3L1 (985 MB/s).
sd_storage.ssr.speed_class, uhs_au_size, uhs_au_mb ? "MiB)" : "KiB)",
sd_storage.ssr.uhs_grade, sd_storage.ssr.video_class, cpe ? cpe : "", sd_storage.ssr.app_class, cpe ? "#" : "",
bus_speed,
wp_info);
wp_info,
sd_storage.cid.rsvd, sd_storage.scr.vendor);
lv_label_set_text(lb_val2, txt_buf);
@@ -2767,28 +2961,33 @@ static lv_res_t _create_window_battery_status(lv_obj_t *btn)
value = i2c_recv_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_CID4);
u32 main_pmic_version = i2c_recv_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_CID3) & 0xF;
s_printf(txt_buf + strlen(txt_buf), "max77620 v%d%s\n",
main_pmic_version, main_pmic_version == 11 ? "" : "#FF8000 "SYMBOL_WARNING"#");
if (value == 0x35)
s_printf(txt_buf + strlen(txt_buf), "max77620 v%d\nErista OTP\n", main_pmic_version);
strcat(txt_buf, "Erista OTP\n");
else if (value == 0x53)
s_printf(txt_buf + strlen(txt_buf), "max77620 v%d\nMariko OTP\n", main_pmic_version);
strcat(txt_buf, "Mariko OTP\n");
else
s_printf(txt_buf + strlen(txt_buf), "max77620 v%d\n#FF8000 Unknown OTP# (%02X)\n", main_pmic_version, value);
s_printf(txt_buf + strlen(txt_buf), "#FF8000 Unknown OTP# (%02X)\n", value);
// CPU/GPU/DRAM Pmic IC info.
u32 cpu_gpu_pmic_type = h_cfg.t210b01 ? (FUSE(FUSE_RESERVED_ODM28_B01) & 1) + 1 : 0;
u8 version;
switch (cpu_gpu_pmic_type)
{
case 0:
s_printf(txt_buf + strlen(txt_buf), "max77621 v%d",
i2c_recv_byte(I2C_5, MAX77621_CPU_I2C_ADDR, MAX77621_REG_CHIPID1));
version = i2c_recv_byte(I2C_5, MAX77621_CPU_I2C_ADDR, MAX77621_REG_CHIPID1);
s_printf(txt_buf + strlen(txt_buf), "max77621 v%d%s",
version , version == 18 ? "" : "#FF8000 "SYMBOL_WARNING"#");
break;
case 1:
s_printf(txt_buf + strlen(txt_buf), "max77812-2 v%d", // High power GPU. 2 Outputs, phases 3 1.
s_printf(txt_buf + strlen(txt_buf), "max77812-2 v%d", // High power GPU. 2 Outputs, phases 3 1.
i2c_recv_byte(I2C_5, MAX77812_PHASE31_CPU_I2C_ADDR, MAX77812_REG_VERSION) & 7);
break;
case 2:
s_printf(txt_buf + strlen(txt_buf), "max77812-3 v%d.0", // Low power GPU. 3 Outputs, phases 2 1 1.
i2c_recv_byte(I2C_5, MAX77812_PHASE211_CPU_I2C_ADDR, MAX77812_REG_VERSION) & 7);
version = i2c_recv_byte(I2C_5, MAX77812_PHASE211_CPU_I2C_ADDR, MAX77812_REG_VERSION) & 7;
s_printf(txt_buf + strlen(txt_buf), "max77812-3 v%d%s", // Low power GPU. 3 Outputs, phases 2 1 1.
version, version == 5 ? "" : "#FF8000 "SYMBOL_WARNING"#");
break;
}

2
nyx/nyx_gui/frontend/gui_tools_partition_manager.c
View File

@@ -968,7 +968,7 @@ static u32 _get_available_l4t_partition()
// Search for a suitable partition.
u32 size_sct = 0;
if (!memcmp(&gpt->header.signature, "EFI PART", 8) || gpt->header.num_part_ents > 128)
if (!memcmp(&gpt->header.signature, "EFI PART", 8) && gpt->header.num_part_ents <= 128)
{
for (u32 i = 0; i < gpt->header.num_part_ents; i++)
{