rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show the free space on each drive in the root menu (#76)

Browse Source 
* show the free space on each of the drives in the root menu

* round up to nearest 0.1GB, instead of nearest GB

* remove redundant checks for bytes
This commit is contained in:
urmum-69 2020-12-14 19:51:38 +00:00 committed by GitHub
parent f8cd65dd69
commit d68ac105e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arm9/source/driveMenu.cpp
View File

@ -200,7 +200,9 @@ void dm_drawBottomScreen(void) {
} }
printf ("\n(SD FAT, "); printf ("\n(SD FAT, ");
printDriveBytes(sdSize); printDriveBytes(sdSize);
printf(")"); printf(")\n");
printDriveBytes(getBytesFree("sd:/"));
printf(" space free");
} else if (dmAssignedOp[dmCursorPosition] == 1) { } else if (dmAssignedOp[dmCursorPosition] == 1) {
printf ("[fat:] FLASHCART"); printf ("[fat:] FLASHCART");
if (fatLabel[0] != '\0') { if (fatLabel[0] != '\0') {
@ -208,7 +210,9 @@ void dm_drawBottomScreen(void) {
} }
printf ("\n(Slot-1 SD FAT, "); printf ("\n(Slot-1 SD FAT, ");
printDriveBytes(fatSize); printDriveBytes(fatSize);
printf(")"); printf(")\n");
printDriveBytes(getBytesFree("fat:/"));
printf(" space free");
} else if (dmAssignedOp[dmCursorPosition] == 2) { } else if (dmAssignedOp[dmCursorPosition] == 2) {
printf ("GBA GAMECART\n"); printf ("GBA GAMECART\n");
printf ("(GBA Game)"); printf ("(GBA Game)");
@ -228,7 +232,9 @@ void dm_drawBottomScreen(void) {
printf ("[nand:] SYSNAND"); printf ("[nand:] SYSNAND");
printf ("\n(SysNAND FAT, "); printf ("\n(SysNAND FAT, ");
printDriveBytes(nandSize); printDriveBytes(nandSize);
printf(")"); printf(")\n");
printDriveBytes(getBytesFree("nand:/"));
printf(" space free");
} else if (dmAssignedOp[dmCursorPosition] == 8) { } else if (dmAssignedOp[dmCursorPosition] == 8) {
printf ("[img:] FAT IMAGE"); printf ("[img:] FAT IMAGE");
printf ("\n(Image FAT, "); printf ("\n(Image FAT, ");

34
arm9/source/driveOperations.cpp
View File

@ -42,41 +42,35 @@ u64 sdSize = 0;
u64 fatSize = 0; u64 fatSize = 0;
u64 imgSize = 0; u64 imgSize = 0;
static int getGbNumber(u64 bytes) { static float getGbNumber(u64 bytes) {
int gbNumber = 0; float gbNumber = 0.0f;
for (u64 i = 0; i <= bytes; i += 0x40000000) { for (u64 i = 0; i <= bytes; i += 0x6666666) {
gbNumber++; gbNumber += 0.1f;
} }
return gbNumber; return gbNumber;
} }
static int getTbNumber(u64 bytes) { static float getTbNumber(u64 bytes) {
int tbNumber = 0; float tbNumber = 0.0f;
for (u64 i = 0; i <= bytes; i += 0x10000000000) { for (u64 i = 0; i <= bytes; i += 0x1999999999) {
tbNumber++; tbNumber += 0.01f;
} }
return tbNumber; return tbNumber;
} }
void printDriveBytes(u64 bytes) void printDriveBytes(u64 bytes)
{ {
if (bytes == 1) if (bytes < (1024 * 1024))
iprintf("%d Byte", (int)bytes);
else if (bytes >= 0 && bytes < 1024)
iprintf("%d Bytes", (int)bytes);
else if (bytes >= 1024 && bytes < (1024 * 1024))
printf("%d KB", (int)bytes / 1024); printf("%d KB", (int)bytes / 1024);
else if (bytes >= (1024 * 1024) && bytes < (1024 * 1024 * 1024)) else if (bytes >= (1024 * 1024) && bytes < (1024 * 1024 * 1024))
printf("%d MB", (int)bytes / 1024 / 1024); printf("%d MB", (int)bytes / 1024 / 1024);
else if (bytes >= 0x40000000 && bytes < 0x10000000000) else if (bytes >= 0x40000000 && bytes < 0x10000000000)
printf("%d GB", getGbNumber(bytes)); printf("%.1f GB", getGbNumber(bytes));
else else
printf("%d TB", getTbNumber(bytes)); printf("%.1f TB", getTbNumber(bytes));
} }
const char* getDrivePath(void) { const char* getDrivePath(void) {
@ -169,6 +163,12 @@ bool sdMount(void) {
return false; return false;
} }
u64 getBytesFree(const char* drivePath) {
struct statvfs st;
statvfs(drivePath, &st);
return (u64)st.f_bsize * (u64)st.f_bavail;
}
void sdUnmount(void) { void sdUnmount(void) {
fatUnmount("sd"); fatUnmount("sd");
sdLabel[0] = '\0'; sdLabel[0] = '\0';

1
arm9/source/driveOperations.h
View File

@ -44,5 +44,6 @@ extern void ramdrive2Mount(void);
extern void nitroUnmount(void); extern void nitroUnmount(void);
extern bool imgMount(const char* imgName); extern bool imgMount(const char* imgName);
extern void imgUnmount(void); extern void imgUnmount(void);
extern u64 getBytesFree(const char* drivePath);
#endif //FLASHCARD_H #endif //FLASHCARD_H