mirrors/TegraExplorer
1
0
Fork 0
mirror of https://github.com/suchmememanyskill/TegraExplorer.git synced 2024-11-22 20:06:43 +00:00
Code Issues Releases Activity

Fix partitioning mistake, bump version to 1.2.1

Browse source
This commit is contained in:
Such Meme, Many Skill 2020-01-08 14:21:53 +01:00
parent 6724f364b5
commit 1410fa185f
3 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

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

39
source/libs/fatfs/ff.c
View file

@ -39,6 +39,8 @@
#include "ff.h" /* Declarations of FatFs API */ #include "ff.h" /* Declarations of FatFs API */
#include "diskio.h" /* Declarations of device I/O functions */ #include "diskio.h" /* Declarations of device I/O functions */
#include "../../gfx/gfx.h" #include "../../gfx/gfx.h"
#include "../../storage/sdmmc.h"
extern sdmmc_storage_t sd_storage;
#define EFSPRINTF(text, ...) print_error(); gfx_printf("%k"text"%k\n", 0xFFFFFF00, 0xFFFFFFFF); #define EFSPRINTF(text, ...) print_error(); gfx_printf("%k"text"%k\n", 0xFFFFFF00, 0xFFFFFFFF);
//#define EFSPRINTF(...) //#define EFSPRINTF(...)
@ -6108,14 +6110,14 @@ FRESULT f_fdisk (
UINT i, n, sz_cyl, tot_cyl, e_cyl; UINT i, n, sz_cyl, tot_cyl, e_cyl;
BYTE s_hd, e_hd, *p, *buf = (BYTE*)work; BYTE s_hd, e_hd, *p, *buf = (BYTE*)work;
DSTATUS stat; DSTATUS stat;
DWORD sz_disk, sz_part, s_part, p_cyl, b_cyl; DWORD sz_disk, p_sect, b_cyl, b_sect;
FRESULT res; FRESULT res;
stat = disk_initialize(pdrv); stat = disk_initialize(pdrv);
if (stat & STA_NOINIT) return FR_NOT_READY; if (stat & STA_NOINIT) return FR_NOT_READY;
if (stat & STA_PROTECT) return FR_WRITE_PROTECTED; if (stat & STA_PROTECT) return FR_WRITE_PROTECTED;
if (disk_ioctl(pdrv, GET_SECTOR_COUNT, &sz_disk)) return FR_DISK_ERR; sz_disk = sd_storage.csd.capacity;
buf = (BYTE*)work; buf = (BYTE*)work;
#if FF_USE_LFN == 3 #if FF_USE_LFN == 3
@ -6132,20 +6134,25 @@ FRESULT f_fdisk (
/* Create partition table */ /* Create partition table */
mem_set(buf, 0, FF_MAX_SS); mem_set(buf, 0, FF_MAX_SS);
p = buf + MBR_Table; b_cyl = 0; p = buf + MBR_Table; b_cyl = 0, b_sect = 0;
for (i = 0; i < 4; i++, p += SZ_PTE) { for (i = 0; i < 4; i++, p += SZ_PTE) {
p_cyl = (szt[i] <= 100U) ? (DWORD)tot_cyl * (szt[i] / 100) : szt[i]; // sz_cyl; /* Number of cylinders */ p_sect = szt[i]; /* Number of sectors */
if (p_cyl == 0) continue;
s_part = /*(DWORD)sz_cyl * */ b_cyl; if (p_sect == 0)
sz_part = /* (DWORD)sz_cyl * */ p_cyl; continue;
if (i == 0) { /* Exclude first track of cylinder 0 */
if (i == 0) { /* Exclude first 16MiB of sd */
s_hd = 1; s_hd = 1;
s_part += 32768; sz_part -= 32768; b_sect += 32768; p_sect -= 32768;
} else { }
else
s_hd = 0; s_hd = 0;
}
e_cyl = (b_cyl + p_cyl - 1) / sz_cyl; /* End cylinder */ b_cyl = b_sect / sz_cyl;
if (e_cyl >= tot_cyl) LEAVE_MKFS(FR_INVALID_PARAMETER); e_cyl = ((b_sect + p_sect) / sz_cyl) - 1; /* End cylinder */
if (e_cyl >= tot_cyl)
LEAVE_MKFS(FR_INVALID_PARAMETER);
/* Set partition table */ /* Set partition table */
@ -6156,10 +6163,10 @@ FRESULT f_fdisk (
p[5] = e_hd; /* End head */ p[5] = e_hd; /* End head */
p[6] = (BYTE)(((e_cyl >> 2) & 0xC0) | 63); /* End sector */ p[6] = (BYTE)(((e_cyl >> 2) & 0xC0) | 63); /* End sector */
p[7] = (BYTE)e_cyl; /* End cylinder */ p[7] = (BYTE)e_cyl; /* End cylinder */
st_dword(p + 8, s_part); /* Start sector in LBA */ st_dword(p + 8, b_sect); /* Start sector in LBA */
st_dword(p + 12, sz_part); /* Number of sectors */ st_dword(p + 12, p_sect); /* Number of sectors */
/* Next partition */ /* Next partition */
b_cyl += p_cyl; b_sect += p_sect;
} }
st_word(p, 0xAA55); /* MBR signature (always at offset 510) */ st_word(p, 0xAA55); /* MBR signature (always at offset 510) */

2
source/tegraexplorer/gfx.c
View file

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