summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/common/kernel/cpu.h17
-rw-r--r--include/kernel/kernel/cpu.h7
-rw-r--r--nids/360/SceSysmem.yml4
3 files changed, 19 insertions, 9 deletions
diff --git a/include/common/kernel/cpu.h b/include/common/kernel/cpu.h
index 2757db4..48ca303 100644
--- a/include/common/kernel/cpu.h
+++ b/include/common/kernel/cpu.h
@@ -18,4 +18,21 @@
#define SCE_KERNEL_CPU_MASK_USER_QUAD \
(SCE_KERNEL_CPU_MASK_USER_0 | SCE_KERNEL_CPU_MASK_USER_1 | SCE_KERNEL_CPU_MASK_USER_2 | SCE_KERNEL_CPU_MASK_USER_3)
+SCE_CDECL_BEGIN
+
+#if !defined(_LANGUAGE_ASSEMBLY)
+
+/**
+ * @j
+ * @brief CPUの物理コア番号を取得するAPIです。デバッグ目的のみに限定してください。
+ *
+ * @retval 0-3 cpu core number
+ * @ej
+ */
+SceUInt sceKernelCpuId(void);
+
+#endif /* !defined(_LANGUAGE_ASSEMBLY) */
+
+SCE_CDECL_END
+
#endif // _VDSUITE_COMMON_KERNEL_CPU_H
diff --git a/include/kernel/kernel/cpu.h b/include/kernel/kernel/cpu.h
index 066bf78..70b3d51 100644
--- a/include/kernel/kernel/cpu.h
+++ b/include/kernel/kernel/cpu.h
@@ -33,13 +33,6 @@ void sceKernelCpuDcacheWritebackRange(const void *ptr, SceSize len);
int sceKernelCpuUnrestrictedMemcpy(void *dst, const void *src, SceSize len);
/**
- * @brief Returns the CPU ID of the calling processor
- *
- * @return The CPU ID
- */
-int sceKernelCpuGetCpuId(void);
-
-/**
* @brief Disabled interrupts
*
* @return Interrupt masks before disabling
diff --git a/nids/360/SceSysmem.yml b/nids/360/SceSysmem.yml
index da30aad..832c909 100644
--- a/nids/360/SceSysmem.yml
+++ b/nids/360/SceSysmem.yml
@@ -5,7 +5,7 @@ modules:
SceCpu:
nid: 0x45265161
functions:
- sceKernelCpuGetCpuId: 0x2704CFEE
+ sceKernelCpuId: 0x2704CFEE
SceCpuForDriver:
nid: 0x40ECDB0E
functions:
@@ -92,7 +92,7 @@ modules:
sceKernelCpuDcacheWritebackRange: 0x9CB9F0CE
sceKernelCpuDisableInterrupts: 0x821FC0EE
sceKernelCpuEnableInterrupts: 0xF5BAD43B
- sceKernelCpuGetCpuId: 0x5E4D5DE1
+ sceKernelCpuId: 0x5E4D5DE1
sceKernelCpuIsVaddrMapped: 0x337CBDF3
sceKernelCpuLockStoreFlag: 0x3F42B434
sceKernelCpuLockStoreLR: 0xBF82DEB2