Fix cpu corelock

SonicMastr · Jan 12, 2022 · 1d68ddb · 1d68ddb
1 parent 15b7281
commit 1d68ddb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/db/360/SceSysmem.yml b/db/360/SceSysmem.yml
@@ -120,7 +120,7 @@ modules:
         kernel: true
         nid: 0x54BF2BAB
         functions:
-          ksceKernelCorelockContextInitialize: 0x4CD4D921
+          ksceKernelCorelockInitialize: 0x4CD4D921
           ksceKernelCorelockLock: 0x9D72DD1B
           ksceKernelCorelockUnlock: 0xA5C9DBBA
           ksceKernelCpuBranchPredictorInvalidateAll: 0x4C4C7D6B

diff --git a/include/psp2kern/kernel/cpu.h b/include/psp2kern/kernel/cpu.h
@@ -254,22 +254,15 @@ int ksceKernelCpuSpinLockIrqSave(int *addr);
  */
 int ksceKernelCpuSpinLockIrqRestore(int *addr, int flags);
 
-typedef enum SceCorelockCore {
-	SCE_CORELOCK_CORE0 = 0,
-	SCE_CORELOCK_CORE1 = 1,
-	SCE_CORELOCK_CORE2 = 2,
-	SCE_CORELOCK_CORE3 = 3
-} SceCorelockCore;
-
 typedef struct SceCorelockContext {
 	int lock;
 	int16_t core_count;
 	int16_t last_wait_core;
 } SceCorelockContext;
 
-void ksceKernelCorelockContextInitialize(SceCorelockContext *ctx);
+void ksceKernelCorelockInitialize(SceCorelockContext *ctx);
 
-void ksceKernelCorelockLock(SceCorelockContext *ctx, int core);
+void ksceKernelCorelockLock(SceCorelockContext *ctx, SceUInt32 core);
 void ksceKernelCorelockUnlock(SceCorelockContext *ctx);
 
 #ifdef __cplusplus