ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sys_fs hotfix 

Co-Authored-By: brian218 <17809637+brian218@users.noreply.github.com>
This commit is contained in:
Eladash 2022-12-03 16:42:51 +02:00 committed by Megamouse
parent ad3ea966cb
commit 82a8d96fba
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
rpcs3/Emu/Cell/lv2/sys_fs.cpp
View File

@ -31,6 +31,7 @@ lv2_fs_mount_point g_mp_sys_dev_flash{"/dev_flash", "CELL_FS_FAT", "CELL_FS_IOS:
lv2_fs_mount_point g_mp_sys_host_root{"/host_root", "CELL_FS_DUMMYFS", "CELL_FS_DUMMY:/", 512, 0x100, 512, lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid, &g_mp_sys_dev_flash}; lv2_fs_mount_point g_mp_sys_host_root{"/host_root", "CELL_FS_DUMMYFS", "CELL_FS_DUMMY:/", 512, 0x100, 512, lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid, &g_mp_sys_dev_flash};
lv2_fs_mount_point g_mp_sys_app_home{"/app_home", "CELL_FS_DUMMYFS", "CELL_FS_DUMMY:", 512, 0x100, 512, lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid, &g_mp_sys_host_root}; lv2_fs_mount_point g_mp_sys_app_home{"/app_home", "CELL_FS_DUMMYFS", "CELL_FS_DUMMY:", 512, 0x100, 512, lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid, &g_mp_sys_host_root};
lv2_fs_mount_point g_mp_sys_dev_root{"/", "CELL_FS_ADMINFS", "CELL_FS_ADMINFS:", 512, 0x100, 512, lv2_mp_flag::read_only + lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid, &g_mp_sys_app_home}; lv2_fs_mount_point g_mp_sys_dev_root{"/", "CELL_FS_ADMINFS", "CELL_FS_ADMINFS:", 512, 0x100, 512, lv2_mp_flag::read_only + lv2_mp_flag::strict_get_block_size + lv2_mp_flag::no_uid_gid, &g_mp_sys_app_home};
lv2_fs_mount_point g_mp_sys_no_device{};
struct mount_point_reset struct mount_point_reset
{ {
@ -206,31 +207,36 @@ std::string_view lv2_fs_object::get_device_path(std::string_view filename)
lv2_fs_mount_point* lv2_fs_object::get_mp(std::string_view filename) lv2_fs_mount_point* lv2_fs_object::get_mp(std::string_view filename)
{ {
if (!filename.starts_with('/'))
{
return &g_mp_sys_no_device;
}
const auto mp_name = get_device_path(filename); const auto mp_name = get_device_path(filename);
if (mp_name == "dev_hdd0"sv) for (auto mp = &g_mp_sys_dev_root; mp; mp = mp->next)
return &g_mp_sys_dev_hdd0; {
if (mp_name == "dev_hdd1"sv) const auto pos = mp->root.find_first_not_of('/');
return &g_mp_sys_dev_hdd1; const auto mp_root = pos != umax ? mp->root.substr(pos) : mp->root;
if (mp_name.starts_with("dev_usb"sv))
return &g_mp_sys_dev_usb; if (mp == &g_mp_sys_dev_usb)
if (mp_name == "dev_bdvd"sv) {
return &g_mp_sys_dev_bdvd; for (int i = 0; i < 8; i++)
if (mp_name == "dev_ps2disc"sv) {
return &g_mp_sys_dev_dvd; if (fmt::format("%s%03d", mp_root, i) == mp_name)
if (mp_name == "app_home"sv) {
return &g_mp_sys_app_home; return mp;
if (mp_name == "host_root"sv) }
return &g_mp_sys_host_root; }
if (mp_name == "dev_flash"sv) }
return &g_mp_sys_dev_flash; else if (mp_root == mp_name)
if (mp_name == "dev_flash2"sv) {
return &g_mp_sys_dev_flash2; return mp;
if (mp_name == "dev_flash3"sv) }
return &g_mp_sys_dev_flash3; }
// Default fallback // Default fallback
return &g_mp_sys_dev_root; return &g_mp_sys_no_device;
} }
std::string lv2_fs_object::get_vfs(std::string_view filename) std::string lv2_fs_object::get_vfs(std::string_view filename)