Bump version to 1.3.0

Notable bugs fixed:
- pkg1id is now also used as foldername during fw dump
- Clearing of screen in _recursive functions is no longer hardcoded
- Folders get the correct file attributes
- first 16 MiB of partition during partitioning gets cleared now

Makefile

@@ -10,8 +10,8 @@ include $(DEVKITARM)/base_rules
 
 IPL_LOAD_ADDR := 0x40003000
 LPVERSION_MAJOR := 2
-LPVERSION_MINOR := 2
+LPVERSION_MINOR := 3
-LPVERSION_BUGFX := 1
+LPVERSION_BUGFX := 0
 
 ################################################################################
 

source/libs/fatfs/diskio.c

@@ -32,6 +32,7 @@
 #include "../../sec/se.h"
 #include "../../storage/nx_emmc.h"
 #include "../../storage/sdmmc.h"
+#include "../../storage/emummc.h"
 
 extern sdmmc_storage_t sd_storage;
 extern sdmmc_storage_t storage;

source/libs/fatfs/ff.c

@@ -6113,6 +6113,8 @@ FRESULT f_fdisk (
 	DWORD sz_disk, p_sect, b_cyl, b_sect;
 	FRESULT res;
 
+	BYTE *empty_buff;
+	empty_buff = ff_memcalloc(sizeof(BYTE), 16384);
 
 	stat = disk_initialize(pdrv);
 	if (stat & STA_NOINIT) return FR_NOT_READY;
@@ -6167,8 +6169,13 @@ FRESULT f_fdisk (
 		st_dword(p + 12, p_sect);			/* Number of sectors */
 		/* Next partition */
 		b_sect += p_sect;
+
+		for (int cursect = 0; cursect < 1024; cursect++){
+			disk_write(pdrv, empty_buff, b_sect + (32 * cursect), 32);
+		}
 	}
 	st_word(p, 0xAA55);		/* MBR signature (always at offset 510) */
+	ff_memfree(empty_buff);
 
 	/* Write it to the MBR */
 	res = (disk_write(pdrv, buf, 0, 1) == RES_OK && disk_ioctl(pdrv, CTRL_SYNC, 0) == RES_OK) ? FR_OK : FR_DISK_ERR;

source/libs/fatfs/ff.h

@@ -321,6 +321,7 @@ DWORD ff_wtoupper (DWORD uni);			/* Unicode upper-case conversion */
 #endif
 #if FF_USE_LFN == 3						/* Dynamic memory allocation */
 void* ff_memalloc (UINT msize);			/* Allocate memory block */
+void* ff_memcalloc (UINT msize, UINT amount);
 void ff_memfree (void* mblock);			/* Free memory block */
 #endif
 

source/libs/fatfs/ffsystem.c

@@ -23,6 +23,10 @@ void* ff_memalloc (	/* Returns pointer to the allocated memory block (null if no
 	return malloc(msize);	/* Allocate a new memory block with POSIX API */
 }
 
+void* ff_memcalloc (UINT msize, UINT amount){
+	return calloc(amount, msize);
+}
+
 
 /*------------------------------------------------------------------------*/
 /* Free a memory block                                                    */

source/main.c

@@ -52,10 +52,10 @@ boot_cfg_t __attribute__((section ("._boot_cfg"))) b_cfg;
 
 bool return_sd_mounted(int value){
 	switch(value){
-		case 1:
+		case 10:
-			return sd_mounted;
-		case 7:
 			return sd_inited;
+		default:
+			return sd_mounted;
 	}
 }
 

source/storage/emummc.c

@@ -139,7 +139,6 @@ out:
 
 int emummc_storage_end(sdmmc_storage_t *storage)
 {
-	sd_unmount();
 	sdmmc_storage_end(storage);
 
 	return 1;

source/storage/nx_emmc.c

@@ -74,5 +74,5 @@ int nx_emmc_part_write(sdmmc_storage_t *storage, emmc_part_t *part, u32 sector_o
 	// The last LBA is inclusive.
 	if (part->lba_start + sector_off > part->lba_end)
 		return 0;
-	return sdmmc_storage_write(storage, part->lba_start + sector_off, num_sectors, buf);
+	return emummc_storage_write(storage, part->lba_start + sector_off, num_sectors, buf);
 }

source/tegraexplorer/emmc.c

@@ -20,15 +20,20 @@
 #include "../soc/hw_init.h"
 #include "../mem/emc.h"
 #include "../mem/sdram.h"
+#include "../storage/emummc.h"
+#include "../config/config.h"
 
 sdmmc_storage_t storage;
 emmc_part_t *system_part;
 sdmmc_t sdmmc;
+extern hekate_config h_cfg;
 __attribute__ ((aligned (16))) FATFS emmc;
 LIST_INIT(gpt);
 
 u8 bis_key[4][32];
-short pkg1ver = -1;
+pkg1_info pkg1inf = {-1, ""};
+short currentlyMounted = -1;
+
 
 static bool  _key_exists(const void *data) { return memcmp(data, zeros, 0x10); };
 
@@ -52,7 +57,11 @@ void print_biskeys(){
     gfx_hexdump(0, bis_key[2], 32);
 }
 
-int mount_emmc(char *partition, int biskeynumb){
+pkg1_info returnpkg1info(){
+    return pkg1inf;
+}
+
+int mount_mmc(const char *partition, const int biskeynumb){
     f_unmount("emmc:");
 
     se_aes_key_set(8, bis_key[biskeynumb] + 0x00, 0x10);
@@ -72,13 +81,36 @@ int mount_emmc(char *partition, int biskeynumb){
     return 0;
 }
 
-short returnpkg1ver(){
+void connect_mmc(short mmctype){
-    return pkg1ver;
+    if (mmctype != currentlyMounted){
+        disconnect_mmc();
+        switch (mmctype){
+            case SYSMMC:
+                sdmmc_storage_init_mmc(&storage, &sdmmc, SDMMC_4, SDMMC_BUS_WIDTH_8, 4);
+                h_cfg.emummc_force_disable = 1;
+                currentlyMounted = SYSMMC;
+                break;
+            case EMUMMC:
+                if (emummc_storage_init_mmc(&storage, &sdmmc)){
+                    h_cfg.emummc_force_disable = 0;
+                    currentlyMounted = EMUMMC;
+                }
+                break;
+        }
+    }
 }
 
-void disconnect_emmc(){
+void disconnect_mmc(){
     f_unmount("emmc:");
+    switch (currentlyMounted){
+        case SYSMMC:
             sdmmc_storage_end(&storage);
+            break;
+        case EMUMMC:
+            emummc_storage_end(&storage);
+            break;
+    }
+    currentlyMounted = -1;
 }
 
 int dump_biskeys(){
@@ -87,7 +119,7 @@ int dump_biskeys(){
 
 	int retries = 0;
 
-    sdmmc_storage_init_mmc(&storage, &sdmmc, SDMMC_4, SDMMC_BUS_WIDTH_8, 4);
+    connect_mmc(SYSMMC);
 
     // Read package1.
     u8 *pkg1 = (u8 *)malloc(0x40000);
@@ -172,41 +204,11 @@ int dump_biskeys(){
     sdmmc_storage_set_mmc_partition(&storage, 0);
     // Parse eMMC GPT.
     nx_emmc_gpt_parse(&gpt, &storage);
-    /*
-    char part_name[37] = "SYSTEM";
 
-    // todo: menu selection for this
-
-    u32 bis_key_index = 0;
-    if (strcmp(part_name, "PRODINFOF") == 0)
-        bis_key_index = 0;
-    else if (strcmp(part_name, "SAFE") == 0)
-        bis_key_index = 1;
-    else if (strcmp(part_name, "SYSTEM") == 0)
-        bis_key_index = 2;
-    else if (strcmp(part_name, "USER") == 0)
-        bis_key_index = 3;
-    else {
-        gfx_printf("Partition name %s unrecognized.", part_name);
-        return;
-    }
-    */
     se_aes_key_set(8, bis_key[2] + 0x00, 0x10);
     se_aes_key_set(9, bis_key[2] + 0x10, 0x10);
     
-    /*
+    pkg1inf.ver = pkg1_id->kb;
-    system_part = nx_emmc_part_find(&gpt, "SYSTEM");
+    strcpy(pkg1inf.id, pkg1_id->id);
-    if (!system_part) {
-        gfx_printf("Failed to locate SYSTEM partition.");
-        return -1;
-    }
-
-    if (f_mount(&emmc_sys, "system:", 1)) {
-        gfx_printf("Mount failed of SYSTEM.");
-        return -1;
-    }
-    */
-
-    pkg1ver = pkg1_id->kb;
     return 0;
 }

source/tegraexplorer/emmc.h

@@ -1,11 +1,19 @@
 #pragma once
 
+typedef struct _pkg1_info {
+    short ver;
+    char id[16];
+} pkg1_info;
+
 //int mount_emmc_partition(const char *part, int logicnumb);
 int dump_biskeys();
 void print_biskeys();
-int mount_emmc(char *partition, int biskeynumb);
+pkg1_info returnpkg1info();
-short returnpkg1ver();
+
-void disconnect_emmc();
+int mount_mmc(const char *partition, const int biskeynumb);
+void connect_mmc(short mmctype);
+void disconnect_mmc();
+
 
 static const u8 zeros[0x10] = {0};
 
@@ -41,3 +49,8 @@ static const u8 bis_key_source[3][0x20] = {
         0x52, 0xC2, 0xE9, 0xEB, 0x09, 0xE3, 0xEE, 0x29, 0x32, 0xA1, 0x0C, 0x1F, 0xB6, 0xA0, 0x92, 0x6C,
         0x4D, 0x12, 0xE1, 0x4B, 0x2A, 0x47, 0x4C, 0x1C, 0x09, 0xCB, 0x03, 0x59, 0xF0, 0x15, 0xF4, 0xE4}
 };
+
+enum mmc_types {
+    SYSMMC = 0,
+    EMUMMC
+};

source/tegraexplorer/fs.c

@@ -9,6 +9,7 @@
 #include "../gfx/gfx.h"
 #include "../utils/util.h"
 #include "io.h"
+#include "script.h"
 
 fs_entry *fileobjects;
 char rootpath[10] = "";
@@ -18,7 +19,7 @@ u8 clipboardhelper = 0;
 extern const char sizevalues[4][3];
 extern int launch_payload(char *path);
 
-menu_item explfilemenu[10] = {
+menu_item explfilemenu[11] = {
     {"-- File Menu --", COLOR_BLUE, -1, 0},
     {"FILE", COLOR_GREEN, -1, 0},
     {"\nSIZE", COLOR_VIOLET, -1, 0},
@@ -28,6 +29,7 @@ menu_item explfilemenu[10] = {
     {"Move to clipboard", COLOR_BLUE, MOVE, 1},
     {"\nDelete file\n", COLOR_RED, DELETE, 1},
     {"Launch Payload", COLOR_ORANGE, PAYLOAD, 1},
+    {"Launch Script", COLOR_YELLOW, SCRIPT, 1},
     {"View Hex", COLOR_GREEN, HEXVIEW, 1}
 };
 
@@ -309,7 +311,12 @@ int filemenu(fs_entry file){
     else
         explfilemenu[8].property = -1;
 
-    temp = makemenu(explfilemenu, 10);
+    if (strstr(file.name, ".tegrascript") != NULL)
+        explfilemenu[9].property = 1;
+    else
+        explfilemenu[9].property = -1;
+
+    temp = makemenu(explfilemenu, 11);
 
     switch (temp){
         case COPY:
@@ -324,6 +331,9 @@ int filemenu(fs_entry file){
         case PAYLOAD:
             launch_payload(getnextloc(currentpath, file.name));
             break;
+        case SCRIPT:
+            ParseScript(getnextloc(currentpath, file.name));
+            break;
         case HEXVIEW:
             viewbytes(getnextloc(currentpath, file.name));
             break;

source/tegraexplorer/fs.h

@@ -34,6 +34,7 @@ enum filemenuoptions {
     MOVE,
     DELETE,
     PAYLOAD,
+    SCRIPT,
     HEXVIEW
 };
 

source/tegraexplorer/gfx.c

@@ -27,7 +27,7 @@ void clearscreen(){
     gfx_clear_grey(0x1B);
     gfx_box(0, 0, 719, 15, COLOR_WHITE);
     gfx_con_setpos(0, 0);
-    gfx_printf("%k%KTegraexplorer v1.2.1%k%K\n", COLOR_DEFAULT, COLOR_WHITE, COLOR_WHITE, COLOR_DEFAULT);
+    gfx_printf("%k%KTegraexplorer v1.3.0%k%K\n", COLOR_DEFAULT, COLOR_WHITE, COLOR_WHITE, COLOR_DEFAULT);
 }
 
 int message(u32 color, const char* message, ...){

source/tegraexplorer/io.c

@@ -75,7 +75,7 @@ int copy(const char *locin, const char *locout, bool print, bool canCancel){
         return 21;
     }
 
-    if (f_open(&in, locin, FA_READ | FA_OPEN_EXISTING)){
+    if ((res = f_open(&in, locin, FA_READ | FA_OPEN_EXISTING))){
         return 22;
     }
 
@@ -123,6 +123,7 @@ int copy(const char *locin, const char *locout, bool print, bool canCancel){
     if ((res = f_chmod(locout, in_info.fattrib, 0x3A)))
         return res;
 
+    f_stat(locin, &in_info); //somehow stops fatfs from being weird
     return 0;
 }
 
@@ -158,7 +159,10 @@ int del_recursive(char *path){
     DIR dir;
     FILINFO fno;
     int res;
+    u32 x, y;
     char *localpath = NULL;
+
+    gfx_con_getpos(&x, &y);
     makestring(path, &localpath);
 
     if ((res = f_opendir(&dir, localpath))){
@@ -167,11 +171,11 @@ int del_recursive(char *path){
     }
 
     while (!f_readdir(&dir, &fno) && fno.fname[0]){
-        if (fno.fattrib & AM_DIR)
+        if (fno.fattrib & AM_DIR){
             del_recursive(getnextloc(localpath, fno.fname));
-
+        }
         else {
-            gfx_box(0, 47, 719, 63, COLOR_DEFAULT);
+            gfx_box(0, y, 719, y + 16, COLOR_DEFAULT);
             SWAPCOLOR(COLOR_RED);
             gfx_printf("\r");
             gfx_print_length(37, fno.fname);
@@ -197,15 +201,17 @@ int copy_recursive(char *path, char *dstpath){
     DIR dir;
     FILINFO fno;
     int res;
+    u32 x, y;
     char *startpath = NULL, *destpath = NULL, *destfoldername = NULL, *temp = NULL;
 
+    gfx_con_getpos(&x, &y);
+
     makestring(path, &startpath);
     makestring(strrchr(path, '/') + 1, &destfoldername);
 
     destpath = (char*) malloc (strlen(dstpath) + strlen(destfoldername) + 2);
     sprintf(destpath, (dstpath[strlen(dstpath) - 1] == '/') ? "%s%s" : "%s/%s", dstpath, destfoldername);
 
-
     if ((res = f_opendir(&dir, startpath))){
         message(COLOR_RED, "Error during f_opendir: %d", res);
         return 21;
@@ -213,15 +219,12 @@ int copy_recursive(char *path, char *dstpath){
 
     f_mkdir(destpath);
 
-    if (f_stat(startpath, &fno))
-        return 22;
-
     while (!f_readdir(&dir, &fno) && fno.fname[0]){
         if (fno.fattrib & AM_DIR){
             copy_recursive(getnextloc(startpath, fno.fname), destpath);
         }
         else {
-            gfx_box(0, 47, 719, 63, COLOR_DEFAULT);
+            gfx_box(0, y, 719, y + 16, COLOR_DEFAULT);
             SWAPCOLOR(COLOR_GREEN);
             gfx_printf("\r");
             gfx_print_length(37, fno.fname);
@@ -241,8 +244,12 @@ int copy_recursive(char *path, char *dstpath){
     free(destpath);
     free(destfoldername);
     
+    if (f_stat(startpath, &fno))
+        return 22;
+
     if ((res = f_chmod(destpath, fno.fattrib, 0x3A)))
         return res;
     
+
     return 0;
 }

source/tegraexplorer/script.c

@@ -0,0 +1,235 @@
+#include <string.h>
+#include "../mem/heap.h"
+#include "gfx.h"
+#include "fs.h"
+#include "io.h"
+#include "emmc.h"
+#include "../utils/types.h"
+#include "../libs/fatfs/ff.h"
+#include "../utils/sprintf.h"
+#include "../utils/btn.h"
+#include "../gfx/gfx.h"
+#include "../utils/util.h"
+#include "../storage/emummc.h"
+#include "script.h"
+
+char func[11] = "", args[2][128] = {"", ""};
+int res, errcode;
+
+int Part_Move(){
+    errcode = f_rename(args[0], args[1]);
+    f_rename(args[0], args[1]);
+    return errcode;
+}
+
+int Part_Delete(){
+    errcode = f_unlink(args[0]);
+    f_unlink(args[0]);
+    return errcode;
+}
+
+int Part_DeleteRecursive(){
+    errcode = del_recursive(args[0]);
+    return errcode;
+}
+
+int Part_Copy(){
+    errcode = copy(args[0], args[1], true, false); 
+    return errcode;
+}
+
+int Part_RecursiveCopy(){
+    errcode = copy_recursive(args[0], args[1]);
+    return errcode;
+}
+
+int Part_MakeFolder(){
+    errcode = f_mkdir(args[0]);
+    f_mkdir(args[0]);
+    return errcode;
+}
+
+int Part_ConnectMMC(){
+    if (strcmpcheck(args[0], "SYSMMC"))
+        connect_mmc(SYSMMC);
+    if (strcmpcheck(args[0], "EMUMMC"))
+        connect_mmc(EMUMMC);
+
+    return 0;
+}
+
+int Part_MountMMC(){
+    errcode = mount_mmc(args[0], 2);
+    return errcode;
+}
+
+int Part_Print(){
+    RESETCOLOR;
+    gfx_printf(args[0]);
+    gfx_printf("\n");
+    return 0;
+}
+
+int Part_ErrorPrint(){
+    RESETCOLOR;
+    gfx_printf("Errorcode: %d\n", errcode);
+    return 0;
+}
+
+bool forceExit = false;
+int Part_Exit(){
+    forceExit = true;
+    return 0;
+}
+
+u8 buttons_pressed = 0;
+int Part_WaitOnUser(){
+    buttons_pressed = btn_wait();
+    return (buttons_pressed & BTN_POWER);
+}
+
+script_parts parts[] = {
+    {"COPY", Part_Copy, 2},
+    {"COPY-R", Part_RecursiveCopy, 2},
+    {"MKDIR", Part_MakeFolder, 1},
+    {"CON_MMC", Part_ConnectMMC, 1},
+    {"MNT_MMC", Part_MountMMC, 1},
+    {"PRINT", Part_Print, 1},
+    {"ERRPRINT", Part_ErrorPrint, 0},
+    {"EXIT", Part_Exit, 0},
+    {"PAUSE", Part_WaitOnUser, 0},
+    {"DEL", Part_Delete, 1},
+    {"DEL-R", Part_DeleteRecursive, 1},
+    {"MOVE", Part_Move, 2},
+    {"NULL", NULL, -1}
+};
+
+int ParsePart(){
+    int i;
+    for (i = 0; parts[i].arg_amount != -1; i++){
+        if (strcmpcheck(func, parts[i].name))
+            return i;
+    }
+    forceExit = true;
+    return -1;
+}
+
+FIL in;
+UINT endByte = 0;
+
+char GetNextByte(){
+    char single;
+    f_read(&in, &single, sizeof(char), &endByte);
+    
+    if (sizeof(char) != endByte)
+        forceExit = true;
+
+    return single;
+}
+
+void ParseScript(char* path){
+    char currentchar;
+    int strlength;
+    bool inifstatement = false;
+    forceExit = false;
+    
+    clearscreen();
+
+    res = f_open(&in, path, FA_READ | FA_OPEN_EXISTING);
+    if (res != FR_OK){
+        message(COLOR_RED, "File Opening Failed\nErrcode %d", res);
+        return;
+    }
+
+    while (!forceExit){
+        currentchar = GetNextByte();
+
+        if (endByte == 0 || currentchar == (char)EOF)
+            break;
+
+        switch(currentchar){
+            case '{':
+                if (!inifstatement)
+                    while (currentchar != '}')
+                        currentchar = GetNextByte();
+                
+                break;
+            case '}':
+                if (inifstatement)
+                    inifstatement = false;
+
+                break;
+            case '<':
+                strlength = 0;
+                currentchar = GetNextByte();
+
+                while (currentchar != '>'){
+                    func[strlength++] = currentchar;
+                    currentchar = GetNextByte();
+                }
+                func[strlength] = '\0';
+
+                res = ParsePart();
+                if (res == -1)
+                    break;
+                
+                for (int i = 0; i < parts[res].arg_amount; i++){
+                    while (currentchar != 0x22)
+                        currentchar = GetNextByte();
+                    
+                    strlength = 0;
+                    currentchar = GetNextByte();
+                    while (currentchar != 0x22){
+                        args[i][strlength++] = currentchar;
+                        currentchar = GetNextByte();
+                    }
+                    args[i][strlength] = '\0';  
+
+                    if (i < parts[res].arg_amount)
+                        currentchar = GetNextByte();              
+                }
+                parts[res].handler();
+                break;
+            case '$':
+                strlength = 0;
+                currentchar = GetNextByte();
+                
+                while (currentchar != '$'){
+                    func[strlength++] = currentchar;
+                    currentchar = GetNextByte();
+                }
+                func[strlength] = '\0';
+
+                if (strcmpcheck(func, "ERROR") || strcmpcheck(func, "TRUE")){
+                    inifstatement = (errcode);
+                }
+                else if (strcmpcheck(func, "NOERROR") || strcmpcheck(func, "FALSE")){
+                    inifstatement = (!errcode);
+                }
+                else if (strcmpcheck(func, "BTN_POWER")){
+                    inifstatement = (buttons_pressed & BTN_POWER);
+                }
+                else if (strcmpcheck(func, "BTN_VOL+")){
+                    inifstatement = (buttons_pressed & BTN_VOL_UP);
+                }
+                else if (strcmpcheck(func, "BTN_VOL-")){
+                    inifstatement = (buttons_pressed & BTN_VOL_DOWN);
+                }
+                else if (strcmpcheck(func, "EMUMMC")){
+                    inifstatement = (emu_cfg.enabled);
+                }
+                else if (strcmpcheck(func, "NOEMUMMC")){
+                    inifstatement = (!emu_cfg.enabled);
+                }
+
+                if (inifstatement)
+                    while(currentchar != '{')
+                        currentchar = GetNextByte();
+                
+                break;
+
+        }
+    }
+
+    f_close(&in);
+}

source/tegraexplorer/script.h

@@ -0,0 +1,11 @@
+#pragma once
+#define strcmpcheck(x, y) (!strcmp(x, y))
+
+typedef int (*part_handler)();
+typedef struct _script_parts {
+    char name[11];
+    part_handler handler;
+    short arg_amount;
+} script_parts;
+
+void ParseScript(char* path);

source/tegraexplorer/te.c

@@ -8,6 +8,7 @@
 #include "io.h"
 #include "../utils/btn.h"
 #include "emmc.h"
+#include "../storage/emummc.h"
 
 extern bool sd_mount();
 extern void sd_unmount();
@@ -19,6 +20,9 @@ menu_item mainmenu[MAINMENU_AMOUNT] = {
     {"[SYSTEM:/] EMMC", COLOR_ORANGE, EMMC_SYS, 1},
     {"[USER:/] EMMC", COLOR_ORANGE, EMMC_USR, 1},
     {"[SAFE:/] EMMC", COLOR_ORANGE, EMMC_SAF, 1},
+    {"\n[SYSTEM:/] EMUMMC", COLOR_BLUE, EMUMMC_SYS, 1},
+    {"[USER:/] EMUMMC", COLOR_BLUE, EMUMMC_USR, 1},
+    {"[SAFE:/] EMUMMC", COLOR_BLUE, EMUMMC_SAF, 1},
     {"\nMount/Unmount SD", COLOR_WHITE, MOUNT_SD, 1},
     {"Tools", COLOR_VIOLET, TOOLS, 1},
     {"SD format", COLOR_VIOLET, SD_FORMAT, 1},
@@ -52,6 +56,12 @@ menu_item formatmenu[4] = {
     {"Format for EmuMMC setup (FAT32/RAW)", COLOR_RED, FORMAT_EMUMMC, 1}
 };
 
+menu_item mmcChoice[3] = {
+    {"Back\n", COLOR_WHITE, -1, 1},
+    {"SysMMC", COLOR_ORANGE, SYSMMC, 1},
+    {"EmuMMC", COLOR_BLUE, EMUMMC, 1}
+};
+
 const char emmc_entries[3][8] = {
     "SAFE",
     "SYSTEM",
@@ -63,14 +73,19 @@ void fillmainmenu(){
 
     for (i = 0; i < MAINMENU_AMOUNT; i++){
         switch (i + 1) {
-            case 1:
+            case 5:
+            case 6:
             case 7:
+                if (mainmenu[i].property == -2)
+                    continue;
+            case 1:
+            case 10:
                 if (return_sd_mounted(i + 1))
                     mainmenu[i].property = 1;
                 else
                     mainmenu[i].property = -1;
                 break;
-            case 5:
+            case 8:
                 if (return_sd_mounted(1)){
                     mainmenu[i].property = 2;
                     strcpy(mainmenu[i].name, "\nUnmount SD");
@@ -94,6 +109,14 @@ void te_main(){
         mainmenu[3].property = -1;
     }
 
+    if (emummc_load_cfg()){
+        mainmenu[4].property = -2;
+        mainmenu[5].property = -2;
+        mainmenu[6].property = -2;
+    }
+
+    disconnect_mmc();
+
     while (1){
         fillmainmenu();
         res = makemenu(mainmenu, MAINMENU_AMOUNT);
@@ -108,7 +131,8 @@ void te_main(){
             case EMMC_USR:
 
                 if (makewaitmenu("You're about to enter EMMC\nModifying anything here\n        can result in a BRICK!\n\nPlease only continue\n    if you know what you're doing\n\nPress Vol+/- to return\n", "Press Power to enter", 4)){
-                if (!mount_emmc(emmc_entries[res - 2], res - 1)){
+                    connect_mmc(SYSMMC);
+                    if (!mount_mmc(emmc_entries[res - 2], res - 1)){
                         fileexplorer("emmc:/");
                     }
                     else
@@ -117,6 +141,19 @@ void te_main(){
     
                 break;
 
+            case EMUMMC_SAF:
+            case EMUMMC_SYS:
+            case EMUMMC_USR:
+
+                connect_mmc(EMUMMC);
+                if (!mount_mmc(emmc_entries[res - 5], res - 4)){
+                    fileexplorer("emmc:/");
+                }
+                else
+                    message(COLOR_RED, "EMUMMC failed to mount!");
+                
+                break;
+
             case MOUNT_SD:
                 if (return_sd_mounted(1))
                     sd_unmount();
@@ -136,10 +173,28 @@ void te_main(){
                         displaygpio();
                         break;
                     case DUMPFIRMWARE:
-                        dumpfirmware();
+                        /*
+                        if (mainmenu[4].property >= 0){
+                            res = makemenu(mmcChoice, 3);
+
+                            if (res >= 0)
+                                dumpfirmware(res);
+                        }
+                        else
+                        */
+                        dumpfirmware(SYSMMC);
+
                         break;
                     case DUMPUSERSAVE:
-                        dumpusersaves();
+                        if (mainmenu[4].property >= 0){
+                            res = makemenu(mmcChoice, 3);
+
+                            if (res >= 0)
+                                dumpusersaves(res);
+                        }
+                        else
+                            dumpusersaves(SYSMMC);
+
                         break;
                 }
                 break;

source/tegraexplorer/te.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "../utils/types.h"
 
-#define MAINMENU_AMOUNT 9
+#define MAINMENU_AMOUNT 12
 #define CREDITS_MESSAGE "\nTegraexplorer, made by:\nSuch Meme, Many Skill\n\nProject based on:\nLockpick_RCM\nHekate\n\nCool people:\nshchmue\ndennthecafebabe\nDax"
 
 typedef struct _menu_item {
@@ -16,6 +16,9 @@ enum mainmenu_return {
     EMMC_SAF,
     EMMC_SYS,
     EMMC_USR,
+    EMUMMC_SAF,
+    EMUMMC_SYS,
+    EMUMMC_USR,
     MOUNT_SD,
     TOOLS,
     SD_FORMAT,
@@ -43,6 +46,4 @@ enum formatmenu_return {
     FORMAT_ALL_FAT32
 };
 
-//menu_item mainmenu[MAINMENU_AMOUNT];
-
 void te_main();

source/tegraexplorer/tools.c

@@ -25,6 +25,7 @@ void displayinfo(){
     DWORD fre_clust, fre_sect, tot_sect;
     u32 capacity;
     u8 fuse_count = 0;
+    pkg1_info pkg1 = returnpkg1info();
     int res;
 
     for (u32 i = 0; i < 32; i++){
@@ -34,7 +35,7 @@ void displayinfo(){
 
     SWAPCOLOR(COLOR_ORANGE);
 
-    gfx_printf("Fuse count: %d\nPKG1 version: %d\n\n", fuse_count, returnpkg1ver());
+    gfx_printf("Fuse count: %d\nPKG1 version: %d\nPKG1 id: %s\n\n", fuse_count, pkg1.ver, pkg1.id);
     print_biskeys();
 
     RESETCOLOR;
@@ -85,7 +86,7 @@ void displaygpio(){
     }
 }
 
-int dumpfirmware(){
+int dumpfirmware(int mmc){
     DIR dir;
     FILINFO fno;
     bool fail = false;
@@ -94,13 +95,14 @@ int dumpfirmware(){
     char sdfolderpath[100] = "";
     char syspath[100] = "";
     char sdpath[100] = "";
-    short pkg1ver = returnpkg1ver();
+    pkg1_info pkg1 = returnpkg1info();
     u32 timer = get_tmr_s();
 
     clearscreen();
-    mount_emmc("SYSTEM", 2);
+    connect_mmc(mmc);
+    mount_mmc("SYSTEM", 2);
 
-    gfx_printf("PKG1 version: %d\n", pkg1ver);
+    gfx_printf("PKG1 version: %d\n", pkg1.ver);
 
     ret = f_mkdir("sd:/tegraexplorer");
     gfx_printf("Creating sd:/tegraexplorer %d\n", ret);
@@ -108,7 +110,7 @@ int dumpfirmware(){
     ret = f_mkdir("sd:/tegraexplorer/Firmware");
     gfx_printf("Creating sd:/tegraexplorer/Firmware %d\n", ret);
 
-    sprintf(sdfolderpath, "sd:/tegraexplorer/Firmware/%d", pkg1ver);
+    sprintf(sdfolderpath, "sd:/tegraexplorer/Firmware/%d (%s)", pkg1.ver, pkg1.id);
     ret = f_mkdir(sdfolderpath);
     gfx_printf("Creating %s %d\n", sdfolderpath, ret);
 
@@ -141,10 +143,11 @@ int dumpfirmware(){
     return fail;
 }
 
-void dumpusersaves(){
+void dumpusersaves(int mmc){
     int res;
 
-    mount_emmc("USER", 2);
+    connect_mmc(mmc);
+    mount_mmc("USER", 2);
     clearscreen();
 
     res = f_mkdir("sd:/tegraexplorer");
@@ -180,7 +183,7 @@ int format(int mode){
     formatoptions |= (FM_FAT32);
     //formatoptions |= (FM_SFD);
 
-    disconnect_emmc();
+    disconnect_mmc();
 
     timer = get_tmr_s();
     totalsectors = sd_storage.csd.capacity;
@@ -238,8 +241,7 @@ int format(int mode){
         }
     }
 
-    dump_biskeys();
+    connect_mmc(SYSMMC);
-    mount_emmc("SYSTEM", 2);
 
     gfx_printf("\nPress any button to return%k\nTotal time taken: %ds", COLOR_WHITE, (get_tmr_s() - timer));
     btn_wait();

source/tegraexplorer/tools.h

@@ -3,5 +3,5 @@
 void displayinfo();
 void displaygpio();
 int format(int mode);
-int dumpfirmware();
+int dumpfirmware(int mmc);
-void dumpusersaves();
+void dumpusersaves(int mmc);