From e0d5cdd5e150cc881a41cd976571a5b9360f58b6 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Sun, 26 Jul 2015 23:48:59 +0300 Subject: [PATCH] Fixes for trigraph, unused and tautological warning. --- rpcs3/Emu/SysCalls/Modules/cellRtc.cpp | 8 ++++---- rpcs3/Emu/SysCalls/Modules/cellVpost.cpp | 10 +++++----- rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp index 72ff357e02..47ecffb94a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp @@ -429,10 +429,10 @@ s32 cellRtcCheckValid(vm::ptr pTime) if ((pTime->year < 1) || (pTime->year > 9999)) return CELL_RTC_ERROR_INVALID_YEAR; else if ((pTime->month < 1) || (pTime->month > 12)) return CELL_RTC_ERROR_INVALID_MONTH; else if ((pTime->day < 1) || (pTime->day > 31)) return CELL_RTC_ERROR_INVALID_DAY; - else if ((pTime->hour < 0) || (pTime->hour > 23)) return CELL_RTC_ERROR_INVALID_HOUR; - else if ((pTime->minute < 0) || (pTime->minute > 59)) return CELL_RTC_ERROR_INVALID_MINUTE; - else if ((pTime->second < 0) || (pTime->second > 59)) return CELL_RTC_ERROR_INVALID_SECOND; - else if ((pTime->microsecond < 0) || (pTime->microsecond > 999999)) return CELL_RTC_ERROR_INVALID_MICROSECOND; + else if (pTime->hour > 23) return CELL_RTC_ERROR_INVALID_HOUR; + else if (pTime->minute > 59) return CELL_RTC_ERROR_INVALID_MINUTE; + else if (pTime->second > 59) return CELL_RTC_ERROR_INVALID_SECOND; + else if (pTime->microsecond > 999999) return CELL_RTC_ERROR_INVALID_MICROSECOND; else return CELL_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp b/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp index d52bde0255..a326f6cd12 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp @@ -76,19 +76,19 @@ s32 cellVpostExec(u32 handle, vm::cptr inPicBuff, vm::cptroutWidth; u32 oh = ctrlParam->outHeight; - ctrlParam->inWindow; // ignored + //ctrlParam->inWindow; // ignored if (ctrlParam->inWindow.x) cellVpost.Notice("*** inWindow.x = %d", (u32)ctrlParam->inWindow.x); if (ctrlParam->inWindow.y) cellVpost.Notice("*** inWindow.y = %d", (u32)ctrlParam->inWindow.y); if (ctrlParam->inWindow.width != w) cellVpost.Notice("*** inWindow.width = %d", (u32)ctrlParam->inWindow.width); if (ctrlParam->inWindow.height != h) cellVpost.Notice("*** inWindow.height = %d", (u32)ctrlParam->inWindow.height); - ctrlParam->outWindow; // ignored + //ctrlParam->outWindow; // ignored if (ctrlParam->outWindow.x) cellVpost.Notice("*** outWindow.x = %d", (u32)ctrlParam->outWindow.x); if (ctrlParam->outWindow.y) cellVpost.Notice("*** outWindow.y = %d", (u32)ctrlParam->outWindow.y); if (ctrlParam->outWindow.width != ow) cellVpost.Notice("*** outWindow.width = %d", (u32)ctrlParam->outWindow.width); if (ctrlParam->outWindow.height != oh) cellVpost.Notice("*** outWindow.height = %d", (u32)ctrlParam->outWindow.height); - ctrlParam->execType; // ignored - ctrlParam->scalerType; // ignored - ctrlParam->ipcType; // ignored + //ctrlParam->execType; // ignored + //ctrlParam->scalerType; // ignored + //ctrlParam->ipcType; // ignored picInfo->inWidth = w; // copy picInfo->inHeight = h; // copy diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp index 2b0b296f9e..914cca991e 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpSns.cpp @@ -9,7 +9,7 @@ std::unique_ptr g_sceNpSns; s32 sceNpSnsFbInit(/*const SceNpSnsFbInitParams params*/) { - sceNpSns.Todo("sceNpSnsFbInit(params=???)"/*, params*/); + sceNpSns.Todo("sceNpSnsFbInit(params=?)"/*, params*/); if (g_sceNpSns->m_bSceNpSnsInitialized) {