From 8b689adc97add4458ecc461ff1e3c296ec56f6b6 Mon Sep 17 00:00:00 2001
From: Phillip Stephens <antidote.crk@gmail.com>
Date: Sat, 10 Sep 2022 15:41:46 -0700
Subject: [PATCH] Commit missed files

Former-commit-id: c33b42a7c0b3db72233a1692e7c1f3fd6a77219d
---
 asm/Dolphin/card/CARDUnlock.s | 3 ---
 include/dolphin/CARDPriv.h    | 4 ++++
 obj_files.mk                  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/asm/Dolphin/card/CARDUnlock.s b/asm/Dolphin/card/CARDUnlock.s
index 99a2cb41..d147e406 100644
--- a/asm/Dolphin/card/CARDUnlock.s
+++ b/asm/Dolphin/card/CARDUnlock.s
@@ -3,7 +3,6 @@
 .section .data, "wa"
 .balign 8
 
-.global CardData
 CardData:
 	# ROM: 0x3F3D00
 	.4byte 0
@@ -104,7 +103,6 @@ next:
 
 .section .text, "ax"
 
-.global bitrev
 bitrev:
 /* 803B908C 003B5FEC  38 00 00 08 */	li r0, 8
 /* 803B9090 003B5FF0  7C 09 03 A6 */	mtctr r0
@@ -211,7 +209,6 @@ lbl_803B91E8:
 /* 803B91F0 003B6150  7C E3 3B 78 */	mr r3, r7
 /* 803B91F4 003B6154  4E 80 00 20 */	blr
 
-.global ReadArrayUnlock
 ReadArrayUnlock:
 /* 803B91F8 003B6158  7C 08 02 A6 */	mflr r0
 /* 803B91FC 003B615C  90 01 00 04 */	stw r0, 4(r1)
diff --git a/include/dolphin/CARDPriv.h b/include/dolphin/CARDPriv.h
index 5e146361..678df8ee 100644
--- a/include/dolphin/CARDPriv.h
+++ b/include/dolphin/CARDPriv.h
@@ -5,6 +5,7 @@
 extern "C" {
 #endif
 
+#define CARD_FAT_AVAIL          0x0000u
 #define CARD_FAT_CHECKSUM       0x0000u
 #define CARD_FAT_CHECKSUMINV    0x0001u
 #define CARD_FAT_CHECKCODE      0x0002u
@@ -94,8 +95,11 @@ typedef struct CARDID {
   u16 checkSumInv;
 } CARDID;
 
+#define CARDIsValidBlockNo(card, iBlock)    (CARD_NUM_SYSTEM_BLOCK <= (iBlock) && (iBlock) < (card)->cBlock)
+
 CARDDir* __CARDGetDirBlock( CARDControl* card );
 u16* __CARDGetFatBlock   ( CARDControl* card );
+s32 __CARDUpdateFatBlock(s32 chan, u16* fat, CARDCallback callback);
 
 
 extern CARDControl __CARDBlock[2];
diff --git a/obj_files.mk b/obj_files.mk
index 6bd09114..1e2f8e75 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -818,7 +818,7 @@ CARD_FILES :=\
 	$(BUILD_DIR)/asm/Dolphin/card/CARDBios.o\
 	$(BUILD_DIR)/src/Dolphin/card/CARDUnlock.ep.o\
 	$(BUILD_DIR)/src/Dolphin/card/CARDRdwr.ep.o\
-	$(BUILD_DIR)/asm/Dolphin/card/CARDBlock.o\
+	$(BUILD_DIR)/src/Dolphin/card/CARDBlock.ep.o\
 	$(BUILD_DIR)/asm/Dolphin/card/CARDDir.o\
 	$(BUILD_DIR)/asm/Dolphin/card/CARDCheck.o\
 	$(BUILD_DIR)/asm/Dolphin/card/CARDMount.o\