diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp index a047abb7ee..504d7acfc6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp @@ -508,6 +508,7 @@ s32 cellGameGetParamInt(u32 id, vm::ptr 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 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 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; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp index 02f1de3183..c24de449c5 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp @@ -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; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp index cf7b86c5a9..413616848b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp @@ -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; } } diff --git a/rpcs3/config.h b/rpcs3/config.h index 2ed632a31a..5489e4c689 100644 --- a/rpcs3/config.h +++ b/rpcs3/config.h @@ -942,7 +942,7 @@ namespace rpcs3 { net_group(group *grp) : group{ grp, "net" } {} - entry status{ this, "Connection status", misc_net_status::connecting }; + entry status{ this, "Connection status", misc_net_status::ip_obtained }; entry _interface { this, "Network adapter", 0 }; } net{ this };