From 8276d29d4f81e3491fa0a0e18c88f2a1fccdb63b Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Wed, 1 Nov 2017 23:28:40 -0700 Subject: [PATCH] Silence warnings in lv2/Modules --- rpcs3/Emu/Cell/Modules/cellCamera.cpp | 2 ++ rpcs3/Emu/Cell/Modules/cellGame.cpp | 6 +++--- rpcs3/Emu/Cell/lv2/sys_event_flag.h | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.cpp b/rpcs3/Emu/Cell/Modules/cellCamera.cpp index 2ebd3c3f82..0276f198ac 100644 --- a/rpcs3/Emu/Cell/Modules/cellCamera.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCamera.cpp @@ -164,6 +164,8 @@ s32 cellCameraInit() camera->attr[CELL_CAMERA_AGCHIGH] = { 64 }; break; } + default: + cellCamera.todo("Trying to init cellCamera with un-researched camera type."); } // TODO: Some other default attributes? Need to check the actual behaviour on a real PS3. diff --git a/rpcs3/Emu/Cell/Modules/cellGame.cpp b/rpcs3/Emu/Cell/Modules/cellGame.cpp index 06d5639a1b..b08973f55f 100644 --- a/rpcs3/Emu/Cell/Modules/cellGame.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGame.cpp @@ -115,7 +115,7 @@ s32 cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr dirName, u32 e if (dir.size() != 9) { - return CELL_HDDGAME_ERROR_PARAM; + return (s32)CELL_HDDGAME_ERROR_PARAM; } vm::var result; @@ -165,7 +165,7 @@ s32 cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr dirName, u32 e if (result->result != CELL_HDDGAME_CBRESULT_OK && result->result != CELL_HDDGAME_CBRESULT_OK_CANCEL) { - return CELL_HDDGAME_ERROR_CBRESULT; + return (s32)CELL_HDDGAME_ERROR_CBRESULT; } // TODO ? @@ -186,7 +186,7 @@ s32 cellHddGameGetSizeKB(vm::ptr size) if (!fs::is_dir(local_dir)) { - return CELL_HDDGAME_ERROR_FAILURE; + return (s32)CELL_HDDGAME_ERROR_FAILURE; } *size = ::narrow(fs::get_dir_size(local_dir) / 1024); diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.h b/rpcs3/Emu/Cell/lv2/sys_event_flag.h index fe525ff1f9..9188061307 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event_flag.h +++ b/rpcs3/Emu/Cell/lv2/sys_event_flag.h @@ -87,8 +87,8 @@ struct lv2_event_flag final : lv2_obj } // Check pattern - if ((mode & 0xf) == SYS_EVENT_FLAG_WAIT_AND && (pattern & bitptn) != bitptn || - (mode & 0xf) == SYS_EVENT_FLAG_WAIT_OR && (pattern & bitptn) == 0) + if (((mode & 0xf) == SYS_EVENT_FLAG_WAIT_AND && (pattern & bitptn) != bitptn) || + ((mode & 0xf) == SYS_EVENT_FLAG_WAIT_OR && (pattern & bitptn) == 0)) { return false; }