FS_archive through FS_LoadArchive

9 files changed, 192 insertions, 313 deletions

diff --git a/Makefile b/Makefile
index 3a4c2e29..fe2a04ba 100644
--- a/Makefile
+++ b/Makefile
@@ -258,7 +258,7 @@ arm7:
 	$(MAKE) -C arm7
 
 $(BINFILES): %.bin: %.sbin
-	cp $< $@
+	@cp $< $@
 
 $(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BINFILES)
 	# Hack because mwldarm doesn't like the sbin suffix
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 1c2b17a2..9476f69c 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -272,6 +272,7 @@ SECTIONS {
 		OSi_vramExclusive                = 0x021D37E4;
 		OSi_vramLockId                   = 0x021D37E8;
 		cardi_common                     = 0x021D55C0;
+		arc_list                         = 0x021D53E8;
 		current_dir_pos                  = 0x021D53EC;
 		is_init                          = 0x021D53F8;
 		fsi_ovt9                         = 0x021D5404;
diff --git a/arm9/asm/FS_archive.asm.s b/arm9/asm/FS_archive.asm.s
index fd205e5a..ac647d7e 100644
--- a/arm9/asm/FS_archive.asm.s
+++ b/arm9/asm/FS_archive.asm.s
@@ -9,6 +9,12 @@
 	.extern FSi_NextCommand
 	.extern FSi_ExecuteAsyncCommand
 	.extern FSi_ExecuteSyncCommand
+	.extern FSi_SendCommand
+	.extern FS_InitArchive
+	.extern FS_FindArchive
+	.extern FS_RegisterArchiveName
+	.extern FS_ReleaseArchiveName
+	.extern FS_LoadArchive
 
 	arm_func_start FS_NotifyArchiveAsyncEnd
 FS_NotifyArchiveAsyncEnd: ; 0x020D0B40
@@ -322,303 +328,3 @@ _020D0F64:
 	mov r0, #0x1
 	ldmia sp!, {r4-r8,lr}
 	bx lr
-
-	arm_func_start FS_LoadArchive
-FS_LoadArchive: ; 0x020D0F78
-	str r1, [r0, #0x28]
-	str r3, [r0, #0x30]
-	str r2, [r0, #0x3c]
-	ldr r1, [r0, #0x3c]
-	ldr r2, [sp, #0x4]
-	str r1, [r0, #0x2c]
-	str r2, [r0, #0x38]
-	ldr r1, [sp, #0x0]
-	ldr r2, [sp, #0x8]
-	str r1, [r0, #0x40]
-	ldr r1, [r0, #0x40]
-	cmp r2, #0x0
-	str r1, [r0, #0x34]
-	ldreq r2, _020D0FE8 ; =FSi_ReadMemCallback
-	ldr r1, [sp, #0xc]
-	str r2, [r0, #0x48]
-	cmp r1, #0x0
-	ldreq r1, _020D0FEC ; =FSi_WriteMemCallback
-	str r1, [r0, #0x4c]
-	ldr r2, [r0, #0x48]
-	mov r1, #0x0
-	str r2, [r0, #0x50]
-	str r1, [r0, #0x44]
-	ldr r1, [r0, #0x1c]
-	orr r1, r1, #0x2
-	str r1, [r0, #0x1c]
-	mov r0, #0x1
-	bx lr
-	.balign 4
-_020D0FE8: .word FSi_ReadMemCallback
-_020D0FEC: .word FSi_WriteMemCallback
-
-	arm_func_start FUN_020D0FF0
-FUN_020D0FF0: ; 0x020D0FF0
-	stmdb sp!, {r4,lr}
-	mov r4, r0
-	ldr r0, [r4, #0x0]
-	cmp r0, #0x0
-	ldmeqia sp!, {r4,lr}
-	bxeq lr
-	bl OS_DisableInterrupts
-	ldr r2, [r4, #0x4]
-	mov r3, #0x0
-	cmp r2, #0x0
-	ldrne r1, [r4, #0x8]
-	strne r1, [r2, #0x8]
-	ldr r2, [r4, #0x8]
-	cmp r2, #0x0
-	ldrne r1, [r4, #0x4]
-	strne r1, [r2, #0x4]
-	str r3, [r4, #0x0]
-	str r3, [r4, #0x8]
-	ldr r1, [r4, #0x8]
-	ldr r2, _020D1080 ; =0x021D53EC
-	str r1, [r4, #0x4]
-	ldr r1, [r4, #0x1c]
-	bic r1, r1, #0x1
-	str r1, [r4, #0x1c]
-	ldr r1, [r2, #0x0]
-	cmp r1, r4
-	bne _020D1074
-	ldr r1, _020D1084 ; =0x021D53E8
-	str r3, [r2, #0x8]
-	ldr r1, [r1, #0x0]
-	strh r3, [r2, #0x6]
-	str r1, [r2, #0x0]
-	strh r3, [r2, #0x4]
-_020D1074:
-	bl OS_RestoreInterrupts
-	ldmia sp!, {r4,lr}
-	bx lr
-	.balign 4
-_020D1080: .word 0x021D53EC
-_020D1084: .word 0x021D53E8
-
-	arm_func_start FS_RegisterArchiveName
-FS_RegisterArchiveName: ; 0x020D1088
-	stmdb sp!, {r4-r8,lr}
-	mov r6, r1
-	mov r5, r2
-	mov r7, r0
-	mov r8, #0x0
-	bl OS_DisableInterrupts
-	mov r4, r0
-	mov r0, r6
-	mov r1, r5
-	bl FS_FindArchive
-_020D10B0:
-	cmp r0, #0x0
-	bne _020D112C
-	ldr r1, _020D1140
-	ldr r2, [r1]
-	cmp r2, #0x0
-	bne _020D10E8
-	ldr r0, _020D1144
-	mov r2, r8
-	str r7, [r1]
-	str r7, [r0]
-	str r2, [r0, #0x8]
-	strh r2, [r0, #0x6]
-	strh r2, [r0, #0x4]
-	b _020D110C
-_020D10E8:
-	ldr r0, [r2, #0x4]
-	cmp r0, #0x0
-	beq _020D1104
-_020D10F4:
-	mov r2, r0
-	ldr r0, [r0, #0x4]
-	cmp r0, #0x0
-	bne _020D10F4
-_020D1104:
-	str r7, [r2, #0x4]
-	str r2, [r7, #0x8]
-_020D110C:
-	mov r0, r6
-	mov r1, r5
-	bl FSi_GetPackedName
-	str r0, [r7]
-	ldr r0, [r7, #0x1C]
-	mov r8, #0x1
-	orr r0, r0, #0x1
-	str r0, [r7, #0x1C]
-_020D112C:
-	mov r0, r4
-	bl OS_RestoreInterrupts
-	mov r0, r8
-	ldmia sp!, {r4-r8,lr}
-	bx lr
-_020D1140: .word 0x021D53E8
-_020D1144: .word 0x021D53EC
-
-	arm_func_start FS_FindArchive
-FS_FindArchive:
-	stmdb sp!, {r4-r5,lr}
-	sub sp, sp, #0x4
-	bl FSi_GetPackedName
-	mov r5, r0
-	bl OS_DisableInterrupts
-	ldr r1, _020D1194 ; =0x021D53E8
-	ldr r4, [r1, #0x0]
-	b _020D116C
-_020D1168:
-	ldr r4, [r4, #0x4]
-_020D116C:
-	cmp r4, #0x0
-	beq _020D1180
-	ldr r1, [r4, #0x0]
-	cmp r1, r5
-	bne _020D1168
-_020D1180:
-	bl OS_RestoreInterrupts
-	mov r0, r4
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r5,lr}
-	bx lr
-	.balign 4
-_020D1194: .word 0x021D53E8
-
-	arm_func_start FS_InitArchive
-FS_InitArchive: ; 0x020D1198
-	stmdb sp!, {r4,lr}
-	mov r1, #0x0
-	mov r2, #0x5c
-	mov r4, r0
-	bl MI_CpuFill8
-	mov r1, #0x0
-	str r1, [r4, #0x10]
-	ldr r0, [r4, #0x10]
-	str r0, [r4, #0xc]
-	str r1, [r4, #0x18]
-	ldr r0, [r4, #0x18]
-	str r0, [r4, #0x14]
-	ldmia sp!, {r4,lr}
-	bx lr
-
-	arm_func_start FSi_SendCommand
-FSi_SendCommand:
-	stmdb sp!, {r4-r7,lr}
-	sub sp, sp, #0x4
-	mov r7, r0
-	ldr r6, [r7, #0x8]
-	mov r2, #0x1
-	str r1, [r7, #0x10]
-	mov r0, #0x2
-	str r0, [r7, #0x14]
-	ldr r0, [r7, #0xc]
-	mov r5, r2, lsl r1
-	orr r0, r0, #0x1
-	str r0, [r7, #0xc]
-	bl OS_DisableInterrupts
-	ldr r1, [r6, #0x1c]
-	mov r4, r0
-	ands r0, r1, #0x80
-	beq _020D1238
-	mov r0, r7
-	mov r1, #0x3
-	bl FSi_ReleaseCommand
-	mov r0, r4
-	bl OS_RestoreInterrupts
-	add sp, sp, #0x4
-	mov r0, #0x0
-	ldmia sp!, {r4-r7,lr}
-	bx lr
-_020D1238:
-	ands r0, r5, #0x1fc
-	ldrne r0, [r7, #0xc]
-	add r2, r6, #0x20
-	orrne r0, r0, #0x4
-	strne r0, [r7, #0xc]
-	ldr r1, [r7, #0x0]
-	ldr r0, [r7, #0x4]
-	cmp r1, #0x0
-	strne r0, [r1, #0x4]
-	cmp r0, #0x0
-	strne r1, [r0, #0x0]
-	ldr r0, [r2, #0x4]
-	cmp r0, #0x0
-	beq _020D1280
-_020D1270:
-	mov r2, r0
-	ldr r0, [r0, #0x4]
-	cmp r0, #0x0
-	bne _020D1270
-_020D1280:
-	str r7, [r2, #0x4]
-	str r2, [r7, #0x0]
-	mov r1, #0x0
-	str r1, [r7, #0x4]
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x8
-	movne r1, #0x1
-	cmp r1, #0x0
-	bne _020D132C
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x10
-	bne _020D132C
-	ldr r1, [r6, #0x1c]
-	mov r0, r4
-	orr r1, r1, #0x10
-	str r1, [r6, #0x1c]
-	bl OS_RestoreInterrupts
-	ldr r0, [r6, #0x58]
-	ands r0, r0, #0x200
-	beq _020D12E0
-	ldr r2, [r6, #0x54]
-	mov r0, r7
-	mov r1, #0x9
-	blx r2
-_020D12E0:
-	bl OS_DisableInterrupts
-	ldr r1, [r7, #0xc]
-	orr r1, r1, #0x40
-	str r1, [r7, #0xc]
-	ldr r1, [r7, #0xc]
-	ands r1, r1, #0x4
-	movne r1, #0x1
-	moveq r1, #0x0
-	cmp r1, #0x0
-	bne _020D1324
-	bl OS_RestoreInterrupts
-	mov r0, r7
-	bl FSi_ExecuteAsyncCommand
-	add sp, sp, #0x4
-	mov r0, #0x1
-	ldmia sp!, {r4-r7,lr}
-	bx lr
-_020D1324:
-	bl OS_RestoreInterrupts
-	b _020D1378
-_020D132C:
-	ldr r0, [r7, #0xc]
-	ands r0, r0, #0x4
-	movne r0, #0x1
-	moveq r0, #0x0
-	cmp r0, #0x0
-	bne _020D135C
-	mov r0, r4
-	bl OS_RestoreInterrupts
-	add sp, sp, #0x4
-	mov r0, #0x1
-	ldmia sp!, {r4-r7,lr}
-	bx lr
-_020D135C:
-	add r0, r7, #0x18
-	bl OS_SleepThread
-	ldr r0, [r7, #0xc]
-	ands r0, r0, #0x40
-	beq _020D135C
-	mov r0, r4
-	bl OS_RestoreInterrupts
-_020D1378:
-	mov r0, r7
-	bl FSi_ExecuteSyncCommand
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r7,lr}
-	bx lr
diff --git a/arm9/global.inc b/arm9/global.inc
index b5f85485..e2e45165 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -5023,7 +5023,7 @@
 .extern FUN_020C5E04

 .extern FUN_020D0D84

 .extern FUN_020D0EB0

-.extern FUN_020D0FF0

+.extern FS_ReleaseArchiveName

 .extern FUN_021EB9A4

 .extern FUN_021EB9D8

 .extern FUN_021EBAE8

diff --git a/arm9/lib/include/FS_archive.h b/arm9/lib/include/FS_archive.h
index b39e7738..baf11add 100644
--- a/arm9/lib/include/FS_archive.h
+++ b/arm9/lib/include/FS_archive.h
@@ -110,8 +110,8 @@ typedef struct FSArchive
         char ptr[4];
         u32 pack;
     } name;
-    struct FSArchive * prev;
     struct FSArchive * next;
+    struct FSArchive * prev;
     OSThreadQueue sync_q;
     OSThreadQueue stat_q;
     u32 flag;
@@ -163,6 +163,11 @@ static inline BOOL FSi_IsArchiveRunning(volatile const FSArchive * p_arc)
     return (p_arc->flag & FS_ARCHIVE_FLAG_RUNNING) != 0;
 }
 
+static inline BOOL FSi_IsArchiveUnloading(volatile const FSArchive * p_arc)
+{
+    return (p_arc->flag & FS_ARCHIVE_FLAG_UNLOADING) != 0;
+}
+
 BOOL FSi_SendCommand(struct FSFile * file, FSCommandType command);
 BOOL FSi_ExecuteSyncCommand(struct FSFile * file);
 
diff --git a/arm9/lib/include/FSi_util.h b/arm9/lib/include/FSi_util.h
new file mode 100644
index 00000000..babb6d75
--- /dev/null
+++ b/arm9/lib/include/FSi_util.h
@@ -0,0 +1,33 @@
+#ifndef NITRO_FSI_UTIL_H_
+#define NITRO_FSI_UTIL_H_
+
+static inline BOOL FSi_IsSlash(u32 c)
+{
+    return (c == '/') || (c == '\\');
+}
+
+static inline void FSi_CutFromListCore(FSFileLink *trg)
+{
+    FSFile *const pr = trg->prev;
+    FSFile *const nx = trg->next;
+    if (pr)
+        pr->link.next = nx;
+    if (nx)
+        nx->link.prev = pr;
+}
+
+static inline void FSi_AppendToList(FSFile *elem, FSFile *list)
+{
+    FSFileLink *const trg = &elem->link;
+    FSi_CutFromListCore(trg);
+    {
+        while (list->link.next)
+            list = list->link.next;
+        list->link.next = elem;
+        trg->prev = list;
+        trg->next = NULL;
+    }
+}
+
+
+#endif //NITRO_FSI_UTIL_H_
diff --git a/arm9/lib/src/FS_archive.c b/arm9/lib/src/FS_archive.c
index 39daa324..c8404144 100644
--- a/arm9/lib/src/FS_archive.c
+++ b/arm9/lib/src/FS_archive.c
@@ -1,6 +1,7 @@
 #include "FS_archive.h"
 #include "FS_file.h"
 #include "FS_command.h"
+#include "FSi_util.h"
 #include "MI_memory.h"
 #include "MI_byteAccess.h"
 
@@ -29,15 +30,15 @@ u32 FSi_GetPackedName(const char * name, int name_len)
     return ret;
 }
 
-FSResult FSi_ReadMemCallback(FSArchive * p_arc, u8 * dest, u32 offset, u32 size)
+FSResult FSi_ReadMemCallback(struct FSArchive * p_arc, void * dest, u32 pos, u32 size)
 {
-    MI_CpuCopy8((const void *)FS_GetArchiveOffset(p_arc, offset), dest, size);
+    MI_CpuCopy8((const void *)FS_GetArchiveOffset(p_arc, pos), dest, size);
     return FS_RESULT_SUCCESS;
 }
 
-FSResult FSi_WriteMemCallback(FSArchive * p_arc, const u8 * src, u32 offset, u32 size)
+FSResult FSi_WriteMemCallback(struct FSArchive * p_arc, const void * src, u32 pos, u32 size)
 {
-    MI_CpuCopy8(src, (void *)FS_GetArchiveOffset(p_arc, offset), size);
+    MI_CpuCopy8(src, (void *)FS_GetArchiveOffset(p_arc, pos), size);
     return FS_RESULT_SUCCESS;
 }
 
@@ -145,3 +146,140 @@ BOOL FSi_ExecuteSyncCommand(FSFile * p_file)
         FSi_ExecuteAsyncCommand(p_target);
     return FS_IsSucceeded(p_file);
 }
+
+BOOL FSi_SendCommand(FSFile * p_file, FSCommandType command)
+{
+    FSArchive * p_arc = p_file->arc;
+    const int bit = 1 << command;
+    p_file->command = command;
+    p_file->error = FS_RESULT_BUSY;
+    p_file->stat |= FS_FILE_STATUS_BUSY;
+    {
+        OSIntrMode bak_psr = OS_DisableInterrupts();
+        if (FSi_IsArchiveUnloading(p_arc))
+        {
+            FSi_ReleaseCommand(p_file, FS_RESULT_CANCELLED);
+            OS_RestoreInterrupts(bak_psr);
+            return FALSE;
+        }
+        if ((bit & FS_ARCHIVE_PROC_SYNC) != 0)
+            p_file->stat |= FS_FILE_STATUS_SYNC;
+        FSi_AppendToList(p_file, (FSFile *)&p_arc->list);
+        if (!FS_IsArchiveSuspended(p_arc) && !FSi_IsArchiveRunning(p_arc))
+        {
+            p_arc->flag |= FS_ARCHIVE_FLAG_RUNNING;
+            OS_RestoreInterrupts(bak_psr);
+            if ((p_arc->proc_flag & FS_ARCHIVE_PROC_ACTIVATE))
+                (*p_arc->proc)(p_file, FS_COMMAND_ACTIVATE);
+            bak_psr = OS_DisableInterrupts();
+            p_file->stat |= FS_FILE_STATUS_OPERATING;
+            if (!FS_IsFileSyncMode(p_file))
+            {
+                OS_RestoreInterrupts(bak_psr);
+                FSi_ExecuteAsyncCommand(p_file);
+                return TRUE;
+            }
+            OS_RestoreInterrupts(bak_psr);
+        }
+        else if (!FS_IsFileSyncMode(p_file))
+        {
+            OS_RestoreInterrupts(bak_psr);
+            return TRUE;
+        }
+        else
+        {
+            do
+            {
+                OS_SleepThread(p_file->queue);
+            } while (!(p_file->stat & FS_FILE_STATUS_OPERATING));
+            OS_RestoreInterrupts(bak_psr);
+        }
+    }
+    return FSi_ExecuteSyncCommand(p_file);
+}
+
+void FS_InitArchive(FSArchive * p_arc)
+{
+    MI_CpuClear8(p_arc, sizeof(FSArchive));
+    p_arc->sync_q.head = p_arc->sync_q.tail = NULL;
+    p_arc->stat_q.head = p_arc->stat_q.tail = NULL;
+}
+
+FSArchive * const FS_FindArchive(const char * name, int name_len)
+{
+    u32 pack = FSi_GetPackedName(name, name_len);
+    OSIntrMode bak_psr = OS_DisableInterrupts();
+    FSArchive * p_arc = arc_list;
+    while (p_arc && (p_arc->name.pack != pack))
+        p_arc = p_arc->next;
+    OS_RestoreInterrupts(bak_psr);
+    return p_arc;
+}
+
+BOOL FS_RegisterArchiveName(FSArchive * p_arc, const char * name, int name_len)
+{
+    BOOL ret = FALSE;
+    OSIntrMode bak_psr = OS_DisableInterrupts();
+    if (!FS_FindArchive(name, name_len))
+    {
+        FSArchive * p_tail = arc_list;
+        if (!p_tail)
+        {
+            arc_list = p_arc;
+            current_dir_pos.arc = p_arc;
+            current_dir_pos.pos = 0;
+            current_dir_pos.index = 0;
+            current_dir_pos.own_id = 0;
+        }
+        else
+        {
+            while (p_tail->next)
+                p_tail = p_tail->next;
+            p_tail->next = p_arc;
+            p_arc->prev = p_tail;
+        }
+        p_arc->name.pack = FSi_GetPackedName(name, name_len);
+        p_arc->flag |= FS_ARCHIVE_FLAG_REGISTER;
+        ret = TRUE;
+    }
+    OS_RestoreInterrupts(bak_psr);
+    return ret;
+}
+
+void FS_ReleaseArchiveName(FSArchive * p_arc)
+{
+    if (p_arc->name.pack)
+    {
+        OSIntrMode bak_psr = OS_DisableInterrupts();
+        if (p_arc->next)
+            p_arc->next->prev = p_arc->prev;
+        if (p_arc->prev)
+            p_arc->prev->next = p_arc->next;
+        p_arc->name.pack = 0;
+        p_arc->next = p_arc->prev = NULL;
+        p_arc->flag &= ~FS_ARCHIVE_FLAG_REGISTER;
+        if (current_dir_pos.arc == p_arc)
+        {
+            current_dir_pos.arc = arc_list;
+            current_dir_pos.pos = 0;
+            current_dir_pos.index = 0;
+            current_dir_pos.own_id = 0;
+        }
+        OS_RestoreInterrupts(bak_psr);
+    }
+}
+
+BOOL FS_LoadArchive(FSArchive * p_arc, u32 base, u32 fat, u32 fat_size, u32 fnt, u32 fnt_size, FS_ARCHIVE_READ_FUNC read_func, FS_ARCHIVE_WRITE_FUNC write_func)
+{
+    p_arc->base = base;
+    p_arc->fat_size = fat_size;
+    p_arc->fat = p_arc->fat_bak = fat;
+    p_arc->fnt_size = fnt_size;
+    p_arc->fnt = p_arc->fnt_bak = fnt;
+    p_arc->read_func = (read_func != NULL) ? read_func : FSi_ReadMemCallback;
+    p_arc->write_func = (write_func != NULL) ? write_func : FSi_WriteMemCallback;
+    p_arc->table_func = p_arc->read_func;
+    p_arc->load_mem = NULL;
+    p_arc->flag |= FS_ARCHIVE_FLAG_LOADED;
+    return TRUE;
+}
diff --git a/arm9/lib/src/FS_file.c b/arm9/lib/src/FS_file.c
index 479a5085..32c07187 100644
--- a/arm9/lib/src/FS_file.c
+++ b/arm9/lib/src/FS_file.c
@@ -2,15 +2,11 @@
 #include "MI_byteAccess.h"
 #include "FS_rom.h"
 #include "FS_file.h"
+#include "FSi_util.h"
 
 extern FSDirPos current_dir_pos;
 BOOL is_init = FALSE;
 
-static inline BOOL FSi_IsSlash(u32 c)
-{
-    return (c == '/') || (c == '\\');
-}
-
 void FS_Init(u32 default_dma_no)
 {
     if (!is_init)
diff --git a/arm9/modules/13/asm/module_13_arm2.s b/arm9/modules/13/asm/module_13_arm2.s
index 028a3b7c..aeb640f2 100644
--- a/arm9/modules/13/asm/module_13_arm2.s
+++ b/arm9/modules/13/asm/module_13_arm2.s
@@ -31913,7 +31913,7 @@ MOD13_022395A0: ; 0x022395A0
 	ldr r0, _02239628 ; =0x02243190
 	ldr r0, [r0]
 	add r0, r0, #0x88
-	bl FUN_020D0FF0
+	bl FS_ReleaseArchiveName
 	ldr r0, _02239628 ; =0x02243190
 	ldr r0, [r0]
 	ldrh r0, [r0, #0xe4]