tegraex

Author: Kronos2308

Hakupayload/source/tegraexplorer/common/common.h

@@ -21,9 +21,11 @@ enum utils_err_codes_te_call {
     ERR_EMMC_WRITE_FAILED,
     ERR_FILE_TOO_BIG_FOR_DEST,
     ERR_SD_EJECTED,
-    ERR_PARSE_FAIL,
+    ERR_SCRIPT_LOOKUP_FAIL,
     ERR_CANNOT_COPY_FILE_TO_FS_PART,
-    ERR_NO_DESTINATION
+    ERR_NO_DESTINATION,
+    ERR_INI_PARSE_FAIL,
+    ERR_IN_FUNC
 };
 
 extern const char *utils_err_codes_te[];
@@ -58,8 +60,7 @@ extern menu_entry mainmenu_shutdown[];
 enum mainmenu_tools_return {
     TOOLS_DISPLAY_INFO = 1,
     TOOLS_DISPLAY_GPIO,
-    TOOLS_DUMPFIRMWARE,
-    TOOLS_DUMPUSERSAVE
+    TOOLS_DUMPFIRMWARE
 };
 
 extern menu_entry mainmenu_tools[];
@@ -86,7 +87,8 @@ enum fs_menu_file_return {
     FILE_PAYLOAD,
     FILE_SCRIPT,
     FILE_HEXVIEW,
-    FILE_DUMPBIS
+    FILE_DUMPBIS,
+    FILE_SIGN
 };
 
 extern menu_entry fs_menu_file[];

Hakupayload/source/tegraexplorer/common/strings.c

