OmniNX/Atmosphere-Pro
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add partition checks

Browse Source
This commit is contained in:
Christoph Baumann
2025-05-22 14:42:55 +02:00
parent 8254e56b58
commit 2d20e9af5a
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
emummc/source/emuMMC/emummc.c vendored
View File

@@ -401,6 +401,7 @@ static void _file_based_update_filename(char *outFilename, unsigned int sd_path_
static void _file_based_sd_flush() static void _file_based_sd_flush()
{ {
if((emuMMC_ctx.SD_Type == EmummcType_File_Emmc || emuMMC_ctx.SD_Type == EmummcType_File_Sd) && file_based_sd_initialized){ if((emuMMC_ctx.SD_Type == EmummcType_File_Emmc || emuMMC_ctx.SD_Type == EmummcType_File_Sd) && file_based_sd_initialized){
_ensure_correct_partition(FS_SDMMC_SD);
int i = 0; int i = 0;
do{ do{
int res = f_sync(&f_emu_sd.fp[i]); int res = f_sync(&f_emu_sd.fp[i]);
@@ -410,11 +411,14 @@ static void _file_based_sd_flush()
} }
i++; i++;
}while(i < f_emu_sd.parts); }while(i < f_emu_sd.parts);
_restore_partition();
} }
} }
static void _file_based_sd_initialize(void) static void _file_based_sd_initialize(void)
{ {
_ensure_correct_partition(FS_SDMMC_SD);
if(emuMMC_ctx.SD_Type == EmummcType_File_Emmc) { if(emuMMC_ctx.SD_Type == EmummcType_File_Emmc) {
_mount_emmc(true); _mount_emmc(true);
}else if(emuMMC_ctx.SD_Type == EmummcType_File_Sd){ }else if(emuMMC_ctx.SD_Type == EmummcType_File_Sd){
@@ -467,6 +471,8 @@ static void _file_based_sd_initialize(void)
} }
file_based_sd_initialized = true; file_based_sd_initialized = true;
_restore_partition();
} }
static void _sdmmc_ensure_initialized_sd(void) static void _sdmmc_ensure_initialized_sd(void)
@@ -502,6 +508,7 @@ static void _file_based_emmc_finalize(void)
{ {
if ((emuMMC_ctx.EMMC_Type == EmummcType_File_Emmc || emuMMC_ctx.EMMC_Type == EmummcType_File_Sd) && file_based_emmc_initialized) if ((emuMMC_ctx.EMMC_Type == EmummcType_File_Emmc || emuMMC_ctx.EMMC_Type == EmummcType_File_Sd) && file_based_emmc_initialized)
{ {
_ensure_correct_partition(FS_SDMMC_EMMC);
// Close all open handles. // Close all open handles.
f_close(&f_emu.fp_boot0); f_close(&f_emu.fp_boot0);
f_close(&f_emu.fp_boot1); f_close(&f_emu.fp_boot1);
@@ -517,12 +524,14 @@ static void _file_based_emmc_finalize(void)
} }
file_based_emmc_initialized = false; file_based_emmc_initialized = false;
_restore_partition();
} }
} }
static void _file_based_sd_finalize(void) static void _file_based_sd_finalize(void)
{ {
if((emuMMC_ctx.SD_Type == EmummcType_File_Emmc || emuMMC_ctx.SD_Type == EmummcType_File_Sd) && file_based_sd_initialized){ if((emuMMC_ctx.SD_Type == EmummcType_File_Emmc || emuMMC_ctx.SD_Type == EmummcType_File_Sd) && file_based_sd_initialized){
_ensure_correct_partition(FS_SDMMC_SD);
for(int i = 0; i < f_emu_sd.parts; i++){ for(int i = 0; i < f_emu_sd.parts; i++){
f_close(&f_emu_sd.fp[i]); f_close(&f_emu_sd.fp[i]);
} }
@@ -534,6 +543,7 @@ static void _file_based_sd_finalize(void)
} }
file_based_sd_initialized = false; file_based_sd_initialized = false;
_restore_partition();
} }
} }
@@ -630,6 +640,8 @@ void sdmmc_finalize_sd(void)
static void _file_based_emmc_initialize(void) static void _file_based_emmc_initialize(void)
{ {
_ensure_correct_partition(FS_SDMMC_EMMC);
if(emuMMC_ctx.EMMC_Type == EmummcType_File_Emmc) { if(emuMMC_ctx.EMMC_Type == EmummcType_File_Emmc) {
_mount_emmc(true); _mount_emmc(true);
}else if (emuMMC_ctx.EMMC_Type == EmummcType_File_Sd) { }else if (emuMMC_ctx.EMMC_Type == EmummcType_File_Sd) {
@@ -719,6 +731,8 @@ static void _file_based_emmc_initialize(void)
} }
file_based_emmc_initialized = true; file_based_emmc_initialized = true;
_restore_partition();
} }
bool sdmmc_initialize_sd(void) bool sdmmc_initialize_sd(void)