archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 00:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

cellSysCache: return /dev_hdd1 root

Browse source 
It simplifies internal logic a little.
This commit is contained in:
Nekotekina 2019-11-09 14:35:05 +03:00
parent e0bc276205
commit 73ee6abb0f
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/Cell/Modules/cellSysCache.cpp
View file

@ -71,12 +71,6 @@ struct syscache_info
{ {
cellSysutil.fatal("cellSysCache: failed to clear cache directory '%s%s' (%s)", cache_root, cache_id, fs::g_tls_error); cellSysutil.fatal("cellSysCache: failed to clear cache directory '%s%s' (%s)", cache_root, cache_id, fs::g_tls_error);
} }
if (!remove_root)
{
// Recreate /cache subdirectory if necessary
fs::create_path(cache_root + cache_id + "/cache");
}
} }
}; };
@ -120,7 +114,7 @@ error_code cellSysCacheMount(vm::ptr<CellSysCacheParam> param)
std::string new_path = cache->cache_root + cache_id + '/'; std::string new_path = cache->cache_root + cache_id + '/';
// Set fixed VFS path // Set fixed VFS path
strcpy_trunc(param->getCachePath, "/dev_hdd1/cache"); strcpy_trunc(param->getCachePath, "/dev_hdd1");
// Lock pseudo-mutex // Lock pseudo-mutex
const auto lock = cache->init.init_always([&] const auto lock = cache->init.init_always([&]
@ -128,7 +122,7 @@ error_code cellSysCacheMount(vm::ptr<CellSysCacheParam> param)
}); });
// Check if can reuse existing cache (won't if cache id is an empty string) // Check if can reuse existing cache (won't if cache id is an empty string)
if (param->cacheId[0] && cache_id == cache->cache_id && fs::is_dir(new_path + "cache")) if (param->cacheId[0] && cache_id == cache->cache_id)
{ {
// Isn't mounted yet on first call to cellSysCacheMount // Isn't mounted yet on first call to cellSysCacheMount
vfs::mount("/dev_hdd1", new_path); vfs::mount("/dev_hdd1", new_path);
@ -145,7 +139,7 @@ error_code cellSysCacheMount(vm::ptr<CellSysCacheParam> param)
// Set new cache id // Set new cache id
cache->cache_id = std::move(cache_id); cache->cache_id = std::move(cache_id);
fs::create_path(new_path + "cache"); fs::create_dir(new_path);
vfs::mount("/dev_hdd1", new_path); vfs::mount("/dev_hdd1", new_path);
return not_an_error(CELL_SYSCACHE_RET_OK_CLEARED); return not_an_error(CELL_SYSCACHE_RET_OK_CLEARED);