6 files changed, 73 insertions, 1 deletions
diff --git a/arm9/lib/include/MI_exMemory.h b/arm9/lib/include/MI_exMemory.h
index 4a8a10a8..8bd355ac 100644
--- a/arm9/lib/include/MI_exMemory.h
+++ b/arm9/lib/include/MI_exMemory.h
@@ -1,9 +1,23 @@
 #ifndef NITRO_MI_EXMEMORY_H_
 #define NITRO_MI_EXMEMORY_H_
 
+#include "consts.h"
+
 typedef enum {
     MI_PROCESSOR_ARM9 = 0,
     MI_PROCESSOR_ARM7 = 1
 } MIProcessor;
 
+static inline void MIi_SetCardProcessor(MIProcessor proc)
+{
+    reg_MI_EXMEMCNT =
+            (u16)((reg_MI_EXMEMCNT & ~0x0800) | (proc << 11));
+}
+
+static inline void MIi_SetCartridgeProcessor(MIProcessor proc)
+{
+    reg_MI_EXMEMCNT =
+            (u16)((reg_MI_EXMEMCNT & ~0x0080) | (proc << 7));
+}
+
 #endif //NITRO_MI_EXMEMORY_H_
diff --git a/arm9/lib/include/OS_init.h b/arm9/lib/include/OS_init.h
index a998b45e..69d21213 100644
--- a/arm9/lib/include/OS_init.h
+++ b/arm9/lib/include/OS_init.h
@@ -23,6 +23,7 @@
 #include "OS_terminate_proc.h"
 #include "OS_interrupt.h"
 #include "OS_reset.h"
+#include "OS_spinLock.h"
 
 void OS_Init();
 
diff --git a/arm9/lib/include/OS_spinLock.h b/arm9/lib/include/OS_spinLock.h
index 3bb8a1c2..7711b423 100644
--- a/arm9/lib/include/OS_spinLock.h
+++ b/arm9/lib/include/OS_spinLock.h
@@ -5,12 +5,21 @@
 #ifndef POKEDIAMOND_OS_SPINLOCK_H
 #define POKEDIAMOND_OS_SPINLOCK_H
 
+#include "types.h"
+#include "syscall.h"
+
 typedef volatile struct OSLockWord {
     u32 lockFlag;
     u16 ownerID;
     u16 extension;
 } OSLockWord;
 
+static inline void OSi_WaitByLoop()
+{
+    SVC_WaitByLoop(0x1000 / 4);
+}
+
+void OS_InitLock();
 s32 OS_GetLockID(void);
 
 #endif //POKEDIAMOND_OS_SPINLOCK_H
diff --git a/arm9/lib/include/mmap.h b/arm9/lib/include/mmap.h
index 27255115..b316a1fa 100644
--- a/arm9/lib/include/mmap.h
+++ b/arm9/lib/include/mmap.h
@@ -39,6 +39,9 @@ extern u32 SDK_AUTOLOAD_DTCM_START[];
 #define HW_DTCM_SVC_STACK       (HW_DTCM_SVC_STACK_END - HW_SVC_STACK_SIZE)
 #define HW_DTCM_IRQ_STACK_END   (HW_DTCM_SVC_STACK)
 
+#define HW_LOCK_ID_FLAG_MAIN    (HW_MAIN_MEM + 0x007fffb0)
+#define HW_SHARED_LOCK_BUF      (HW_MAIN_MEM + 0x007fffc0)
+
 #define HW_BUTTON_XY_BUF        (HW_MAIN_MEM + 0x007fffa8)
 
 #define OSi_MAIN_ARENA_HI_DEFAULT       (HW_MAIN_MEM_MAIN_END)
diff --git a/arm9/lib/src/OS_init.c b/arm9/lib/src/OS_init.c
index a1db8788..a34196f4 100644
--- a/arm9/lib/src/OS_init.c
+++ b/arm9/lib/src/OS_init.c
@@ -6,7 +6,6 @@
 #include "OS_init.h"
 
 extern void PXI_Init();
-extern void OS_InitLock();
 extern void OS_InitException();
 extern void MI_Init();
 extern void OS_InitVAlarm();
diff --git a/arm9/lib/src/OS_spinLock.c b/arm9/lib/src/OS_spinLock.c
new file mode 100644
index 00000000..46309c42
--- /dev/null
+++ b/arm9/lib/src/OS_spinLock.c
@@ -0,0 +1,46 @@
+//
+// Created by red031000 on 2020-05-21.
+//
+
+#include "OS_spinLock.h"
+#include "function_target.h"
+#include "consts.h"
+#include "MI_exMemory.h"
+
+extern void OS_TryLockByWord(u16 param1, OSLockWord* lockp, void* func);
+extern void OS_UnlockByWord(u16 param1, OSLockWord* lockp, void* func);
+extern void MIi_CpuClear32(u32 param1, void * addr, u32 length); //not too sure about names
+
+ARM_FUNC void OS_InitLock()
+{
+    static BOOL isInitialized = FALSE;
+
+    if (isInitialized)
+    {
+        return;
+    }
+    isInitialized = TRUE;
+
+    OSLockWord* lockp = (OSLockWord *)0x027FFFF0;
+
+    lockp->lockFlag = 0;
+
+    (void)OS_TryLockByWord(0x7e, lockp, NULL);
+
+    while (lockp->extension)
+    {
+        OSi_WaitByLoop();
+    }
+
+    ((u32 *)HW_LOCK_ID_FLAG_MAIN)[0] = 0xffffffff;
+    ((u32 *)HW_LOCK_ID_FLAG_MAIN)[1] = 0xffff0000;
+
+    MIi_CpuClear32(0x0, (void *)HW_SHARED_LOCK_BUF, 0x28);
+
+    MIi_SetCardProcessor(MI_PROCESSOR_ARM7);
+
+    MIi_SetCartridgeProcessor(MI_PROCESSOR_ARM7);
+
+    OS_UnlockByWord(0x7e, lockp, NULL);
+    OS_TryLockByWord(0x7f, lockp, NULL);
+}