RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-06 15:05:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Seperate ConLog.h and ConLogFrame.h (for now only seperate headers)

Browse source 
make precompiled header slimmer under Linux to increase CI and dev-machine build-times

make sure unused modules don't compile
add unused modules to the VS project to easier keep track of them
This commit is contained in:
Peter Tissen 2014-06-02 19:27:24 +02:00
parent 4f36ecc681
commit 40add8f9a2
182 changed files with 893 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rpcs3/Emu/SysCalls/lv2/SC_FileSystem.cpp
View file

@ -1,4 +1,13 @@
#include "stdafx.h"
#include "Emu/ConLog.h"
#include "Emu/Memory/Memory.h"
#include "Emu/System.h"
#include "Emu/Cell/PPUThread.h"
#include "Emu/SysCalls/SC_FUNC.h"
#include "Emu/SysCalls/Modules.h"
#include "Emu/FS/vfsFile.h"
#include "Emu/FS/vfsDir.h"
#include "SC_FileSystem.h"
#include "Emu/SysCalls/SysCalls.h"
@ -139,7 +148,7 @@ int cellFsRead(u32 fd, u32 buf_addr, u64 nbytes, mem64_t nread)
if (count) if (u32 frag = buf_addr & 4095) // memory page fragment
{
u32 req = min(count, 4096 - frag);
u32 req = std::min(count, 4096 - frag);
u32 read = file->Read(Memory + buf_addr, req);
buf_addr += req;
res += read;