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

Various minor logging improvements

Browse source 
Also changed the default connection state, because chances are, that
you're connected to Internet.
This commit is contained in:
Raul Tambre 2016-01-04 11:04:58 +02:00
parent 9d1208bf95
commit 8f937bda0f
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Emu/SysCalls/Modules/cellGame.cpp
View file

@ -508,6 +508,7 @@ s32 cellGameGetParamInt(u32 id, vm::ptr<u32> value)
// TODO: Access through cellGame***Check functions
vfsFile f("/app_home/../PARAM.SFO");
const PSFLoader psf(f);
if (!psf)
{
return CELL_GAME_ERROR_FAILURE;
@ -515,11 +516,12 @@ s32 cellGameGetParamInt(u32 id, vm::ptr<u32> value)
switch(id)
{
case CELL_GAME_PARAMID_PARENTAL_LEVEL: *value = psf.GetInteger("PARENTAL_LEVEL"); break;
case CELL_GAME_PARAMID_RESOLUTION: *value = psf.GetInteger("RESOLUTION"); break;
case CELL_GAME_PARAMID_SOUND_FORMAT: *value = psf.GetInteger("SOUND_FORMAT"); break;
case CELL_GAME_PARAMID_PARENTAL_LEVEL: *value = psf.GetInteger("PARENTAL_LEVEL"); break;
case CELL_GAME_PARAMID_RESOLUTION: *value = psf.GetInteger("RESOLUTION"); break;
case CELL_GAME_PARAMID_SOUND_FORMAT: *value = psf.GetInteger("SOUND_FORMAT"); break;
default:
cellGame.Error("cellGameGetParamInt(): Unimplemented parameter (%d)", id);
return CELL_GAME_ERROR_INVALID_ID;
}
@ -568,6 +570,7 @@ s32 cellGameGetParamString(u32 id, vm::ptr<char> buf, u32 bufsize)
case CELL_GAME_PARAMID_APP_VER: data = psf.GetString("APP_VER"); break;
default:
cellGame.Error("cellGameGetParamString(): Unimplemented parameter (%d)", id);
return CELL_GAME_ERROR_INVALID_ID;
}

6
rpcs3/Emu/SysCalls/Modules/cellResc.cpp
View file

@ -1220,19 +1220,19 @@ s32 cellRescCreateInterlaceTable(u32 ea_addr, float srcH, CellRescTableElement d
if (!s_rescInternalInstance->m_bInitialized)
{
cellResc.Error("cellRescCreateInterlaceTable : CELL_RESC_ERROR_NOT_INITIALIZED");
cellResc.Error("cellRescCreateInterlaceTable: CELL_RESC_ERROR_NOT_INITIALIZED");
return CELL_RESC_ERROR_NOT_INITIALIZED;
}
if ((ea_addr == 0) || (srcH <= 0.f) || (!(depth == CELL_RESC_ELEMENT_HALF || depth == CELL_RESC_ELEMENT_FLOAT)) || (length <= 0))
{
cellResc.Error("cellRescCreateInterlaceTable : CELL_RESC_ERROR_NOT_INITIALIZED");
cellResc.Error("cellRescCreateInterlaceTable: CELL_RESC_ERROR_BAD_ARGUMENT");
return CELL_RESC_ERROR_BAD_ARGUMENT;
}
if (s_rescInternalInstance->m_dstHeight == 0)
{
cellResc.Error("cellRescCreateInterlaceTable : CELL_RESC_ERROR_BAD_COMBINATION");
cellResc.Error("cellRescCreateInterlaceTable: CELL_RESC_ERROR_BAD_COMBINATION");
return CELL_RESC_ERROR_BAD_COMBINATION;
}

3
rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp
View file

@ -194,6 +194,7 @@ s32 cellSysmoduleIsLoaded(u16 id)
if (!Emu.GetModuleManager().CheckModuleId(id))
{
cellSysmodule.Error("cellSysmoduleIsLoaded(): unknown module (id=0x%04x)", id);
return CELL_SYSMODULE_ERROR_UNKNOWN;
}
@ -201,7 +202,7 @@ s32 cellSysmoduleIsLoaded(u16 id)
{
if (!m->IsLoaded())
{
cellSysmodule.Error("cellSysmoduleIsLoaded() failed: module not loaded (id=0x%04x)", id);
cellSysmodule.Warning("cellSysmoduleIsLoaded(): module not loaded (id=0x%04x)", id);
return CELL_SYSMODULE_ERROR_UNLOADED;
}
}

2
rpcs3/config.h
View file

@ -942,7 +942,7 @@ namespace rpcs3
{
net_group(group *grp) : group{ grp, "net" } {}
entry<misc_net_status> status{ this, "Connection status", misc_net_status::connecting };
entry<misc_net_status> status{ this, "Connection status", misc_net_status::ip_obtained };
entry<u32> _interface { this, "Network adapter", 0 };
} net{ this };