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

Merge pull request #127 from lioncash/misc-things

Browse source 
Minor logging changes.
This commit is contained in:
Alexandro Sánchez Bach 2014-03-27 16:03:38 +01:00
commit 7d3414c44c
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Emu/HDD/HDD.h
View file

@ -583,13 +583,12 @@ public:
} }
u64 new_block = FindFreeBlock(); u64 new_block = FindFreeBlock();
ConLog.Write("CREATION ENTRY AT 0x%llx", new_block);
if(!new_block) if(!new_block)
{ {
return false; return false;
} }
ConLog.Write("CREATING ENTRY AT 0x%llx", new_block);
WriteBlock(new_block, g_used_block); WriteBlock(new_block, g_used_block);
{ {
@ -739,7 +738,7 @@ public:
return false; return false;
} }
ConLog.Write("ENTRY FINDED AT 0x%llx", file_block); ConLog.Write("ENTRY FOUND AT 0x%llx", file_block);
m_file.Open(file_block); m_file.Open(file_block);
return vfsFileBase::Open(path, mode); return vfsFileBase::Open(path, mode);
@ -769,7 +768,7 @@ public:
if(entry.type == vfsHDD_Entry_Dir && name != "." && name != "..") if(entry.type == vfsHDD_Entry_Dir && name != "." && name != "..")
{ {
ConLog.Warning("removing sub folder '%s'", name.wx_str()); ConLog.Warning("Removing sub folder '%s'", name.wx_str());
RemoveBlocksDir(entry.data_block); RemoveBlocksDir(entry.data_block);
} }
else if(entry.type == vfsHDD_Entry_File) else if(entry.type == vfsHDD_Entry_File)

8
rpcs3/Emu/SysCalls/Modules/cellAdec.cpp
View file

@ -30,7 +30,7 @@ next:
{ {
if (Emu.IsStopped()) if (Emu.IsStopped())
{ {
ConLog.Warning("adecRead() aborted"); ConLog.Warning("adecRawRead() aborted");
return 0; return 0;
} }
Sleep(1); Sleep(1);
@ -47,7 +47,7 @@ next:
{ {
if (!Memory.CopyToReal(buf, adec.reader.addr, adec.reader.size)) if (!Memory.CopyToReal(buf, adec.reader.addr, adec.reader.size))
{ {
ConLog.Error("adecRead: data reading failed (reader.size=0x%x)", adec.reader.size); ConLog.Error("adecRawRead: data reading failed (reader.size=0x%x)", adec.reader.size);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }
@ -68,7 +68,7 @@ next:
} }
break; break;
default: default:
ConLog.Error("adecRead(): sequence error (task %d)", adec.job.Peek().type); ConLog.Error("adecRawRead(): sequence error (task %d)", adec.job.Peek().type);
return -1; return -1;
} }
@ -85,7 +85,7 @@ next:
} }
else if (!Memory.CopyToReal(buf, adec.reader.addr, buf_size)) else if (!Memory.CopyToReal(buf, adec.reader.addr, buf_size))
{ {
ConLog.Error("adecRead: data reading failed (buf_size=0x%x)", buf_size); ConLog.Error("adecRawRead: data reading failed (buf_size=0x%x)", buf_size);
Emu.Pause(); Emu.Pause();
return 0; return 0;
} }

2
rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
View file

@ -701,7 +701,7 @@ int32_t cellGcmMapLocalMemory(u64 address, u64 size)
} }
else else
{ {
printf("RSX local memory already mapped"); cellGcmSys.Error("RSX local memory already mapped");
return CELL_GCM_ERROR_FAILURE; return CELL_GCM_ERROR_FAILURE;
} }

5
rpcs3/Emu/SysCalls/Modules/sys_fs.cpp
View file

@ -50,9 +50,10 @@ int sdata_unpack(wxString packed_file, wxString unpacked_file)
char buffer [10200]; char buffer [10200];
packed_stream->Read(buffer, 256); packed_stream->Read(buffer, 256);
if (re32(*(u32*)&buffer[0]) != 0x4E504400) // "NPD\x00" u32 format = re32(*(u32*)&buffer[0]);
if (format != 0x4E504400) // "NPD\x00"
{ {
printf("ERROR: illegal format."); sys_fs.Error("Illegal format. Expected 0x4E504400, but got 0x%08x", format);
return CELL_EFSSPECIFIC; return CELL_EFSSPECIFIC;
} }