3 files changed, 65 insertions, 10 deletions
diff --git a/include/kernel/kernel/processmgr.h b/include/kernel/kernel/processmgr.h
index e0209f9..465066e 100644
--- a/include/kernel/kernel/processmgr.h
+++ b/include/kernel/kernel/processmgr.h
@@ -7,6 +7,12 @@
 extern "C" {
 #endif
 
+/** UID of the current process */
+#define SCE_KERNEL_PROCESS_ID_SELF 0
+
+/** UID of the kernel process */
+#define SCE_KERNEL_PROCESS_ID_KERNEL 0x10005
+
 typedef struct SceKernelProcessInfo {
 	SceSize size;           //!< size of this struct, make sure it's 0xE8
 	SceUID pid;             //!< our process ID
diff --git a/include/kernel/kernel/sysmem.h b/include/kernel/kernel/sysmem.h
index 978db42..3b3ebc0 100644
--- a/include/kernel/kernel/sysmem.h
+++ b/include/kernel/kernel/sysmem.h
@@ -1,6 +1,7 @@
 #ifndef _PSP2_KERNEL_SYSMEM_H_
 #define _PSP2_KERNEL_SYSMEM_H_
 
+#include <stdarg.h>
 #include <psp2kern/types.h>
 
 #ifdef __cplusplus
@@ -439,7 +440,9 @@ typedef struct kernel_message_ctx
 // msg_type_flag : 0 or 0xB
 
 int sceDebugPrintf2(int msg_type_flag, kernel_message_ctx *msg_ctx, const char *fmt, ...);
-	
+
+int sceDebugVprintf(const char *fmt, va_list args);
+
 int sceDebugPrintKernelPanic(kernel_message_ctx *msg_ctx, void *some_address);
 
 int sceDebugPrintfKernelPanic(kernel_message_ctx *msg_ctx, void *some_address, char* format, ...);
diff --git a/include/kernel/kernel/threadmgr.h b/include/kernel/kernel/threadmgr.h
index 61f96b3..d1a260d 100644
--- a/include/kernel/kernel/threadmgr.h
+++ b/include/kernel/kernel/threadmgr.h
@@ -14,6 +14,9 @@ typedef SceUInt64 SceKernelSysClock;
 
 /* Threads. */
 
+/** UID of the current thread */
+#define SCE_KERNEL_THREAD_ID_SELF 0
+
 typedef int (*SceKernelThreadEntry)(SceSize args, void *argp);
 
 /** Additional options used when creating threads. */
@@ -449,18 +452,61 @@ int sceKernelCancelMutex(SceUID mutexid, int newCount, int *numWaitThreads);
  */
 int sceKernelGetMutexInfo(SceUID mutexid, SceKernelMutexInfo *info);
 
-typedef struct  SceKernelLwMutexWork {
-	SceInt64 data[4];
-} SceKernelLwMutexWork;
+/* Fast mutex */
+
+typedef struct SceKernelFastMutexWork {
+	SceInt64 data[8];
+} SceKernelFastMutexWork;
 
-typedef struct SceKernelLwMutexOptParam {
+typedef enum SceKernelFastMutexAttr {
+	SCE_KERNEL_FAST_MUTEX_ATTR_RECURSIVE   = 0x00000002,
+	SCE_KERNEL_FAST_MUTEX_ATTR_CEILING     = 0x00000004,
+	SCE_KERNEL_FAST_MUTEX_ATTR_UNK_3       = 0x00000008,
+	SCE_KERNEL_FAST_MUTEX_ATTR_TH_FIFO     = 0x00000000,
+	SCE_KERNEL_FAST_MUTEX_ATTR_TH_PRIO     = 0x00002000,
+	SCE_KERNEL_FAST_MUTEX_ATTR_UNK_15      = 0x00008000,
+	// All other flags are invalid
+} SceKernelFastMutexAttr;
+
+typedef struct SceKernelFastMutexOptParam {
 	SceSize size;
-} SceKernelLwMutexOptParam;
+	SceInt32 ceilingPriority;
+} SceKernelFastMutexOptParam;
+
+SceInt32 sceKernelInitializeFastMutex(
+	SceKernelFastMutexWork *pWork,
+	const char *pName,
+	SceKernelFastMutexAttr attr,
+	const SceKernelFastMutexOptParam *pOptParam);
 
-int sceKernelInitializeFastMutex(void *mutex, const char *name, int unk0, int unk1);
-int sceKernelLockFastMutex(void *mutex);
-int sceKernelUnlockFastMutex(void *mutex);
-int sceKernelDeleteFastMutex(void *mutex);
+SceInt32 sceKernelLockFastMutex(SceKernelFastMutexWork *pWork);
+
+SceInt32 sceKernelTryLockFastMutex(SceKernelFastMutexWork *pWork);
+
+SceInt32 sceKernelUnlockFastMutex(SceKernelFastMutexWork *pWork);
+
+SceInt32 sceKernelFinalizeFastMutex(SceKernelFastMutexWork *pWork);
+
+typedef struct SceKernelFastMutexInfo {
+// 0x00
+	SceSize size;
+	SceUID uid;
+	char name[SCE_UID_NAMELEN + 1];
+	SceKernelFastMutexAttr attr;
+	SceKernelFastMutexWork *pWork;
+// 0x30
+	SceInt32 currentCount;
+	SceUID currentOwnerId;
+	SceInt32 ceilingPriority;
+	SceInt32 unk3C;
+// 0x40
+	SceUInt32 numWaitThreads;
+// 0x44
+} SceKernelFastMutexInfo;
+
+SceInt32 sceKernelGetFastMutexInfo(SceKernelFastMutexWork *pWork, SceKernelFastMutexInfo *pInfo);
+
+SceInt32 sceKernelGetFastMutexInfoById(SceUID uid, SceKernelFastMutexInfo *pInfo);
 
 /* Event flags. */