summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax <mparisi@stevens.edu>2020-10-11 22:37:55 -0400
committerMax <mparisi@stevens.edu>2020-10-11 22:37:55 -0400
commitb6bdb8f23056aa9aeacfe00e9bdb9df006531f19 (patch)
tree2fbd2a30f1be6320fec77e33fd2e28cee3d0ab54
parentd2e4b9078b23d16b32a297c69525997e074ea942 (diff)
split NWC24System.s
-rw-r--r--asm/SDK/NWC24/NWC24System.s (renamed from asm/text_9_2.s)11
-rw-r--r--asm/SDK/OS/OSNet.s2
-rw-r--r--obj_files.mk2
3 files changed, 8 insertions, 7 deletions
diff --git a/asm/text_9_2.s b/asm/SDK/NWC24/NWC24System.s
index f2fbd03..a3748b4 100644
--- a/asm/text_9_2.s
+++ b/asm/SDK/NWC24/NWC24System.s
@@ -2,17 +2,17 @@
.section .text, "ax" # 0x80006980 - 0x803E1E60
-.global func_80304D1C
-func_80304D1C:
+.global NWC24iPrepareShutdown
+NWC24iPrepareShutdown:
/* 80304D1C 0030097C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80304D20 00300980 7C 08 02 A6 */ mflr r0
/* 80304D24 00300984 90 01 00 24 */ stw r0, 0x24(r1)
/* 80304D28 00300988 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80304D2C 0030098C 3B E0 00 00 */ li r31, 0
/* 80304D30 00300990 4B FF E3 25 */ bl NWC24iRegister
-/* 80304D34 00300994 3C A0 80 30 */ lis r5, lbl_80304DC4@ha
+/* 80304D34 00300994 3C A0 80 30 */ lis r5, NWC24Shutdown@ha
/* 80304D38 00300998 3C 80 80 58 */ lis r4, lbl_8057EA00@ha
-/* 80304D3C 0030099C 38 A5 4D C4 */ addi r5, r5, lbl_80304DC4@l
+/* 80304D3C 0030099C 38 A5 4D C4 */ addi r5, r5, NWC24Shutdown@l
/* 80304D40 003009A0 38 00 00 6E */ li r0, 0x6e
/* 80304D44 003009A4 38 64 EA 00 */ addi r3, r4, lbl_8057EA00@l
/* 80304D48 003009A8 90 A4 EA 00 */ stw r5, -0x1600(r4)
@@ -49,7 +49,8 @@ lbl_80304DAC:
/* 80304DB8 00300A18 7C 08 03 A6 */ mtlr r0
/* 80304DBC 00300A1C 38 21 00 20 */ addi r1, r1, 0x20
/* 80304DC0 00300A20 4E 80 00 20 */ blr
-lbl_80304DC4:
+
+NWC24Shutdown:
/* 80304DC4 00300A24 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80304DC8 00300A28 7C 08 02 A6 */ mflr r0
/* 80304DCC 00300A2C 2C 03 00 00 */ cmpwi r3, 0
diff --git a/asm/SDK/OS/OSNet.s b/asm/SDK/OS/OSNet.s
index 8e5ea96..430f8cf 100644
--- a/asm/SDK/OS/OSNet.s
+++ b/asm/SDK/OS/OSNet.s
@@ -19,7 +19,7 @@ __OSInitNet:
/* 80274140 0026FDA0 40 82 00 08 */ bne lbl_80274148
/* 80274144 0026FDA4 48 00 00 5C */ b lbl_802741A0
lbl_80274148:
-/* 80274148 0026FDA8 48 09 0B D5 */ bl func_80304D1C
+/* 80274148 0026FDA8 48 09 0B D5 */ bl NWC24iPrepareShutdown
/* 8027414C 0026FDAC 2C 03 00 00 */ cmpwi r3, 0
/* 80274150 0026FDB0 41 82 00 34 */ beq lbl_80274184
/* 80274154 0026FDB4 40 80 00 14 */ bge lbl_80274168
diff --git a/obj_files.mk b/obj_files.mk
index e4326db..562aae5 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -363,7 +363,7 @@ TEXT_O_FILES := \
$(BUILD_DIR)/asm/SDK/NWC24/NWC24Time.o \
$(BUILD_DIR)/asm/SDK/NWC24/NWC24Ipc.o \
$(BUILD_DIR)/asm/SDK/NWC24/NWC24Download.o \
- $(BUILD_DIR)/asm/text_9_2.o \
+ $(BUILD_DIR)/asm/SDK/NWC24/NWC24System.o \
$(BUILD_DIR)/asm/SDK/VF/pf_clib.o \
$(BUILD_DIR)/asm/SDK/VF/pf_code.o \
$(BUILD_DIR)/asm/SDK/VF/pf_service.o \