Merge branch 'master' into pikalax_work

8 files changed, 17 insertions, 371 deletions

diff --git a/arm9/asm/CTRDG.s b/arm9/asm/CTRDG.s
index d7cbe017..3cc4dadd 100644
--- a/arm9/asm/CTRDG.s
+++ b/arm9/asm/CTRDG.s
@@ -135,7 +135,7 @@ _020DB290:
 _020DB294:
 	ldr r0, _020DB2BC ; =UNK_021D6944
 	ldrh r0, [r0, #0x2]
-	bl OS_UnlockCartridge
+	bl OS_UnLockCartridge
 	bl CTRDG_IsExisting
 _020DB2A4: ; 0x020DB2A4
 	cmp r0, #0x0
@@ -248,7 +248,7 @@ _020DB3F0:
 _020DB404:
 	ldr r0, _020DB42C ; =UNK_021D6944
 	ldrh r0, [r0, #0x2]
-	bl OS_UnlockCartridge
+	bl OS_UnLockCartridge
 	bl CTRDG_IsExisting
 _020DB414: ; 0x020DB414
 	cmp r0, #0x0
@@ -362,7 +362,7 @@ CTRDGi_UnlockByProcessor: ; 0x020DB568
 	ldr r1, [r4, #0x0]
 	cmp r1, #0x0
 	bne _020DB580
-	bl OS_UnlockCartridge
+	bl OS_UnLockCartridge
 _020DB580:
 	ldr r0, [r4, #0x4]
 	bl OS_RestoreInterrupts
diff --git a/arm9/asm/CTRDG_backup.s b/arm9/asm/CTRDG_backup.s
index 0cafa0aa..f5ed989d 100644
--- a/arm9/asm/CTRDG_backup.s
+++ b/arm9/asm/CTRDG_backup.s
@@ -224,7 +224,7 @@ CTRDG_IdentifyAgbBackup: ; 0x020DBD50
 	strh r1, [r2, #0x0]
 	ldrh r0, [r0, #0x0]
 	ldreq r5, _020DBEEC ; =UNK_02103FE8
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	ldr r2, [r5, #0x0]
 	mov r0, #0x1
 	ldrh r1, [r2, #0x38]
diff --git a/arm9/asm/CTRDG_flash_AT29LV512.s b/arm9/asm/CTRDG_flash_AT29LV512.s
index 390d4293..33298e6c 100644
--- a/arm9/asm/CTRDG_flash_AT29LV512.s
+++ b/arm9/asm/CTRDG_flash_AT29LV512.s
@@ -287,7 +287,7 @@ _020DC92C:
 	orr r0, r0, r5
 	strh r0, [r3, #0x0]
 	ldrh r0, [r1, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r4
 	add sp, sp, #0x24
 	ldmia sp!, {r4-r5,lr}
@@ -428,7 +428,7 @@ _020DCB18:
 	ldr r0, _020DCB84 ; =UNK_021D6B0C
 	strh r1, [r2, #0x0]
 	ldrh r0, [r0, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r5
 	add sp, sp, #0x24
 	ldmia sp!, {r4-r5,lr}
@@ -495,7 +495,7 @@ CTRDGi_EraseFlashChipCoreAT: ; 0x020DCBA0
 	orr r0, r0, r5
 	strh r0, [r3, #0x0]
 	ldrh r0, [r1, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r4
 	add sp, sp, #0x4
 	ldmia sp!, {r4-r5,lr}
diff --git a/arm9/asm/CTRDG_flash_LE39FW512.s b/arm9/asm/CTRDG_flash_LE39FW512.s
index cb702648..77071a6d 100644
--- a/arm9/asm/CTRDG_flash_LE39FW512.s
+++ b/arm9/asm/CTRDG_flash_LE39FW512.s
@@ -122,7 +122,7 @@ CTRDGi_VerifyFlashErase: ; 0x020DCD94
 	orr r1, r1, r6
 	strh r1, [r2, #0x0]
 	ldrh r0, [r0, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r4
 	ldmia sp!, {r4-r6,lr}
 	bx lr
@@ -267,7 +267,7 @@ _020DCFD4:
 	orr r1, r1, r5
 	strh r1, [r2, #0x0]
 	ldrh r0, [r0, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r8
 	add sp, sp, #0x24
 	ldmia sp!, {r4-r9,lr}
@@ -379,7 +379,7 @@ CTRDGi_EraseFlashSectorCoreLE: ; 0x020DD098
 	orr r0, r0, r5
 	strh r0, [r3, #0x0]
 	ldrh r0, [r1, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r4
 	add sp, sp, #0x28
 	ldmia sp!, {r4-r6,lr}
@@ -447,7 +447,7 @@ CTRDGi_EraseFlashChipCoreLE: ; 0x020DD1DC
 	orr r0, r0, r5
 	strh r0, [r3, #0x0]
 	ldrh r0, [r1, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r4
 	add sp, sp, #0x4
 	ldmia sp!, {r4-r5,lr}
diff --git a/arm9/asm/CTRDG_flash_MX29L010.s b/arm9/asm/CTRDG_flash_MX29L010.s
index 1b566288..646121f3 100644
--- a/arm9/asm/CTRDG_flash_MX29L010.s
+++ b/arm9/asm/CTRDG_flash_MX29L010.s
@@ -183,7 +183,7 @@ _020DD4FC:
 	orr r1, r1, r7
 	strh r1, [r2, #0x0]
 	ldrh r0, [r0, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r6
 	add sp, sp, #0x28
 	ldmia sp!, {r4-r8,lr}
@@ -323,7 +323,7 @@ _020DD714:
 	orr r0, r3, r0
 	strh r0, [r2, #0x0]
 	ldrh r0, [r1, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	ldr r0, [sp, #0x4]
 	add sp, sp, #0x34
 	ldmia sp!, {r4-r11,lr}
@@ -391,7 +391,7 @@ CTRDGi_EraseFlashChipCoreMX: ; 0x020DD76C
 	orr r0, r0, r5
 	strh r0, [r3, #0x0]
 	ldrh r0, [r1, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r4
 	add sp, sp, #0x4
 	ldmia sp!, {r4-r5,lr}
diff --git a/arm9/asm/CTRDG_flash_MX29L512.s b/arm9/asm/CTRDG_flash_MX29L512.s
index 38b1f5bf..f075c9f0 100644
--- a/arm9/asm/CTRDG_flash_MX29L512.s
+++ b/arm9/asm/CTRDG_flash_MX29L512.s
@@ -109,7 +109,7 @@ _020DD9B8:
 	orr r1, r1, r7
 	strh r1, [r2, #0x0]
 	ldrh r0, [r0, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r6
 	add sp, sp, #0x28
 	ldmia sp!, {r4-r8,lr}
diff --git a/arm9/asm/CTRDG_flash_common.s b/arm9/asm/CTRDG_flash_common.s
index 374c532c..9d245806 100644
--- a/arm9/asm/CTRDG_flash_common.s
+++ b/arm9/asm/CTRDG_flash_common.s
@@ -217,7 +217,7 @@ _020DC0D4:
 	orr r0, r0, r7
 	strh r0, [r3, #0x0]
 	ldrh r0, [r1, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, r4
 	add sp, sp, #0x24
 	ldmia sp!, {r4-r7,lr}
@@ -306,7 +306,7 @@ _020DC22C:
 	orr r1, r1, r8
 	strh r1, [r2, #0x0]
 	ldrh r0, [r0, #0x0]
-	bl OS_UnlockCartridge2
+	bl OS_UnlockCartridge
 	mov r0, #0x0
 	add sp, sp, #0x28
 	ldmia sp!, {r4-r8,lr}
diff --git a/arm9/asm/OS_spinLock.s b/arm9/asm/OS_spinLock.s
deleted file mode 100644
index f60e8604..00000000
--- a/arm9/asm/OS_spinLock.s
+++ /dev/null
@@ -1,354 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.section .bss
-	.global isInitialized
-isInitialized: ; 0x021D347C
-	.space 0x4
-
-    .text
-
-	arm_func_start OS_UnlockCartridge
-OS_UnlockCartridge: ; 0x020CA094
-	ldr r1, _020CA09C ; =OS_UnlockCartridge2
-	bx r1
-	.balign 4
-_020CA09C: .word OS_UnlockCartridge2
-
-	arm_func_start OS_GetLockID
-OS_GetLockID: ; 0x020CA0A0
-	ldr r3, _020CA0F0 ; =0x027FFFB0
-	ldr r1, [r3, #0x0]
-	clz r2, r1
-	cmp r2, #0x20
-	movne r0, #0x40
-	bne _020CA0D4
-	add r3, r3, #0x4
-	ldr r1, [r3, #0x0]
-	clz r2, r1
-	cmp r2, #0x20
-	ldr r0, _020CA0F4 ; =0xFFFFFFFD
-	bxeq lr
-	mov r0, #0x60
-_020CA0D4:
-	add r0, r0, r2
-	mov r1, #0x80000000
-	mov r1, r1, lsr r2
-	ldr r2, [r3, #0x0]
-	bic r2, r2, r1
-	str r2, [r3, #0x0]
-	bx lr
-	.balign 4
-_020CA0F0: .word 0x027FFFB0
-_020CA0F4: .word 0xFFFFFFFD
-
-	arm_func_start OS_ReleaseLockID
-OS_ReleaseLockID: ; 0x020CA0F8
-	ldr r3, _020CA124 ; =0x027FFFB0
-	cmp r0, #0x60
-	addpl r3, r3, #0x4
-	subpl r0, r0, #0x60
-	submi r0, r0, #0x40
-	mov r1, #0x80000000
-	mov r1, r1, lsr r0
-	ldr r2, [r3, #0x0]
-	orr r2, r2, r1
-	str r2, [r3, #0x0]
-	bx lr
-	.balign 4
-_020CA124: .word 0x027FFFB0
-
-	arm_func_start OS_ReadOwnerOfLockWord
-OS_ReadOwnerOfLockWord: ; 0x020CA128
-	ldrh r0, [r0, #0x4]
-	bx lr
-
-	arm_func_start OSi_FreeCardBus
-OSi_FreeCardBus: ; 0x020CA130
-	ldr r1, _020CA144 ; =0x04000204
-	ldrh r0, [r1, #0x0]
-	orr r0, r0, #0x800
-	strh r0, [r1, #0x0]
-	bx lr
-	.balign 4
-_020CA144: .word 0x04000204
-
-	arm_func_start OSi_AllocateCardBus
-OSi_AllocateCardBus: ; 0x020CA148
-	ldr r1, _020CA15C ; =0x04000204
-	ldrh r0, [r1, #0x0]
-	bic r0, r0, #0x800
-	strh r0, [r1, #0x0]
-	bx lr
-	.balign 4
-_020CA15C: .word 0x04000204
-
-	arm_func_start OS_UnlockCard
-OS_UnlockCard: ; 0x020CA160
-	ldr ip, _020CA170 ; =OS_UnlockByWord
-	ldr r1, _020CA174 ; =0x027FFFE0
-	ldr r2, _020CA178 ; =OSi_FreeCardBus
-	bx r12
-	.balign 4
-_020CA170: .word OS_UnlockByWord
-_020CA174: .word 0x027FFFE0
-_020CA178: .word OSi_FreeCardBus
-
-	arm_func_start OS_TryLockCard
-OS_TryLockCard: ; 0x020CA17C
-	ldr ip, _020CA18C ; =OS_TryLockByWord
-	ldr r1, _020CA190 ; =0x027FFFE0
-	ldr r2, _020CA194 ; =OSi_AllocateCardBus
-	bx r12
-	.balign 4
-_020CA18C: .word OS_TryLockByWord
-_020CA190: .word 0x027FFFE0
-_020CA194: .word OSi_AllocateCardBus
-
-	arm_func_start OSi_FreeCartridgeBus
-OSi_FreeCartridgeBus: ; 0x020CA198
-	ldr r1, _020CA1AC ; =0x04000204
-	ldrh r0, [r1, #0x0]
-	orr r0, r0, #0x80
-	strh r0, [r1, #0x0]
-	bx lr
-	.balign 4
-_020CA1AC: .word 0x04000204
-
-	arm_func_start OSi_AllocateCartridgeBus
-OSi_AllocateCartridgeBus: ; 0x020CA1B0
-	ldr r1, _020CA1C4 ; =0x04000204
-	ldrh r0, [r1, #0x0]
-	bic r0, r0, #0x80
-	strh r0, [r1, #0x0]
-	bx lr
-	.balign 4
-_020CA1C4: .word 0x04000204
-
-	arm_func_start OS_TryLockCartridge
-OS_TryLockCartridge: ; 0x020CA1C8
-	ldr ip, _020CA1DC ; =OSi_DoTryLockByWord
-	ldr r1, _020CA1E0 ; =0x027FFFE8
-	ldr r2, _020CA1E4 ; =OSi_AllocateCartridgeBus
-	mov r3, #0x1
-	bx r12
-	.balign 4
-_020CA1DC: .word OSi_DoTryLockByWord
-_020CA1E0: .word 0x027FFFE8
-_020CA1E4: .word OSi_AllocateCartridgeBus
-
-	arm_func_start OS_UnlockCartridge2
-OS_UnlockCartridge2: ; 0x020CA1E8
-	ldr ip, _020CA1FC ; =FUN_020CA2B8
-	ldr r1, _020CA200 ; =0x027FFFE8
-	ldr r2, _020CA204 ; =OSi_FreeCartridgeBus
-	mov r3, #0x1
-	bx r12
-	.balign 4
-_020CA1FC: .word FUN_020CA2B8
-_020CA200: .word 0x027FFFE8
-_020CA204: .word OSi_FreeCartridgeBus
-
-	arm_func_start OS_LockCartridge
-OS_LockCartridge: ; 0x020CA208
-	ldr ip, _020CA21C ; =FUN_020CA358
-	ldr r1, _020CA220 ; =0x027FFFE8
-	ldr r2, _020CA224 ; =OSi_AllocateCartridgeBus
-	mov r3, #0x1
-	bx r12
-	.balign 4
-_020CA21C: .word FUN_020CA358
-_020CA220: .word 0x027FFFE8
-_020CA224: .word OSi_AllocateCartridgeBus
-
-	arm_func_start OSi_DoTryLockByWord
-OSi_DoTryLockByWord:
-	stmdb sp!, {r4-r9,lr}
-	sub sp, sp, #0x4
-	movs r6, r3
-	mov r9, r0
-	mov r8, r1
-	mov r7, r2
-	beq _020CA250
-	bl OS_DisableInterrupts_IrqAndFiq
-	mov r5, r0
-	b _020CA258
-_020CA250:
-	bl OS_DisableInterrupts
-	mov r5, r0
-_020CA258:
-	mov r0, r9
-	mov r1, r8
-	bl MI_SwapWord
-	movs r4, r0
-	bne _020CA27C
-	cmp r7, #0x0
-	beq _020CA278
-	blx r7
-_020CA278:
-	strh r9, [r8, #0x4]
-_020CA27C:
-	cmp r6, #0x0
-	beq _020CA290
-	mov r0, r5
-	bl OS_RestoreInterrupts_IrqAndFiq
-	b _020CA298
-_020CA290:
-	mov r0, r5
-	bl OS_RestoreInterrupts
-_020CA298:
-	mov r0, r4
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r9,lr}
-	bx lr
-
-	arm_func_start OS_UnlockByWord
-OS_UnlockByWord: ; 0x020CA2A8
-	ldr ip, _020CA2B4 ; =FUN_020CA2B8
-	mov r3, #0x0
-	bx r12
-	.balign 4
-_020CA2B4: .word FUN_020CA2B8
-
-	arm_func_start FUN_020CA2B8
-FUN_020CA2B8: ; 0x020CA2B8
-	stmdb sp!, {r4-r7,lr}
-	sub sp, sp, #0x4
-	mov r7, r1
-	ldrh r1, [r7, #0x4]
-	mov r6, r2
-	mov r5, r3
-	cmp r0, r1
-	addne sp, sp, #0x4
-	mvnne r0, #0x1
-	ldmneia sp!, {r4-r7,lr}
-	bxne lr
-	cmp r5, #0x0
-	beq _020CA2F8
-	bl OS_DisableInterrupts_IrqAndFiq
-	mov r4, r0
-	b _020CA300
-_020CA2F8:
-	bl OS_DisableInterrupts
-	mov r4, r0
-_020CA300:
-	mov r0, #0x0
-	strh r0, [r7, #0x4]
-	cmp r6, #0x0
-	beq _020CA314
-	blx r6
-_020CA314:
-	mov r0, #0x0
-	str r0, [r7, #0x0]
-	cmp r5, #0x0
-	beq _020CA330
-	mov r0, r4
-	bl OS_RestoreInterrupts_IrqAndFiq
-	b _020CA338
-_020CA330:
-	mov r0, r4
-	bl OS_RestoreInterrupts
-_020CA338:
-	mov r0, #0x0
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r7,lr}
-	bx lr
-
-	arm_func_start OS_TryLockByWord
-OS_TryLockByWord: ; 0x020CA348
-	ldr ip, _020CA354 ; =FUN_020CA358
-	mov r3, #0x0
-	bx r12
-	.balign 4
-_020CA354: .word FUN_020CA358
-
-	arm_func_start FUN_020CA358
-FUN_020CA358: ; 0x020CA358
-	stmdb sp!, {r4-r8,lr}
-	mov r8, r0
-	mov r7, r1
-	mov r6, r2
-	mov r5, r3
-	bl OSi_DoTryLockByWord
-	cmp r0, #0x0
-	ldmleia sp!, {r4-r8,lr}
-	bxle lr
-	mov r4, #0x400
-_020CA380:
-	mov r0, r4
-	bl SVC_WaitByLoop
-	mov r0, r8
-	mov r1, r7
-	mov r2, r6
-	mov r3, r5
-	bl OSi_DoTryLockByWord
-	cmp r0, #0x0
-	bgt _020CA380
-	ldmia sp!, {r4-r8,lr}
-	bx lr
-
-	arm_func_start OS_InitLock
-OS_InitLock: ; 0x020CA3AC
-	stmdb sp!, {r4-r5,lr}
-	sub sp, sp, #0x4
-	ldr r0, _020CA484 ; =isInitialized
-	ldr r1, [r0, #0x0]
-	cmp r1, #0x0
-	addne sp, sp, #0x4
-	ldmneia sp!, {r4-r5,lr}
-	bxne lr
-	mov r2, #0x1
-	ldr r1, _020CA488 ; =0x027FFFF0
-	str r2, [r0, #0x0]
-	mov r2, #0x0
-	mov r0, #0x7e
-	str r2, [r1, #0x0]
-	bl OS_TryLockByWord
-	ldr r5, _020CA488 ; =0x027FFFF0
-	ldrh r0, [r5, #0x6]
-	cmp r0, #0x0
-	beq _020CA410
-	mov r4, #0x400
-_020CA3FC:
-	mov r0, r4
-	bl SVC_WaitByLoop
-	ldrh r0, [r5, #0x6]
-	cmp r0, #0x0
-	bne _020CA3FC
-_020CA410:
-	ldr r2, _020CA48C ; =0x027FFFB0
-	mvn r12, #0x0
-	mov r0, #0x10000
-	ldr r3, _020CA490 ; =0x027FFFB4
-	ldr r1, _020CA494 ; =0x027FFFC0
-	str r12, [r2, #0x0]
-	rsb r12, r0, #0x0
-	mov r0, #0x0
-	mov r2, #0x28
-	str r12, [r3, #0x0]
-	bl MIi_CpuClear32
-	ldr ip, _020CA498 ; =0x04000204
-	ldr r1, _020CA488 ; =0x027FFFF0
-	ldrh r3, [r12, #0x0]
-	mov r0, #0x7e
-	mov r2, #0x0
-	orr r3, r3, #0x800
-	strh r3, [r12, #0x0]
-	ldrh r3, [r12, #0x0]
-	orr r3, r3, #0x80
-	strh r3, [r12, #0x0]
-	bl OS_UnlockByWord
-	ldr r1, _020CA488 ; =0x027FFFF0
-	mov r0, #0x7f
-	mov r2, #0x0
-	bl OS_TryLockByWord
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r5,lr}
-	bx lr
-	.balign 4
-_020CA484: .word isInitialized
-_020CA488: .word 0x027FFFF0
-_020CA48C: .word 0x027FFFB0
-_020CA490: .word 0x027FFFB4
-_020CA494: .word 0x027FFFC0
-_020CA498: .word 0x04000204