@@ -50,9 +50,11 @@ const char *utils_err_codes_te[] = { // these start at 50
     "EMMC WRITE FAILED",
     "FILE TOO BIG FOR DEST",
     "SD EJECTED",
-    "PARSING FAILED",
+    "FUNC LOOKUP FAIL",
     "CANNOT COPY FILE TO FS PART",
-    "NO DESTINATION"
+    "NO DESTINATION",
+    "INI PARSE FAIL",
+    "ERR IN FUNC"
 };
 /*
 const char *pkg2names[] = {

Hakupayload/source/tegraexplorer/common/structs.c

@@ -53,7 +53,9 @@ menu_entry fs_menu_file[] = {
     {"Lanzar Payload", COLOR_ORANGE, ISMENU},
     {"Lanzar Script", COLOR_YELLOW, ISMENU},
     {"Visor Hex", COLOR_GREEN, ISMENU},
-    {"\nExtraer BIS", COLOR_YELLOW, ISMENU}
+    {"\nExtraer BIS", COLOR_YELLOW, ISMENU},
+    {"Sign Save", COLOR_ORANGE, {ISMENU}}
+
 };
 
 menu_entry fs_menu_folder[] = {

Hakupayload/source/tegraexplorer/common/types.h

@@ -1,18 +1,14 @@
 #pragma once
 #include "../../utils/types.h"
 
-#define ISDIR (1 << 0)
-#define ISARC (1 << 1)
+#define BIT(n) (1U << n)
 
-#define ISHIDE (1 << 8)
-#define ISMENU (1 << 9)
-#define ISSKIP (1 << 10)
-
-#define ISGB (1 << 7)
-#define ISMB (1 << 6)
-#define ISKB (1 << 5)
-#define ISB  (1 << 4)
-#define ISNULL (1 << 3)
+#define ISDIR BIT(0)
+#define ISMENU BIT(1)
+#define SETSIZE(x) (x << 2)
+#define ISNULL BIT(4)
+#define ISHIDE BIT(5)
+#define ISSKIP BIT(6)
 
 #define SETBIT(object, shift, value) ((value) ? (object |= shift) : (object &= ~shift))
 
@@ -27,7 +23,7 @@
 
 #define COPY_MODE_PRINT 0x1
 #define COPY_MODE_CANCEL 0x2
-#define BUFSIZE 32768
+#define BUFSIZE 65536 //32768
 
 #define OPERATIONCOPY 0x2
 #define OPERATIONMOVE 0x4
@@ -43,7 +39,17 @@
 typedef struct {
     char *name;
     u32 storage;
-    u16 property;
+    union {
+        u8 property;
+        struct {
+            u8 isDir:1;
+            u8 isMenu:1;
+            u8 size:2;
+            u8 isNull:1;
+            u8 isHide:1;
+            u8 isSkip:1;
+        };
+    };
 } menu_entry; 
 
 typedef struct {

Hakupayload/source/tegraexplorer/emmc/emmcdumppart.c

@@ -45,7 +45,7 @@ int emmcDumpPart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part){
     f_lseek(&fp, 0);
 
     while (totalSectors > 0){
-        num = MIN(totalSectors, 64);
+        num = MIN(totalSectors, 128);
         if (!emummc_storage_read(mmcstorage, lba_curr, num, buf)){
             gfx_errDisplay("dump_emmc_part", ERR_EMMC_READ_FAILED, 3);
             return -1;

Hakupayload/source/tegraexplorer/emmc/emmcmenu.c

@@ -16,12 +16,12 @@
 #include "../../utils/list.h"
 #include "../../mem/heap.h"
 #include "emmcmenu.h"
-#include "../fs/fsreader.h"
 #include "../utils/utils.h"
 #include "../gfx/menu.h"
 #include "../fs/fsmenu.h"
 #include "emmcoperations.h"
 #include "../fs/fsutils.h"
+#include "../utils/menuUtils.h"
 
 menu_entry *mmcMenuEntries = NULL;
 extern sdmmc_storage_t storage;
@@ -30,21 +30,18 @@ extern char *clipboard;
 extern u8 clipboardhelper;
 
 
-void addEntry(emmc_part_t *part, u8 property, int spot){
-    if (mmcMenuEntries[spot].name != NULL){
-        free(mmcMenuEntries[spot].name);
-    }
-
-    utils_copystring(part->name, &mmcMenuEntries[spot].name);
+void addEntry(emmc_part_t *part, u8 property_GPT, int spot){
+    u32 storage = 0;
+    u8 property = 0;
 
-    if (property & isFS){
-        mmcMenuEntries[spot].storage = (u32)(property & 0x7F);
-        mmcMenuEntries[spot].property = ISDIR;
+    if (property_GPT & isFS){
+        storage = (u32)(property_GPT & 0x7F);
+        property = ISDIR;
     }
     else {
         u64 size = 0;
-        int sizes = 0;
-        mmcMenuEntries[spot].property = 0;
+        u32 sizes = 0;
+
         size = (u64)(part->lba_end + 1 - part->lba_start);
         size *= (u64)NX_EMMC_BLOCKSIZE;
 
@@ -54,31 +51,30 @@ void addEntry(emmc_part_t *part, u8 property, int spot){
         }
 
         if (sizes > 3)
-            sizes = 0;
+            sizes = 3;
 
-        mmcMenuEntries[spot].property |= (1 << (4 + sizes));
-        mmcMenuEntries[spot].storage = (u32)size;
+        property |= SETSIZE(sizes);
+        storage = (u32)size;
     }
+
+    mu_copySingle(part->name, storage, property, &mmcMenuEntries[spot]);
 }
 
 int fillMmcMenu(short mmcType){
     int count = 4, i;
 
     if (mmcMenuEntries != NULL)
-        clearfileobjects(&mmcMenuEntries);
+        mu_clearObjects(&mmcMenuEntries);
 
     link_t *gpt = selectGpt(mmcType);
 
     LIST_FOREACH_ENTRY(emmc_part_t, part, gpt, link)
         count++;
 
-    createfileobjects(count, &mmcMenuEntries);
+    mu_createObjects(count, &mmcMenuEntries);
 
-    for (i = 0; i < 4; i++){
-        utils_copystring(mmcmenu_start[i].name, &mmcMenuEntries[i].name);
-        mmcMenuEntries[i].property = mmcmenu_start[i].property;
-        mmcMenuEntries[i].storage = mmcmenu_start[i].storage;
-    }
+    for (i = 0; i < 4; i++)
+        mu_copySingle(mmcmenu_start[i].name, mmcmenu_start[i].storage, mmcmenu_start[i].property, &mmcMenuEntries[i]);
 
     LIST_FOREACH_ENTRY(emmc_part_t, part, gpt, link){
         addEntry(part, checkGptRules(part->name), i++);
@@ -99,10 +95,14 @@ int handleEntries(short mmcType, menu_entry part){
             fileexplorer("emmc:/", 1);  
     }
     else {
+        /*
         if (mmcmenu_filemenu[1].name != NULL)
             free(mmcmenu_filemenu[1].name);
                     
         utils_copystring(part.name, &mmcmenu_filemenu[1].name);
+        */
+
+        mu_copySingle(part.name, mmcmenu_filemenu[1].storage, mmcmenu_filemenu[1].property, &mmcmenu_filemenu[1]);
 
         if ((menu_make(mmcmenu_filemenu, 4, "-- RAW PARTITION --")) < 3)
             return 0;
