diff options
-rw-r--r-- | asm/SDK/VF/d_common.s | 2 | ||||
-rw-r--r-- | asm/SDK/VF/d_vf_sys.s | 2 | ||||
-rw-r--r-- | asm/SDK/VF/nand_drv.s (renamed from asm/text_9_2.s) | 8 | ||||
-rw-r--r-- | asm/SDK/VF/sd_drv.s | 7 | ||||
-rw-r--r-- | obj_files.mk | 3 |
5 files changed, 13 insertions, 9 deletions
diff --git a/asm/SDK/VF/d_common.s b/asm/SDK/VF/d_common.s index 68c7988..c7014df 100644 --- a/asm/SDK/VF/d_common.s +++ b/asm/SDK/VF/d_common.s @@ -156,7 +156,7 @@ dCommon_FlushFromVol: /* 8031BDE4 00317A44 2C 03 FF FF */ cmpwi r3, -1
/* 8031BDE8 00317A48 41 82 00 18 */ beq lbl_8031BE00
/* 8031BDEC 00317A4C 7F C4 F3 78 */ mr r4, r30
-/* 8031BDF0 00317A50 48 00 00 2D */ bl func_8031BE1C
+/* 8031BDF0 00317A50 48 00 00 2D */ bl VFi_NandFlushNANDFromHandleIdx
/* 8031BDF4 00317A54 7C 7F 1B 78 */ mr r31, r3
/* 8031BDF8 00317A58 48 00 00 08 */ b lbl_8031BE00
lbl_8031BDFC:
diff --git a/asm/SDK/VF/d_vf_sys.s b/asm/SDK/VF/d_vf_sys.s index add45dc..824a774 100644 --- a/asm/SDK/VF/d_vf_sys.s +++ b/asm/SDK/VF/d_vf_sys.s @@ -256,7 +256,7 @@ lbl_8031AD68: /* 8031AD78 003169D8 90 8D AF F4 */ stw r4, lbl_806402B4-_SDA_BASE_(r13)
/* 8031AD7C 003169DC 90 6D B0 0C */ stw r3, lbl_806402CC-_SDA_BASE_(r13)
/* 8031AD80 003169E0 90 0D B0 08 */ stw r0, lbl_806402C8-_SDA_BASE_(r13)
-/* 8031AD84 003169E4 48 00 13 9D */ bl func_8031C120
+/* 8031AD84 003169E4 48 00 13 9D */ bl VFi_InitSDWrok
/* 8031AD88 003169E8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 8031AD8C 003169EC 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 8031AD90 003169F0 83 C1 00 18 */ lwz r30, 0x18(r1)
diff --git a/asm/text_9_2.s b/asm/SDK/VF/nand_drv.s index 29decee..721fd8e 100644 --- a/asm/text_9_2.s +++ b/asm/SDK/VF/nand_drv.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80006980 - 0x803E1E60
-.global func_8031BE1C
-func_8031BE1C:
+.global VFi_NandFlushNANDFromHandleIdx
+VFi_NandFlushNANDFromHandleIdx:
/* 8031BE1C 00317A7C 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 8031BE20 00317A80 7C 08 02 A6 */ mflr r0
/* 8031BE24 00317A84 90 01 00 34 */ stw r0, 0x34(r1)
@@ -220,7 +220,3 @@ lbl_8031C108: /* 8031C114 00317D74 7C 08 03 A6 */ mtlr r0
/* 8031C118 00317D78 38 21 00 30 */ addi r1, r1, 0x30
/* 8031C11C 00317D7C 4E 80 00 20 */ blr
-
-.global func_8031C120
-func_8031C120:
-/* 8031C120 00317D80 4E 80 00 20 */ blr
diff --git a/asm/SDK/VF/sd_drv.s b/asm/SDK/VF/sd_drv.s new file mode 100644 index 0000000..2004e7a --- /dev/null +++ b/asm/SDK/VF/sd_drv.s @@ -0,0 +1,7 @@ +.include "macros.inc"
+
+.section .text, "ax" # 0x80006980 - 0x803E1E60
+
+.global VFi_InitSDWrok
+VFi_InitSDWrok:
+/* 8031C120 00317D80 4E 80 00 20 */ blr
diff --git a/obj_files.mk b/obj_files.mk index 5d5d5de..d6660a0 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -391,7 +391,8 @@ TEXT_O_FILES := \ $(BUILD_DIR)/asm/SDK/VF/d_hash.o \ $(BUILD_DIR)/asm/SDK/VF/d_time.o \ $(BUILD_DIR)/asm/SDK/VF/d_common.o \ - $(BUILD_DIR)/asm/text_9_2.o \ + $(BUILD_DIR)/asm/SDK/VF/nand_drv.o \ + $(BUILD_DIR)/asm/SDK/VF/sd_drv.o \ $(BUILD_DIR)/asm/SDK/DWC/dwc_common/dwc_base64.o \ $(BUILD_DIR)/asm/SDK/DWC/dwc_common/dwc_error.o \ $(BUILD_DIR)/asm/SDK/DWC/dwc_common/dwc_init.o \ |