From 55725cf5ec61ac9b3685bc4952095475da5c9178 Mon Sep 17 00:00:00 2001 From: Princess of Sleeping Date: Fri, 26 Jun 2020 21:32:02 +0900 Subject: Fix many args (#451) Changes document and variable types--- include/user/appmgr.h | 4 ++-- include/user/compat.h | 2 +- include/user/kernel/dmac.h | 6 +++--- include/user/kernel/modulemgr.h | 2 +- include/user/kernel/rng.h | 4 +++- include/user/kernel/sysmem.h | 10 +++++----- include/user/kernel/threadmgr.h | 22 +++++++++++----------- include/user/paf.h | 29 ++++++++++++++--------------- include/user/vshbridge.h | 8 ++++---- 9 files changed, 44 insertions(+), 43 deletions(-) (limited to 'include/user') diff --git a/include/user/appmgr.h b/include/user/appmgr.h index 16fd815..e4ba75e 100644 --- a/include/user/appmgr.h +++ b/include/user/appmgr.h @@ -248,7 +248,7 @@ int sceAppMgrGetRunningAppIdListForShell(SceUID *appIds, int count); * @return 0 on success, < 0 on error. */ -int _sceAppMgrGetAppState(SceAppMgrAppState *appState, uint32_t len, uint32_t version); +int _sceAppMgrGetAppState(SceAppMgrAppState *appState, SceSize len, uint32_t version); /** * Receive system event @@ -396,7 +396,7 @@ int sceAppMgrAppDataMountById(int id, const char *titleid, const char *mount_poi * * @note param: 6 (contentid) 8 (category), 9 (stitle/title?), 10 (title/stitle?), 12 (titleid) */ -int sceAppMgrAppParamGetString(int pid, int param, char *string, int length); +int sceAppMgrAppParamGetString(int pid, int param, char *string, SceSize length); /** * Get device info diff --git a/include/user/compat.h b/include/user/compat.h index 9a4786e..8957138 100644 --- a/include/user/compat.h +++ b/include/user/compat.h @@ -274,7 +274,7 @@ int sceCompatWriteSharedCtrl(SceCtrlDataPsp *pad_data); * * @return 0 on success, < 0 on error. */ -int sceCompatGetTitleList(void *buf, int length); +int sceCompatGetTitleList(void *buf, SceSize length); /** * Get Memory Card device information diff --git a/include/user/kernel/dmac.h b/include/user/kernel/dmac.h index 0047d6f..a6e0e42 100644 --- a/include/user/kernel/dmac.h +++ b/include/user/kernel/dmac.h @@ -1,7 +1,7 @@ #ifndef _PSP2_DMAC_H_ #define _PSP2_DMAC_H_ -#include +#include #ifdef __cplusplus extern "C" { @@ -16,7 +16,7 @@ extern "C" { * * @return dst. */ -void *sceDmacMemcpy(void *dst, const void *src, size_t size); +void *sceDmacMemcpy(void *dst, const void *src, SceSize size); /** * DMA memset @@ -27,7 +27,7 @@ void *sceDmacMemcpy(void *dst, const void *src, size_t size); * * @return dst. */ -void *sceDmacMemset(void *dst, int c, size_t size); +void *sceDmacMemset(void *dst, int c, SceSize size); #ifdef __cplusplus } diff --git a/include/user/kernel/modulemgr.h b/include/user/kernel/modulemgr.h index 3aa6f30..993078c 100644 --- a/include/user/kernel/modulemgr.h +++ b/include/user/kernel/modulemgr.h @@ -60,7 +60,7 @@ typedef struct SceKernelULMOption { SceSize size; } SceKernelULMOption; -int sceKernelGetModuleList(int flags, SceUID *modids, int *num); +int sceKernelGetModuleList(int flags, SceUID *modids, SceSize *num); int sceKernelGetModuleInfo(SceUID modid, SceKernelModuleInfo *info); SceUID sceKernelLoadModule(const char *path, int flags, SceKernelLMOption *option); diff --git a/include/user/kernel/rng.h b/include/user/kernel/rng.h index 177e662..af302f1 100644 --- a/include/user/kernel/rng.h +++ b/include/user/kernel/rng.h @@ -1,6 +1,8 @@ #ifndef _PSP2_KERNEL_RNG_H_ #define _PSP2_KERNEL_RNG_H_ +#include + #ifdef __cplusplus extern "C" { #endif @@ -13,7 +15,7 @@ extern "C" { * * @return 0 on success, < 0 on error. */ -int sceKernelGetRandomNumber(void *output, unsigned size); +int sceKernelGetRandomNumber(void *output, SceSize size); #ifdef __cplusplus } diff --git a/include/user/kernel/sysmem.h b/include/user/kernel/sysmem.h index 1e0ea9c..654949d 100644 --- a/include/user/kernel/sysmem.h +++ b/include/user/kernel/sysmem.h @@ -64,11 +64,11 @@ typedef enum SceKernelMemoryType { * @param[in] name - Name for the memory block * @param[in] type - Type of the memory to allocate * @param[in] size - Size of the memory to allocate - * @param[in] optp - Memory block options? + * @param[in] opt - Memory block options? * * @return SceUID of the memory block on success, < 0 on error. */ -SceUID sceKernelAllocMemBlock(const char *name, SceKernelMemBlockType type, int size, SceKernelAllocMemBlockOpt *optp); +SceUID sceKernelAllocMemBlock(const char *name, SceKernelMemBlockType type, SceSize size, SceKernelAllocMemBlockOpt *opt); /** * Frees new memory block @@ -82,12 +82,12 @@ int sceKernelFreeMemBlock(SceUID uid); /** * Gets the base address of a memory block * - * @param[in] uid - SceUID of the memory block to free - * @param[out] basep - Base address of the memory block identified by SceUID + * @param[in] uid - SceUID of the memory block to free + * @param[out] base - Base address of the memory block identified by SceUID * * @return 0 on success, < 0 on error. */ -int sceKernelGetMemBlockBase(SceUID uid, void **basep); +int sceKernelGetMemBlockBase(SceUID uid, void **base); SceUID sceKernelFindMemBlockByAddr(const void *addr, SceSize size); diff --git a/include/user/kernel/threadmgr.h b/include/user/kernel/threadmgr.h index a73562f..4bc8ac3 100644 --- a/include/user/kernel/threadmgr.h +++ b/include/user/kernel/threadmgr.h @@ -120,7 +120,7 @@ typedef enum SceKernelMutexAttribute { * @return UID of the created thread, or an error code. */ SceUID sceKernelCreateThread(const char *name, SceKernelThreadEntry entry, int initPriority, - int stackSize, SceUInt attr, int cpuAffinityMask, + SceSize stackSize, SceUInt attr, int cpuAffinityMask, const SceKernelThreadOptParam *option); /** @@ -245,11 +245,11 @@ int sceKernelGetThreadCurrentPriority(void); /** * Get the exit status of a thread. * - * @param thid - The UID of the thread to check. - * + * @param[in] thid - The UID of the thread to check. + * @param[out] status - Status out pointer * @return The exit status */ -int sceKernelGetThreadExitStatus(SceUID thid); +int sceKernelGetThreadExitStatus(SceUID thid, int *status); /** * Check the thread stack? @@ -334,7 +334,7 @@ typedef struct SceKernelSemaInfo { * @par Example: * @code * int semaid; - * semaid = sceKernelCreateSema("MyMutex", 0, 1, 1, 0); + * semaid = sceKernelCreateSema("MySema", 0, 1, 1, NULL); * @endcode * * @param name - Specifies the name of the sema @@ -470,7 +470,7 @@ typedef struct SceKernelMutexInfo { * @par Example: * @code * int mutexid; - * mutexid = sceKernelCreateMutex("MyMutex", 0, 1, 1, 0); + * mutexid = sceKernelCreateMutex("MyMutex", 0, 1, NULL); * @endcode * * @param name - Specifies the name of the mutex @@ -621,7 +621,7 @@ typedef enum SceEventFlagWaitTypes { * @par Example: * @code * int evid; - * evid = sceKernelCreateEventFlag("wait_event", 0, 0, 0); + * evid = sceKernelCreateEventFlag("wait_event", 0, 0, NULL); * @endcode */ SceUID sceKernelCreateEventFlag(const char *name, int attr, int bits, SceKernelEventFlagOptParam *opt); @@ -972,7 +972,7 @@ int sceKernelSendMsgPipeCB(SceUID uid, void *message, unsigned int size, int unk * * @return 0 on success, < 0 on error */ -int sceKernelTrySendMsgPipe(SceUID uid, void *message, unsigned int size, int unk1, void *unk2); +int sceKernelTrySendMsgPipe(SceUID uid, void *message, SceSize size, int unk1, void *unk2); /** * Receive a message from a pipe @@ -986,7 +986,7 @@ int sceKernelTrySendMsgPipe(SceUID uid, void *message, unsigned int size, int un * * @return 0 on success, < 0 on error */ -int sceKernelReceiveMsgPipe(SceUID uid, void *message, unsigned int size, int unk1, void *unk2, unsigned int *timeout); +int sceKernelReceiveMsgPipe(SceUID uid, void *message, SceSize size, int unk1, void *unk2, unsigned int *timeout); /** * Receive a message from a pipe (with callback) @@ -1000,7 +1000,7 @@ int sceKernelReceiveMsgPipe(SceUID uid, void *message, unsigned int size, int un * * @return 0 on success, < 0 on error */ -int sceKernelReceiveMsgPipeCB(SceUID uid, void *message, unsigned int size, int unk1, void *unk2, unsigned int *timeout); +int sceKernelReceiveMsgPipeCB(SceUID uid, void *message, SceSize size, int unk1, void *unk2, unsigned int *timeout); /** * Receive a message from a pipe @@ -1013,7 +1013,7 @@ int sceKernelReceiveMsgPipeCB(SceUID uid, void *message, unsigned int size, int * * @return 0 on success, < 0 on error */ -int sceKernelTryReceiveMsgPipe(SceUID uid, void *message, unsigned int size, int unk1, void *unk2); +int sceKernelTryReceiveMsgPipe(SceUID uid, void *message, SceSize size, int unk1, void *unk2); /** * Cancel a message pipe diff --git a/include/user/paf.h b/include/user/paf.h index 1d81d3b..f01190e 100644 --- a/include/user/paf.h +++ b/include/user/paf.h @@ -2,31 +2,30 @@ #define _PSP2_PAF_H_ #include -#include #ifdef __cplusplus extern "C" { #endif void sce_paf_private_free(void *ptr); -void *sce_paf_private_malloc(size_t size); -void *sce_paf_private_bzero(void *ptr, size_t num); -void *sce_paf_private_memchr(const void *ptr, int value, size_t num); -int sce_paf_private_memcmp(const void *ptr1, const void *ptr2, size_t num); -int sce_paf_private_bcmp(const void *ptr1, const void *ptr2, size_t num); -void *sce_paf_private_memcpy(void *destination, const void *source, size_t num); -void *sce_paf_private_memcpy2(void *destination, const void *source, size_t num); -void *sce_paf_private_memmove(void *destination, const void *source, size_t num); -void *sce_paf_private_bcopy(void *destination, const void *source, size_t num); -void *sce_paf_private_memset(void *ptr, int value, size_t num); -int sce_paf_private_snprintf(char *s, size_t n, const char *format, ...); +void *sce_paf_private_malloc(SceSize size); +void *sce_paf_private_bzero(void *ptr, SceSize num); +void *sce_paf_private_memchr(const void *ptr, int value, SceSize num); +int sce_paf_private_memcmp(const void *ptr1, const void *ptr2, SceSize num); +int sce_paf_private_bcmp(const void *ptr1, const void *ptr2, SceSize num); +void *sce_paf_private_memcpy(void *destination, const void *source, SceSize num); +void *sce_paf_private_memcpy2(void *destination, const void *source, SceSize num); +void *sce_paf_private_memmove(void *destination, const void *source, SceSize num); +void *sce_paf_private_bcopy(void *destination, const void *source, SceSize num); +void *sce_paf_private_memset(void *ptr, int value, SceSize num); +int sce_paf_private_snprintf(char *s, SceSize n, const char *format, ...); int sce_paf_private_strcasecmp(const char *str1, const char *str2); char *sce_paf_private_strchr(const char *str, int character); int sce_paf_private_strcmp(const char *str1, const char *str2); size_t sce_paf_private_strlen(const char *str); -int sce_paf_private_strncasecmp(const char *str1, const char *str2, size_t num); -int sce_paf_private_strncmp(const char *str1, const char *str2, size_t num); -char *sce_paf_private_strncpy(char *destination, const char *source, size_t num); +int sce_paf_private_strncasecmp(const char *str1, const char *str2, SceSize num); +int sce_paf_private_strncmp(const char *str1, const char *str2, SceSize num); +char *sce_paf_private_strncpy(char *destination, const char *source, SceSize num); char *sce_paf_private_strrchr(const char *str, int character); #ifdef __cplusplus diff --git a/include/user/vshbridge.h b/include/user/vshbridge.h index a525c04..db64be4 100644 --- a/include/user/vshbridge.h +++ b/include/user/vshbridge.h @@ -8,7 +8,7 @@ extern "C" { #endif -int _vshSblGetSystemSwVersion(SceKernelFwInfo * data); +int _vshSblGetSystemSwVersion(SceKernelFwInfo *data); int _vshSblAimgrGetConsoleId(char CID[32]); @@ -20,7 +20,7 @@ int _vshSblAimgrGetConsoleId(char CID[32]); * * @return 0 >= on success, < 0 on error. */ -int _vshIoMount(int id, const char *path, int permission, void* buf); +int _vshIoMount(int id, const char *path, int permission, void *buf); /** * @param[in] id - mount id @@ -42,7 +42,7 @@ int vshIdStorageIsReadOnly(void); * * @return 0 on success, < 0 on error. */ -int vshIdStorageReadLeaf(int leafnum, void *buf); +int vshIdStorageReadLeaf(SceSize leafnum, void *buf); /** * @param[in] leafnum - 0x0 ~ 0x80 / leafnum > 0x80 = error @@ -50,7 +50,7 @@ int vshIdStorageReadLeaf(int leafnum, void *buf); * * @return 0 on success, < 0 on error. */ -int vshIdStorageWriteLeaf(int leafnum, const void *buf); +int vshIdStorageWriteLeaf(SceSize leafnum, const void *buf); int vshSblAimgrIsCEX(void); int vshSblAimgrIsDEX(void); -- cgit v1.2.3