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

Fix remounting SD card (#130)

Browse Source 
* Fix remounting SD card

* Fix SD label whitespace trimming

It was cutting at the first space, not the last one
Also clean up the function calls, `&sdLabel[0]` is the same thing as `sdLabel`
This commit is contained in:
Pk11 2022-01-01 21:52:21 -06:00 committed by GitHub
parent 5d5d05cf7c
commit aa2cfcab81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arm7/source/my_sdmmc.c
View File

@ -594,7 +594,7 @@ int my_sdmmc_nand_startup() {
//---------------------------------------------------------------------------------
int my_sdmmc_sd_startup() {
//---------------------------------------------------------------------------------
my_sdmmc_controller_init(false);
my_sdmmc_controller_init(true);
return my_sdmmc_sdcard_init();
}

6
arm9/source/driveMenu.cpp
View File

@ -152,9 +152,7 @@ void dm_drawBottomScreen(void) {
font->print(0, row--, false, STR_START_START_MENU);
if (sdMountedDone) {
if (isRegularDS || sdMounted) {
font->print(0, row--, false, sdMounted ? STR_UNMOUNT_SDCARD : STR_REMOUNT_SDCARD);
}
font->print(0, row--, false, sdMounted ? STR_UNMOUNT_SDCARD : STR_REMOUNT_SDCARD);
} else {
font->print(0, row--, false, flashcardMounted ? STR_UNMOUNT_FLASHCARD : STR_REMOUNT_FLASHCARD);
}
@ -401,7 +399,7 @@ void driveMenu (void) {
currentDrive = Drive::sdCard;
chdir("sd:/");
sdUnmount();
} else if (isRegularDS) {
} else {
sdMounted = sdMount();
}
} else {

16
arm9/source/driveOperations.cpp
View File

@ -101,11 +101,9 @@ const char* getDrivePath(void) {
}
void fixLabel(char* label) {
for (int i = 0; i < 12; i++) {
if (((label[i] == ' ') && (label[i+1] == ' ') && (label[i+2] == ' '))
|| ((label[i] == ' ') && (label[i+1] == ' '))
|| (label[i] == ' ')) {
label[i] = '\0';
for (int i = strlen(label) - 1; i >= 0; i--) {
if(label[i] != ' ') {
label[i + 1] = '\0';
break;
}
}
@ -160,7 +158,7 @@ bool sdMount(void) {
if (sdFound()) {
sdMountedDone = true;
fatGetVolumeLabel("sd", sdLabel);
fixLabel(&sdLabel[0]);
fixLabel(sdLabel);
struct statvfs st;
if (statvfs("sd:/", &st) == 0) {
sdSize = st.f_bsize * st.f_blocks;
@ -288,7 +286,7 @@ TWL_CODE bool twl_flashcardMount(void) {
if (flashcardFound()) {
fatGetVolumeLabel("fat", fatLabel);
fixLabel(&fatLabel[0]);
fixLabel(fatLabel);
struct statvfs st;
if (statvfs("fat:/", &st) == 0) {
fatSize = st.f_bsize * st.f_blocks;
@ -304,7 +302,7 @@ bool flashcardMount(void) {
fatInitDefault();
if (flashcardFound()) {
fatGetVolumeLabel("fat", fatLabel);
fixLabel(&fatLabel[0]);
fixLabel(fatLabel);
struct statvfs st;
if (statvfs("fat:/", &st) == 0) {
fatSize = st.f_bsize * st.f_blocks;
@ -349,7 +347,7 @@ bool imgMount(const char* imgName) {
fatMountSimple("img", &io_img);
if (imgFound()) {
fatGetVolumeLabel("img", imgLabel);
fixLabel(&imgLabel[0]);
fixLabel(imgLabel);
struct statvfs st;
if (statvfs("img:/", &st) == 0) {
imgSize = st.f_bsize * st.f_blocks;