nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

git subrepo pull emummc

Browse source 
subrepo:
  subdir:   "emummc"
  merged:   "38ed90b6e"
upstream:
  origin:   "https://github.com/m4xw/emuMMC"
  branch:   "develop"
  commit:   "5a29e1b2c"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
This commit is contained in:
Michael Scire 2021-04-11 03:51:53 -07:00
parent 3b3082cf58
commit b24784f5c1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emummc/.gitrepo
View file

@ -6,7 +6,7 @@
[subrepo] [subrepo]
remote = https://github.com/m4xw/emuMMC remote = https://github.com/m4xw/emuMMC
branch = develop branch = develop
commit = 5eed18eb527bbaa63aee5323c26de5b0cca6d28e commit = 5a29e1b2cb1b60771594999fa1671fea19c596fc
parent = 021b29d2dbc8ed0469bc822393e58c9f0d174d57 parent = 021b29d2dbc8ed0469bc822393e58c9f0d174d57
method = rebase method = rebase
cmdver = 0.4.1 cmdver = 0.4.1

4
emummc/source/emuMMC/emummc.c
View file

@ -328,13 +328,13 @@ uint64_t sdmmc_wrapper_controller_open(int mmc_id)
if (_this != NULL) if (_this != NULL)
{ {
// Lock eMMC xfer while SD card is being initialized by FS. // Lock eMMC xfer while SD card is being initialized by FS.
if (_this == sdmmc_accessor_get(FS_SDMMC_SD)) if (mmc_id == FS_SDMMC_SD)
mutex_lock_handler(FS_SDMMC_EMMC); // Recursive Mutex, handler will lock SD as well if custom_driver mutex_lock_handler(FS_SDMMC_EMMC); // Recursive Mutex, handler will lock SD as well if custom_driver
result = _this->vtab->sdmmc_accessor_controller_open(_this); result = _this->vtab->sdmmc_accessor_controller_open(_this);
// Unlock eMMC. // Unlock eMMC.
if (_this == sdmmc_accessor_get(FS_SDMMC_SD)) if (mmc_id == FS_SDMMC_SD)
mutex_unlock_handler(FS_SDMMC_EMMC); mutex_unlock_handler(FS_SDMMC_EMMC);
return result; return result;