1 files changed, 67 insertions, 4 deletions
diff --git a/arm9/lib/include/CARD_rom.h b/arm9/lib/include/CARD_rom.h
index b96c527b..e72d653f 100644
--- a/arm9/lib/include/CARD_rom.h
+++ b/arm9/lib/include/CARD_rom.h
@@ -1,9 +1,31 @@
-#ifndef NITRO_CARD_ROM_H_
-#define NITRO_CARD_ROM_H_
+#ifndef POKEDIAMOND_CARD_ROM_H
+#define POKEDIAMOND_CARD_ROM_H
 
 #include "nitro/types.h"
 #include "MI_exMemory.h"
 #include "MI_dma.h"
+#include "CARD_common.h"
+#include "OS_tcm.h"
+
+#define CARD_ROM_PAGE_SIZE	512
+
+#define CARDMST_SEL_ROM     0x00
+#define CARDMST_IF_ENABLE   0x40
+#define CARDMST_ENABLE      0x80
+
+#define CARD_DATA_READY     0x00800000
+#define CARD_COMMAND_PAGE   0x01000000
+#define CARD_COMMAND_ID     0x07000000
+#define CARD_COMMAND_MASK   0x07000000
+#define CARD_RESET_HI       0x20000000
+#define CARD_READ_MODE      0x00000000
+#define CARD_START          0x80000000
+#define CARD_LATENCY1_MASK  0x00001FFF
+
+#define MROMOP_G_READ_PAGE  0xB7000000
+#define MROMOP_G_READ_ID    0xB8000000
+
+extern CARDiCommon cardi_common;
 
 typedef struct
 {
@@ -12,6 +34,15 @@ typedef struct
 }
 CARDRomRegion;
 
+typedef struct CARDRomStat
+{
+    void (*read_func) (struct CARDRomStat *);
+    u32 ctrl;
+    u8 *cache_page;
+    u32 dummy[5];
+    u8 cache_buf[CARD_ROM_PAGE_SIZE];
+} CARDRomStat;
+
 static inline const CARDRomRegion * CARD_GetRomRegionOVT(MIProcessor target)
 {
     return (target == MI_PROCESSOR_ARM9)
@@ -19,7 +50,14 @@ 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);
+BOOL CARDi_TryReadCardDma(CARDRomStat *p);
+void CARDi_ReadCard(CARDRomStat *p);
+u32 CARDi_ReadRomIDCore(void);
+void CARDi_CheckPulledOutCore(u32 id);
+void CARDi_ReadRom(u32 dma, const void *src, void *dst, u32 len, MIDmaCallback callback, void *arg, BOOL is_async);
+void CARD_Init(void);
+void CARD_WaitRomAsync(void);
+void (*CARDi_GetRomAccessor(void)) (CARDRomStat *);
 
 static inline void CARD_ReadRomAsync(u32 dma, const void * src, void * dst, u32 len, MIDmaCallback callback, void * arg)
 {
@@ -34,4 +72,29 @@ static inline const CARDRomRegion * CARD_GetRomRegionFAT() {
     return (const CARDRomRegion *)((const u8 *)HW_ROM_HEADER_BUF + 0x48);
 }
 
-#endif //NITRO_CARD_ROM_H_
+static inline void CARDi_ReadEnd(void)
+{
+    CARDiCommon *const p = &cardi_common;
+    CARDi_CheckPulledOutCore(CARDi_ReadRomIDCore());
+    p->cmd->result = CARD_RESULT_SUCCESS;
+    CARDi_EndTask(p, TRUE);
+}
+
+static inline BOOL CARDi_IsInTcm(u32 buf, u32 len)
+{
+    const u32 i = (u32)HW_ITCM;
+    const u32 d = OS_GetDTCMAddress();
+    return ((i < buf + len) && (i + HW_ITCM_SIZE > buf)) ||
+           ((d < buf + len) && (d + HW_DTCM_SIZE > buf));
+}
+
+extern u32 cardi_rom_header_addr;
+
+static inline u32 CARDi_GetRomFlag(u32 flag)
+{
+    const u32 rom_ctrl = *(vu32 *)(cardi_rom_header_addr + 0x60);
+    return (u32)((rom_ctrl & ~CARD_COMMAND_MASK) | flag |
+                 CARD_READ_MODE | CARD_START | CARD_RESET_HI);
+}
+
+#endif //POKEDIAMOND_CARD_ROM_H