Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 05:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unicode FAT labels (#508)

Browse Source
This commit is contained in:
Wolfvak 2019-07-29 14:40:11 -03:00 committed by d0k3
parent e6b63f328b
commit c8a7c63963
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arm9/source/filesys/fsdrive.c
View File

@ -83,9 +83,9 @@ bool GetRootDirContentsWorker(DirStruct* contents) {
static const char* drvnum[] = { FS_DRVNUM }; static const char* drvnum[] = { FS_DRVNUM };
u32 n_entries = 0; u32 n_entries = 0;
char sdlabel[16]; char sdlabel[DRV_LABEL_LEN];
if (!GetFATVolumeLabel("0:", sdlabel) || !(*sdlabel)) if (!GetFATVolumeLabel("0:", sdlabel) || !(*sdlabel))
snprintf(sdlabel, 16, "NOLABEL"); strcpy(sdlabel, "NOLABEL");
char carttype[16]; char carttype[16];
GetVCartTypeString(carttype); GetVCartTypeString(carttype);

2
arm9/source/filesys/fsdrive.h
View File

@ -29,6 +29,8 @@
#define DRV_SEARCH (1UL<<16) #define DRV_SEARCH (1UL<<16)
#define DRV_STDFAT (1UL<<17) // standard FAT drive without limitations #define DRV_STDFAT (1UL<<17) // standard FAT drive without limitations
#define DRV_LABEL_LEN (36)
#define FS_DRVNAME \ #define FS_DRVNAME \
"SDCARD", \ "SDCARD", \
"SYSNAND CTRNAND", "SYSNAND TWLN", "SYSNAND TWLP", "SYSNAND SD", "SYSNAND VIRTUAL", \ "SYSNAND CTRNAND", "SYSNAND TWLN", "SYSNAND TWLP", "SYSNAND SD", "SYSNAND VIRTUAL", \

6
arm9/source/godmode.c
View File

@ -421,7 +421,7 @@ u32 SdFormatMenu(const char* slabel) {
u64 sysnand_min_size_mb = ((sysnand_min_size_sectors * 0x200) + 0xFFFFF) / 0x100000; u64 sysnand_min_size_mb = ((sysnand_min_size_sectors * 0x200) + 0xFFFFF) / 0x100000;
u64 sysnand_multi_size_mb = (align(sysnand_min_size_sectors + 1, 0x2000) * 0x200) / 0x100000; u64 sysnand_multi_size_mb = (align(sysnand_min_size_sectors + 1, 0x2000) * 0x200) / 0x100000;
u64 sysnand_size_mb = (((u64)GetNandSizeSectors(NAND_SYSNAND) * 0x200) + 0xFFFFF) / 0x100000; u64 sysnand_size_mb = (((u64)GetNandSizeSectors(NAND_SYSNAND) * 0x200) + 0xFFFFF) / 0x100000;
char label[16]; char label[DRV_LABEL_LEN + 4];
u32 cluster_size = 0; u32 cluster_size = 0;
u64 sdcard_size_mb = 0; u64 sdcard_size_mb = 0;
u64 emunand_size_mb = (u64) -1; u64 emunand_size_mb = (u64) -1;
@ -450,7 +450,7 @@ u32 SdFormatMenu(const char* slabel) {
if (!user_select) return 1; if (!user_select) return 1;
else cluster_size = cluster_size_table[user_select]; else cluster_size = cluster_size_table[user_select];
snprintf(label, 16, "0:%s", (slabel && *slabel) ? slabel : "GM9SD"); snprintf(label, DRV_LABEL_LEN + 4, "0:%s", (slabel && *slabel) ? slabel : "GM9SD");
if (!ShowKeyboardOrPrompt(label + 2, 11 + 1, "Format SD card (%lluMB)?\nEnter label:", sdcard_size_mb)) if (!ShowKeyboardOrPrompt(label + 2, 11 + 1, "Format SD card (%lluMB)?\nEnter label:", sdcard_size_mb))
return 1; return 1;
@ -1949,7 +1949,7 @@ u32 HomeMoreMenu(char* current_path) {
int user_select = ShowSelectPrompt(n_opt, optionstr, promptstr); int user_select = ShowSelectPrompt(n_opt, optionstr, promptstr);
if (user_select == sdformat) { // format SD card if (user_select == sdformat) { // format SD card
bool sd_state = CheckSDMountState(); bool sd_state = CheckSDMountState();
char slabel[16] = { '\0' }; char slabel[DRV_LABEL_LEN] = { '\0' };
if (clipboard->n_entries && (DriveType(clipboard->entry[0].path) & (DRV_SDCARD|DRV_ALIAS|DRV_EMUNAND|DRV_IMAGE))) if (clipboard->n_entries && (DriveType(clipboard->entry[0].path) & (DRV_SDCARD|DRV_ALIAS|DRV_EMUNAND|DRV_IMAGE)))
clipboard->n_entries = 0; // remove SD clipboard entries clipboard->n_entries = 0; // remove SD clipboard entries
GetFATVolumeLabel("0:", slabel); // get SD volume label GetFATVolumeLabel("0:", slabel); // get SD volume label