Merge pull request #106 from red031000/master

OS_spinLock + OS_vsnprintf

4 files changed, 49 insertions, 0 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..eccc502b 100644
--- a/arm9/lib/include/OS_spinLock.h
+++ b/arm9/lib/include/OS_spinLock.h
@@ -5,12 +5,41 @@
 #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(void)
+{
+    SVC_WaitByLoop(0x1000 / 4);
+}
+
+void OS_InitLock(void);
+s32 OSi_DoLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void),
+        BOOL disableFiq);
+s32 OS_TryLockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void));
+s32 OSi_DoUnlockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) (void),
+        BOOL disableFIQ);
+s32 OS_UnlockByWord(u16 lockId, OSLockWord *lockp, void (*ctrlFuncp) (void));
+s32 OSi_DoTryLockByWord(u16 lockID, OSLockWord *lockp, void (*ctrlFuncp) (void),
+        BOOL disableFiq);
+s32 OS_LockCartridge(u16 lockID);
+s32 OS_UnlockCartridge(u16 lockID);
+s32 OS_TryLockCartridge(u16 lockID);
+void OSi_AllocateCartridgeBus(void);
+void OSi_FreeCartridgeBus(void);
+s32 OS_TryLockCard(u16 lockID);
+s32 OS_UnlockCard(u16 lockID);
+void OSi_AllocateCardBus(void);
+void OSi_FreeCardBus(void);
+u16 OS_ReadOwnerOfLockWord(OSLockWord * lock);
+s32 OS_UnLockCartridge(u16 lockID);
 s32 OS_GetLockID(void);
+void OS_ReleaseLockID(register u16 lockID);
 
 #endif //POKEDIAMOND_OS_SPINLOCK_H
diff --git a/arm9/lib/include/mmap.h b/arm9/lib/include/mmap.h
index 27255115..207e0509 100644
--- a/arm9/lib/include/mmap.h
+++ b/arm9/lib/include/mmap.h
@@ -39,6 +39,11 @@ 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_CARD_LOCK_BUF        (HW_MAIN_MEM + 0x007fffe0)
+#define HW_CTRDG_LOCK_BUF       (HW_MAIN_MEM + 0x007fffe8)
+
 #define HW_BUTTON_XY_BUF        (HW_MAIN_MEM + 0x007fffa8)
 
 #define OSi_MAIN_ARENA_HI_DEFAULT       (HW_MAIN_MEM_MAIN_END)