@@ -112,7 +112,7 @@ int handleEntries(short mmcType, menu_entry part){
 
         gfx_clearscreen();
 
-        if (part.property & isBOOT){
+        if (part.isNull){
             res = emmcDumpBoot("sd:/tegraexplorer/partition_dumps");
         }
         else {
@@ -146,7 +146,7 @@ int makeMmcMenu(short mmcType){
                 f_mkdir("sd:/tegraexplorer/partition_dumps");
 
                 for (int i = 0; i < count; i++){
-                    if (mmcMenuEntries[i].property & ISMENU || mmcMenuEntries[i].property & ISDIR)
+                    if (mmcMenuEntries[i].property & (ISMENU | ISDIR))
                         continue;
 
                     //gfx_printf("Dumping %s...\n", mmcMenuEntries[i].name);
@@ -159,7 +159,7 @@ int makeMmcMenu(short mmcType){
             case 2:
                 if (!(clipboardhelper & ISDIR) && (clipboardhelper & OPERATIONCOPY)){
                     gfx_clearscreen();
-                    if (!mmcFlashFile(clipboard, mmcType)){
+                    if (!mmcFlashFile(clipboard, mmcType, true)){
                         gfx_printf("\nDone!");
                         hidWait();
                     }   

Hakupayload/source/tegraexplorer/emmc/emmcoperations.h

@@ -4,7 +4,7 @@
 
 int emmcDumpSpecific(char *part, char *path);
 int emmcDumpBoot(char *basePath);
-int mmcFlashFile(char *path, short mmcType);
+int mmcFlashFile(char *path, short mmcType, bool warnings);
 
 int emmcDumpPart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part);
-int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part);
+int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part, bool warnings);

Hakupayload/source/tegraexplorer/emmc/emmcrestorepart.c

@@ -17,7 +17,7 @@
 extern sdmmc_storage_t storage;
 extern emmc_part_t *system_part;
 
-int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part){
+int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part, bool warnings){
     FIL fp;
     FILINFO fno;
     u8 *buf;
@@ -32,7 +32,7 @@ int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part){
 
     gfx_printf("Initializing\r");
 
-    buf = calloc(16384, sizeof(u8));
+    buf = calloc(BUFSIZE, sizeof(u8));
 
     if (!buf){
         gfx_errDisplay("restore_emmc_part", ERR_MEM_ALLOC_FAILED, 1);
@@ -54,10 +54,10 @@ int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part){
 
     gfx_printf("Flashing %s\n", part->name);
 
-    if (totalSize < totalSizeDest){
+    if (totalSize < totalSizeDest && warnings){
         SWAPCOLOR(COLOR_ORANGE);
         gfx_printf("File is too small for destination.\nDo you want to flash it anyway?\n\nB to Cancel\n");
-        u8 btnres = gfx_makewaitmenu(
+        u32 btnres = gfx_makewaitmenu(
             "A to Confirm",
             3
         );
@@ -78,7 +78,7 @@ int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part){
     }
 
     while (totalSectors > 0){
-        num = MIN(totalSectors, 32);
+        num = MIN(totalSectors, 128);
 
         if ((res = f_read(&fp, buf, num * NX_EMMC_BLOCKSIZE, NULL))){
             gfx_errDisplay("restore_emmc_part", res, 5);
@@ -214,13 +214,13 @@ emmc_part_t *mmcFindPart(char *path, short mmcType){
     return NULL;
 }
 
-int mmcFlashFile(char *path, short mmcType){
+int mmcFlashFile(char *path, short mmcType, bool warnings){
     emmc_part_t *part;
     int res;
 
     part = mmcFindPart(path, mmcType);
     if (part != NULL){
-        res = emmcRestorePart(path, &storage, part);
+        res = emmcRestorePart(path, &storage, part, warnings);
         emummc_storage_set_mmc_partition(&storage, 0);
         return res;
     }