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

Merge pull request #800 from darkf/stread

Browse source 
implement cellFsStRead (does *not* use ringbuffers)
This commit is contained in:
B1ackDaemon 2014-09-10 08:02:25 +03:00
commit ff29320a34
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Emu/SysCalls/lv2/lv2Fs.cpp
View file

@ -696,15 +696,20 @@ s32 cellFsStReadStop(u32 fd)
s32 cellFsStRead(u32 fd, u32 buf_addr, u64 size, vm::ptr<be_t<u64>> rsize) s32 cellFsStRead(u32 fd, u32 buf_addr, u64 size, vm::ptr<be_t<u64>> rsize)
{ {
sys_fs->Todo("cellFsStRead(fd=%d, buf_addr=0x%x, size=0x%llx, rsize_addr = 0x%x)", fd, buf_addr, size, rsize.addr()); sys_fs->Warning("cellFsStRead(fd=%d, buf_addr=0x%x, size=0x%llx, rsize_addr=0x%x)", fd, buf_addr, size, rsize.addr());
LV2_LOCK(0); LV2_LOCK(0);
vfsStream* file; vfsStream* file;
if(!sys_fs->CheckId(fd, file)) return CELL_ESRCH; if(!sys_fs->CheckId(fd, file)) return CELL_ESRCH;
// TODO: use ringbuffer (fs_config)
fs_config.m_regid += size; fs_config.m_regid += size;
*rsize = fs_config.m_regid;
if (file->Eof())
return CELL_FS_ERANGE;
*rsize = file->Read(vm::get_ptr<void>(buf_addr), size);
return CELL_OK; return CELL_OK;
} }

4
rpcs3/Emu/SysCalls/lv2/lv2Fs.h
View file

@ -70,6 +70,10 @@ enum cellFsStStatus
CELL_FS_ST_PROGRESS = 0x0200, CELL_FS_ST_PROGRESS = 0x0200,
}; };
enum cellFsErrors
{
CELL_FS_ERANGE = 34
};
#pragma pack(push, 4) #pragma pack(push, 4)