FS_rom.c

14 files changed, 187 insertions, 247 deletions

diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index c7342b57..8fbbdb70 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -221,9 +221,13 @@ SECTIONS {
 		libc.o (.text)
 		/* MWCC library */
 		libmwcc.o (.text)
+
+		/* Static data */
 		rom2.o (.data)
 		string_util.o (.data)
 		rom2_2.o (.data)
+		FS_rom.o (.data)
+		rom2_3.o (.data)
 		SDK_STATIC_END = .;
 		SDK_STATIC_SIZE = SDK_STATIC_END - SDK_STATIC_START;
 	} > arm9
@@ -274,6 +278,8 @@ SECTIONS {
 		arc_list                         = 0x021D53E8;
 		current_dir_pos                  = 0x021D53EC;
 		is_init                          = 0x021D53F8;
+		fsi_card_lock_id                 = 0x021D53FC;
+		fsi_default_dma_no               = 0x021D5400;
 		fsi_ovt9                         = 0x021D5404;
 		fsi_ovt7                         = 0x021D540C;
 		fsi_arc_rom                      = 0x021D5414;
diff --git a/arm9/asm/FS_rom.s b/arm9/asm/FS_rom.s
deleted file mode 100644
index 5cfeead6..00000000
--- a/arm9/asm/FS_rom.s
+++ /dev/null
@@ -1,245 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-	.section .text
-
-	arm_func_start FS_TryLoadTable
-FS_TryLoadTable: ; 0x020D1D10
-	ldr ip, _020D1D28 ; =FS_LoadArchiveTables
-	mov r3, r0
-	mov r2, r1
-	ldr r0, _020D1D2C ; =0x021D5414
-	mov r1, r3
-	bx r12
-	.balign 4
-_020D1D28: .word FS_LoadArchiveTables
-_020D1D2C: .word 0x021D5414
-
-	arm_func_start FS_SetDefaultDMA
-FS_SetDefaultDMA: ; 0x020D1D30
-	stmdb sp!, {r4-r6,lr}
-	mov r6, r0
-	bl OS_DisableInterrupts
-	mov r5, r0
-	ldr r1, _020D1D7C ; =0x021D5400
-	ldr r0, _020D1D80 ; =0x021D5414
-	ldr r4, [r1, #0x0]
-	bl FS_SuspendArchive
-	ldr r1, _020D1D7C ; =0x021D5400
-	cmp r0, #0x0
-	str r6, [r1, #0x0]
-	beq _020D1D68
-	ldr r0, _020D1D80 ; =0x021D5414
-	bl FS_ResumeArchive
-_020D1D68:
-	mov r0, r5
-	bl OS_RestoreInterrupts
-	mov r0, r4
-	ldmia sp!, {r4-r6,lr}
-	bx lr
-	.balign 4
-_020D1D7C: .word 0x021D5400
-_020D1D80: .word 0x021D5414
-
-	arm_func_start FSi_InitRom
-FSi_InitRom: ; 0x020D1D84
-	stmdb sp!, {r4-r5,lr}
-	sub sp, sp, #0x14
-	ldr r1, _020D1EE8 ; =0x021D5400
-	str r0, [r1, #0x0]
-	bl OS_GetLockID
-	ldr r3, _020D1EEC ; =0x021D53FC
-	ldr r2, _020D1EF0 ; =0x021D5404
-	mov r12, #0x0
-	ldr r1, _020D1EF4 ; =0x021D540C
-	str r0, [r3, #0x0]
-	str r12, [r2, #0x0]
-	str r12, [r2, #0x4]
-	str r12, [r1, #0x0]
-	str r12, [r1, #0x4]
-	bl CARD_Init
-	ldr r0, _020D1EF8 ; =0x021D5414
-	bl FS_InitArchive
-	ldr r0, _020D1EF8 ; =0x021D5414
-	ldr r1, _020D1EFC ; =0x02106830
-	mov r2, #0x3
-	bl FS_RegisterArchiveName
-	ldr r0, _020D1F00 ; =0x027FFC40
-	ldrh r0, [r0, #0x0]
-	cmp r0, #0x2
-	bne _020D1E4C
-	ldr ip, _020D1EF0 ; =0x021D5404
-	mvn r2, #0x0
-	ldr r3, _020D1EF4 ; =0x021D540C
-	mov lr, #0x0
-	ldr r0, _020D1EF8 ; =0x021D5414
-	ldr r1, _020D1F04 ; =FSi_EmptyArchiveProc
-	str r2, [r12, #0x0]
-	str lr, [r12, #0x4]
-	str r2, [r3, #0x0]
-	str lr, [r3, #0x4]
-	bl FS_SetArchiveProc
-	mov r1, #0x0
-	str r1, [sp, #0x0]
-	ldr r0, _020D1F08 ; =FSi_ReadDummyCallback
-	str r1, [sp, #0x4]
-	str r0, [sp, #0x8]
-	ldr ip, _020D1F0C ; =FSi_WriteDummyCallback
-	ldr r0, _020D1EF8 ; =0x021D5414
-	mov r2, r1
-	mov r3, r1
-	str r12, [sp, #0xc]
-	bl FS_LoadArchive
-	add sp, sp, #0x14
-	ldmia sp!, {r4-r5,lr}
-	bx lr
-_020D1E4C:
-	ldr r5, _020D1F10 ; =0x027FFE40
-	ldr r0, _020D1EF8 ; =0x021D5414
-	ldr r1, _020D1F14 ; =FSi_RomArchiveProc
-	ldr r2, _020D1F18 ; =0x00000602
-	ldr r4, _020D1F1C ; =0x027FFE48
-	bl FS_SetArchiveProc
-	ldr r1, [r5, #0x0]
-	mvn r0, #0x0
-	cmp r1, r0
-	addeq sp, sp, #0x14
-	ldmeqia sp!, {r4-r5,lr}
-	bxeq lr
-	cmp r1, #0x0
-	addeq sp, sp, #0x14
-	ldmeqia sp!, {r4-r5,lr}
-	bxeq lr
-	ldr r2, [r4, #0x0]
-	cmp r2, r0
-	addeq sp, sp, #0x14
-	ldmeqia sp!, {r4-r5,lr}
-	bxeq lr
-	cmp r2, #0x0
-	addeq sp, sp, #0x14
-	ldmeqia sp!, {r4-r5,lr}
-	bxeq lr
-	str r1, [sp, #0x0]
-	ldr r0, [r5, #0x4]
-	ldr r1, _020D1F20 ; =FSi_ReadRomCallback
-	str r0, [sp, #0x4]
-	ldr r0, _020D1F0C ; =FSi_WriteDummyCallback
-	str r1, [sp, #0x8]
-	str r0, [sp, #0xc]
-	ldr r3, [r4, #0x4]
-	ldr r0, _020D1EF8 ; =0x021D5414
-	mov r1, #0x0
-	bl FS_LoadArchive
-	add sp, sp, #0x14
-	ldmia sp!, {r4-r5,lr}
-	bx lr
-	.balign 4
-_020D1EE8: .word 0x021D5400
-_020D1EEC: .word 0x021D53FC
-_020D1EF0: .word 0x021D5404
-_020D1EF4: .word 0x021D540C
-_020D1EF8: .word 0x021D5414
-_020D1EFC: .word 0x02106830
-_020D1F00: .word 0x027FFC40
-_020D1F04: .word FSi_EmptyArchiveProc
-_020D1F08: .word FSi_ReadDummyCallback
-_020D1F0C: .word FSi_WriteDummyCallback
-_020D1F10: .word 0x027FFE40
-_020D1F14: .word FSi_RomArchiveProc
-_020D1F18: .word 0x00000602
-_020D1F1C: .word 0x027FFE48
-_020D1F20: .word FSi_ReadRomCallback
-
-	arm_func_start FSi_EmptyArchiveProc
-FSi_EmptyArchiveProc: ; 0x020D1F24
-	mov r0, #0x4
-	bx lr
-
-	arm_func_start FSi_ReadDummyCallback
-FSi_ReadDummyCallback: ; 0x020D1F2C
-	mov r0, #0x1
-	bx lr
-
-	arm_func_start FSi_RomArchiveProc
-FSi_RomArchiveProc: ; 0x020D1F34
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	cmp r1, #0x1
-	beq _020D1FA0
-	cmp r1, #0x9
-	beq _020D1F58
-	cmp r1, #0xa
-	beq _020D1F7C
-	b _020D1FB0
-_020D1F58:
-	ldr r0, _020D1FC0 ; =0x021D53FC
-	ldr r0, [r0, #0x0]
-	mov r0, r0, lsl #0x10
-	mov r0, r0, lsr #0x10
-	bl CARD_LockRom
-	add sp, sp, #0x4
-	mov r0, #0x0
-	ldmia sp!, {lr}
-	bx lr
-_020D1F7C:
-	ldr r0, _020D1FC0 ; =0x021D53FC
-	ldr r0, [r0, #0x0]
-	mov r0, r0, lsl #0x10
-	mov r0, r0, lsr #0x10
-	bl CARD_UnlockRom
-	add sp, sp, #0x4
-	mov r0, #0x0
-	ldmia sp!, {lr}
-	bx lr
-_020D1FA0:
-	add sp, sp, #0x4
-	mov r0, #0x4
-	ldmia sp!, {lr}
-	bx lr
-_020D1FB0:
-	mov r0, #0x8
-	add sp, sp, #0x4
-	ldmia sp!, {lr}
-	bx lr
-	.balign 4
-_020D1FC0: .word 0x021D53FC
-
-	arm_func_start FSi_WriteDummyCallback
-FSi_WriteDummyCallback: ; 0x020D1FC4
-	mov r0, #0x1
-	bx lr
-
-	arm_func_start FSi_ReadRomCallback
-FSi_ReadRomCallback: ; 0x020D1FCC
-	stmdb sp!, {lr}
-	sub sp, sp, #0xc
-	ldr ip, _020D2010 ; =FSi_OnRomReadDone
-	mov lr, r1
-	str r12, [sp, #0x0]
-	str r0, [sp, #0x4]
-	mov r1, #0x1
-	ldr r0, _020D2014 ; =0x021D5400
-	str r1, [sp, #0x8]
-	mov r1, r2
-	ldr r0, [r0, #0x0]
-	mov r2, lr
-	bl CARDi_ReadRom
-	mov r0, #0x6
-	add sp, sp, #0xc
-	ldmia sp!, {lr}
-	bx lr
-	.balign 4
-_020D2010: .word FSi_OnRomReadDone
-_020D2014: .word 0x021D5400
-
-	arm_func_start FSi_OnRomReadDone
-FSi_OnRomReadDone: ; 0x020D2018
-	stmdb sp!, {r4,lr}
-	mov r4, r0
-	bl CARD_IsPulledOut
-	cmp r0, #0x0
-	movne r1, #0x5
-	moveq r1, #0x0
-	mov r0, r4
-	bl FS_NotifyArchiveAsyncEnd
-	ldmia sp!, {r4,lr}
-	bx lr
diff --git a/arm9/data/rom2_2.s b/arm9/data/rom2_2.s
index d5055773..ee7cadd3 100644
--- a/arm9/data/rom2_2.s
+++ b/arm9/data/rom2_2.s
@@ -731,4 +731,4 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203AF84
     .word FUN_0203AFA4
 
-.incbin "baserom.nds",  0xF80A0, 0x12F00
+.incbin "baserom.nds",  0xF80A0, 0x12790
diff --git a/arm9/data/rom2_3.s b/arm9/data/rom2_3.s
new file mode 100644
index 00000000..43bd3cf2
--- /dev/null
+++ b/arm9/data/rom2_3.s
@@ -0,0 +1,8 @@
+	.include "asm/macros.inc"
+	.include "global.inc"
+
+	/* rom2.s TODO: Disassemble */
+
+	.section .data
+
+	.incbin "baserom.nds",  0x10a834, 0x76c
\ No newline at end of file
diff --git a/arm9/lib/include/CARD_common.h b/arm9/lib/include/CARD_common.h
new file mode 100644
index 00000000..1396de12
--- /dev/null
+++ b/arm9/lib/include/CARD_common.h
@@ -0,0 +1,6 @@
+#ifndef NITRO_CARD_COMMON_H_
+#define NITRO_CARD_COMMON_H_
+
+void CARD_Init(void);
+
+#endif //NITRO_CARD_COMMON_H_
diff --git a/arm9/lib/include/CARD_pullOut.h b/arm9/lib/include/CARD_pullOut.h
new file mode 100644
index 00000000..4a64f5ae
--- /dev/null
+++ b/arm9/lib/include/CARD_pullOut.h
@@ -0,0 +1,6 @@
+#ifndef NITRO_CARD_PULLOUT_H_
+#define NITRO_CARD_PULLOUT_H_
+
+BOOL CARD_IsPulledOut(void);
+
+#endif //NITRO_CARD_PULLOUT_H_
diff --git a/arm9/lib/include/CARD_rom.h b/arm9/lib/include/CARD_rom.h
index c43a2f06..4c2e9dd5 100644
--- a/arm9/lib/include/CARD_rom.h
+++ b/arm9/lib/include/CARD_rom.h
@@ -2,6 +2,7 @@
 #define NITRO_CARD_ROM_H_
 
 #include "MI_exMemory.h"
+#include "MI_dma.h"
 
 typedef struct
 {
@@ -17,4 +18,22 @@ static inline const CARDRomRegion * CARD_GetRomRegionOVT(MIProcessor target)
     : (const CARDRomRegion *)((const u8 *)HW_ROM_HEADER_BUF + 0x58);
 }
 
+void CARDi_ReadRom(u32 dma, const void * src, void * dst, u32 len, MIDmaCallback done_cb, void * arg, BOOL is_async);
+
+static inline void CARD_ReadRomAsync(u32 dma, const void * src, void * dst, u32 len, MIDmaCallback callback, void * arg)
+{
+    CARDi_ReadRom(dma, src, dst, len, callback, arg, TRUE);
+}
+
+void CARD_LockRom(u16 lock_id);
+void CARD_UnlockRom(u16 lock_id);
+
+static inline const CARDRomRegion * CARD_GetRomRegionFNT() {
+    return (const CARDRomRegion *)((const u8 *)HW_ROM_HEADER_BUF + 0x40);
+}
+
+static inline const CARDRomRegion * CARD_GetRomRegionFAT() {
+    return (const CARDRomRegion *)((const u8 *)HW_ROM_HEADER_BUF + 0x48);
+}
+
 #endif //NITRO_CARD_ROM_H_
diff --git a/arm9/lib/include/FS_archive.h b/arm9/lib/include/FS_archive.h
index a86478e8..d7c2a785 100644
--- a/arm9/lib/include/FS_archive.h
+++ b/arm9/lib/include/FS_archive.h
@@ -78,6 +78,8 @@ typedef enum {
 	(FS_ARCHIVE_PROC_ACTIVATE | FS_ARCHIVE_PROC_IDLE |	\
 	 FS_ARCHIVE_PROC_SUSPENDING | FS_ARCHIVE_PROC_RESUME)
 
+#define	FS_ARCHIVE_PROC_ALL	(~0)
+
 typedef enum {
     FS_RESULT_SUCCESS = 0,
     FS_RESULT_FAILURE,
@@ -182,5 +184,11 @@ BOOL FSi_SendCommand(struct FSFile * file, FSCommandType command);
 BOOL FSi_ExecuteSyncCommand(struct FSFile * file);
 BOOL FS_SuspendArchive(FSArchive * p_arc);
 BOOL FS_ResumeArchive(FSArchive * p_arc);
+void FS_NotifyArchiveAsyncEnd(FSArchive *p_arc, FSResult ret);
+BOOL FS_RegisterArchiveName(FSArchive * p_arc, const char * name, int name_len);
+void FS_InitArchive(FSArchive * p_arc);
+void FS_SetArchiveProc(struct FSArchive * p_arc, FS_ARCHIVE_PROC_FUNC proc, u32 flags);
+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);
+u32 FS_LoadArchiveTables(FSArchive *p_arc, void *p_mem, u32 max_size);
 
 #endif //NITRO_FS_ARCHIVE_H_
diff --git a/arm9/lib/include/FS_rom.h b/arm9/lib/include/FS_rom.h
index 0bba46bf..ac8ad8fb 100644
--- a/arm9/lib/include/FS_rom.h
+++ b/arm9/lib/include/FS_rom.h
@@ -5,6 +5,7 @@
 #include "CARD_rom.h"
 
 extern FSArchive fsi_arc_rom;
+extern s32 fsi_card_lock_id;
 extern CARDRomRegion fsi_ovt7;
 extern CARDRomRegion fsi_ovt9;
 
diff --git a/arm9/lib/include/MI_dma.h b/arm9/lib/include/MI_dma.h
new file mode 100644
index 00000000..eddcedbb
--- /dev/null
+++ b/arm9/lib/include/MI_dma.h
@@ -0,0 +1,6 @@
+#ifndef NITRO_MI_DMA_H_
+#define NITRO_MI_DMA_H_
+
+typedef void (*MIDmaCallback)(void *);
+
+#endif //NITRO_MI_DMA_H_
diff --git a/arm9/lib/include/OS_printf.h b/arm9/lib/include/OS_printf.h
new file mode 100644
index 00000000..0fda0f51
--- /dev/null
+++ b/arm9/lib/include/OS_printf.h
@@ -0,0 +1,6 @@
+#ifndef NITRO_OS_PRINTF_H_
+#define NITRO_OS_PRINTF_H_
+
+#define OS_Warning( ... )  ((void)0)
+
+#endif //NITRO_OS_PRINTF_H_
diff --git a/arm9/lib/include/OS_spinLock.h b/arm9/lib/include/OS_spinLock.h
index b7f0a571..3bb8a1c2 100644
--- a/arm9/lib/include/OS_spinLock.h
+++ b/arm9/lib/include/OS_spinLock.h
@@ -11,4 +11,6 @@ typedef volatile struct OSLockWord {
     u16 extension;
 } OSLockWord;
 
+s32 OS_GetLockID(void);
+
 #endif //POKEDIAMOND_OS_SPINLOCK_H
diff --git a/arm9/lib/src/FS_rom.c b/arm9/lib/src/FS_rom.c
new file mode 100644
index 00000000..44d31a4a
--- /dev/null
+++ b/arm9/lib/src/FS_rom.c
@@ -0,0 +1,118 @@
+#include "FS_rom.h"
+#include "FS_archive.h"
+#include "FS_file.h"
+#include "CARD_pullOut.h"
+#include "CARD_rom.h"
+#include "CARD_common.h"
+#include "MB_mb.h"
+#include "OS_printf.h"
+
+u32 fsi_default_dma_no;
+
+void FSi_OnRomReadDone(void * p_arc)
+{
+    FS_NotifyArchiveAsyncEnd(p_arc, CARD_IsPulledOut() ? FS_RESULT_ERROR : FS_RESULT_SUCCESS);
+}
+
+FSResult FSi_ReadRomCallback(FSArchive * p_arc, void * dst, u32 src, u32 len)
+{
+    CARD_ReadRomAsync(fsi_default_dma_no, (const void *)src, dst, len, FSi_OnRomReadDone, p_arc);
+    return FS_RESULT_PROC_ASYNC;
+}
+
+FSResult FSi_WriteDummyCallback(FSArchive * p_arc, const void *src, u32 dst, u32 len)
+{
+    return FS_RESULT_FAILURE;
+}
+
+FSResult FSi_RomArchiveProc(FSFile * p_arc, FSCommandType cmd)
+{
+    switch (cmd)
+    {
+    case FS_COMMAND_ACTIVATE:
+        CARD_LockRom(fsi_card_lock_id);
+        return FS_RESULT_SUCCESS;
+    case FS_COMMAND_IDLE:
+        CARD_UnlockRom(fsi_card_lock_id);
+        return FS_RESULT_SUCCESS;
+    case FS_COMMAND_WRITEFILE:
+        return FS_RESULT_UNSUPPORTED;
+    default:
+        return FS_RESULT_PROC_UNKNOWN;
+    }
+}
+
+FSResult FSi_ReadDummyCallback(FSArchive *p_arc, void *dst, u32 src, u32 len)
+{
+    return FS_RESULT_FAILURE;
+}
+
+FSResult FSi_EmptyArchiveProc(FSFile *p_file, FSCommandType cmd)
+{
+    return FS_RESULT_UNSUPPORTED;
+}
+
+void FSi_InitRom(u32 default_dma_no)
+{
+    fsi_default_dma_no = default_dma_no;
+    fsi_card_lock_id = OS_GetLockID();
+    fsi_ovt9.offset = 0;
+    fsi_ovt9.length = 0;
+    fsi_ovt7.offset = 0;
+    fsi_ovt7.length = 0;
+
+    CARD_Init();
+
+    FS_InitArchive(&fsi_arc_rom);
+    FS_RegisterArchiveName(&fsi_arc_rom, "rom", 3);
+
+    if (MB_IsMultiBootChild())
+    {
+        fsi_ovt9.offset = (u32)~0;
+        fsi_ovt9.length = 0;
+        fsi_ovt7.offset = (u32)~0;
+        fsi_ovt7.length = 0;
+        FS_SetArchiveProc(&fsi_arc_rom, FSi_EmptyArchiveProc, (u32)FS_ARCHIVE_PROC_ALL);
+        FS_LoadArchive(&fsi_arc_rom, 0x00000000, 0, 0, 0, 0, FSi_ReadDummyCallback, FSi_WriteDummyCallback);
+    }
+    else
+    {
+        const CARDRomRegion *const fnt = CARD_GetRomRegionFNT();
+        const CARDRomRegion *const fat = CARD_GetRomRegionFAT();
+
+        FS_SetArchiveProc(&fsi_arc_rom, FSi_RomArchiveProc,
+                          FS_ARCHIVE_PROC_WRITEFILE |
+                          FS_ARCHIVE_PROC_ACTIVATE | FS_ARCHIVE_PROC_IDLE);
+
+        if ((fnt->offset == 0xFFFFFFFF) || (fnt->offset == 0x00000000) ||
+            (fat->offset == 0xFFFFFFFF) || (fat->offset == 0x00000000))
+        {
+            OS_Warning("file-system : no MAKEROM-information in rom header.");
+        }
+        else
+        {
+            FS_LoadArchive(&fsi_arc_rom, 0x00000000,
+                                 fat->offset, fat->length,
+                                 fnt->offset, fnt->length,
+                                 FSi_ReadRomCallback, FSi_WriteDummyCallback);
+        }
+    }
+}
+
+u32 FS_SetDefaultDMA(u32 dma_no)
+{
+    OSIntrMode bak_psr = OS_DisableInterrupts();
+    u32 bak_dma_no = fsi_default_dma_no;
+    BOOL bak_stat = FS_SuspendArchive(&fsi_arc_rom);
+    fsi_default_dma_no = dma_no;
+    if (bak_stat)
+        FS_ResumeArchive(&fsi_arc_rom);
+    OS_RestoreInterrupts(bak_psr);
+    return bak_dma_no;
+}
+
+u32 FS_TryLoadTable(void * p_mem, u32 size)
+{
+    return FS_LoadArchiveTables(&fsi_arc_rom, p_mem, size);
+}
+
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c
index b12703da..774b392b 100644
--- a/arm9/lib/src/OS_reset.c
+++ b/arm9/lib/src/OS_reset.c
@@ -14,7 +14,6 @@ extern void PXI_SetFifoRecvCallback(u32 param1, void* callback);
 extern void OS_Terminate();
 extern u32 PXI_SendWordByFifo(u32 param1, u32 data, u32 param2);
 extern void CARD_LockRom(u16 lockId);
-extern u32 OS_GetLockID();
 extern void MI_StopDma(u32 dma);
 extern void OS_SetIrqMask(u32 mask);
 extern void OS_ResetRequestIrqMask(u32 mask);