summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rw-r--r--asm/SDK/NET/NETVersion.s7
-rw-r--r--asm/SDK/NET/neterrorcode.s (renamed from asm/text_9.s)26
-rw-r--r--asm/SDK/NET/wireless_macaddr.s7
-rw-r--r--asm/text_10.s2
-rw-r--r--asm/text_4.s2
-rw-r--r--asm/text_7.s4
-rw-r--r--asm/text_9_2.s2
-rw-r--r--obj_files.mk5
9 files changed, 35 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index 6d3969c..e238012 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ SRC_DIRS := src src/SDK/OS src/SDK/EXI src/SDK/SI src/SDK/DB src/SDK/VI src/SDK/
src/SDK/TPL src/SDK/THP src/SDK/KPAD src/SDK/CX src/SDK/PAD src/SDK/WPAD src/SDK/FS src/SDK/IPC \
src/SDK/NdevExi2A src/SDK/USB src/SDK/EUART src/SDK/WUD src/SDK/BTE src/SDK/NAND \
src/SDK/SC src/SDK/WENC src/SDK/ARC src/SDK/NCD src/SDK/WD src/SDK/NTR src/SDK/MP src/SDK/MPDL \
- src/SDK/SO src/SDK/base src/SDK/HBM src/MSL_C/MSL_Common src/MSL_C/MSL_Common_Embedded \
+ src/SDK/NET src/SDK/SO src/SDK/base src/SDK/HBM src/MSL_C/MSL_Common src/MSL_C/MSL_Common_Embedded \
src/MSL_C/MSL_Common_Embedded/Math src/MSL_C/PPC_EABI src/Runtime \
src/MetroTRK src/GameSpy src/nw4r/ut src/nw4r/snd src/nw4r/ut/detail \
src/nw4r/snd/detail src/nw4r/math src/nw4r/lyt src/nw4r/lyt/detail
@@ -42,7 +42,7 @@ ASM_DIRS := asm asm/SDK/OS asm/SDK/EXI asm/SDK/SI asm/SDK/DB asm/SDK/VI asm/SDK/
asm/SDK/TPL asm/SDK/THP asm/SDK/KPAD asm/SDK/CX asm/SDK/PAD asm/SDK/WPAD asm/SDK/FS asm/SDK/IPC \
asm/SDK/NdevExi2A asm/SDK/USB asm/SDK/EUART asm/SDK/WUD asm/SDK/BTE asm/SDK/NAND \
asm/SDK/SC asm/SDK/WENC asm/SDK/ARC asm/SDK/NCD asm/SDK/WD asm/SDK/NTR asm/SDK/MP asm/SDK/MPDL \
- asm/SDK/SO asm/SDK/base asm/SDK/HBM asm/MSL_C/MSL_Common asm/MSL_C/MSL_Common_Embedded \
+ asm/SDK/NET asm/SDK/SO asm/SDK/base asm/SDK/HBM asm/MSL_C/MSL_Common asm/MSL_C/MSL_Common_Embedded \
asm/MSL_C/MSL_Common_Embedded/Math asm/MSL_C/PPC_EABI asm/Runtime \
asm/MetroTRK asm/GameSpy asm/nw4r/ut asm/nw4r/snd asm/nw4r/ut/detail \
asm/nw4r/snd/detail asm/nw4r/math asm/nw4r/lyt asm/nw4r/lyt/detail
diff --git a/asm/SDK/NET/NETVersion.s b/asm/SDK/NET/NETVersion.s
new file mode 100644
index 0000000..e2eca88
--- /dev/null
+++ b/asm/SDK/NET/NETVersion.s
@@ -0,0 +1,7 @@
+.include "macros.inc"
+
+.section .text, "ax" # 0x80006980 - 0x803E1E60
+
+NETGetRexPPCVersionPrintable:
+/* 802F5190 002F0DF0 80 6D 8C 00 */ lwz r3, lbl_8063DEC0-_SDA_BASE_(r13)
+/* 802F5194 002F0DF4 4E 80 00 20 */ blr
diff --git a/asm/text_9.s b/asm/SDK/NET/neterrorcode.s
index c6df596..3ecf04e 100644
--- a/asm/text_9.s
+++ b/asm/SDK/NET/neterrorcode.s
@@ -2,8 +2,8 @@
.section .text, "ax" # 0x80006980 - 0x803E1E60
-.global func_802F4D18
-func_802F4D18:
+.global NETGetConnectionType
+NETGetConnectionType:
/* 802F4D18 002F0978 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802F4D1C 002F097C 7C 08 02 A6 */ mflr r0
/* 802F4D20 002F0980 90 01 00 24 */ stw r0, 0x24(r1)
@@ -18,7 +18,7 @@ func_802F4D18:
/* 802F4D44 002F09A4 80 61 00 10 */ lwz r3, 0x10(r1)
/* 802F4D48 002F09A8 80 81 00 0C */ lwz r4, 0xc(r1)
/* 802F4D4C 002F09AC 80 A1 00 08 */ lwz r5, 8(r1)
-/* 802F4D50 002F09B0 48 00 00 21 */ bl func_802F4D70
+/* 802F4D50 002F09B0 48 00 00 21 */ bl NETiGetConnectionTypeFromConfigList
/* 802F4D54 002F09B4 7C 7F 1B 78 */ mr r31, r3
lbl_802F4D58:
/* 802F4D58 002F09B8 7F E3 FB 78 */ mr r3, r31
@@ -28,8 +28,8 @@ lbl_802F4D58:
/* 802F4D68 002F09C8 38 21 00 20 */ addi r1, r1, 0x20
/* 802F4D6C 002F09CC 4E 80 00 20 */ blr
-.global func_802F4D70
-func_802F4D70:
+.global NETiGetConnectionTypeFromConfigList
+NETiGetConnectionTypeFromConfigList:
/* 802F4D70 002F09D0 2C 03 00 00 */ cmpwi r3, 0
/* 802F4D74 002F09D4 38 00 00 63 */ li r0, 0x63
/* 802F4D78 002F09D8 41 82 00 D4 */ beq lbl_802F4E4C
@@ -222,14 +222,14 @@ lbl_802F4FE0:
/* 802F4FE0 002F0C40 7C 03 03 78 */ mr r3, r0
/* 802F4FE4 002F0C44 4E 80 00 20 */ blr
-.global func_802F4FE8
-func_802F4FE8:
+.global NETGetStartupErrorCodeEx
+NETGetStartupErrorCodeEx:
/* 802F4FE8 002F0C48 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802F4FEC 002F0C4C 7C 08 02 A6 */ mflr r0
/* 802F4FF0 002F0C50 90 01 00 14 */ stw r0, 0x14(r1)
/* 802F4FF4 002F0C54 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802F4FF8 002F0C58 7C 9F 23 78 */ mr r31, r4
-/* 802F4FFC 002F0C5C 48 00 00 1D */ bl func_802F5018
+/* 802F4FFC 002F0C5C 48 00 00 1D */ bl GetStartupErrorCode
/* 802F5000 002F0C60 7C 7F 18 50 */ subf r3, r31, r3
/* 802F5004 002F0C64 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802F5008 002F0C68 80 01 00 14 */ lwz r0, 0x14(r1)
@@ -237,8 +237,8 @@ func_802F4FE8:
/* 802F5010 002F0C70 38 21 00 10 */ addi r1, r1, 0x10
/* 802F5014 002F0C74 4E 80 00 20 */ blr
-.global func_802F5018
-func_802F5018:
+.global GetStartupErrorCode
+GetStartupErrorCode:
/* 802F5018 002F0C78 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802F501C 002F0C7C 7C 08 02 A6 */ mflr r0
/* 802F5020 002F0C80 2C 03 00 00 */ cmpwi r3, 0
@@ -350,9 +350,3 @@ lbl_802F5180:
/* 802F5184 002F0DE4 7C 08 03 A6 */ mtlr r0
/* 802F5188 002F0DE8 38 21 00 10 */ addi r1, r1, 0x10
/* 802F518C 002F0DEC 4E 80 00 20 */ blr
-/* 802F5190 002F0DF0 80 6D 8C 00 */ lwz r3, lbl_8063DEC0-_SDA_BASE_(r13)
-/* 802F5194 002F0DF4 4E 80 00 20 */ blr
-
-.global func_802F5198
-func_802F5198:
-/* 802F5198 002F0DF8 4B FF 84 90 */ b NCDiGetWirelessMacAddress
diff --git a/asm/SDK/NET/wireless_macaddr.s b/asm/SDK/NET/wireless_macaddr.s
new file mode 100644
index 0000000..b4d563c
--- /dev/null
+++ b/asm/SDK/NET/wireless_macaddr.s
@@ -0,0 +1,7 @@
+.include "macros.inc"
+
+.section .text, "ax" # 0x80006980 - 0x803E1E60
+
+.global NETGetWirelessMacAddress
+NETGetWirelessMacAddress:
+/* 802F5198 002F0DF8 4B FF 84 90 */ b NCDiGetWirelessMacAddress
diff --git a/asm/text_10.s b/asm/text_10.s
index 38ea1e7..f1ecf31 100644
--- a/asm/text_10.s
+++ b/asm/text_10.s
@@ -13827,7 +13827,7 @@ lbl_80335014:
/* 80335098 00330CF8 38 8D 8E AC */ addi r4, r13, lbl_8063E16C-_SDA_BASE_
/* 8033509C 00330CFC 4B FC A1 9D */ bl func_802FF238
/* 803350A0 00330D00 38 61 00 18 */ addi r3, r1, 0x18
-/* 803350A4 00330D04 4B FC 00 F5 */ bl func_802F5198
+/* 803350A4 00330D04 4B FC 00 F5 */ bl NETGetWirelessMacAddress
/* 803350A8 00330D08 88 A1 00 18 */ lbz r5, 0x18(r1)
/* 803350AC 00330D0C 38 61 00 88 */ addi r3, r1, 0x88
/* 803350B0 00330D10 88 C1 00 19 */ lbz r6, 0x19(r1)
diff --git a/asm/text_4.s b/asm/text_4.s
index 080986f..b2ed901 100644
--- a/asm/text_4.s
+++ b/asm/text_4.s
@@ -38168,7 +38168,7 @@ func_8013B094:
/* 8013B0E0 00136D40 38 61 00 08 */ addi r3, r1, 8
/* 8013B0E4 00136D44 7C 00 C3 78 */ or r0, r0, r24
/* 8013B0E8 00136D48 54 1E 04 3E */ clrlwi r30, r0, 0x10
-/* 8013B0EC 00136D4C 48 1B A0 AD */ bl func_802F5198
+/* 8013B0EC 00136D4C 48 1B A0 AD */ bl NETGetWirelessMacAddress
/* 8013B0F0 00136D50 A1 01 00 08 */ lhz r8, 8(r1)
/* 8013B0F4 00136D54 38 A1 00 08 */ addi r5, r1, 8
/* 8013B0F8 00136D58 A0 C1 00 0A */ lhz r6, 0xa(r1)
diff --git a/asm/text_7.s b/asm/text_7.s
index 0e81d70..65bb873 100644
--- a/asm/text_7.s
+++ b/asm/text_7.s
@@ -76352,10 +76352,10 @@ lbl_80264870:
/* 80264874 002604D4 90 03 33 8C */ stw r0, 0x338c(r3)
/* 80264878 002604D8 4B FF 75 25 */ bl func_8025BD9C
/* 8026487C 002604DC 7C 7F 1B 78 */ mr r31, r3
-/* 80264880 002604E0 48 09 04 99 */ bl func_802F4D18
+/* 80264880 002604E0 48 09 04 99 */ bl NETGetConnectionType
/* 80264884 002604E4 7C 64 1B 78 */ mr r4, r3
/* 80264888 002604E8 7F E3 FB 78 */ mr r3, r31
-/* 8026488C 002604EC 48 09 07 5D */ bl func_802F4FE8
+/* 8026488C 002604EC 48 09 07 5D */ bl NETGetStartupErrorCodeEx
/* 80264890 002604F0 7C 64 1B 78 */ mr r4, r3
/* 80264894 002604F4 7F C3 F3 78 */ mr r3, r30
/* 80264898 002604F8 48 00 26 A5 */ bl func_80266F3C
diff --git a/asm/text_9_2.s b/asm/text_9_2.s
index dce8657..33e45db 100644
--- a/asm/text_9_2.s
+++ b/asm/text_9_2.s
@@ -46342,7 +46342,7 @@ func_8031F02C:
/* 8031F078 0031ACD8 7C 60 03 79 */ or. r0, r3, r0
/* 8031F07C 0031ACDC 40 82 00 78 */ bne lbl_8031F0F4
/* 8031F080 0031ACE0 38 61 00 08 */ addi r3, r1, 8
-/* 8031F084 0031ACE4 4B FD 61 15 */ bl func_802F5198
+/* 8031F084 0031ACE4 4B FD 61 15 */ bl NETGetWirelessMacAddress
/* 8031F088 0031ACE8 4B F5 37 31 */ bl OSGetTime
/* 8031F08C 0031ACEC 80 C1 00 0C */ lwz r6, 0xc(r1)
/* 8031F090 0031ACF0 3C A0 01 00 */ lis r5, 0x00FFFFFF@ha
diff --git a/obj_files.mk b/obj_files.mk
index 88ccfa7..f79922c 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -327,7 +327,10 @@ TEXT_O_FILES := \
$(BUILD_DIR)/asm/SDK/MP/mpport.o \
$(BUILD_DIR)/asm/SDK/MP/mpbeacon.o \
$(BUILD_DIR)/asm/SDK/MPDL/mpdlsystem.o \
- $(BUILD_DIR)/asm/text_9.o \
+ $(BUILD_DIR)/asm/SDK/NET/neterrorcode.o \
+ $(BUILD_DIR)/asm/SDK/NET/neterrorcode.o \
+ $(BUILD_DIR)/asm/SDK/NET/NETVersion.o \
+ $(BUILD_DIR)/asm/SDK/NET/wireless_macaddr.o \
$(BUILD_DIR)/asm/SDK/SO/SOCommon.o \
$(BUILD_DIR)/asm/SDK/SO/SOBasic.o \
$(BUILD_DIR)/asm/SDK/SO/SOInformation.o \
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 01:39:22 +0000