From 7d8d4930274a1d8405029fd14bc0c1622e9efdc7 Mon Sep 17 00:00:00 2001 From: Princess of Sleeping Date: Wed, 24 Jun 2020 03:51:40 +0900 Subject: Fix modulemgr two function name --- nids/360/SceKernelModulemgr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nids/360/SceKernelModulemgr.yml b/nids/360/SceKernelModulemgr.yml index 058cd5e..a5a5080 100644 --- a/nids/360/SceKernelModulemgr.yml +++ b/nids/360/SceKernelModulemgr.yml @@ -51,6 +51,7 @@ modules: nid: 0xC445FA63 functions: sceKernelFinalizeKbl: 0xFDD7F646 + sceKernelGetModuleExportLibraryList: 0x1FDEAE16 sceKernelGetModuleIdByAddr: 0x0053BA4A sceKernelGetModuleInfo: 0xD269F915 sceKernelGetModuleInfoMinByAddr: 0x8309E043 @@ -59,9 +60,8 @@ modules: sceKernelGetModuleLibraryInfo: 0x6A655255 sceKernelGetModuleList: 0x97CF7B4E sceKernelGetModuleList2: 0x410E1D2E + sceKernelGetModuleListByImport: 0x3B93CF88 sceKernelGetModulePath: 0x779A1025 - sceKernelGetModuleUid: 0x3B93CF88 - sceKernelGetModuleUidList: 0x1FDEAE16 sceKernelGetProcessMainModule: 0x20A27FA9 sceKernelLoadModuleForPid: 0xFA21D8CB sceKernelLoadPreloadingModules: 0x3AD26B43 -- cgit v1.2.3 From d794363d23123fe0f444a7a763f5581836bf2f59 Mon Sep 17 00:00:00 2001 From: Princess of Sleeping Date: Wed, 24 Jun 2020 04:00:44 +0900 Subject: Fix two function name and args --- include/kernel/kernel/modulemgr.h | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/include/kernel/kernel/modulemgr.h b/include/kernel/kernel/modulemgr.h index c8e115c..5632db7 100644 --- a/include/kernel/kernel/modulemgr.h +++ b/include/kernel/kernel/modulemgr.h @@ -508,8 +508,29 @@ typedef struct SceKernelModuleExportEntry { */ int sceKernelGetModuleLibExportList(SceUID pid, SceUID libid, SceKernelModuleExportEntry *list, SceSize *num, SceSize cpy_skip_num); -int sceKernelGetModuleUid(SceUID pid, SceUID modid, SceUID *modid_out, const void *unk1, int unk2); -int sceKernelGetModuleUidList(SceUID pid, SceUID *modids, size_t *num); +/** + * @brief Get module id list by import + * + * @param[in] pid - target pid + * @param[in] libid - target library uid + * @param[out] modids - module id output list + * @param[inout] num - in:list max num, out:get entry num + * @param[in] cpy_skip_num - The index at which to start copying + * + * @return 0 on success, < 0 on error. + */ +int sceKernelGetModuleListByImport(SceUID pid, SceUID libid, SceUID *modids, SceSize *num, SceSize cpy_skip_num); + +/** + * @brief Get module export list + * + * @param[in] pid - target pid + * @param[out] libids - library id output list + * @param[inout] num - in:list max num, out:get entry num + * + * @return 0 on success, < 0 on error. + */ +int sceKernelGetModuleExportLibraryList(SceUID pid, SceUID *libids, SceSize *num); #ifdef __cplusplus } -- cgit v1.2.3 From 33a4b3032a1b3bcfb4034b7d8126a82f668e7511 Mon Sep 17 00:00:00 2001 From: Princess of Sleeping Date: Wed, 24 Jun 2020 10:23:25 +0900 Subject: Fix modulemgr one function name --- nids/360/SceKernelModulemgr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nids/360/SceKernelModulemgr.yml b/nids/360/SceKernelModulemgr.yml index a5a5080..2ead893 100644 --- a/nids/360/SceKernelModulemgr.yml +++ b/nids/360/SceKernelModulemgr.yml @@ -51,7 +51,6 @@ modules: nid: 0xC445FA63 functions: sceKernelFinalizeKbl: 0xFDD7F646 - sceKernelGetModuleExportLibraryList: 0x1FDEAE16 sceKernelGetModuleIdByAddr: 0x0053BA4A sceKernelGetModuleInfo: 0xD269F915 sceKernelGetModuleInfoMinByAddr: 0x8309E043 @@ -62,6 +61,7 @@ modules: sceKernelGetModuleList2: 0x410E1D2E sceKernelGetModuleListByImport: 0x3B93CF88 sceKernelGetModulePath: 0x779A1025 + sceKernelGetProcessLibraryIdList: 0x1FDEAE16 sceKernelGetProcessMainModule: 0x20A27FA9 sceKernelLoadModuleForPid: 0xFA21D8CB sceKernelLoadPreloadingModules: 0x3AD26B43 -- cgit v1.2.3 From e3d27bcf769ac353cd9d96000631571667c0d05b Mon Sep 17 00:00:00 2001 From: Princess of Sleeping Date: Wed, 24 Jun 2020 10:25:49 +0900 Subject: Fix one function name and args --- include/kernel/kernel/modulemgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/kernel/kernel/modulemgr.h b/include/kernel/kernel/modulemgr.h index 5632db7..cee6bf6 100644 --- a/include/kernel/kernel/modulemgr.h +++ b/include/kernel/kernel/modulemgr.h @@ -530,7 +530,7 @@ int sceKernelGetModuleListByImport(SceUID pid, SceUID libid, SceUID *modids, Sce * * @return 0 on success, < 0 on error. */ -int sceKernelGetModuleExportLibraryList(SceUID pid, SceUID *libids, SceSize *num); +int sceKernelGetProcessLibraryIdList(SceUID pid, SceUID *library_ids, SceSize *num); #ifdef __cplusplus } -- cgit v1.2.3 From 7df3ee240df35e894e96b2e1e283ccb63f6c4645 Mon Sep 17 00:00:00 2001 From: Princess of Sleeping Date: Thu, 25 Jun 2020 11:47:41 +0900 Subject: Fix modulemgr two function arg name and document --- include/kernel/kernel/modulemgr.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/kernel/kernel/modulemgr.h b/include/kernel/kernel/modulemgr.h index cee6bf6..f169011 100644 --- a/include/kernel/kernel/modulemgr.h +++ b/include/kernel/kernel/modulemgr.h @@ -512,21 +512,21 @@ int sceKernelGetModuleLibExportList(SceUID pid, SceUID libid, SceKernelModuleExp * @brief Get module id list by import * * @param[in] pid - target pid - * @param[in] libid - target library uid + * @param[in] library_id - target library uid * @param[out] modids - module id output list * @param[inout] num - in:list max num, out:get entry num * @param[in] cpy_skip_num - The index at which to start copying * * @return 0 on success, < 0 on error. */ -int sceKernelGetModuleListByImport(SceUID pid, SceUID libid, SceUID *modids, SceSize *num, SceSize cpy_skip_num); +int sceKernelGetModuleListByImport(SceUID pid, SceUID library_id, SceUID *modids, SceSize *num, SceSize cpy_skip_num); /** * @brief Get module export list * - * @param[in] pid - target pid - * @param[out] libids - library id output list - * @param[inout] num - in:list max num, out:get entry num + * @param[in] pid - target pid + * @param[out] library_ids - library id output list + * @param[inout] num - in:list max num, out:get entry num * * @return 0 on success, < 0 on error. */ -- cgit v1.2.3 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/kernel/appmgr.h | 4 +- include/kernel/bt.h | 6 +-- include/kernel/idstorage.h | 4 +- include/kernel/kernel/cpu.h | 18 ++++----- include/kernel/kernel/dmac.h | 6 +-- include/kernel/kernel/modulemgr.h | 14 +++---- include/kernel/kernel/processmgr.h | 2 +- include/kernel/kernel/sysmem.h | 81 +++++++++++++++++++------------------- include/kernel/kernel/threadmgr.h | 30 +++++++------- include/kernel/kernel/utils.h | 44 ++++++++++----------- include/kernel/registrymgr.h | 12 +++--- include/kernel/sblauthmgr.h | 2 +- include/kernel/syscon.h | 10 ++--- 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 ++-- 22 files changed, 160 insertions(+), 160 deletions(-) diff --git a/include/kernel/appmgr.h b/include/kernel/appmgr.h index 758c339..2f8e91a 100644 --- a/include/kernel/appmgr.h +++ b/include/kernel/appmgr.h @@ -16,7 +16,7 @@ int sceAppMgrKillProcess(SceUID pid); typedef struct { - size_t size; + SceSize size; unsigned int unk_4; // 0x80 = error @@ -21,7 +21,7 @@ int sceIdStorageReadLeaf(int leafnum, void *buf); * * @return 0 on success, < 0 on error. */ -int sceIdStorageWriteLeaf(int leafnum, const void *buf); +int sceIdStorageWriteLeaf(SceSize leafnum, const void *buf); #ifdef __cplusplus } diff --git a/include/kernel/kernel/cpu.h b/include/kernel/kernel/cpu.h index db3a5e9..d0b5d5f 100644 --- a/include/kernel/kernel/cpu.h +++ b/include/kernel/kernel/cpu.h @@ -37,7 +37,7 @@ extern "C" { * * @return Zero on success */ -int sceKernelCpuDcacheWritebackRange(const void *ptr, size_t len); +int sceKernelCpuDcacheWritebackRange(const void *ptr, SceSize len); /** @@ -87,7 +87,7 @@ static inline void sceKernelCpuRestoreContext(int context[3]) * * @return Zero on success. */ -static inline int sceKernelCpuUnrestrictedMemcpy(void *dst, const void *src, size_t len) +static inline int sceKernelCpuUnrestrictedMemcpy(void *dst, const void *src, SceSize len) { int prev_dacr; @@ -134,7 +134,7 @@ int sceKernelCpuEnableInterrupts(int flags); * * @return Zero on success */ -int sceKernelCpuDcacheInvalidateRange(const void *ptr, size_t len); +int sceKernelCpuDcacheInvalidateRange(const void *ptr, SceSize len); /** * @brief Writeback and invalidate a range of L1 dcache (without L2) @@ -144,7 +144,7 @@ int sceKernelCpuDcacheInvalidateRange(const void *ptr, size_t len); * * @return Zero on success */ -int sceKernelCpuDcacheWritebackInvalidateRange(const void *ptr, size_t len); +int sceKernelCpuDcacheWritebackInvalidateRange(const void *ptr, SceSize len); /** * @brief Invalidate all the L1 dcache (without L2) @@ -175,7 +175,7 @@ int sceKernelCpuDcacheWritebackInvalidateAll(void); * * @return Zero on success */ -int sceKernelCpuDcacheAndL2WritebackRange(const void *ptr, size_t len); +int sceKernelCpuDcacheAndL2WritebackRange(const void *ptr, SceSize len); /** * @brief Writeback and invalidate a range of L1 dcache and L2 @@ -185,7 +185,7 @@ int sceKernelCpuDcacheAndL2WritebackRange(const void *ptr, size_t len); * * @return Zero on success */ -int sceKernelCpuDcacheAndL2InvalidateRange(const void *ptr, size_t len); +int sceKernelCpuDcacheAndL2InvalidateRange(const void *ptr, SceSize len); /** * @brief Writeback and invalidate a range of L1 dcache and L2 @@ -195,7 +195,7 @@ int sceKernelCpuDcacheAndL2InvalidateRange(const void *ptr, size_t len); * * @return Zero on success */ -int sceKernelCpuDcacheAndL2WritebackInvalidateRange(const void *ptr, size_t len); +int sceKernelCpuDcacheAndL2WritebackInvalidateRange(const void *ptr, SceSize len); /** * @brief Invalidate a range of L1 icache (without L2) @@ -205,7 +205,7 @@ int sceKernelCpuDcacheAndL2WritebackInvalidateRange(const void *ptr, size_t len) * * @return Zero on success */ -int sceKernelCpuIcacheInvalidateRange(const void *ptr, size_t len); +int sceKernelCpuIcacheInvalidateRange(const void *ptr, SceSize len); /** * @brief Invalidate all the L1 icache (without L2) @@ -222,7 +222,7 @@ int sceKernelCpuIcacheInvalidateAll(void); * * @return Zero on success */ -int sceKernelCpuIcacheAndL2WritebackInvalidateRange(const void *ptr, size_t len); +int sceKernelCpuIcacheAndL2WritebackInvalidateRange(const void *ptr, SceSize len); /** * @brief Suspend all interrupts (disables IRQs) diff --git a/include/kernel/kernel/dmac.h b/include/kernel/kernel/dmac.h index 669257e..adb1008 100644 --- a/include/kernel/kernel/dmac.h +++ b/include/kernel/kernel/dmac.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERNEL_DMAC_H_ #define _PSP2_KERNEL_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/kernel/kernel/modulemgr.h b/include/kernel/kernel/modulemgr.h index f169011..09ea4d6 100644 --- a/include/kernel/kernel/modulemgr.h +++ b/include/kernel/kernel/modulemgr.h @@ -137,7 +137,7 @@ typedef struct SceKernelModuleLibraryInfo { * * @return none */ -void sceKernelRegisterSyscall(int syscall_id, const void *func); +void sceKernelRegisterSyscall(SceSize syscall_id, const void *func); /** * @brief Setup kernel for modulemgr @@ -159,7 +159,7 @@ void sceKernelSetupForModulemgr(void); * * @return 0 on success, < 0 on error. */ -int sceKernelGetModuleList(SceUID pid, int flags1, int flags2, SceUID *modids, size_t *num); +int sceKernelGetModuleList(SceUID pid, int flags1, int flags2, SceUID *modids, SceSize *num); /** * @par Example1: Get max to 10 kernel module info @@ -189,7 +189,7 @@ int sceKernelGetModuleList(SceUID pid, int flags1, int flags2, SceUID *modids, s * * @return 0 on success, < 0 on error. */ -int sceKernelGetModuleList2(SceUID pid, SceKernelModuleListInfo *infolists, size_t *num); +int sceKernelGetModuleList2(SceUID pid, SceKernelModuleListInfo *infolists, SceSize *num); /** * @brief Get module info @@ -223,7 +223,7 @@ int sceKernelGetModuleInfoMinByAddr(SceUID pid, const void *module_addr, uint32_ * * @return 0 on success, < 0 on error. */ -int sceKernelGetModuleInternal(SceUID modid, void **module_info); +int sceKernelGetModuleInternal(SceUID modid, void **info); /** * @brief Get module id by module address @@ -477,7 +477,7 @@ SceUID sceKernelGetProcessMainModule(SceUID pid); * * @return 0 on success, < 0 on error. */ -int sceKernelGetModulePath(SceUID modid, char *path, int pathlen); +int sceKernelGetModulePath(SceUID modid, char *path, SceSize pathlen); /** * @brief Get library info @@ -488,7 +488,7 @@ int sceKernelGetModulePath(SceUID modid, char *path, int pathlen); * * @return 0 on success, < 0 on error. */ -int sceKernelGetModuleLibraryInfo(SceUID pid, SceUID libid, SceKernelModuleLibraryInfo *info); +int sceKernelGetModuleLibraryInfo(SceUID pid, SceUID library_id, SceKernelModuleLibraryInfo *info); typedef struct SceKernelModuleExportEntry { uint32_t libnid; @@ -506,7 +506,7 @@ typedef struct SceKernelModuleExportEntry { * * @return 0 on success, < 0 on error. */ -int sceKernelGetModuleLibExportList(SceUID pid, SceUID libid, SceKernelModuleExportEntry *list, SceSize *num, SceSize cpy_skip_num); +int sceKernelGetModuleLibExportList(SceUID pid, SceUID library_id, SceKernelModuleExportEntry *list, SceSize *num, SceSize cpy_skip_num); /** * @brief Get module id list by import diff --git a/include/kernel/kernel/processmgr.h b/include/kernel/kernel/processmgr.h index e0209f9..6438113 100644 --- a/include/kernel/kernel/processmgr.h +++ b/include/kernel/kernel/processmgr.h @@ -33,7 +33,7 @@ int sceKernelGetProcessLocalStorageAddrForPid(SceUID pid, int key, void **out_ad * @param[in] unk Unknown. * @return PID of the launched app on success, < 0 on error. */ -SceUID sceKernelLaunchApp(char* titleid, uint32_t flags, char *path, uint32_t unk); +SceUID sceKernelLaunchApp(const char *titleid, uint32_t flags, const char *path, uint32_t unk); /** * @brief Resume a suspended process. diff --git a/include/kernel/kernel/sysmem.h b/include/kernel/kernel/sysmem.h index 978db42..b2fc17f 100644 --- a/include/kernel/kernel/sysmem.h +++ b/include/kernel/kernel/sysmem.h @@ -2,6 +2,7 @@ #define _PSP2_KERNEL_SYSMEM_H_ #include +#include #ifdef __cplusplus extern "C" { @@ -104,7 +105,7 @@ typedef enum SceKernelModel { SCE_KERNEL_MODEL_VITATV = 0x20000 } SceKernelModel; -typedef int (*SceClassCallback)(void *item); +typedef int (* SceClassCallback)(void *item); typedef struct SceClass { struct SceClass *next; @@ -150,11 +151,11 @@ typedef struct SceKernelSysrootSelfInfo { * @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, SceKernelAllocMemBlockKernelOpt *optp); +SceUID sceKernelAllocMemBlock(const char *name, SceKernelMemBlockType type, SceSize size, SceKernelAllocMemBlockKernelOpt *opt); /** * Frees new memory block @@ -168,12 +169,12 @@ int sceKernelFreeMemBlock(SceUID uid); /** * Gets the base address of a memory block * - * @param[in] uid - SceUID of the memory block - * @param[out] basep - Base address of the memory block identified by uid + * @param[in] uid - SceUID of the memory block + * @param[out] base - Base address of the memory block identified by uid * * @return 0 on success, < 0 on error. */ -int sceKernelGetMemBlockBase(SceUID uid, void **basep); +int sceKernelGetMemBlockBase(SceUID uid, void **base); /** * Gets the memory block type of a memory block @@ -221,14 +222,14 @@ int sceKernelDeleteHeap(SceUID uid); void *sceKernelAllocHeapMemory(SceUID uid, SceSize size); void sceKernelFreeHeapMemory(SceUID uid, void *ptr); -int sceKernelMemcpyUserToKernelForPid(SceUID pid, void *dst, uintptr_t src, size_t len); -int sceKernelMemcpyUserToKernel(void *dst, uintptr_t src, size_t len); -int sceKernelMemcpyKernelToUser(uintptr_t dst, const void *src, size_t len); -int sceKernelRxMemcpyKernelToUserForPid(SceUID pid, uintptr_t dst, const void *src, size_t len); +int sceKernelMemcpyUserToKernelForPid(SceUID pid, void *dst, uintptr_t src, SceSize len); +int sceKernelMemcpyUserToKernel(void *dst, uintptr_t src, SceSize len); +int sceKernelMemcpyKernelToUser(uintptr_t dst, const void *src, SceSize len); +int sceKernelRxMemcpyKernelToUserForPid(SceUID pid, uintptr_t dst, const void *src, SceSize len); -int sceKernelStrncpyUserToKernel(void *dst, uintptr_t src, size_t len); -int sceKernelStrncpyKernelToUser(uintptr_t dst, const void *src, size_t len); -int sceKernelStrncpyUserForPid(SceUID pid, void *dst, uintptr_t src, size_t len); +int sceKernelStrncpyUserToKernel(void *dst, uintptr_t src, SceSize len); +int sceKernelStrncpyKernelToUser(uintptr_t dst, const void *src, SceSize len); +int sceKernelStrncpyUserForPid(SceUID pid, void *dst, uintptr_t src, SceSize len); SceUID sceKernelKernelUidForUserUid(SceUID pid, SceUID user_uid); SceUID sceKernelCreateUserUid(SceUID pid, SceUID kern_uid); @@ -274,7 +275,8 @@ SceClass *sceKernelGetUidClass(void); SceClass *sceKernelGetUidDLinkClass(void); SceClass *sceKernelGetUidHeapClass(void); SceClass *sceKernelGetUidMemBlockClass(void); -int sceKernelCreateClass(SceClass *cls, const char *name, void *uidclass, size_t itemsize, SceClassCallback create, SceClassCallback destroy); + +int sceKernelCreateClass(SceClass *cls, const char *name, void *uidclass, SceSize itemsize, SceClassCallback create, SceClassCallback destroy); int sceKernelDeleteUserUid(SceUID pid, SceUID user_uid); int sceKernelDeleteUid(SceUID uid); int sceKernelFindClassByName(const char *name, SceClass **cls); @@ -284,18 +286,18 @@ int sceKernelSwitchVmaForPid(SceUID pid); void *sceKernelGetSysrootBuffer(void); int sceKernelGetPidContext(SceUID pid, SceKernelProcessContext **ctx); -int sceKernelGetProcessTitleId(SceUID pid, char *titleid, size_t len); +int sceKernelGetProcessTitleId(SceUID pid, char *titleid, SceSize len); int sceKernelMapBlockUserVisible(SceUID uid); int sceKernelMapUserBlock(const char *name, int permission, int type, - const void *user_buf, unsigned int size, void **kernel_page, - unsigned int *kernel_size, unsigned int *kernel_offset); + const void *user_buf, SceSize size, void **kernel_page, + SceSize *kernel_size, unsigned int *kernel_offset); int sceKernelMapUserBlockDefaultType(const char *name, int permission, const void *user_buf, - unsigned int size, void **kernel_page, - unsigned int *kernel_size, unsigned int *kernel_offset); + SceSize size, void **kernel_page, + SceSize *kernel_size, unsigned int *kernel_offset); int sceKernelMapUserBlockDefaultTypeForPid(int pid, const char *name, int permission, - const void *user_buf, unsigned int size, void **kernel_page, - unsigned int *kernel_size, unsigned int *kernel_offset); + const void *user_buf, SceSize size, void **kernel_page, + SceSize *kernel_size, unsigned int *kernel_offset); int sceSysrootGetSelfInfo(SceKernelSysrootSelfIndex index, SceKernelSysrootSelfInfo *info); @@ -342,7 +344,7 @@ int sceKernelMemBlockRelease(SceUID uid); * * @return 0 on success, < 0 on error. */ -int sceKernelMemRangeRetain(void *addr, unsigned int size); +int sceKernelMemRangeRetain(void *addr, SceSize size); /** * Retains a memory range for a process (pid) @@ -357,7 +359,7 @@ int sceKernelMemRangeRetain(void *addr, unsigned int size); * * @return 0 on success, < 0 on error. */ -int sceKernelMemRangeRetainForPid(SceUID pid, void *addr, unsigned int size); +int sceKernelMemRangeRetainForPid(SceUID pid, void *addr, SceSize size); /** * Retains a memory range checking for a given permission @@ -372,7 +374,7 @@ int sceKernelMemRangeRetainForPid(SceUID pid, void *addr, unsigned int size); * * @return 0 on success, < 0 on error. */ -int sceKernelMemRangeRetainWithPerm(SceKernelMemoryRefPerm perm, void *addr, unsigned int size); +int sceKernelMemRangeRetainWithPerm(SceKernelMemoryRefPerm perm, void *addr, SceSize size); /** * Releases a memory range @@ -386,7 +388,7 @@ int sceKernelMemRangeRetainWithPerm(SceKernelMemoryRefPerm perm, void *addr, uns * * @return 0 on success, < 0 on error. */ -int sceKernelMemRangeRelease(void *addr, unsigned int size); +int sceKernelMemRangeRelease(void *addr, SceSize size); /** * Releases a memory range for a process (pid) @@ -401,7 +403,7 @@ int sceKernelMemRangeRelease(void *addr, unsigned int size); * * @return 0 on success, < 0 on error. */ -int sceKernelMemRangeReleaseForPid(SceUID pid, void *addr, unsigned int size); +int sceKernelMemRangeReleaseForPid(SceUID pid, void *addr, SceSize size); /** * Releases a memory range checking for a given permission @@ -416,7 +418,7 @@ int sceKernelMemRangeReleaseForPid(SceUID pid, void *addr, unsigned int size); * * @return 0 on success, < 0 on error. */ -int sceKernelMemRangeReleaseWithPerm(SceKernelMemoryRefPerm perm, void *addr, unsigned int size); +int sceKernelMemRangeReleaseWithPerm(SceKernelMemoryRefPerm perm, void *addr, SceSize size); int sceSysrootUseExternalStorage(void); @@ -426,29 +428,26 @@ int sceSysrootUseInternalStorage(void); int sceDebugPrintf(const char *fmt, ...); -typedef struct kernel_message_ctx -{ +typedef struct SceKernelDebugMessageContext { int hex_value0_hi; int hex_value0_lo; int hex_value1; - char* msg0; - int num; - char* msg1; -} kernel_message_ctx; + char *msg0; + SceSize num; + char *msg1; +} SceKernelDebugMessageContext; // msg_type_flag : 0 or 0xB -int sceDebugPrintf2(int msg_type_flag, kernel_message_ctx *msg_ctx, const char *fmt, ...); +int sceDebugPrintf2(int msg_type_flag, const SceKernelDebugMessageContext *ctx, const char *fmt, ...); -int sceDebugPrintKernelPanic(kernel_message_ctx *msg_ctx, void *some_address); - -int sceDebugPrintfKernelPanic(kernel_message_ctx *msg_ctx, void *some_address, char* format, ...); - -int sceDebugPrintKernelAssertion(int condition, kernel_message_ctx *msg_ctx, void *some_address); +int sceDebugPrintKernelPanic(const SceKernelDebugMessageContext *ctx, void *some_address); +int sceDebugPrintfKernelPanic(const SceKernelDebugMessageContext *ctx, void *some_address, const char *fmt, ...); -int sceDebugPrintfKernelAssertion(int unk, int condition, kernel_message_ctx *msg_ctx, int some_address, const char *fmt, ...); +int sceDebugPrintKernelAssertion(int condition, const SceKernelDebugMessageContext *ctx, void *some_address); +int sceDebugPrintfKernelAssertion(int unk, int condition, const SceKernelDebugMessageContext *ctx, int some_address, const char *fmt, ...); -int sceDebugSetHandlers(int (*func)(void *args, char c), void *args); +int sceDebugSetHandlers(int (*func)(int unk, const char *format, const va_list args), void *args); int sceDebugRegisterPutcharHandler(int (*func)(void *args, char c), void *args); diff --git a/include/kernel/kernel/threadmgr.h b/include/kernel/kernel/threadmgr.h index 61f96b3..3836f70 100644 --- a/include/kernel/kernel/threadmgr.h +++ b/include/kernel/kernel/threadmgr.h @@ -14,7 +14,7 @@ typedef SceUInt64 SceKernelSysClock; /* Threads. */ -typedef int (*SceKernelThreadEntry)(SceSize args, void *argp); +typedef int (* SceKernelThreadEntry)(SceSize args, void *argp); /** Additional options used when creating threads. */ typedef struct SceKernelThreadOptParam { @@ -43,7 +43,7 @@ typedef struct SceKernelThreadInfo { /** Thread stack pointer */ void *stack; /** Thread stack size */ - int stackSize; + SceSize stackSize; /** Initial priority */ int initPriority; /** Current priority */ @@ -123,7 +123,7 @@ typedef struct SceKernelFaultingProcessInfo { * @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); /** @@ -282,7 +282,7 @@ typedef struct SceKernelSemaInfo { * @par Example: * @code * int semaid; - * semaid = sceKernelCreateSema("MySema", 0, 1, 1, 0); + * semaid = sceKernelCreateSema("MySema", 0, 1, 1, NULL); * @endcode * * @param name - Specifies the name of the sema @@ -323,7 +323,7 @@ int sceKernelSignalSema(SceUID semaid, int signal); * * @par Example: * @code - * sceKernelWaitSema(semaid, 1, 0); + * sceKernelWaitSema(semaid, 1, NULL); * @endcode * * @param semaid - The sema id returned from ::sceKernelCreateSema @@ -382,7 +382,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 @@ -511,7 +511,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); @@ -704,7 +704,7 @@ typedef struct SceKernelCallbackInfo { * @par Example: * @code * int cbid; - * cbid = sceKernelCreateCallback("Exit Callback", exit_cb, NULL); + * cbid = sceKernelCreateCallback("Exit Callback", 0, exit_cb, NULL); * @endcode * * @param name - A textual name for the callback @@ -828,7 +828,7 @@ SceUID sceKernelGetProcessId(void); * * @return Zero on success */ -int sceKernelRunWithStack(int stack_size, int (*to_call)(void *), void *args); +int sceKernelRunWithStack(SceSize stack_size, int (* to_call)(void *), void *args); /** * @brief Call from an abort handler to get info on faulting process @@ -841,7 +841,7 @@ int sceKernelGetFaultingProcess(SceKernelFaultingProcessInfo *info); /* Workqueues */ -typedef int (*SceKernelWorkQueueWorkFunction)(void *args); +typedef int (* SceKernelWorkQueueWorkFunction)(void *args); /** * @brief Enqueue work to a workqueue @@ -945,7 +945,7 @@ int sceKernelChangeThreadSuspendStatus(SceUID thid, int status); * * @return The UID of the created pipe, < 0 on error */ -SceUID sceKernelCreateMsgPipe(const char *name, int type, int attr, unsigned int bufSize, void *opt); +SceUID sceKernelCreateMsgPipe(const char *name, int type, int attr, SceSize bufSize, void *opt); /** * Delete a message pipe @@ -959,7 +959,7 @@ int sceKernelDeleteMsgPipe(SceUID uid); typedef struct { const void *message; - unsigned int size; + SceSize size; } MsgPipeSendData; /** @@ -987,12 +987,12 @@ int sceKernelSendMsgPipeVector(SceUID uid, const MsgPipeSendData *v, unsigned in * * @return 0 on success, < 0 on error */ -int sceKernelTrySendMsgPipeVector(SceUID uid, const MsgPipeSendData *v, unsigned int size, int unk1, void *unk2); +int sceKernelTrySendMsgPipeVector(SceUID uid, const MsgPipeSendData *v, SceSize size, int unk1, void *unk2); typedef struct { void *message; - unsigned int size; + SceSize size; } MsgPipeRecvData; /** @@ -1020,7 +1020,7 @@ int sceKernelReceiveMsgPipeVector(SceUID uid, const MsgPipeRecvData *v, unsigned * * @return 0 on success, < 0 on error */ -int sceKernelTryReceiveMsgPipeVector(SceUID uid, const MsgPipeRecvData *v, unsigned int size, int unk1, void *unk2); +int sceKernelTryReceiveMsgPipeVector(SceUID uid, const MsgPipeRecvData *v, SceSize size, int unk1, void *unk2); /** * Cancel a message pipe diff --git a/include/kernel/kernel/utils.h b/include/kernel/kernel/utils.h index c7f1c92..fc1e6f5 100644 --- a/include/kernel/kernel/utils.h +++ b/include/kernel/kernel/utils.h @@ -58,24 +58,24 @@ typedef struct { uint8_t data[976]; } SceAesContext; -int sceSha1BlockInit(SceSha1Context *pContext); -int sceSha1BlockUpdate(SceSha1Context *pContext, const void *plain, uint32_t len); -int sceSha1BlockResult(SceSha1Context *pContext, char *digest); -int sceSha1Digest(const void *plain, uint32_t len, char *result); +int sceSha1BlockInit(SceSha1Context *ctx); +int sceSha1BlockUpdate(SceSha1Context *ctx, const void *plain, SceSize len); +int sceSha1BlockResult(SceSha1Context *ctx, void *result); +int sceSha1Digest(const void *plain, SceSize len, void *digest); -int sceSha224BlockInit(SceSha224Context *pContext); -int sceSha224BlockUpdate(SceSha224Context *pContext, const void *plain, uint32_t len); -int sceSha224BlockResult(SceSha224Context *pContext, char *digest); -int sceSha224Digest(const void *plain, uint32_t len, char *result); +int sceSha224BlockInit(SceSha224Context *ctx); +int sceSha224BlockUpdate(SceSha224Context *ctx, const void *plain, SceSize len); +int sceSha224BlockResult(SceSha224Context *ctx, void *result); +int sceSha224Digest(const void *plain, SceSize len, void *digest); -int sceSha256BlockInit(SceSha256Context *pContext); -int sceSha256BlockUpdate(SceSha256Context *pContext, const void *plain, uint32_t len); -int sceSha256BlockResult(SceSha256Context *pContext, char *digest); -int sceSha256Digest(const void *plain, uint32_t len, char *result); +int sceSha256BlockInit(SceSha256Context *ctx); +int sceSha256BlockUpdate(SceSha256Context *ctx, const void *plain, SceSize len); +int sceSha256BlockResult(SceSha256Context *ctx, void *result); +int sceSha256Digest(const void *plain, SceSize len, void *digest); -int sceHmacSha1Digest(const unsigned char *key, uint32_t key_len, const void *plain, uint32_t len, char *result); -int sceHmacSha224Digest(const unsigned char *key, uint32_t key_len, const void *plain, uint32_t len, char *result); -int sceHmacSha256Digest(const unsigned char *key, uint32_t key_len, const void *plain, uint32_t len, char *result); +int sceHmacSha1Digest(const void *key, SceSize key_len, const void *plain, SceSize len, void *digest); +int sceHmacSha224Digest(const void *key, SceSize key_len, const void *plain, SceSize len, void *digest); +int sceHmacSha256Digest(const void *key, SceSize key_len, const void *plain, SceSize len, void *digest); /** * @param[out] dst - dst buf @@ -85,7 +85,7 @@ int sceHmacSha256Digest(const unsigned char *key, uint32_t key_len, const void * * * @return decompressed size on success, < 0 on error. */ -int sceGzipDecompress(void *dst, uint32_t dst_size, const void *src, uint32_t *crc32); +int sceGzipDecompress(void *dst, SceSize dst_size, const void *src, uint32_t *crc32); /** * @brief Check magic of Gzip header @@ -167,7 +167,7 @@ const void *sceZlibGetCompressedData(const void *src); * * @return decompressed size on success, < 0 on error. */ -int sceZlibDecompress(void *dst, uint32_t dst_size, const void *src, uint32_t *adler32); +int sceZlibDecompress(void *dst, SceSize dst_size, const void *src, uint32_t *adler32); /** * @param[out] dst - dst buf @@ -177,8 +177,8 @@ int sceZlibDecompress(void *dst, uint32_t dst_size, const void *src, uint32_t *a * * @return decompressed size on success, < 0 on error. */ -int sceDeflateDecompress(void *dst, uint32_t dst_size, const void *src, const void **next); -int sceDeflateDecompressPartial(void *dst, unsigned int dst_size, const void *src, const void **next, SceDeflatePartialInputParam *cbInfo); +int sceDeflateDecompress(void *dst, SceSize dst_size, const void *src, const void **next); +int sceDeflateDecompressPartial(void *dst, SceSize dst_size, const void *src, const void **next, SceDeflatePartialInputParam *cbInfo); /** * @param[out] ctx - out key data, etc... @@ -188,9 +188,9 @@ int sceDeflateDecompressPartial(void *dst, unsigned int dst_size, const void *sr * * @return 0 on success, < 0 on error. */ -int sceAesInit1(SceAesContext *ctx, int blocksize, int keysize, const void *key); -int sceAesInit2(SceAesContext *ctx, int blocksize, int keysize, const void *key); -int sceAesInit3(SceAesContext *ctx, int blocksize, int keysize, const void *key); +int sceAesInit1(SceAesContext *ctx, SceSize blocksize, SceSize keysize, const void *key); +int sceAesInit2(SceAesContext *ctx, SceSize blocksize, SceSize keysize, const void *key); +int sceAesInit3(SceAesContext *ctx, SceSize blocksize, SceSize keysize, const void *key); int sceAesDecrypt1(SceAesContext *ctx, const void *src, void *dst); int sceAesDecrypt2(SceAesContext *ctx, const void *src, void *dst); diff --git a/include/kernel/registrymgr.h b/include/kernel/registrymgr.h index 9428e5a..166fc3d 100644 --- a/include/kernel/registrymgr.h +++ b/include/kernel/registrymgr.h @@ -17,7 +17,7 @@ extern "C" { * * @return 0 on success, < 0 on error */ -int sceRegMgrGetKeyBin(const char *category, const char *name, void *buf, int size); +int sceRegMgrGetKeyBin(const char *category, const char *name, void *buf, SceSize size); /** * Get a key's information by category and name @@ -28,7 +28,7 @@ int sceRegMgrGetKeyBin(const char *category, const char *name, void *buf, int si * * @return 0 on success, < 0 on error */ -int sceRegMgrGetKeyInt(const char* category, const char* name, int* buf); +int sceRegMgrGetKeyInt(const char *category, const char *name, int *buf); /** * Get a key's information by category and name @@ -40,7 +40,7 @@ int sceRegMgrGetKeyInt(const char* category, const char* name, int* buf); * * @return 0 on success, < 0 on error */ -int sceRegMgrGetKeyStr(const char* category, const char* name, char* buf, const int size); +int sceRegMgrGetKeyStr(const char *category, const char *name, char *buf, SceSize size); /** * Set a key's information by category and name @@ -52,7 +52,7 @@ int sceRegMgrGetKeyStr(const char* category, const char* name, char* buf, const * * @return 0 on success, < 0 on error */ -int sceRegMgrSetKeyBin(const char *category, const char *name, void *buf, int size); +int sceRegMgrSetKeyBin(const char *category, const char *name, void *buf, SceSize size); /** * Set a key's information by category and name @@ -63,7 +63,7 @@ int sceRegMgrSetKeyBin(const char *category, const char *name, void *buf, int si * * @return 0 on success, < 0 on error */ -int sceRegMgrSetKeyInt(const char* category, const char* name, int buf); +int sceRegMgrSetKeyInt(const char *category, const char *name, int buf); /** * Set a key's information by category and name @@ -75,7 +75,7 @@ int sceRegMgrSetKeyInt(const char* category, const char* name, int buf); * * @return 0 on success, < 0 on error */ -int sceRegMgrSetKeyStr(const char* category, const char* name, char* buf, const int size); +int sceRegMgrSetKeyStr(const char *category, const char *name, char *buf, SceSize size); #ifdef __cplusplus } diff --git a/include/kernel/sblauthmgr.h b/include/kernel/sblauthmgr.h index 0b5f64d..43b7fd2 100644 --- a/include/kernel/sblauthmgr.h +++ b/include/kernel/sblauthmgr.h @@ -8,7 +8,7 @@ extern "C" { #endif int sceSblAuthMgrClearDmac5Key(int slot_id, int val); -int sceSblAuthMgrSetDmac5Key(const void *key, size_t keylen, int slot_id, int key_id); +int sceSblAuthMgrSetDmac5Key(const void *key, SceSize keylen, int slot_id, int key_id); #ifdef __cplusplus } diff --git a/include/kernel/syscon.h b/include/kernel/syscon.h index c5bae25..27bc0d6 100644 --- a/include/kernel/syscon.h +++ b/include/kernel/syscon.h @@ -106,8 +106,8 @@ int sceSysconCmdSync(SceSysconPacket *packet, int noWait); */ int sceSysconSetPowerMode(int type, int mode); -int sceSysconReadCommand(unsigned short cmd, void *buffer, unsigned int size); -int sceSysconSendCommand(unsigned short cmd, const void *buffer, unsigned int size); +int sceSysconReadCommand(unsigned short cmd, void *buffer, SceSize size); +int sceSysconSendCommand(unsigned short cmd, const void *buffer, SceSize size); /** * Set the debug handlers. @@ -163,7 +163,7 @@ int sceSysconIsDownLoaderMode(void); int sceSysconLogStart(void); int sceSysconLogStartWaiting(void); -int sceSysconLogReadData(unsigned short, void *buff, unsigned int size); +int sceSysconLogReadData(unsigned short, void *buff, SceSize size); int sceSysconShowModeClear(void); int sceSysconShowModeSet(void); @@ -196,8 +196,8 @@ int sceSysconClearTemperatureLog(int); int sceSysconBeginConfigstorageTransaction(void); int sceSysconCommitConfigstorageTransaction(void); int sceSysconEndConfigstorageTransaction(void); -int sceSysconLoadConfigstorageScript(unsigned short, const void *buff, unsigned int size); -int sceSysconVerifyConfigstorageScript(unsigned short, const void *buff, unsigned int size); +int sceSysconLoadConfigstorageScript(unsigned short, const void *buff, SceSize size); +int sceSysconVerifyConfigstorageScript(unsigned short, const void *buff, SceSize size); /** * Set the alarm callback, that will be ran when the alarm timer is passed. 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 From 7cf76b93eb2e9e430a15896834caffb7aa8699db Mon Sep 17 00:00:00 2001 From: Princess of Sleeping Date: Mon, 29 Jun 2020 21:21:50 +0900 Subject: Update modulemgr structs (#453) * Update modulemgr structs * Update modulemgr structs * Added SceKernelModuleState enum * Added SceKernelModuleState enum--- include/kernel/kernel/modulemgr.h | 19 ++++++++++++------- include/user/kernel/modulemgr.h | 8 +++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/include/kernel/kernel/modulemgr.h b/include/kernel/kernel/modulemgr.h index 09ea4d6..7ddc168 100644 --- a/include/kernel/kernel/modulemgr.h +++ b/include/kernel/kernel/modulemgr.h @@ -21,6 +21,12 @@ extern "C" { #define SCE_KERNEL_STOP_CANCEL SCE_KERNEL_STOP_FAIL /** @} */ +typedef enum SceKernelModuleState { + SCE_KERNEL_MODULE_STATE_READY = 0x00000002, + SCE_KERNEL_MODULE_STATE_STARTED = 0x00000006, + SCE_KERNEL_MODULE_STATE_ENDED = 0x00000009 +} SceKernelModuleState; + typedef struct SceKernelModuleName { char s[0x1C]; } SceKernelModuleName; @@ -53,7 +59,7 @@ typedef struct SceKernelModuleInfo { SceSize tlsAreaSize; char path[256]; SceKernelSegmentInfo segments[4]; - SceUInt type; //!< 6 = user-mode PRX? + SceUInt state; //!< see:SceKernelModuleState } SceKernelModuleInfo; typedef struct { @@ -64,8 +70,7 @@ typedef struct { SceSize size; } SceKernelULMOption; -typedef struct -{ +typedef struct { SceSize size; char versionString[0x1C]; SceUInt version; @@ -94,7 +99,7 @@ typedef struct { uint32_t unk40; uint32_t unk44; uint32_t nid; - int segments_num; + SceSize segments_num; union { struct { SceKernelSegmentInfo2 SegmentInfo[1]; @@ -117,15 +122,15 @@ typedef struct { typedef struct SceKernelModuleLibraryInfo { SceSize size; //!< sizeof(SceKernelModuleLibraryInfo) : 0x120 - SceUID libid; + SceUID library_id; uint32_t libnid; uint16_t libver[2]; uint16_t entry_num_function; uint16_t entry_num_variable; uint16_t unk_0x14; uint16_t unk_0x16; - char library_name[0x100]; // offset : 0x18 - uint32_t unk_0x118; + char library_name[0x100]; + SceSize number_of_imported; SceUID modid2; } SceKernelModuleLibraryInfo; diff --git a/include/user/kernel/modulemgr.h b/include/user/kernel/modulemgr.h index 993078c..da2f3e1 100644 --- a/include/user/kernel/modulemgr.h +++ b/include/user/kernel/modulemgr.h @@ -21,6 +21,12 @@ extern "C" { #define SCE_KERNEL_STOP_CANCEL SCE_KERNEL_STOP_FAIL /** @} */ +typedef enum SceKernelModuleState { + SCE_KERNEL_MODULE_STATE_READY = 0x00000002, + SCE_KERNEL_MODULE_STATE_STARTED = 0x00000006, + SCE_KERNEL_MODULE_STATE_ENDED = 0x00000009 +} SceKernelModuleState; + typedef struct SceKernelSegmentInfo { SceSize size; //!< this structure size (0x18) SceUInt perms; //!< probably rwx in low bits @@ -49,7 +55,7 @@ typedef struct SceKernelModuleInfo { SceSize tlsAreaSize; char path[256]; SceKernelSegmentInfo segments[4]; - SceUInt type; //!< 6 = user-mode PRX? + SceUInt state; //!< see:SceKernelModuleState } SceKernelModuleInfo; typedef struct SceKernelLMOption { -- cgit v1.2.3 From a9e3463fde76f060022448eceb486a01942fa46d Mon Sep 17 00:00:00 2001 From: Rinnegatamante Date: Tue, 30 Jun 2020 02:14:22 +0200 Subject: Unify SDK Version constant for all occurrences. (#452) * Unify SDK Version constant for all occurrences. * Moved global constants in a separate header.--- include/user/sharedfb.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/user/sharedfb.h b/include/user/sharedfb.h index a8266c4..1919245 100644 --- a/include/user/sharedfb.h +++ b/include/user/sharedfb.h @@ -2,6 +2,7 @@ #define _PSP2_SHAREDFB_H_ #include +#include #ifdef __cplusplus extern "C" { @@ -31,7 +32,7 @@ int sceSharedFbGetInfo(SceUID fb_id, SceSharedFbInfo *info); static inline SceUID sceSharedFbOpen(int index) { - return _sceSharedFbOpen(index, 0x03570011); + return _sceSharedFbOpen(index, PSP2_SDK_VERSION); }; #ifdef __cplusplus -- cgit v1.2.3 From d5fd930a0cacf11ba872e2ba63143d4c4d27e5a0 Mon Sep 17 00:00:00 2001 From: Itai Levin Date: Fri, 17 Jul 2020 00:16:53 +0300 Subject: Update vshbridge and modulemgr (#457) Update vshbridge and modulemgr documentation--- include/user/kernel/modulemgr.h | 7 +++++++ include/user/vshbridge.h | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/user/kernel/modulemgr.h b/include/user/kernel/modulemgr.h index da2f3e1..b1be55d 100644 --- a/include/user/kernel/modulemgr.h +++ b/include/user/kernel/modulemgr.h @@ -85,6 +85,13 @@ typedef struct SceKernelFwInfo { SceUInt unk_24; } SceKernelFwInfo; +/** + * Gets system firmware information. + * + * @param[out] data - firmware information. + * + * @note - If you spoofed the firmware version it will return the spoofed firmware. + */ int sceKernelGetSystemSwVersion(SceKernelFwInfo *data); #ifdef __cplusplus diff --git a/include/user/vshbridge.h b/include/user/vshbridge.h index db64be4..e2771f3 100644 --- a/include/user/vshbridge.h +++ b/include/user/vshbridge.h @@ -8,8 +8,20 @@ extern "C" { #endif +/** + * Gets real system firmware information. + * + * @param[out] data - firmware information. + */ int _vshSblGetSystemSwVersion(SceKernelFwInfo *data); +/** + * Gets factory (minimum) firmware version. + * + * @param[out] minver - factory firmware version. + */ +int _vshSblAimgrGetSMI(int *minver); + int _vshSblAimgrGetConsoleId(char CID[32]); /** -- cgit v1.2.3 From 67b2e9b8962685f506538e360d4caefd5b74072e Mon Sep 17 00:00:00 2001 From: Reiko Asakura Date: Fri, 24 Jul 2020 19:03:25 -0400 Subject: Revert vitasdk commits Revert "psp2: Fix wrong located comma" This reverts commit d6c7a57df8ff5dd5b98090ddbeafd42db4441328. Revert "Added two missing SceGxmTextureFilter values." This reverts commit 3e88cbfb4bcdaa40c30f4b3df6d9e50f65e7712d. Revert "Removed wrong data types and fixed SceMotionState struct." This reverts commit 3990a63bd7c85adad027785bdc271881d72fa8c5. Revert "Unify SDK Version constant for all occurrences. (#452)" This reverts commit 20c8d81432ba237df23155495b699dd1e17348a0. --- include/user/sharedfb.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/user/sharedfb.h b/include/user/sharedfb.h index 1919245..a8266c4 100644 --- a/include/user/sharedfb.h +++ b/include/user/sharedfb.h @@ -2,7 +2,6 @@ #define _PSP2_SHAREDFB_H_ #include -#include #ifdef __cplusplus extern "C" { @@ -32,7 +31,7 @@ int sceSharedFbGetInfo(SceUID fb_id, SceSharedFbInfo *info); static inline SceUID sceSharedFbOpen(int index) { - return _sceSharedFbOpen(index, PSP2_SDK_VERSION); + return _sceSharedFbOpen(index, 0x03570011); }; #ifdef __cplusplus -- cgit v1.2.3