SceIntrmgrForDriver: fix function names

Confirmed by 0.990

intrmgr.skprx
deci4p_sdbgp.skprx

2 files changed, 16 insertions, 18 deletions

diff --git a/include/kernel/kernel/intrmgr.h b/include/kernel/kernel/intrmgr.h
index 32455e0..91c6337 100644
--- a/include/kernel/kernel/intrmgr.h
+++ b/include/kernel/kernel/intrmgr.h
@@ -38,22 +38,21 @@ typedef struct SceKernelIntrOptParam {
 int sceKernelRegisterIntrHandler(int intr_code, const char *name, int interrupt_type,
 	SceKernelIntrHandler *handler, void *userCtx, int priority, int targetcpu, SceKernelIntrOptParam *opt);
 int sceKernelReleaseIntrHandler(int intr_code);
-int sceKernelMaskIntr(int intr_code);
-int sceKernelUnmaskIntr(int intr_code);
-int sceKernelSetIntrMasked(int intr_code, int masked);
-int sceKernelGetIntrMasked(int intr_code, int *masked);
+int sceKernelDisableIntr(int intr_code);
+int sceKernelEnableIntr(int intr_code);
+int sceKernelSuspendIntr(int intr_code, int *masked);
 int sceKernelIsIntrPending(int intr_code);
 int sceKernelClearIntrPending(int intr_code);
 int sceKernelSetIntrPriority(int intr_code, int priority);
 int sceKernelGetIntrPriority(int intr_code, int *priority);
-int sceKernelSetIntrTarget(int intr_code, int cpu_target_list);
-int sceKernelGetIntrTarget(int intr_code, int *cpu_target_list);
-int sceKernelTriggerSGI(int intr_code, unsigned int target_list_filter, unsigned int cpu_target_list);
-int sceKernelIsIntrAllowedInCurrentContext(int intr_code);
+int sceKernelSetIntrTargetCpu(int intr_code, int cpu_target_list);
+int sceKernelGetIntrTargetCpu(int intr_code, int *cpu_target_list);
+int sceKernelGenerateSoftIntr(int intr_code, unsigned int target_list_filter, unsigned int cpu_target_list);
+int sceKernelIsIntrContext(int intr_code);
 int sceKernelRegisterSubIntrHandler(int intr_code, int subintr_code, const char *name,
 	SceKernelSubIntrHandler handler, void *register_arg);
 int sceKernelReleaseSubIntrHandler(int intr_code, int subintr_code);
-int sceKernelTriggerSubIntr(int intr_code, int subintr_code, void *subintr_arg);
+int sceKernelCallSubIntrHandler(int intr_code, int subintr_code, void *subintr_arg);
 int sceKernelEnableSubIntr(int intr_code, int subintr_code);
 int sceKernelDisableSubIntr(int intr_code, int subintr_code);
 
diff --git a/nids/360/SceKernelIntrMgr.yml b/nids/360/SceKernelIntrMgr.yml
index 776bbd6..ea77af3 100644
--- a/nids/360/SceKernelIntrMgr.yml
+++ b/nids/360/SceKernelIntrMgr.yml
@@ -5,14 +5,16 @@ modules:
       SceIntrmgrForDriver:
         nid: 0x9DF04041
         functions:
+          sceKernelCallSubIntrHandler: 0xCC94B294
+          sceKernelDisableIntr: 0x180435EC
           sceKernelDisableSubIntr: 0x259C6D9E
+          sceKernelEnableIntr: 0x7117E827
           sceKernelEnableSubIntr: 0x901E41D8
-          sceKernelGetIntrMasked: 0x6EC07C56
+          sceKernelGenerateSoftIntr: 0x29F62500
           sceKernelGetIntrPriority: 0xE427D050
-          sceKernelGetIntrTarget: 0x353CFAAE
-          sceKernelIsIntrAllowedInCurrentContext: 0x182EE3E3
+          sceKernelGetIntrTargetCpu: 0x353CFAAE
+          sceKernelIsIntrContext: 0x182EE3E3
           sceKernelIsSubInterruptOccurred: 0x950B864B
-          sceKernelMaskIntr: 0x180435EC
           sceKernelRegisterIntrHandler: 0x5C1FEB29
           sceKernelRegisterIntrHookHandler: 0x99048AEC
           sceKernelRegisterSubIntrHandler: 0x96576C18
@@ -21,13 +23,10 @@ modules:
           sceKernelReleaseSubIntrHandler: 0x7B9657B3
           sceKernelResumeIntr: 0xA4C772AF
           sceKernelResumeSubIntr: 0x957023D0
-          sceKernelSetIntrMasked: 0x7117E827
           sceKernelSetIntrPriority: 0x71020E29
-          sceKernelSetIntrTarget: 0x973BACCC
+          sceKernelSetIntrTargetCpu: 0x973BACCC
+          sceKernelSuspendIntr: 0x6EC07C56
           sceKernelSuspendSubIntr: 0x3A9EA7D1
-          sceKernelTriggerSGI: 0x29F62500
-          sceKernelTriggerSubIntr: 0xCC94B294
-          sceKernelUnmaskIntr: 0x7117E827
       SceIntrmgrForKernel:
         nid: 0x07AC5E3A
         functions: