diff options
author | Rinnegatamante | 2017-06-15 11:36:33 +0200 |
---|---|---|
committer | Sunguk Lee | 2017-06-15 18:36:33 +0900 |
commit | b5646d6867a3c279e0a7f5b3db42678f84d7ff15 (patch) | |
tree | b625c863cf3657b5901523e438bddb8330c10a74 /include/user/kernel/sysmem.h | |
parent | Removed next entry (diff) | |
download | vds-libraries-b5646d6867a3c279e0a7f5b3db42678f84d7ff15.tar.gz |
Named anonymous enums in psp2. (#179)
* Named anonymous enums in psp2.
Named anonymous enums in psp2.
* Properly sorted enums.
* Several modifications (see desc)
Added some missing info, fixed identation in some places, aligned all
enums and comments with spaces as delimiters, replaced decimal negative
errorcode in location.h with hexadecimal one, added some comments and
fixed some documentation comments.
* Minor fixes in identation.
* Yet another minor identation fix.
* Fixed enums in structs.
* Reverted SceBool changes.
* SceBool fix.
* Fix for compilation with g++-
* Added some doc references in jpegenc.
* Fixed some references.
Diffstat (limited to 'include/user/kernel/sysmem.h')
-rw-r--r-- | include/user/kernel/sysmem.h | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/include/user/kernel/sysmem.h b/include/user/kernel/sysmem.h index c517210..1694ab2 100644 --- a/include/user/kernel/sysmem.h +++ b/include/user/kernel/sysmem.h @@ -7,15 +7,13 @@ extern "C" { #endif -typedef int SceKernelMemBlockType; - -enum { - SCE_KERNEL_MEMBLOCK_TYPE_USER_RW = 0x0c20d060, - SCE_KERNEL_MEMBLOCK_TYPE_USER_RW_UNCACHE = 0x0c208060, - 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 -}; +typedef enum SceKernelMemBlockType { + SCE_KERNEL_MEMBLOCK_TYPE_USER_RW_UNCACHE = 0x0c208060, + 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; typedef struct SceKernelAllocMemBlockOpt { SceSize size; @@ -23,14 +21,34 @@ typedef struct SceKernelAllocMemBlockOpt { SceSize alignment; SceUInt32 uidBaseBlock; const char *strBaseBlockName; - int flags; //! Unknown flags 0x10 or 0x30 for sceKernelOpenMemBlock + int flags; //! Unknown flags 0x10 or 0x30 for ::sceKernelOpenMemBlock int reserved[10]; } SceKernelAllocMemBlockOpt; -enum { - SCE_KERNEL_MODEL_VITA = 0x10000, +typedef enum SceKernelModel { + SCE_KERNEL_MODEL_VITA = 0x10000, SCE_KERNEL_MODEL_VITATV = 0x20000 -}; +} SceKernelModel; + +typedef struct SceKernelMemBlockInfo { + SceSize size; + void *mappedBase; + SceSize mappedSize; + int memoryType; + SceUInt32 access; + SceKernelMemBlockType type; +} SceKernelMemBlockInfo; + +typedef enum SceKernelMemoryAccessType { + SCE_KERNEL_MEMORY_ACCESS_X = 0x01, + SCE_KERNEL_MEMORY_ACCESS_W = 0x02, + SCE_KERNEL_MEMORY_ACCESS_R = 0x04 +} SceKernelMemoryAccessType; + +typedef enum SceKernelMemoryType { + SCE_KERNEL_MEMORY_TYPE_NORMAL_NC = 0x80, + SCE_KERNEL_MEMORY_TYPE_NORMAL = 0xD0 +} SceKernelMemoryType; /*** * Allocates a new memory block @@ -63,22 +81,6 @@ int sceKernelFreeMemBlock(SceUID uid); */ int sceKernelGetMemBlockBase(SceUID uid, void **basep); -typedef struct SceKernelMemBlockInfo { - SceSize size; - void *mappedBase; - SceSize mappedSize; - int memoryType; - SceUInt32 access; - SceKernelMemBlockType type; -} SceKernelMemBlockInfo; - -#define SCE_KERNEL_MEMORY_ACCESS_X 0x01 -#define SCE_KERNEL_MEMORY_ACCESS_W 0x02 -#define SCE_KERNEL_MEMORY_ACCESS_R 0x04 - -#define SCE_KERNEL_MEMORY_TYPE_NORMAL_NC 0x80 -#define SCE_KERNEL_MEMORY_TYPE_NORMAL 0xD0 - SceUID sceKernelFindMemBlockByAddr(const void *addr, SceSize size); int sceKernelGetMemBlockInfoByAddr(void *base, SceKernelMemBlockInfo *info); |