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

fix MountSd check

Browse Source
This commit is contained in:
Christoph Baumann
2025-05-22 13:34:20 +02:00
parent 5468af8934
commit 8254e56b58
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1114,11 +1114,25 @@ uint64_t sdmmc_wrapper_controller_close(int mmc_id)
{ {
if (mmc_id == FS_SDMMC_SD) if (mmc_id == FS_SDMMC_SD)
{ {
DEBUG_LOG("Controller Close SD\n");
if(custom_driver)
{
lock_mutex(sd_mutex);
}
lock_mutex(nand_mutex);
// Deinitializing/initializing file based emuSD every time SD is opened/closed // Deinitializing/initializing file based emuSD every time SD is opened/closed
// takes a long time. Instead, keep the files open and flush when SD is closed. // takes a long time. Instead, keep the files open and flush when SD is closed.
// Will be finalized when eMMC is finalized // Will be finalized when eMMC is finalized
_file_based_sd_flush(); _file_based_sd_flush();
unlock_mutex(nand_mutex);
if(custom_driver)
{
unlock_mutex(sd_mutex);
}
DEBUG_LOG("Controller Close SD\n");
if(_get_target_device(FS_SDMMC_EMMC) != FS_SDMMC_SD){ if(_get_target_device(FS_SDMMC_EMMC) != FS_SDMMC_SD){
// eMMC not redirected to SD, can close SD // eMMC not redirected to SD, can close SD
uint64_t ret =_this->vtab->sdmmc_accessor_controller_close(_this); uint64_t ret =_this->vtab->sdmmc_accessor_controller_close(_this);
@@ -1138,7 +1152,6 @@ uint64_t sdmmc_wrapper_controller_close(int mmc_id)
// Close file handles and unmount // Close file handles and unmount
DEBUG_LOG("Controller Close eMMC\n"); DEBUG_LOG("Controller Close eMMC\n");
_file_based_emmc_finalize(); _file_based_emmc_finalize();
_file_based_sd_finalize(); _file_based_sd_finalize();
if(_get_target_device(FS_SDMMC_EMMC) == FS_SDMMC_SD) if(_get_target_device(FS_SDMMC_EMMC) == FS_SDMMC_SD)

4
fusee/program/source/fusee_main.cpp
View File

@@ -88,8 +88,8 @@ namespace ams::nxboot {
if (R_FAILED(r = InitializeSdCard())) { if (R_FAILED(r = InitializeSdCard())) {
ShowFatalError("Failed to init SD card (0x%" PRIx32 ")!\n", r.GetValue()); ShowFatalError("Failed to init SD card (0x%" PRIx32 ")!\n", r.GetValue());
} }
if (R_FAILED(r = fs::MountSdCard())) { if (!fs::MountSdCard()) {
ShowFatalError("Failed to mount SD card (0x%" PRIx32 ")!\n", r.GetValue()); ShowFatalError("Failed to mount SD card!\n");
} }
if (R_FAILED(r = fs::ChangeDrive("sdmc:"))) { if (R_FAILED(r = fs::ChangeDrive("sdmc:"))) {
ShowFatalError("Failed to change drive (0x%" PRIx32 ")!\n", r.GetValue()); ShowFatalError("Failed to change drive (0x%" PRIx32 ")!\n", r.GetValue());