From 7f5f67163b36c2b59c6d5f7d8dac25a8e4570f97 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Tue, 1 Jul 2014 21:50:57 +0400 Subject: [PATCH] Compilation fix 4 --- rpcs3/Emu/SysCalls/Modules/cellGame.cpp | 14 +++++++------- rpcs3/Emu/SysCalls/Modules/cellGame.h | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp index d247780327..62ed6f9fc2 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp @@ -279,28 +279,28 @@ int cellGameDataCheckCreate2(u32 version, const mem_list_ptr_t dirName, u32 cellGame->Error("cellGameDataCheckCreate2(): TODO: writing PARAM.SFO parameters (addr=0x%x)", cbSet->setParam.GetAddr()); } - switch (cbResult->result.ToBE()) + switch (cbResult->result) { - case se32(CELL_GAMEDATA_CBRESULT_OK_CANCEL): + case CELL_GAMEDATA_CBRESULT_OK_CANCEL: // TODO: do not process game data cellGame->Warning("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_OK_CANCEL"); - case se32(CELL_GAMEDATA_CBRESULT_OK): + case CELL_GAMEDATA_CBRESULT_OK: return CELL_GAMEDATA_RET_OK; - case se32(CELL_GAMEDATA_CBRESULT_ERR_NOSPACE): // TODO: process errors, error message and needSizeKB result + case CELL_GAMEDATA_CBRESULT_ERR_NOSPACE: // TODO: process errors, error message and needSizeKB result cellGame->Error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_NOSPACE"); return CELL_GAMEDATA_ERROR_CBRESULT; - case se32(CELL_GAMEDATA_CBRESULT_ERR_BROKEN): + case CELL_GAMEDATA_CBRESULT_ERR_BROKEN: cellGame->Error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_BROKEN"); return CELL_GAMEDATA_ERROR_CBRESULT; - case se32(CELL_GAMEDATA_CBRESULT_ERR_NODATA): + case CELL_GAMEDATA_CBRESULT_ERR_NODATA: cellGame->Error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_NODATA"); return CELL_GAMEDATA_ERROR_CBRESULT; - case se32(CELL_GAMEDATA_CBRESULT_ERR_INVALID): + case CELL_GAMEDATA_CBRESULT_ERR_INVALID: cellGame->Error("cellGameDataCheckCreate2(): callback returned CELL_GAMEDATA_CBRESULT_ERR_INVALID"); return CELL_GAMEDATA_ERROR_CBRESULT; diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.h b/rpcs3/Emu/SysCalls/Modules/cellGame.h index 963a8cfc62..12a0165eba 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGame.h +++ b/rpcs3/Emu/SysCalls/Modules/cellGame.h @@ -127,10 +127,10 @@ enum // old consts { CELL_GAMEDATA_CBRESULT_OK_CANCEL = 1, CELL_GAMEDATA_CBRESULT_OK = 0, - CELL_GAMEDATA_CBRESULT_ERR_NOSPACE = 0xffffffff, - CELL_GAMEDATA_CBRESULT_ERR_BROKEN = 0xfffffffd, - CELL_GAMEDATA_CBRESULT_ERR_NODATA = 0xfffffffc, - CELL_GAMEDATA_CBRESULT_ERR_INVALID = 0xfffffffb, + CELL_GAMEDATA_CBRESULT_ERR_NOSPACE = -1, + CELL_GAMEDATA_CBRESULT_ERR_BROKEN = -3, + CELL_GAMEDATA_CBRESULT_ERR_NODATA = -4, + CELL_GAMEDATA_CBRESULT_ERR_INVALID = -5, CELL_GAMEDATA_RET_OK = 0, CELL_GAMEDATA_RET_CANCEL = 1,