diff options
| author | Reiko Asakura | 2020-07-05 20:50:52 -0400 |
|---|---|---|
| committer | Reiko Asakura | 2020-07-05 20:50:52 -0400 |
| commit | 7df549ba76f43ca796d36ff8af6d39d94e3f3a06 (patch) | |
| tree | a10d69f5875ff51610ca61129976cd146a0437bb /include/kernel | |
| parent | Name changes to match style (diff) | |
| parent | Add threadmgr constants and prototypes (diff) | |
| download | vds-libraries-7df549ba76f43ca796d36ff8af6d39d94e3f3a06.tar.gz | |
Merge
Diffstat (limited to 'include/kernel')
| -rw-r--r-- | include/kernel/kernel/cpu.h | 1 | ||||
| -rw-r--r-- | include/kernel/kernel/processmgr.h | 3 | ||||
| -rw-r--r-- | include/kernel/kernel/sysmem.h | 6 | ||||
| -rw-r--r-- | include/kernel/kernel/threadmgr.h | 12 |
4 files changed, 5 insertions, 17 deletions
diff --git a/include/kernel/kernel/cpu.h b/include/kernel/kernel/cpu.h index db3a5e9..4765d52 100644 --- a/include/kernel/kernel/cpu.h +++ b/include/kernel/kernel/cpu.h @@ -1,6 +1,7 @@ #ifndef _PSP2_KERNEL_CPU_H_ #define _PSP2_KERNEL_CPU_H_ +#include <psp2common/kernel/cpu.h> #include <psp2kern/types.h> #ifdef __cplusplus diff --git a/include/kernel/kernel/processmgr.h b/include/kernel/kernel/processmgr.h index 465066e..819129b 100644 --- a/include/kernel/kernel/processmgr.h +++ b/include/kernel/kernel/processmgr.h @@ -7,9 +7,6 @@ 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 diff --git a/include/kernel/kernel/sysmem.h b/include/kernel/kernel/sysmem.h index 3b3ebc0..aa882e3 100644 --- a/include/kernel/kernel/sysmem.h +++ b/include/kernel/kernel/sysmem.h @@ -2,13 +2,13 @@ #define _PSP2_KERNEL_SYSMEM_H_ #include <stdarg.h> -#include <psp2kern/types.h> +#include <psp2kern/kernel/types.h> #ifdef __cplusplus extern "C" { #endif -typedef enum SceKernelMemBlockType { +typedef enum _SceKernelMemBlockType { SCE_KERNEL_MEMBLOCK_TYPE_SHARED_RX = 0x0390D050, SCE_KERNEL_MEMBLOCK_TYPE_USER_CDRAM_RW = 0x09408060, SCE_KERNEL_MEMBLOCK_TYPE_USER_RW_UNCACHE = 0x0C208060, @@ -19,7 +19,7 @@ typedef enum SceKernelMemBlockType { SCE_KERNEL_MEMBLOCK_TYPE_KERNEL_RX = 0x1020D005, SCE_KERNEL_MEMBLOCK_TYPE_KERNEL_RW = 0x1020D006, SCE_KERNEL_MEMBLOCK_TYPE_RW_UNK0 = 0x6020D006 -} SceKernelMemBlockType; +} _SceKernelMemBlockType; typedef enum SceKernelAllocMemBlockAttr { SCE_KERNEL_ALLOC_MEMBLOCK_ATTR_HAS_PADDR = 0x00000002U, diff --git a/include/kernel/kernel/threadmgr.h b/include/kernel/kernel/threadmgr.h index d1a260d..76e2b4c 100644 --- a/include/kernel/kernel/threadmgr.h +++ b/include/kernel/kernel/threadmgr.h @@ -1,24 +1,14 @@ #ifndef _PSP2_KERNEL_THREADMGR_H_ #define _PSP2_KERNEL_THREADMGR_H_ -#include <psp2kern/types.h> +#include <psp2common/kernel/threadmgr.h> #ifdef __cplusplus extern "C" { #endif -#define SCE_KERNEL_MUTEX_ATTR_RECURSIVE 2 - -/** 64-bit system clock type. */ -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. */ typedef struct SceKernelThreadOptParam { /** Size of the ::SceKernelThreadOptParam structure. */ |