From c665eedbf2cce2ae62fe200551bcf98f8bdb425f Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Sat, 7 Jun 2025 16:31:55 +0200 Subject: [PATCH] Fix all the warning in the PSPSDK samples --- src/samples/debug/prxdecrypt/main.c | 2 +- src/samples/gu/vertex/Makefile.sample | 2 +- src/samples/gu/vertex/vertex.c | 10 +++++----- src/samples/kernel/kdumper/main.c | 2 +- src/samples/me/basic/main.c | 2 +- src/samples/net/simple/main.c | 2 ++ src/samples/net/wlanscan_elf/main.c | 1 - src/samples/prx/prx_loader/main.c | 4 ++-- src/samples/savedata/decrypt/main.c | 15 ++++++++++----- src/samples/savedata/encrypt/main.c | 15 ++++++++++----- src/samples/savedata/utility/main.c | 4 ++-- src/samples/usb/storage/main.c | 6 +++--- src/samples/utility/netconf/main.c | 2 +- src/user/pspmodulemgr.h | 4 +++- 14 files changed, 42 insertions(+), 29 deletions(-) diff --git a/src/samples/debug/prxdecrypt/main.c b/src/samples/debug/prxdecrypt/main.c index 2b24bdfb..44ec2be5 100644 --- a/src/samples/debug/prxdecrypt/main.c +++ b/src/samples/debug/prxdecrypt/main.c @@ -104,7 +104,7 @@ int extract_file(const char* name, const char* dstname) if(size >= 0) { - printf("Extracted file - size %d\n", size); + printf("Extracted file - size %ld\n", size); fd = sceIoOpen(dstname, PSP_O_WRONLY | PSP_O_CREAT | PSP_O_TRUNC, 0777); if(fd >= 0) { diff --git a/src/samples/gu/vertex/Makefile.sample b/src/samples/gu/vertex/Makefile.sample index 2435d50c..b16bb383 100644 --- a/src/samples/gu/vertex/Makefile.sample +++ b/src/samples/gu/vertex/Makefile.sample @@ -2,7 +2,7 @@ TARGET = vertex OBJS = vertex.o ../common/callbacks.o ../common/menu.o INCDIR = -CFLAGS = -Wall +CFLAGS = -Wall -ffast-math CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti ASFLAGS = $(CFLAGS) diff --git a/src/samples/gu/vertex/vertex.c b/src/samples/gu/vertex/vertex.c index fe4d3cdb..848608c3 100644 --- a/src/samples/gu/vertex/vertex.c +++ b/src/samples/gu/vertex/vertex.c @@ -131,7 +131,7 @@ void generateVertexBuffer(int vertexFormat, void* vertices, int batchSize) memset(current,0,vertexSize); // TODO: render something nice -/* + float x = cosf((i * batchScale) * (GU_PI*2)); float y = sinf((i * batchScale) * (GU_PI*2)); @@ -180,7 +180,7 @@ void generateVertexBuffer(int vertexFormat, void* vertices, int batchSize) } break; } -*/ + current = current + vertexSize; } } @@ -253,7 +253,7 @@ int main(int argc, char* argv[]) // run sample - int val = 0; + int frame = 0; SceCtrlData oldPad; memset(&oldPad,0,sizeof(SceCtrlData)); @@ -598,7 +598,7 @@ int main(int argc, char* argv[]) pspDebugScreenSetOffset((int)fbp0); pspDebugScreenSetXY(0,0); - pspDebugScreenPrintf("Mask: 0x%08x, Size: %u", vertexMask, vertexSize,val); + pspDebugScreenPrintf("Mask: 0x%08x, Size: %u, frame: %d", vertexMask, vertexSize, frame); if (avgVertexSpeed) pspDebugScreenPrintf(", %.2f million vertices / sec.",avgVertexSpeed); else @@ -613,7 +613,7 @@ int main(int argc, char* argv[]) fbp1 = fbp0; fbp0 = sceGuSwapBuffers(); - val++; + frame++; } sceGuTerm(); diff --git a/src/samples/kernel/kdumper/main.c b/src/samples/kernel/kdumper/main.c index 87998733..f3bc9fff 100644 --- a/src/samples/kernel/kdumper/main.c +++ b/src/samples/kernel/kdumper/main.c @@ -171,7 +171,7 @@ void dump_cop0_regs(void) printf("Cop0 regs\n"); for(i = 0; i < 32; i+=4) { - printf("$%02d: %08X, $%02d: %08X, $%02d: %08X $%02d: %08X\n", + printf("$%02d: %08lX, $%02d: %08lX, $%02d: %08lX $%02d: %08lX\n", i, regs[i], i+1, regs[i+1], i+2, regs[i+2], i+3, regs[i+3]); } } diff --git a/src/samples/me/basic/main.c b/src/samples/me/basic/main.c index 0eb18ddc..34934593 100644 --- a/src/samples/me/basic/main.c +++ b/src/samples/me/basic/main.c @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) pspDebugScreenSetXY(0, 0); pspDebugScreenPrintf("ME Basic Example, press Home to exit\n"); sceKernelDcacheWritebackInvalidateAll(); - pspDebugScreenPrintf("ME Counter: %08x\n", *count); + pspDebugScreenPrintf("ME Counter: %08lx\n", *count); sceCtrlReadBufferPositive(&ctl, 1); if(ctl.Buttons & PSP_CTRL_HOME) { diff --git a/src/samples/net/simple/main.c b/src/samples/net/simple/main.c index 22e0b15b..2a302f07 100644 --- a/src/samples/net/simple/main.c +++ b/src/samples/net/simple/main.c @@ -246,6 +246,8 @@ int net_thread(SceSize args, void *argp) start_server(info.ip); } } while (0); + + return 0; } /* Simple thread */ int main(int argc, char **argv) diff --git a/src/samples/net/wlanscan_elf/main.c b/src/samples/net/wlanscan_elf/main.c index 4a4ff976..bd2a7007 100644 --- a/src/samples/net/wlanscan_elf/main.c +++ b/src/samples/net/wlanscan_elf/main.c @@ -78,7 +78,6 @@ const char *caps[8] = { void print_apsum(struct ScanData *pData) { char name[33]; - int loop; strncpy(name, pData->name, 32); name[32] = 0; printf("RSSI:%02d ", pData->rssi); diff --git a/src/samples/prx/prx_loader/main.c b/src/samples/prx/prx_loader/main.c index 995a6cb7..4e439412 100644 --- a/src/samples/prx/prx_loader/main.c +++ b/src/samples/prx/prx_loader/main.c @@ -87,8 +87,8 @@ int main(void) SceUID modid; SceModule *mod; int i; - int ret; int fd; + int ret = -1; pspDebugScreenInit(); @@ -126,5 +126,5 @@ int main(void) /* Let's bug out */ sceKernelExitDeleteThread(0); - return 0; + return ret >= 0 ? 0 : ret; } diff --git a/src/samples/savedata/decrypt/main.c b/src/samples/savedata/decrypt/main.c index 22038518..77e548f5 100644 --- a/src/samples/savedata/decrypt/main.c +++ b/src/samples/savedata/decrypt/main.c @@ -27,7 +27,8 @@ PSP_MODULE_INFO("SaveDecrypt", 0, 1, 1); #define printf pspDebugScreenPrintf const char *decrypted = "ms0:/PLAIN.BIN"; -#if 0 +#define USE_OLD_FORMAT 0 +#if USE_OLD_FORMAT /* Old format save with no key, supported by 1.0+ firmware */ const char *encrypted = "ms0:/PSP/SAVEDATA/DATA111110000/DATA.BIN"; const unsigned char *gamekey = NULL; @@ -66,12 +67,16 @@ int main(int argc, char *argv[]) printf("Will decrypt: %s\n", encrypted); printf(" Using key:"); - if(gamekey) { - for (i = 0; i < 0x10; i++) - printf(" %02x", gamekey[i]); - } else { +#if USE_OLD_FORMAT + { printf(" none"); } +#else + { + for (i = 0; i < 0x10; i++) + printf(" %02x", gamekey[i]); + } +#endif printf("\n\n"); printf(" Output file: %s\n\n", decrypted); printf("Press X to continue, or O to quit.\n\n"); diff --git a/src/samples/savedata/encrypt/main.c b/src/samples/savedata/encrypt/main.c index 6ef2a4e9..983fffb7 100644 --- a/src/samples/savedata/encrypt/main.c +++ b/src/samples/savedata/encrypt/main.c @@ -26,7 +26,8 @@ PSP_MODULE_INFO("SaveEncrypt", 0, 1, 1); #define printf pspDebugScreenPrintf -#if 0 +#define USE_OLD_FORMAT 0 +#if USE_OLD_FORMAT /* Old format save with no key, supported by 1.0+ firmware */ const char *plaintext = "ms0:/PLAIN.BIN"; const char *encrypted = "ms0:/PSP/SAVEDATA/DATA111110000/DATA.BIN"; @@ -71,12 +72,16 @@ int main(int argc, char *argv[]) printf(" Will encrypt: %s\n", plaintext); printf(" Using key:"); - if(gamekey) { - for (i = 0; i < 0x10; i++) - printf(" %02x", gamekey[i]); - } else { +#if USE_OLD_FORMAT + { printf(" none"); } +#else + { + for (i = 0; i < 0x10; i++) + printf(" %02x", gamekey[i]); + } +#endif printf("\n\n"); printf(" Output file: %s\n", encrypted); printf("Update hashes: %s\n\n", paramsfo); diff --git a/src/samples/savedata/utility/main.c b/src/samples/savedata/utility/main.c index 4fd7433c..e4e1940a 100644 --- a/src/samples/savedata/utility/main.c +++ b/src/samples/savedata/utility/main.c @@ -213,7 +213,7 @@ char nameMultiple[][20] = // End list with "" "" }; -char key[] = "QTAK319JQKJ952HA"; // Key to encrypt or decrypt savedata +static const char key[] = "QTAK319JQKJ952H"; // Key to encrypt or decrypt savedata void initSavedata(SceUtilitySavedataParam * savedata, int mode) { @@ -232,7 +232,7 @@ void initSavedata(SceUtilitySavedataParam * savedata, int mode) savedata->focus = PSP_UTILITY_SAVEDATA_FOCUS_LATEST; // Set initial focus to the newest file (for loading) #if defined(_PSP_FW_VERSION) && _PSP_FW_VERSION >= 200 - strncpy(savedata->key, key, 16); + strncpy(savedata->key, key, sizeof(savedata->key)); #endif strcpy(savedata->gameName, "DEMO11111"); // First part of the save name, game identifier name diff --git a/src/samples/usb/storage/main.c b/src/samples/usb/storage/main.c index 99c1b4bc..ab2766b5 100644 --- a/src/samples/usb/storage/main.c +++ b/src/samples/usb/storage/main.c @@ -155,19 +155,19 @@ int main(void) //setup USB drivers retVal = sceUsbStart(PSP_USBBUS_DRIVERNAME, 0, 0); if (retVal != 0) { - printf("Error starting USB Bus driver (0x%08X)\n", retVal); + printf("Error starting USB Bus driver (0x%08lX)\n", retVal); sceKernelSleepThread(); } retVal = sceUsbStart(PSP_USBSTOR_DRIVERNAME, 0, 0); if (retVal != 0) { - printf("Error starting USB Mass Storage driver (0x%08X)\n", + printf("Error starting USB Mass Storage driver (0x%08lX)\n", retVal); sceKernelSleepThread(); } retVal = sceUsbstorBootSetCapacity(0x800000); if (retVal != 0) { printf - ("Error setting capacity with USB Mass Storage driver (0x%08X)\n", + ("Error setting capacity with USB Mass Storage driver (0x%08lX)\n", retVal); sceKernelSleepThread(); } diff --git a/src/samples/utility/netconf/main.c b/src/samples/utility/netconf/main.c index 41d03f4a..597ed6eb 100644 --- a/src/samples/utility/netconf/main.c +++ b/src/samples/utility/netconf/main.c @@ -93,7 +93,7 @@ int main(int argc, char *argv[]) //clear netData data.asUint = 0xBADF00D; memset(&data.asString[4], 0, 124); - printf("param %03d: ret(0x%08X) uint(%d) string(%s)\n", i, sceUtilityGetNetParam(netConfIndex, i, &data), data.asUint, data.asString); + printf("param %03d: ret(0x%08X) uint(%ld) string(%s)\n", i, sceUtilityGetNetParam(netConfIndex, i, &data), data.asUint, data.asString); } printf("\nPress X to show details for next net configuration.\n"); sceDisplayWaitVblankStart(); diff --git a/src/user/pspmodulemgr.h b/src/user/pspmodulemgr.h index 1869e56a..cc208450 100644 --- a/src/user/pspmodulemgr.h +++ b/src/user/pspmodulemgr.h @@ -114,7 +114,9 @@ SceUID sceKernelLoadModuleBufferUsbWlan(SceSize bufsize, void *buf, int flags, S * @param status - Returns the status of the start. * @param option - Pointer to an optional ::SceKernelSMOption structure. * - * @return ??? on success, otherwise one of ::PspKernelErrorCodes. + * @return modID (modID > 0) UID of the module that was started and made resident, + * 0 on success for modules that don't need to be made resident, + * otherwise one of ::PspKernelErrorCodes. */ int sceKernelStartModule(SceUID modid, SceSize argsize, void *argp, int *status, SceKernelSMOption *option);