diff options
| author | Reiko Asakura | 2021-01-19 19:16:31 -0500 |
|---|---|---|
| committer | Reiko Asakura | 2021-01-19 19:16:31 -0500 |
| commit | 5d8327e0d6e7bc562be00d1a46c4989210937cbc (patch) | |
| tree | 5eea3859c671c635417d1a5b344784abecbe0aa1 | |
| parent | Remove dupe: sysmodule.h (diff) | |
| download | vds-libraries-5d8327e0d6e7bc562be00d1a46c4989210937cbc.tar.gz | |
Remove dupe: kernel/cpu.h
| -rw-r--r-- | include/common/kernel/cpu.h | 11 | ||||
| -rw-r--r-- | include/kernel/kernel/cpu.h | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/include/common/kernel/cpu.h b/include/common/kernel/cpu.h index 4b42321..1ace9a3 100644 --- a/include/common/kernel/cpu.h +++ b/include/common/kernel/cpu.h @@ -1,16 +1,9 @@ #ifndef _DOLCESDK_PSP2COMMON_KERNEL_CPU_H_ #define _DOLCESDK_PSP2COMMON_KERNEL_CPU_H_ -#define SCE_KERNEL_MAX_CPU 4 -#define SCE_KERNEL_CPU_MASK_SHIFT 16 -#define SCE_KERNEL_CPU_MASK_USER_0 (0x01 << SCE_KERNEL_CPU_MASK_SHIFT) -#define SCE_KERNEL_CPU_MASK_USER_1 (0x02 << SCE_KERNEL_CPU_MASK_SHIFT) -#define SCE_KERNEL_CPU_MASK_USER_2 (0x04 << SCE_KERNEL_CPU_MASK_SHIFT) -#define SCE_KERNEL_CPU_MASK_USER_3 (0x08 << SCE_KERNEL_CPU_MASK_SHIFT) +#include_next <kernel/cpu.h> -#define SCE_KERNEL_CPU_MASK_USER_ALL \ - (SCE_KERNEL_CPU_MASK_USER_0 | SCE_KERNEL_CPU_MASK_USER_1 \ - | SCE_KERNEL_CPU_MASK_USER_2) +#define SCE_KERNEL_CPU_MASK_USER_3 (0x08 << SCE_KERNEL_CPU_MASK_SHIFT) #define SCE_KERNEL_CPU_MASK_USER_QUAD \ (SCE_KERNEL_CPU_MASK_USER_0 | SCE_KERNEL_CPU_MASK_USER_1 \ diff --git a/include/kernel/kernel/cpu.h b/include/kernel/kernel/cpu.h index 356383a..bced525 100644 --- a/include/kernel/kernel/cpu.h +++ b/include/kernel/kernel/cpu.h @@ -1,9 +1,10 @@ #ifndef _PSP2_KERNEL_CPU_H_ #define _PSP2_KERNEL_CPU_H_ -#include <psp2common/kernel/cpu.h> -#include <psp2kern/types.h> +#include_next <kernel/cpu.h> + #include <string.h> +#include <scetypes.h> #ifdef __cplusplus extern "C" { |