From 43b487959bb8e1a9d78c5a9422e2f4174b8d3815 Mon Sep 17 00:00:00 2001 From: Simon Stapleton Date: Sun, 22 Mar 2020 13:24:34 +0100 Subject: Fix value for SCE_EVENT_WAITMULTIPLE, add other missing event flags --- include/user/kernel/threadmgr.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'include/user/kernel') diff --git a/include/user/kernel/threadmgr.h b/include/user/kernel/threadmgr.h index c5d93b7..ffb8fd6 100644 --- a/include/user/kernel/threadmgr.h +++ b/include/user/kernel/threadmgr.h @@ -585,8 +585,16 @@ typedef struct SceKernelEventFlagOptParam SceKernelEventFlagOptParam; /** Event flag creation attributes */ typedef enum SceEventFlagAttributes { - /** Allow the event flag to be waited upon by multiple threads */ - SCE_EVENT_WAITMULTIPLE = 0x200 + /* Waiting threads queued on a FIFO basis */ + SCE_EVENT_THREAD_FIFO = 0, + /* Waiting threads queued on priority basis */ + SCE_EVENT_THREAD_PRIO = 0x00002000, + /* Event flag can only be waited upon by one thread */ + SCE_EVENT_WAITSINGLE = 0, + /* Event flag can be waited upon by multiple threads */ + SCE_EVENT_WAITMULTIPLE = 0x00001000, + /* Event flag can be accessed by sceKernelOpenEventFlag / sceKernelCloseEventFlag */ + SCE_EVENT_OPENABLE = 0x00000080 } SceEventFlagAttributes; /** Event flag wait types */ -- cgit v1.2.3 From 2c750c7fbe68b0cbf35d0edf2009de9d08a0daac Mon Sep 17 00:00:00 2001 From: Simon Stapleton Date: Sun, 22 Mar 2020 15:15:21 +0100 Subject: tabification. --- include/user/kernel/threadmgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/user/kernel') diff --git a/include/user/kernel/threadmgr.h b/include/user/kernel/threadmgr.h index ffb8fd6..a73562f 100644 --- a/include/user/kernel/threadmgr.h +++ b/include/user/kernel/threadmgr.h @@ -588,7 +588,7 @@ typedef enum SceEventFlagAttributes { /* Waiting threads queued on a FIFO basis */ SCE_EVENT_THREAD_FIFO = 0, /* Waiting threads queued on priority basis */ - SCE_EVENT_THREAD_PRIO = 0x00002000, + SCE_EVENT_THREAD_PRIO = 0x00002000, /* Event flag can only be waited upon by one thread */ SCE_EVENT_WAITSINGLE = 0, /* Event flag can be waited upon by multiple threads */ -- cgit v1.2.3 From 166584c57f1f4111f11d2cdfa5ac3e66c4d5a7d2 Mon Sep 17 00:00:00 2001 From: Princess of Sleeping Date: Thu, 18 Jun 2020 23:21:13 +0900 Subject: Update modulemgr (#434) * update SceKernelModuleInfo and SceKernelSegmentInfo * update SceKernelModuleInfo and SceKernelSegmentInfo * fix wrong name of modulemgr nid * fix SceKernelModuleName * fix wrong function and wrong struct * fix sort * update SceKernelModuleInfo * update SceKernelModuleInfo--- include/user/kernel/modulemgr.h | 49 +++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'include/user/kernel') diff --git a/include/user/kernel/modulemgr.h b/include/user/kernel/modulemgr.h index a8d44f6..3aa6f30 100644 --- a/include/user/kernel/modulemgr.h +++ b/include/user/kernel/modulemgr.h @@ -22,33 +22,34 @@ extern "C" { /** @} */ typedef struct SceKernelSegmentInfo { - SceUInt size; //!< sizeof(SceKernelSegmentInfo) - SceUInt perms; //!< probably rwx in low bits - void *vaddr; //!< address in memory - SceUInt memsz; //!< size in memory - SceUInt flags; //!< meaning unknown - SceUInt res; //!< unused? + SceSize size; //!< this structure size (0x18) + SceUInt perms; //!< probably rwx in low bits + void *vaddr; //!< address in memory + SceSize memsz; //!< size in memory + SceSize filesz; //!< original size of memsz + SceUInt res; //!< unused } SceKernelSegmentInfo; typedef struct SceKernelModuleInfo { - SceUInt size; //!< 0x1B8 for Vita 1.x - SceUInt handle; //!< kernel module handle? - SceUInt flags; //!< some bits. could be priority or whatnot - char module_name[28]; - SceUInt unk28; - void *module_start; - void *module_stop; - void *module_exit; - void *exidxTop; - void *exidxBtm; - SceUInt unk40; - SceUInt unk44; - void *tlsInit; - SceSize tlsInitSize; - SceSize tlsAreaSize; - char path[256]; - SceKernelSegmentInfo segments[4]; - SceUInt type; //!< 6 = user-mode PRX? + SceSize size; //!< 0x1B8 for Vita 1.x + SceUID modid; + uint16_t modattr; + uint8_t modver[2]; + char module_name[28]; + SceUInt unk28; + void *start_entry; + void *stop_entry; + void *exit_entry; + void *exidx_top; + void *exidx_btm; + void *extab_top; + void *extab_btm; + void *tlsInit; + SceSize tlsInitSize; + SceSize tlsAreaSize; + char path[256]; + SceKernelSegmentInfo segments[4]; + SceUInt type; //!< 6 = user-mode PRX? } SceKernelModuleInfo; typedef struct SceKernelLMOption { -- cgit v1.2.3 From 5b790219e34cb71abaebde7b8b933cca83298918 Mon Sep 17 00:00:00 2001 From: Reiko Asakura Date: Tue, 23 Jun 2020 17:15:05 -0400 Subject: Revert vitasdk commits Revert "Added sceAppMgrGetBudgetInfo prototype." This reverts commit 8fa5c1fd177b7f921ee809cea04099d3c7e25933. Revert "Added sceSharedFB group in doxygen doc." This reverts commit 70876044c82f8320eaa8c2da6b8af61b48625b18. Revert "Fix for incorrect sceGxmGetRenderTargetMemSize prototype." This reverts commit 361b2153c3ffee8aa4a022a41541391b6465d9fd. Revert "Added sceAVConfigSetDisplayColorSpaceMode prototype (#444)" This reverts commit 3a130e9ab8a981316dbd3d03abccf0a651baabe1. Revert "Added sceSharedFb prototypes." This reverts commit fe1adba231c35f60c0c54ed63bc52d9c25520bc5. Revert "tabification." This reverts commit 537864dfd836390810a0fc5b91256507f3459398. Revert "Fix value for SCE_EVENT_WAITMULTIPLE, add other missing event flags" This reverts commit eaeaa78e3890aa5ebf12ff88c2f57a08cfda9a51. Revert "Added sceGxmVshInitialize reference." This reverts commit dafa6f1c3a58a2ea9af8008edef4d4c6168c2f90. --- include/user/kernel/threadmgr.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'include/user/kernel') diff --git a/include/user/kernel/threadmgr.h b/include/user/kernel/threadmgr.h index a73562f..c5d93b7 100644 --- a/include/user/kernel/threadmgr.h +++ b/include/user/kernel/threadmgr.h @@ -585,16 +585,8 @@ typedef struct SceKernelEventFlagOptParam SceKernelEventFlagOptParam; /** Event flag creation attributes */ typedef enum SceEventFlagAttributes { - /* Waiting threads queued on a FIFO basis */ - SCE_EVENT_THREAD_FIFO = 0, - /* Waiting threads queued on priority basis */ - SCE_EVENT_THREAD_PRIO = 0x00002000, - /* Event flag can only be waited upon by one thread */ - SCE_EVENT_WAITSINGLE = 0, - /* Event flag can be waited upon by multiple threads */ - SCE_EVENT_WAITMULTIPLE = 0x00001000, - /* Event flag can be accessed by sceKernelOpenEventFlag / sceKernelCloseEventFlag */ - SCE_EVENT_OPENABLE = 0x00000080 + /** Allow the event flag to be waited upon by multiple threads */ + SCE_EVENT_WAITMULTIPLE = 0x200 } SceEventFlagAttributes; /** Event flag wait types */ -- cgit v1.2.3