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

emuSD/Boot fix

Browse Source
This commit is contained in:
NaGa
2026-04-08 16:56:50 +02:00
parent 234c80df04
commit af3613b521
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -458,7 +458,7 @@ static void _file_based_sd_initialize(void)
if (f_emu_sd.parts == 1) if (f_emu_sd.parts == 1)
f_emu_sd.parts = 0; f_emu_sd.parts = 0;
return; break;
} }
if(!f_expand_cltbl(&f_emu_sd.fp[f_emu_sd.parts], EMUSD_FP_CLMT_COUNT, &f_emu_sd.clmt[f_emu_sd.parts][0], f_size(&f_emu_sd.fp[f_emu_sd.parts]))){ if(!f_expand_cltbl(&f_emu_sd.fp[f_emu_sd.parts], EMUSD_FP_CLMT_COUNT, &f_emu_sd.clmt[f_emu_sd.parts][0], f_size(&f_emu_sd.fp[f_emu_sd.parts]))){
@@ -513,8 +513,13 @@ static void _file_based_emmc_finalize(void)
f_close(&f_emu.fp_boot0); f_close(&f_emu.fp_boot0);
f_close(&f_emu.fp_boot1); f_close(&f_emu.fp_boot1);
for (int i = 0; i < f_emu.parts; i++) {
f_close(&f_emu.fp_gpp[i]); int i = 0;
do {
f_close(&f_emu.fp_gpp[i]);
i++;
} while (i < f_emu.parts);
}
// Force unmount FAT volume. // Force unmount FAT volume.
if (emuMMC_ctx.EMMC_Type == EmummcType_File_Emmc) { if (emuMMC_ctx.EMMC_Type == EmummcType_File_Emmc) {
@@ -532,9 +537,11 @@ 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); _ensure_correct_partition(FS_SDMMC_SD);
for(int i = 0; i < f_emu_sd.parts; i++){ int i = 0;
do {
f_close(&f_emu_sd.fp[i]); f_close(&f_emu_sd.fp[i]);
} i++;
} while(i < f_emu_sd.parts);
if(emuMMC_ctx.SD_Type == EmummcType_File_Emmc) { if(emuMMC_ctx.SD_Type == EmummcType_File_Emmc) {
_mount_emmc(false); _mount_emmc(false);
@@ -716,7 +723,7 @@ static void _file_based_emmc_initialize(void)
if (f_emu.parts == 1) if (f_emu.parts == 1)
f_emu.parts = 0; f_emu.parts = 0;
return; break;
} }
if (!f_expand_cltbl(&f_emu.fp_gpp[f_emu.parts], EMUMMC_FP_CLMT_COUNT, if (!f_expand_cltbl(&f_emu.fp_gpp[f_emu.parts], EMUMMC_FP_CLMT_COUNT,
@@ -1052,7 +1059,7 @@ static uint64_t emummc_read_write_sd_inner(void *buf, unsigned int sector, unsig
goto out; goto out;
} }
} else { } else {
fp = &f_emu.fp_gpp[0]; fp = &f_emu_sd.fp[0];
} }

13
emummc/source/main.c vendored
View File

@@ -344,7 +344,18 @@ static bool load_emummc_sd_ctx(void) {
exo_emummc_config_t config; exo_emummc_config_t config;
__attribute__((aligned(0x1000))) exo_emummc_paths_t paths; __attribute__((aligned(0x1000))) exo_emummc_paths_t paths;
load_emummc_cfg(EXO_EMUMMC_MMC_SD, &config, &paths); // Try to get SD config. Official Atmosphere exosphere does not support
// EXO_EMUMMC_MMC_SD and returns SmcResult::NotSupported. In that case,
// fall through to the default SD behavior (no SD redirection).
int x = smcGetEmummcConfig(EXO_EMUMMC_MMC_SD, &config, &paths);
if(x != 0) {
DEBUG_LOG("GetEmummcConfig SD smc not supported, using defaults\n");
emuMMC_ctx.SD_Type = EmummcType_Partition_Sd;
emuMMC_ctx.SD_StoragePartitionOffset = 0;
emuMMC_ctx.fs_ver = FS_VER_MAX;
emuMMC_ctx.magic = (u32)-1;
return false;
}
if (config.base_cfg.magic == EMUMMC_STORAGE_MAGIC) { if (config.base_cfg.magic == EMUMMC_STORAGE_MAGIC) {
emuMMC_ctx.magic = config.base_cfg.magic; emuMMC_ctx.magic = config.base_cfg.magic;