mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 03:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

sys_fs: Improved sys_fs_fcntl(0xc0000015 and 0xc000001c) by integrating duplicate code

Browse source
This commit is contained in:
brian218 2023-05-01 21:08:38 +08:00 • committed by Ivan
parent e9281843bf
commit 5696065727
2 changed files with 16 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
rpcs3/Emu/Cell/lv2/sys_fs.cpp
View file

@ -2142,29 +2142,29 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
return CELL_OK;
}
case 0xc0000015: // USB Vid/Pid lookup - Used by arcade games on dev_usbXXX
case 0xc0000015: // USB Vid/Pid query
case 0xc000001c: // USB Vid/Pid/Serial query
{
const auto arg = vm::static_ptr_cast<lv2_file_c0000015>(_arg);
const bool with_serial = op == 0xc000001c;
if (arg->size != 0x20u)
if (arg->size != (with_serial ? sizeof(lv2_file_c000001c) : sizeof(lv2_file_c0000015)))
{
sys_fs.error("sys_fs_fcntl(0xc0000015): invalid size (0x%x)", arg->size);
sys_fs.error("sys_fs_fcntl(0x%08x): invalid size (0x%x)", op, arg->size);
break;
}
if (arg->_x4 != 0x10u || arg->_x8 != 0x18u)
{
sys_fs.error("sys_fs_fcntl(0xc0000015): invalid args (0x%x, 0x%x)", arg->_x4, arg->_x8);
sys_fs.error("sys_fs_fcntl(0x%08x): invalid args (0x%x, 0x%x)", op, arg->_x4, arg->_x8);
break;
}
std::string_view vpath{ arg->name.get_ptr(), arg->name_size };
std::string_view vpath{arg->name.get_ptr(), arg->name_size};
// Trim trailing '\0'
if (const auto trim_pos = vpath.find('\0'); trim_pos != umax)
{
vpath.remove_suffix(vpath.size() - trim_pos);
}
if (vfs::get(vpath).empty())
{
@ -2185,9 +2185,16 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
const cfg::device_info device = g_cfg_vfs.get_device(g_cfg_vfs.dev_usb, device_path);
std::tie(arg->vendorID, arg->productID) = device.get_usb_ids();
if (with_serial)
{
const auto arg_c000001c = vm::static_ptr_cast<lv2_file_c000001c>(_arg);
const std::u16string serial = utf8_to_utf16(device.serial); // Serial needs to be encoded to utf-16 BE
std::copy_n(serial.begin(), std::min(serial.size(), sizeof(arg_c000001c->serial) / sizeof(u16)), arg_c000001c->serial);
}
arg->out_code = CELL_OK;
sys_fs.trace("sys_fs_fcntl(0xc0000015): found device '%s' (vid=0x%x, pid=0x%x)", device_path, arg->vendorID, arg->productID);
sys_fs.trace("sys_fs_fcntl(0x%08x): found device \"%s\" (vid=0x%x, pid=0x%x, serial=\"%s\")", op, device_path, arg->vendorID, arg->productID, device.serial);
return CELL_OK;
}
@ -2202,59 +2209,6 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
return CELL_OK;
}
case 0xc000001c: // USB Vid/Pid/Serial lookup
{
const auto arg = vm::static_ptr_cast<lv2_file_c000001c>(_arg);
if (arg->size != 0x60u)
{
sys_fs.error("sys_fs_fcntl(0xc000001c): invalid size (0x%x)", arg->size);
break;
}
if (arg->_x4 != 0x10u || arg->_x8 != 0x18u)
{
sys_fs.error("sys_fs_fcntl(0xc000001c): invalid args (0x%x, 0x%x)", arg->_x4, arg->_x8);
break;
}
std::string_view vpath{ arg->name.get_ptr(), arg->name_size };
// Trim trailing '\0'
if (const auto trim_pos = vpath.find('\0'); trim_pos != umax)
{
vpath.remove_suffix(vpath.size() - trim_pos);
}
if (vfs::get(vpath).empty())
{
arg->out_code = CELL_ENOTMOUNTED;
return {CELL_ENOTMOUNTED, vpath};
}
const auto& mi = g_fxo->get<lv2_fs_mount_info_map>().lookup(vpath);
const auto num_pos = mi.device.find_first_of("0123456789");
if (mi != &g_mp_sys_dev_usb || num_pos == umax)
{
arg->out_code = CELL_ENOTSUP;
return {CELL_ENOTSUP, vpath};
}
const std::string device_path = fmt::format("%s%s", mi->root, mi.device.substr(num_pos));
const cfg::device_info device = g_cfg_vfs.get_device(g_cfg_vfs.dev_usb, device_path);
std::tie(arg->vendorID, arg->productID) = device.get_usb_ids();
// Serial needs to be encoded to utf-16 BE
const std::u16string serial = utf8_to_utf16(device.serial);
std::copy_n(serial.begin(), std::min(serial.size(), sizeof(arg->serial) / sizeof(u16)), arg->serial);
arg->out_code = CELL_OK;
sys_fs.trace("sys_fs_fcntl(0xc000001c): found device '%s' (vid=0x%x, pid=0x%x, serial=%s)", device_path, arg->vendorID, arg->productID, device.serial);
return CELL_OK;
}
case 0xc0000021: // 9FDBBA89
{
break;

2
rpcs3/Emu/Cell/lv2/sys_fs.h
View file

@ -595,7 +595,7 @@ CHECK_SIZE(lv2_file_c000001a, 0x18);
struct lv2_file_c000001c : lv2_file_op
{
be_t<u32> size; // 0x20
be_t<u32> size; // 0x60
be_t<u32> _x4; // 0x10
be_t<u32> _x8; // 0x18 - offset of out_code
be_t<u32> name_size;