From cdad46e18cbc00c61aaca7491e374a93f7379112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 29 Jan 2025 10:48:00 +0100 Subject: [PATCH] Change some sceDisplay functions to use more appropriate return types --- Core/HLE/sceDisplay.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index d366b8aab4..17d56c667d 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -844,7 +844,7 @@ void __DisplaySetFramebuf(u32 topaddr, int linesize, int pixelFormat, int sync) } // Some games (GTA) never call this during gameplay, so bad place to put a framerate counter. -u32 sceDisplaySetFramebuf(u32 topaddr, int linesize, int pixelformat, int sync) { +int sceDisplaySetFramebuf(u32 topaddr, int linesize, int pixelformat, int sync) { if (sync != PSP_DISPLAY_SETBUF_IMMEDIATE && sync != PSP_DISPLAY_SETBUF_NEXTFRAME) { return hleLogError(Log::sceDisplay, SCE_KERNEL_ERROR_INVALID_MODE, "invalid sync mode"); } @@ -949,12 +949,12 @@ static void __DisplayWaitForVblanksCB(const char *reason, int vblanks) { __DisplayWaitForVblanks(reason, vblanks, true); } -static u32 sceDisplayWaitVblankStart() { +static int sceDisplayWaitVblankStart() { __DisplayWaitForVblanks("vblank start waited", 1); return hleLogDebug(Log::sceDisplay, 0); } -static u32 sceDisplayWaitVblank() { +static int sceDisplayWaitVblank() { if (!DisplayIsVblank()) { __DisplayWaitForVblanks("vblank waited", 1); return hleLogDebug(Log::sceDisplay, 0); @@ -965,7 +965,7 @@ static u32 sceDisplayWaitVblank() { } } -static u32 sceDisplayWaitVblankStartMulti(int vblanks) { +static int sceDisplayWaitVblankStartMulti(int vblanks) { if (vblanks <= 0) { return hleLogWarning(Log::sceDisplay, SCE_KERNEL_ERROR_INVALID_VALUE, "invalid number of vblanks"); } @@ -978,7 +978,7 @@ static u32 sceDisplayWaitVblankStartMulti(int vblanks) { return hleLogDebug(Log::sceDisplay, 0); } -static u32 sceDisplayWaitVblankCB() { +static int sceDisplayWaitVblankCB() { if (!DisplayIsVblank()) { __DisplayWaitForVblanksCB("vblank waited", 1); return hleLogDebug(Log::sceDisplay, 0); @@ -989,12 +989,12 @@ static u32 sceDisplayWaitVblankCB() { } } -static u32 sceDisplayWaitVblankStartCB() { +static int sceDisplayWaitVblankStartCB() { __DisplayWaitForVblanksCB("vblank start waited", 1); return hleLogDebug(Log::sceDisplay, 0); } -static u32 sceDisplayWaitVblankStartMultiCB(int vblanks) { +static int sceDisplayWaitVblankStartMultiCB(int vblanks) { if (vblanks <= 0) { return hleLogWarning(Log::sceDisplay, SCE_KERNEL_ERROR_INVALID_VALUE, "invalid number of vblanks"); } @@ -1007,13 +1007,13 @@ static u32 sceDisplayWaitVblankStartMultiCB(int vblanks) { return hleLogDebug(Log::sceDisplay, 0); } -static u32 sceDisplayGetVcount() { +static int sceDisplayGetVcount() { hleEatCycles(150); hleReSchedule("get vcount"); return hleLogVerbose(Log::sceDisplay, __DisplayGetVCount()); } -static u32 sceDisplayGetCurrentHcount() { +static int sceDisplayGetCurrentHcount() { hleEatCycles(275); return hleLogDebug(Log::sceDisplay, __DisplayGetCurrentHcount()); } @@ -1104,19 +1104,19 @@ static u32 sceDisplaySetHoldMode(u32 hMode) { const HLEFunction sceDisplay[] = { {0X0E20F177, &WrapU_III, "sceDisplaySetMode", 'x', "iii" }, - {0X289D82FE, &WrapU_UIII, "sceDisplaySetFrameBuf", 'x', "xiii"}, + {0X289D82FE, &WrapI_UIII, "sceDisplaySetFrameBuf", 'i', "xiii"}, {0XEEDA2E54, &WrapU_UUUI, "sceDisplayGetFrameBuf", 'x', "pppi"}, - {0X36CDFADE, &WrapU_V, "sceDisplayWaitVblank", 'x', "", HLE_NOT_DISPATCH_SUSPENDED }, - {0X984C27E7, &WrapU_V, "sceDisplayWaitVblankStart", 'x', "", HLE_NOT_IN_INTERRUPT | HLE_NOT_DISPATCH_SUSPENDED }, - {0X40F1469C, &WrapU_I, "sceDisplayWaitVblankStartMulti", 'x', "i" }, - {0X8EB9EC49, &WrapU_V, "sceDisplayWaitVblankCB", 'x', "", HLE_NOT_DISPATCH_SUSPENDED }, - {0X46F186C3, &WrapU_V, "sceDisplayWaitVblankStartCB", 'x', "", HLE_NOT_IN_INTERRUPT | HLE_NOT_DISPATCH_SUSPENDED }, - {0X77ED8B3A, &WrapU_I, "sceDisplayWaitVblankStartMultiCB", 'x', "i" }, + {0X36CDFADE, &WrapI_V, "sceDisplayWaitVblank", 'i', "", HLE_NOT_DISPATCH_SUSPENDED }, + {0X984C27E7, &WrapI_V, "sceDisplayWaitVblankStart", 'i', "", HLE_NOT_IN_INTERRUPT | HLE_NOT_DISPATCH_SUSPENDED }, + {0X40F1469C, &WrapI_I, "sceDisplayWaitVblankStartMulti", 'i', "i" }, + {0X8EB9EC49, &WrapI_V, "sceDisplayWaitVblankCB", 'i', "", HLE_NOT_DISPATCH_SUSPENDED }, + {0X46F186C3, &WrapI_V, "sceDisplayWaitVblankStartCB", 'i', "", HLE_NOT_IN_INTERRUPT | HLE_NOT_DISPATCH_SUSPENDED }, + {0X77ED8B3A, &WrapI_I, "sceDisplayWaitVblankStartMultiCB", 'i', "i" }, {0XDBA6C4C4, &WrapF_V, "sceDisplayGetFramePerSec", 'f', "" }, - {0X773DD3A3, &WrapU_V, "sceDisplayGetCurrentHcount", 'x', "" }, + {0X773DD3A3, &WrapI_V, "sceDisplayGetCurrentHcount", 'i', "" }, {0X210EAB3A, &WrapI_V, "sceDisplayGetAccumulatedHcount", 'i', "" }, {0XA83EF139, &WrapI_I, "sceDisplayAdjustAccumulatedHcount", 'i', "i" }, - {0X9C6EAAD7, &WrapU_V, "sceDisplayGetVcount", 'x', "" }, + {0X9C6EAAD7, &WrapI_V, "sceDisplayGetVcount", 'i', "" }, {0XDEA197D4, &WrapU_UUU, "sceDisplayGetMode", 'x', "ppp" }, {0X7ED59BC4, &WrapU_U, "sceDisplaySetHoldMode", 'x', "x" }, {0XA544C486, &WrapU_U, "sceDisplaySetResumeMode", 'x', "x" },