From aed5a5a4461a0560c2cd1d6e05a4794b733aaa6c Mon Sep 17 00:00:00 2001 From: Reiko Asakura Date: Sun, 5 Jul 2020 16:31:45 -0400 Subject: Add types headers --- include/kernel/kernel/sysmem.h | 6 +++--- include/kernel/kernel/threadmgr.h | 5 +---- include/user/kernel/sysmem.h | 6 +++--- include/user/kernel/threadmgr.h | 5 +---- 4 files changed, 8 insertions(+), 14 deletions(-) (limited to 'include') 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 -#include +#include #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..7083a92 100644 --- a/include/kernel/kernel/threadmgr.h +++ b/include/kernel/kernel/threadmgr.h @@ -1,7 +1,7 @@ #ifndef _PSP2_KERNEL_THREADMGR_H_ #define _PSP2_KERNEL_THREADMGR_H_ -#include +#include #ifdef __cplusplus extern "C" { @@ -9,9 +9,6 @@ extern "C" { #define SCE_KERNEL_MUTEX_ATTR_RECURSIVE 2 -/** 64-bit system clock type. */ -typedef SceUInt64 SceKernelSysClock; - /* Threads. */ /** UID of the current thread */ diff --git a/include/user/kernel/sysmem.h b/include/user/kernel/sysmem.h index 1e0ea9c..404e810 100644 --- a/include/user/kernel/sysmem.h +++ b/include/user/kernel/sysmem.h @@ -1,20 +1,20 @@ #ifndef _PSP2_KERNEL_SYSMEM_H_ #define _PSP2_KERNEL_SYSMEM_H_ -#include +#include #ifdef __cplusplus extern "C" { #endif -typedef enum SceKernelMemBlockType { +typedef enum _SceKernelMemBlockType { SCE_KERNEL_MEMBLOCK_TYPE_USER_RW_UNCACHE = 0x0C208060, SCE_KERNEL_MEMBLOCK_TYPE_USER_RX = 0x0C20D050, SCE_KERNEL_MEMBLOCK_TYPE_USER_RW = 0x0C20D060, SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_PHYCONT_RW = 0x0C80D060, SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_PHYCONT_NC_RW = 0x0D808060, SCE_KERNEL_MEMBLOCK_TYPE_USER_CDRAM_RW = 0x09408060 -} SceKernelMemBlockType; +} _SceKernelMemBlockType; typedef struct SceKernelAllocMemBlockOpt { SceSize size; diff --git a/include/user/kernel/threadmgr.h b/include/user/kernel/threadmgr.h index 9d42eb4..3ff85f6 100644 --- a/include/user/kernel/threadmgr.h +++ b/include/user/kernel/threadmgr.h @@ -1,15 +1,12 @@ #ifndef _PSP2_KERNEL_THREADMGR_H_ #define _PSP2_KERNEL_THREADMGR_H_ -#include +#include #ifdef __cplusplus extern "C" { #endif -/** 64-bit system clock type. */ -typedef SceUInt64 SceKernelSysClock; - /* Threads. */ /** UID of the current thread */ -- cgit v1.2.3