From 2c29f55355efded5b3e9fad2fb6001b747a7e353 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 9 Oct 2020 13:50:29 -0400 Subject: split NET NETVersion, neterrorcode, and wireless_macaddr (NET library) --- Makefile | 4 +- asm/SDK/NET/NETVersion.s | 7 + asm/SDK/NET/neterrorcode.s | 352 ++++++++++++++++++++++++++++++++++++++++ asm/SDK/NET/wireless_macaddr.s | 7 + asm/text_10.s | 2 +- asm/text_4.s | 2 +- asm/text_7.s | 4 +- asm/text_9.s | 358 ----------------------------------------- asm/text_9_2.s | 2 +- obj_files.mk | 5 +- 10 files changed, 377 insertions(+), 366 deletions(-) create mode 100644 asm/SDK/NET/NETVersion.s create mode 100644 asm/SDK/NET/neterrorcode.s create mode 100644 asm/SDK/NET/wireless_macaddr.s delete mode 100644 asm/text_9.s 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/SDK/NET/neterrorcode.s b/asm/SDK/NET/neterrorcode.s new file mode 100644 index 0000000..3ecf04e --- /dev/null +++ b/asm/SDK/NET/neterrorcode.s @@ -0,0 +1,352 @@ +.include "macros.inc" + +.section .text, "ax" # 0x80006980 - 0x803E1E60 + +.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) +/* 802F4D24 002F0984 38 61 00 10 */ addi r3, r1, 0x10 +/* 802F4D28 002F0988 38 81 00 0C */ addi r4, r1, 0xc +/* 802F4D2C 002F098C 38 A1 00 08 */ addi r5, r1, 8 +/* 802F4D30 002F0990 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 802F4D34 002F0994 3B E0 00 63 */ li r31, 0x63 +/* 802F4D38 002F0998 4B FF 8C 25 */ bl NCDiGetEnabledConfigList +/* 802F4D3C 002F099C 2C 03 00 00 */ cmpwi r3, 0 +/* 802F4D40 002F09A0 41 80 00 18 */ blt lbl_802F4D58 +/* 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 NETiGetConnectionTypeFromConfigList +/* 802F4D54 002F09B4 7C 7F 1B 78 */ mr r31, r3 +lbl_802F4D58: +/* 802F4D58 002F09B8 7F E3 FB 78 */ mr r3, r31 +/* 802F4D5C 002F09BC 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 802F4D60 002F09C0 80 01 00 24 */ lwz r0, 0x24(r1) +/* 802F4D64 002F09C4 7C 08 03 A6 */ mtlr r0 +/* 802F4D68 002F09C8 38 21 00 20 */ addi r1, r1, 0x20 +/* 802F4D6C 002F09CC 4E 80 00 20 */ blr + +.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 +/* 802F4D7C 002F09DC 2C 04 00 00 */ cmpwi r4, 0 +/* 802F4D80 002F09E0 40 82 02 60 */ bne lbl_802F4FE0 +/* 802F4D84 002F09E4 2C 05 00 00 */ cmpwi r5, 0 +/* 802F4D88 002F09E8 40 82 02 58 */ bne lbl_802F4FE0 +/* 802F4D8C 002F09EC 38 00 00 04 */ li r0, 4 +/* 802F4D90 002F09F0 38 A0 00 00 */ li r5, 0 +/* 802F4D94 002F09F4 38 80 00 01 */ li r4, 1 +/* 802F4D98 002F09F8 7C 09 03 A6 */ mtctr r0 +lbl_802F4D9C: +/* 802F4D9C 002F09FC 7C 60 20 39 */ and. r0, r3, r4 +/* 802F4DA0 002F0A00 41 82 00 08 */ beq lbl_802F4DA8 +/* 802F4DA4 002F0A04 48 00 00 A0 */ b lbl_802F4E44 +lbl_802F4DA8: +/* 802F4DA8 002F0A08 54 84 08 3C */ slwi r4, r4, 1 +/* 802F4DAC 002F0A0C 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4DB0 002F0A10 7C 60 20 39 */ and. r0, r3, r4 +/* 802F4DB4 002F0A14 41 82 00 08 */ beq lbl_802F4DBC +/* 802F4DB8 002F0A18 48 00 00 8C */ b lbl_802F4E44 +lbl_802F4DBC: +/* 802F4DBC 002F0A1C 54 84 08 3C */ slwi r4, r4, 1 +/* 802F4DC0 002F0A20 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4DC4 002F0A24 7C 60 20 39 */ and. r0, r3, r4 +/* 802F4DC8 002F0A28 41 82 00 08 */ beq lbl_802F4DD0 +/* 802F4DCC 002F0A2C 48 00 00 78 */ b lbl_802F4E44 +lbl_802F4DD0: +/* 802F4DD0 002F0A30 54 84 08 3C */ slwi r4, r4, 1 +/* 802F4DD4 002F0A34 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4DD8 002F0A38 7C 60 20 39 */ and. r0, r3, r4 +/* 802F4DDC 002F0A3C 41 82 00 08 */ beq lbl_802F4DE4 +/* 802F4DE0 002F0A40 48 00 00 64 */ b lbl_802F4E44 +lbl_802F4DE4: +/* 802F4DE4 002F0A44 54 84 08 3C */ slwi r4, r4, 1 +/* 802F4DE8 002F0A48 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4DEC 002F0A4C 7C 60 20 39 */ and. r0, r3, r4 +/* 802F4DF0 002F0A50 41 82 00 08 */ beq lbl_802F4DF8 +/* 802F4DF4 002F0A54 48 00 00 50 */ b lbl_802F4E44 +lbl_802F4DF8: +/* 802F4DF8 002F0A58 54 84 08 3C */ slwi r4, r4, 1 +/* 802F4DFC 002F0A5C 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4E00 002F0A60 7C 60 20 39 */ and. r0, r3, r4 +/* 802F4E04 002F0A64 41 82 00 08 */ beq lbl_802F4E0C +/* 802F4E08 002F0A68 48 00 00 3C */ b lbl_802F4E44 +lbl_802F4E0C: +/* 802F4E0C 002F0A6C 54 84 08 3C */ slwi r4, r4, 1 +/* 802F4E10 002F0A70 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4E14 002F0A74 7C 60 20 39 */ and. r0, r3, r4 +/* 802F4E18 002F0A78 41 82 00 08 */ beq lbl_802F4E20 +/* 802F4E1C 002F0A7C 48 00 00 28 */ b lbl_802F4E44 +lbl_802F4E20: +/* 802F4E20 002F0A80 54 84 08 3C */ slwi r4, r4, 1 +/* 802F4E24 002F0A84 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4E28 002F0A88 7C 60 20 39 */ and. r0, r3, r4 +/* 802F4E2C 002F0A8C 41 82 00 08 */ beq lbl_802F4E34 +/* 802F4E30 002F0A90 48 00 00 14 */ b lbl_802F4E44 +lbl_802F4E34: +/* 802F4E34 002F0A94 54 84 08 3C */ slwi r4, r4, 1 +/* 802F4E38 002F0A98 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4E3C 002F0A9C 42 00 FF 60 */ bdnz lbl_802F4D9C +/* 802F4E40 002F0AA0 38 A0 FF FF */ li r5, -1 +lbl_802F4E44: +/* 802F4E44 002F0AA4 38 05 00 14 */ addi r0, r5, 0x14 +/* 802F4E48 002F0AA8 48 00 01 98 */ b lbl_802F4FE0 +lbl_802F4E4C: +/* 802F4E4C 002F0AAC 2C 04 00 00 */ cmpwi r4, 0 +/* 802F4E50 002F0AB0 41 82 00 CC */ beq lbl_802F4F1C +/* 802F4E54 002F0AB4 2C 05 00 00 */ cmpwi r5, 0 +/* 802F4E58 002F0AB8 40 82 01 88 */ bne lbl_802F4FE0 +/* 802F4E5C 002F0ABC 38 00 00 04 */ li r0, 4 +/* 802F4E60 002F0AC0 38 A0 00 00 */ li r5, 0 +/* 802F4E64 002F0AC4 38 60 00 01 */ li r3, 1 +/* 802F4E68 002F0AC8 7C 09 03 A6 */ mtctr r0 +lbl_802F4E6C: +/* 802F4E6C 002F0ACC 7C 80 18 39 */ and. r0, r4, r3 +/* 802F4E70 002F0AD0 41 82 00 08 */ beq lbl_802F4E78 +/* 802F4E74 002F0AD4 48 00 00 A0 */ b lbl_802F4F14 +lbl_802F4E78: +/* 802F4E78 002F0AD8 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4E7C 002F0ADC 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4E80 002F0AE0 7C 80 18 39 */ and. r0, r4, r3 +/* 802F4E84 002F0AE4 41 82 00 08 */ beq lbl_802F4E8C +/* 802F4E88 002F0AE8 48 00 00 8C */ b lbl_802F4F14 +lbl_802F4E8C: +/* 802F4E8C 002F0AEC 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4E90 002F0AF0 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4E94 002F0AF4 7C 80 18 39 */ and. r0, r4, r3 +/* 802F4E98 002F0AF8 41 82 00 08 */ beq lbl_802F4EA0 +/* 802F4E9C 002F0AFC 48 00 00 78 */ b lbl_802F4F14 +lbl_802F4EA0: +/* 802F4EA0 002F0B00 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4EA4 002F0B04 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4EA8 002F0B08 7C 80 18 39 */ and. r0, r4, r3 +/* 802F4EAC 002F0B0C 41 82 00 08 */ beq lbl_802F4EB4 +/* 802F4EB0 002F0B10 48 00 00 64 */ b lbl_802F4F14 +lbl_802F4EB4: +/* 802F4EB4 002F0B14 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4EB8 002F0B18 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4EBC 002F0B1C 7C 80 18 39 */ and. r0, r4, r3 +/* 802F4EC0 002F0B20 41 82 00 08 */ beq lbl_802F4EC8 +/* 802F4EC4 002F0B24 48 00 00 50 */ b lbl_802F4F14 +lbl_802F4EC8: +/* 802F4EC8 002F0B28 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4ECC 002F0B2C 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4ED0 002F0B30 7C 80 18 39 */ and. r0, r4, r3 +/* 802F4ED4 002F0B34 41 82 00 08 */ beq lbl_802F4EDC +/* 802F4ED8 002F0B38 48 00 00 3C */ b lbl_802F4F14 +lbl_802F4EDC: +/* 802F4EDC 002F0B3C 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4EE0 002F0B40 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4EE4 002F0B44 7C 80 18 39 */ and. r0, r4, r3 +/* 802F4EE8 002F0B48 41 82 00 08 */ beq lbl_802F4EF0 +/* 802F4EEC 002F0B4C 48 00 00 28 */ b lbl_802F4F14 +lbl_802F4EF0: +/* 802F4EF0 002F0B50 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4EF4 002F0B54 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4EF8 002F0B58 7C 80 18 39 */ and. r0, r4, r3 +/* 802F4EFC 002F0B5C 41 82 00 08 */ beq lbl_802F4F04 +/* 802F4F00 002F0B60 48 00 00 14 */ b lbl_802F4F14 +lbl_802F4F04: +/* 802F4F04 002F0B64 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4F08 002F0B68 38 A5 00 01 */ addi r5, r5, 1 +/* 802F4F0C 002F0B6C 42 00 FF 60 */ bdnz lbl_802F4E6C +/* 802F4F10 002F0B70 38 A0 FF FF */ li r5, -1 +lbl_802F4F14: +/* 802F4F14 002F0B74 38 05 00 1E */ addi r0, r5, 0x1e +/* 802F4F18 002F0B78 48 00 00 C8 */ b lbl_802F4FE0 +lbl_802F4F1C: +/* 802F4F1C 002F0B7C 2C 05 00 00 */ cmpwi r5, 0 +/* 802F4F20 002F0B80 41 82 00 C0 */ beq lbl_802F4FE0 +/* 802F4F24 002F0B84 38 00 00 04 */ li r0, 4 +/* 802F4F28 002F0B88 38 80 00 00 */ li r4, 0 +/* 802F4F2C 002F0B8C 38 60 00 01 */ li r3, 1 +/* 802F4F30 002F0B90 7C 09 03 A6 */ mtctr r0 +lbl_802F4F34: +/* 802F4F34 002F0B94 7C A0 18 39 */ and. r0, r5, r3 +/* 802F4F38 002F0B98 41 82 00 08 */ beq lbl_802F4F40 +/* 802F4F3C 002F0B9C 48 00 00 A0 */ b lbl_802F4FDC +lbl_802F4F40: +/* 802F4F40 002F0BA0 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4F44 002F0BA4 38 84 00 01 */ addi r4, r4, 1 +/* 802F4F48 002F0BA8 7C A0 18 39 */ and. r0, r5, r3 +/* 802F4F4C 002F0BAC 41 82 00 08 */ beq lbl_802F4F54 +/* 802F4F50 002F0BB0 48 00 00 8C */ b lbl_802F4FDC +lbl_802F4F54: +/* 802F4F54 002F0BB4 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4F58 002F0BB8 38 84 00 01 */ addi r4, r4, 1 +/* 802F4F5C 002F0BBC 7C A0 18 39 */ and. r0, r5, r3 +/* 802F4F60 002F0BC0 41 82 00 08 */ beq lbl_802F4F68 +/* 802F4F64 002F0BC4 48 00 00 78 */ b lbl_802F4FDC +lbl_802F4F68: +/* 802F4F68 002F0BC8 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4F6C 002F0BCC 38 84 00 01 */ addi r4, r4, 1 +/* 802F4F70 002F0BD0 7C A0 18 39 */ and. r0, r5, r3 +/* 802F4F74 002F0BD4 41 82 00 08 */ beq lbl_802F4F7C +/* 802F4F78 002F0BD8 48 00 00 64 */ b lbl_802F4FDC +lbl_802F4F7C: +/* 802F4F7C 002F0BDC 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4F80 002F0BE0 38 84 00 01 */ addi r4, r4, 1 +/* 802F4F84 002F0BE4 7C A0 18 39 */ and. r0, r5, r3 +/* 802F4F88 002F0BE8 41 82 00 08 */ beq lbl_802F4F90 +/* 802F4F8C 002F0BEC 48 00 00 50 */ b lbl_802F4FDC +lbl_802F4F90: +/* 802F4F90 002F0BF0 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4F94 002F0BF4 38 84 00 01 */ addi r4, r4, 1 +/* 802F4F98 002F0BF8 7C A0 18 39 */ and. r0, r5, r3 +/* 802F4F9C 002F0BFC 41 82 00 08 */ beq lbl_802F4FA4 +/* 802F4FA0 002F0C00 48 00 00 3C */ b lbl_802F4FDC +lbl_802F4FA4: +/* 802F4FA4 002F0C04 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4FA8 002F0C08 38 84 00 01 */ addi r4, r4, 1 +/* 802F4FAC 002F0C0C 7C A0 18 39 */ and. r0, r5, r3 +/* 802F4FB0 002F0C10 41 82 00 08 */ beq lbl_802F4FB8 +/* 802F4FB4 002F0C14 48 00 00 28 */ b lbl_802F4FDC +lbl_802F4FB8: +/* 802F4FB8 002F0C18 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4FBC 002F0C1C 38 84 00 01 */ addi r4, r4, 1 +/* 802F4FC0 002F0C20 7C A0 18 39 */ and. r0, r5, r3 +/* 802F4FC4 002F0C24 41 82 00 08 */ beq lbl_802F4FCC +/* 802F4FC8 002F0C28 48 00 00 14 */ b lbl_802F4FDC +lbl_802F4FCC: +/* 802F4FCC 002F0C2C 54 63 08 3C */ slwi r3, r3, 1 +/* 802F4FD0 002F0C30 38 84 00 01 */ addi r4, r4, 1 +/* 802F4FD4 002F0C34 42 00 FF 60 */ bdnz lbl_802F4F34 +/* 802F4FD8 002F0C38 38 80 FF FF */ li r4, -1 +lbl_802F4FDC: +/* 802F4FDC 002F0C3C 38 04 00 28 */ addi r0, r4, 0x28 +lbl_802F4FE0: +/* 802F4FE0 002F0C40 7C 03 03 78 */ mr r3, r0 +/* 802F4FE4 002F0C44 4E 80 00 20 */ blr + +.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 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) +/* 802F500C 002F0C6C 7C 08 03 A6 */ mtlr r0 +/* 802F5010 002F0C70 38 21 00 10 */ addi r1, r1, 0x10 +/* 802F5014 002F0C74 4E 80 00 20 */ blr + +.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 +/* 802F5024 002F0C84 7C 65 1B 78 */ mr r5, r3 +/* 802F5028 002F0C88 90 01 00 14 */ stw r0, 0x14(r1) +/* 802F502C 002F0C8C 41 80 00 0C */ blt lbl_802F5038 +/* 802F5030 002F0C90 38 60 00 00 */ li r3, 0 +/* 802F5034 002F0C94 48 00 01 4C */ b lbl_802F5180 +lbl_802F5038: +/* 802F5038 002F0C98 2C 03 FF C2 */ cmpwi r3, -62 +/* 802F503C 002F0C9C 41 82 00 A8 */ beq lbl_802F50E4 +/* 802F5040 002F0CA0 40 80 00 5C */ bge lbl_802F509C +/* 802F5044 002F0CA4 2C 03 FF 91 */ cmpwi r3, -111 +/* 802F5048 002F0CA8 41 82 00 A8 */ beq lbl_802F50F0 +/* 802F504C 002F0CAC 40 80 00 30 */ bge lbl_802F507C +/* 802F5050 002F0CB0 2C 03 FF 87 */ cmpwi r3, -121 +/* 802F5054 002F0CB4 41 82 00 A8 */ beq lbl_802F50FC +/* 802F5058 002F0CB8 40 80 00 18 */ bge lbl_802F5070 +/* 802F505C 002F0CBC 3C 80 80 00 */ lis r4, 0x80000001@ha +/* 802F5060 002F0CC0 38 04 00 01 */ addi r0, r4, 0x80000001@l +/* 802F5064 002F0CC4 7C 03 00 00 */ cmpw r3, r0 +/* 802F5068 002F0CC8 40 80 00 FC */ bge lbl_802F5164 +/* 802F506C 002F0CCC 48 00 00 EC */ b lbl_802F5158 +lbl_802F5070: +/* 802F5070 002F0CD0 2C 03 FF 90 */ cmpwi r3, -112 +/* 802F5074 002F0CD4 40 80 00 B0 */ bge lbl_802F5124 +/* 802F5078 002F0CD8 48 00 00 EC */ b lbl_802F5164 +lbl_802F507C: +/* 802F507C 002F0CDC 2C 03 FF B4 */ cmpwi r3, -76 +/* 802F5080 002F0CE0 41 82 00 A4 */ beq lbl_802F5124 +/* 802F5084 002F0CE4 40 80 00 E0 */ bge lbl_802F5164 +/* 802F5088 002F0CE8 2C 03 FF 9D */ cmpwi r3, -99 +/* 802F508C 002F0CEC 40 80 00 D8 */ bge lbl_802F5164 +/* 802F5090 002F0CF0 2C 03 FF 9A */ cmpwi r3, -102 +/* 802F5094 002F0CF4 40 80 00 B8 */ bge lbl_802F514C +/* 802F5098 002F0CF8 48 00 00 CC */ b lbl_802F5164 +lbl_802F509C: +/* 802F509C 002F0CFC 2C 03 FF D9 */ cmpwi r3, -39 +/* 802F50A0 002F0D00 41 82 00 84 */ beq lbl_802F5124 +/* 802F50A4 002F0D04 40 80 00 1C */ bge lbl_802F50C0 +/* 802F50A8 002F0D08 2C 03 FF D3 */ cmpwi r3, -45 +/* 802F50AC 002F0D0C 41 82 00 20 */ beq lbl_802F50CC +/* 802F50B0 002F0D10 40 80 00 B4 */ bge lbl_802F5164 +/* 802F50B4 002F0D14 2C 03 FF D0 */ cmpwi r3, -48 +/* 802F50B8 002F0D18 41 82 00 6C */ beq lbl_802F5124 +/* 802F50BC 002F0D1C 48 00 00 A8 */ b lbl_802F5164 +lbl_802F50C0: +/* 802F50C0 002F0D20 2C 03 FF E4 */ cmpwi r3, -28 +/* 802F50C4 002F0D24 41 82 00 14 */ beq lbl_802F50D8 +/* 802F50C8 002F0D28 48 00 00 9C */ b lbl_802F5164 +lbl_802F50CC: +/* 802F50CC 002F0D2C 3C 60 FF FF */ lis r3, 0xFFFF3BE8@ha +/* 802F50D0 002F0D30 38 63 3B E8 */ addi r3, r3, 0xFFFF3BE8@l +/* 802F50D4 002F0D34 48 00 00 AC */ b lbl_802F5180 +lbl_802F50D8: +/* 802F50D8 002F0D38 3C 60 FF FF */ lis r3, 0xFFFF3B84@ha +/* 802F50DC 002F0D3C 38 63 3B 84 */ addi r3, r3, 0xFFFF3B84@l +/* 802F50E0 002F0D40 48 00 00 A0 */ b lbl_802F5180 +lbl_802F50E4: +/* 802F50E4 002F0D44 3C 60 FF FF */ lis r3, 0xFFFF3B20@ha +/* 802F50E8 002F0D48 38 63 3B 20 */ addi r3, r3, 0xFFFF3B20@l +/* 802F50EC 002F0D4C 48 00 00 94 */ b lbl_802F5180 +lbl_802F50F0: +/* 802F50F0 002F0D50 3C 60 FF FF */ lis r3, 0xFFFF3224@ha +/* 802F50F4 002F0D54 38 63 32 24 */ addi r3, r3, 0xFFFF3224@l +/* 802F50F8 002F0D58 48 00 00 88 */ b lbl_802F5180 +lbl_802F50FC: +/* 802F50FC 002F0D5C 2C 04 00 14 */ cmpwi r4, 0x14 +/* 802F5100 002F0D60 41 80 00 18 */ blt lbl_802F5118 +/* 802F5104 002F0D64 2C 04 00 1E */ cmpwi r4, 0x1e +/* 802F5108 002F0D68 40 80 00 10 */ bge lbl_802F5118 +/* 802F510C 002F0D6C 3C 60 FF FF */ lis r3, 0xFFFF3738@ha +/* 802F5110 002F0D70 38 63 37 38 */ addi r3, r3, 0xFFFF3738@l +/* 802F5114 002F0D74 48 00 00 6C */ b lbl_802F5180 +lbl_802F5118: +/* 802F5118 002F0D78 3C 60 FF FF */ lis r3, 0xFFFF38C8@ha +/* 802F511C 002F0D7C 38 63 38 C8 */ addi r3, r3, 0xFFFF38C8@l +/* 802F5120 002F0D80 48 00 00 60 */ b lbl_802F5180 +lbl_802F5124: +/* 802F5124 002F0D84 2C 04 00 14 */ cmpwi r4, 0x14 +/* 802F5128 002F0D88 41 80 00 18 */ blt lbl_802F5140 +/* 802F512C 002F0D8C 2C 04 00 1E */ cmpwi r4, 0x1e +/* 802F5130 002F0D90 40 80 00 10 */ bge lbl_802F5140 +/* 802F5134 002F0D94 3C 60 FF FF */ lis r3, 0xFFFF3738@ha +/* 802F5138 002F0D98 38 63 37 38 */ addi r3, r3, 0xFFFF3738@l +/* 802F513C 002F0D9C 48 00 00 44 */ b lbl_802F5180 +lbl_802F5140: +/* 802F5140 002F0DA0 3C 60 FF FF */ lis r3, 0xFFFF379C@ha +/* 802F5144 002F0DA4 38 63 37 9C */ addi r3, r3, 0xFFFF379C@l +/* 802F5148 002F0DA8 48 00 00 38 */ b lbl_802F5180 +lbl_802F514C: +/* 802F514C 002F0DAC 3C 60 FF FF */ lis r3, 0xFFFF34E0@ha +/* 802F5150 002F0DB0 38 63 34 E0 */ addi r3, r3, 0xFFFF34E0@l +/* 802F5154 002F0DB4 48 00 00 2C */ b lbl_802F5180 +lbl_802F5158: +/* 802F5158 002F0DB8 3C 60 FF FF */ lis r3, 0xFFFF3C4C@ha +/* 802F515C 002F0DBC 38 63 3C 4C */ addi r3, r3, 0xFFFF3C4C@l +/* 802F5160 002F0DC0 48 00 00 20 */ b lbl_802F5180 +lbl_802F5164: +/* 802F5164 002F0DC4 3C 60 80 44 */ lis r3, lbl_80445DA0@ha +/* 802F5168 002F0DC8 7C A4 2B 78 */ mr r4, r5 +/* 802F516C 002F0DCC 38 63 5D A0 */ addi r3, r3, lbl_80445DA0@l +/* 802F5170 002F0DD0 4C C6 31 82 */ crclr 6 +/* 802F5174 002F0DD4 4B D1 29 51 */ bl func_80007AC4 +/* 802F5178 002F0DD8 3C 60 FF FF */ lis r3, 0xFFFF3C4C@ha +/* 802F517C 002F0DDC 38 63 3C 4C */ addi r3, r3, 0xFFFF3C4C@l +lbl_802F5180: +/* 802F5180 002F0DE0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 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 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.s b/asm/text_9.s deleted file mode 100644 index c6df596..0000000 --- a/asm/text_9.s +++ /dev/null @@ -1,358 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 0x80006980 - 0x803E1E60 - -.global func_802F4D18 -func_802F4D18: -/* 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) -/* 802F4D24 002F0984 38 61 00 10 */ addi r3, r1, 0x10 -/* 802F4D28 002F0988 38 81 00 0C */ addi r4, r1, 0xc -/* 802F4D2C 002F098C 38 A1 00 08 */ addi r5, r1, 8 -/* 802F4D30 002F0990 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802F4D34 002F0994 3B E0 00 63 */ li r31, 0x63 -/* 802F4D38 002F0998 4B FF 8C 25 */ bl NCDiGetEnabledConfigList -/* 802F4D3C 002F099C 2C 03 00 00 */ cmpwi r3, 0 -/* 802F4D40 002F09A0 41 80 00 18 */ blt lbl_802F4D58 -/* 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 -/* 802F4D54 002F09B4 7C 7F 1B 78 */ mr r31, r3 -lbl_802F4D58: -/* 802F4D58 002F09B8 7F E3 FB 78 */ mr r3, r31 -/* 802F4D5C 002F09BC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802F4D60 002F09C0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F4D64 002F09C4 7C 08 03 A6 */ mtlr r0 -/* 802F4D68 002F09C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F4D6C 002F09CC 4E 80 00 20 */ blr - -.global func_802F4D70 -func_802F4D70: -/* 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 -/* 802F4D7C 002F09DC 2C 04 00 00 */ cmpwi r4, 0 -/* 802F4D80 002F09E0 40 82 02 60 */ bne lbl_802F4FE0 -/* 802F4D84 002F09E4 2C 05 00 00 */ cmpwi r5, 0 -/* 802F4D88 002F09E8 40 82 02 58 */ bne lbl_802F4FE0 -/* 802F4D8C 002F09EC 38 00 00 04 */ li r0, 4 -/* 802F4D90 002F09F0 38 A0 00 00 */ li r5, 0 -/* 802F4D94 002F09F4 38 80 00 01 */ li r4, 1 -/* 802F4D98 002F09F8 7C 09 03 A6 */ mtctr r0 -lbl_802F4D9C: -/* 802F4D9C 002F09FC 7C 60 20 39 */ and. r0, r3, r4 -/* 802F4DA0 002F0A00 41 82 00 08 */ beq lbl_802F4DA8 -/* 802F4DA4 002F0A04 48 00 00 A0 */ b lbl_802F4E44 -lbl_802F4DA8: -/* 802F4DA8 002F0A08 54 84 08 3C */ slwi r4, r4, 1 -/* 802F4DAC 002F0A0C 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4DB0 002F0A10 7C 60 20 39 */ and. r0, r3, r4 -/* 802F4DB4 002F0A14 41 82 00 08 */ beq lbl_802F4DBC -/* 802F4DB8 002F0A18 48 00 00 8C */ b lbl_802F4E44 -lbl_802F4DBC: -/* 802F4DBC 002F0A1C 54 84 08 3C */ slwi r4, r4, 1 -/* 802F4DC0 002F0A20 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4DC4 002F0A24 7C 60 20 39 */ and. r0, r3, r4 -/* 802F4DC8 002F0A28 41 82 00 08 */ beq lbl_802F4DD0 -/* 802F4DCC 002F0A2C 48 00 00 78 */ b lbl_802F4E44 -lbl_802F4DD0: -/* 802F4DD0 002F0A30 54 84 08 3C */ slwi r4, r4, 1 -/* 802F4DD4 002F0A34 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4DD8 002F0A38 7C 60 20 39 */ and. r0, r3, r4 -/* 802F4DDC 002F0A3C 41 82 00 08 */ beq lbl_802F4DE4 -/* 802F4DE0 002F0A40 48 00 00 64 */ b lbl_802F4E44 -lbl_802F4DE4: -/* 802F4DE4 002F0A44 54 84 08 3C */ slwi r4, r4, 1 -/* 802F4DE8 002F0A48 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4DEC 002F0A4C 7C 60 20 39 */ and. r0, r3, r4 -/* 802F4DF0 002F0A50 41 82 00 08 */ beq lbl_802F4DF8 -/* 802F4DF4 002F0A54 48 00 00 50 */ b lbl_802F4E44 -lbl_802F4DF8: -/* 802F4DF8 002F0A58 54 84 08 3C */ slwi r4, r4, 1 -/* 802F4DFC 002F0A5C 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4E00 002F0A60 7C 60 20 39 */ and. r0, r3, r4 -/* 802F4E04 002F0A64 41 82 00 08 */ beq lbl_802F4E0C -/* 802F4E08 002F0A68 48 00 00 3C */ b lbl_802F4E44 -lbl_802F4E0C: -/* 802F4E0C 002F0A6C 54 84 08 3C */ slwi r4, r4, 1 -/* 802F4E10 002F0A70 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4E14 002F0A74 7C 60 20 39 */ and. r0, r3, r4 -/* 802F4E18 002F0A78 41 82 00 08 */ beq lbl_802F4E20 -/* 802F4E1C 002F0A7C 48 00 00 28 */ b lbl_802F4E44 -lbl_802F4E20: -/* 802F4E20 002F0A80 54 84 08 3C */ slwi r4, r4, 1 -/* 802F4E24 002F0A84 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4E28 002F0A88 7C 60 20 39 */ and. r0, r3, r4 -/* 802F4E2C 002F0A8C 41 82 00 08 */ beq lbl_802F4E34 -/* 802F4E30 002F0A90 48 00 00 14 */ b lbl_802F4E44 -lbl_802F4E34: -/* 802F4E34 002F0A94 54 84 08 3C */ slwi r4, r4, 1 -/* 802F4E38 002F0A98 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4E3C 002F0A9C 42 00 FF 60 */ bdnz lbl_802F4D9C -/* 802F4E40 002F0AA0 38 A0 FF FF */ li r5, -1 -lbl_802F4E44: -/* 802F4E44 002F0AA4 38 05 00 14 */ addi r0, r5, 0x14 -/* 802F4E48 002F0AA8 48 00 01 98 */ b lbl_802F4FE0 -lbl_802F4E4C: -/* 802F4E4C 002F0AAC 2C 04 00 00 */ cmpwi r4, 0 -/* 802F4E50 002F0AB0 41 82 00 CC */ beq lbl_802F4F1C -/* 802F4E54 002F0AB4 2C 05 00 00 */ cmpwi r5, 0 -/* 802F4E58 002F0AB8 40 82 01 88 */ bne lbl_802F4FE0 -/* 802F4E5C 002F0ABC 38 00 00 04 */ li r0, 4 -/* 802F4E60 002F0AC0 38 A0 00 00 */ li r5, 0 -/* 802F4E64 002F0AC4 38 60 00 01 */ li r3, 1 -/* 802F4E68 002F0AC8 7C 09 03 A6 */ mtctr r0 -lbl_802F4E6C: -/* 802F4E6C 002F0ACC 7C 80 18 39 */ and. r0, r4, r3 -/* 802F4E70 002F0AD0 41 82 00 08 */ beq lbl_802F4E78 -/* 802F4E74 002F0AD4 48 00 00 A0 */ b lbl_802F4F14 -lbl_802F4E78: -/* 802F4E78 002F0AD8 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4E7C 002F0ADC 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4E80 002F0AE0 7C 80 18 39 */ and. r0, r4, r3 -/* 802F4E84 002F0AE4 41 82 00 08 */ beq lbl_802F4E8C -/* 802F4E88 002F0AE8 48 00 00 8C */ b lbl_802F4F14 -lbl_802F4E8C: -/* 802F4E8C 002F0AEC 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4E90 002F0AF0 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4E94 002F0AF4 7C 80 18 39 */ and. r0, r4, r3 -/* 802F4E98 002F0AF8 41 82 00 08 */ beq lbl_802F4EA0 -/* 802F4E9C 002F0AFC 48 00 00 78 */ b lbl_802F4F14 -lbl_802F4EA0: -/* 802F4EA0 002F0B00 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4EA4 002F0B04 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4EA8 002F0B08 7C 80 18 39 */ and. r0, r4, r3 -/* 802F4EAC 002F0B0C 41 82 00 08 */ beq lbl_802F4EB4 -/* 802F4EB0 002F0B10 48 00 00 64 */ b lbl_802F4F14 -lbl_802F4EB4: -/* 802F4EB4 002F0B14 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4EB8 002F0B18 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4EBC 002F0B1C 7C 80 18 39 */ and. r0, r4, r3 -/* 802F4EC0 002F0B20 41 82 00 08 */ beq lbl_802F4EC8 -/* 802F4EC4 002F0B24 48 00 00 50 */ b lbl_802F4F14 -lbl_802F4EC8: -/* 802F4EC8 002F0B28 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4ECC 002F0B2C 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4ED0 002F0B30 7C 80 18 39 */ and. r0, r4, r3 -/* 802F4ED4 002F0B34 41 82 00 08 */ beq lbl_802F4EDC -/* 802F4ED8 002F0B38 48 00 00 3C */ b lbl_802F4F14 -lbl_802F4EDC: -/* 802F4EDC 002F0B3C 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4EE0 002F0B40 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4EE4 002F0B44 7C 80 18 39 */ and. r0, r4, r3 -/* 802F4EE8 002F0B48 41 82 00 08 */ beq lbl_802F4EF0 -/* 802F4EEC 002F0B4C 48 00 00 28 */ b lbl_802F4F14 -lbl_802F4EF0: -/* 802F4EF0 002F0B50 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4EF4 002F0B54 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4EF8 002F0B58 7C 80 18 39 */ and. r0, r4, r3 -/* 802F4EFC 002F0B5C 41 82 00 08 */ beq lbl_802F4F04 -/* 802F4F00 002F0B60 48 00 00 14 */ b lbl_802F4F14 -lbl_802F4F04: -/* 802F4F04 002F0B64 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4F08 002F0B68 38 A5 00 01 */ addi r5, r5, 1 -/* 802F4F0C 002F0B6C 42 00 FF 60 */ bdnz lbl_802F4E6C -/* 802F4F10 002F0B70 38 A0 FF FF */ li r5, -1 -lbl_802F4F14: -/* 802F4F14 002F0B74 38 05 00 1E */ addi r0, r5, 0x1e -/* 802F4F18 002F0B78 48 00 00 C8 */ b lbl_802F4FE0 -lbl_802F4F1C: -/* 802F4F1C 002F0B7C 2C 05 00 00 */ cmpwi r5, 0 -/* 802F4F20 002F0B80 41 82 00 C0 */ beq lbl_802F4FE0 -/* 802F4F24 002F0B84 38 00 00 04 */ li r0, 4 -/* 802F4F28 002F0B88 38 80 00 00 */ li r4, 0 -/* 802F4F2C 002F0B8C 38 60 00 01 */ li r3, 1 -/* 802F4F30 002F0B90 7C 09 03 A6 */ mtctr r0 -lbl_802F4F34: -/* 802F4F34 002F0B94 7C A0 18 39 */ and. r0, r5, r3 -/* 802F4F38 002F0B98 41 82 00 08 */ beq lbl_802F4F40 -/* 802F4F3C 002F0B9C 48 00 00 A0 */ b lbl_802F4FDC -lbl_802F4F40: -/* 802F4F40 002F0BA0 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4F44 002F0BA4 38 84 00 01 */ addi r4, r4, 1 -/* 802F4F48 002F0BA8 7C A0 18 39 */ and. r0, r5, r3 -/* 802F4F4C 002F0BAC 41 82 00 08 */ beq lbl_802F4F54 -/* 802F4F50 002F0BB0 48 00 00 8C */ b lbl_802F4FDC -lbl_802F4F54: -/* 802F4F54 002F0BB4 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4F58 002F0BB8 38 84 00 01 */ addi r4, r4, 1 -/* 802F4F5C 002F0BBC 7C A0 18 39 */ and. r0, r5, r3 -/* 802F4F60 002F0BC0 41 82 00 08 */ beq lbl_802F4F68 -/* 802F4F64 002F0BC4 48 00 00 78 */ b lbl_802F4FDC -lbl_802F4F68: -/* 802F4F68 002F0BC8 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4F6C 002F0BCC 38 84 00 01 */ addi r4, r4, 1 -/* 802F4F70 002F0BD0 7C A0 18 39 */ and. r0, r5, r3 -/* 802F4F74 002F0BD4 41 82 00 08 */ beq lbl_802F4F7C -/* 802F4F78 002F0BD8 48 00 00 64 */ b lbl_802F4FDC -lbl_802F4F7C: -/* 802F4F7C 002F0BDC 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4F80 002F0BE0 38 84 00 01 */ addi r4, r4, 1 -/* 802F4F84 002F0BE4 7C A0 18 39 */ and. r0, r5, r3 -/* 802F4F88 002F0BE8 41 82 00 08 */ beq lbl_802F4F90 -/* 802F4F8C 002F0BEC 48 00 00 50 */ b lbl_802F4FDC -lbl_802F4F90: -/* 802F4F90 002F0BF0 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4F94 002F0BF4 38 84 00 01 */ addi r4, r4, 1 -/* 802F4F98 002F0BF8 7C A0 18 39 */ and. r0, r5, r3 -/* 802F4F9C 002F0BFC 41 82 00 08 */ beq lbl_802F4FA4 -/* 802F4FA0 002F0C00 48 00 00 3C */ b lbl_802F4FDC -lbl_802F4FA4: -/* 802F4FA4 002F0C04 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4FA8 002F0C08 38 84 00 01 */ addi r4, r4, 1 -/* 802F4FAC 002F0C0C 7C A0 18 39 */ and. r0, r5, r3 -/* 802F4FB0 002F0C10 41 82 00 08 */ beq lbl_802F4FB8 -/* 802F4FB4 002F0C14 48 00 00 28 */ b lbl_802F4FDC -lbl_802F4FB8: -/* 802F4FB8 002F0C18 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4FBC 002F0C1C 38 84 00 01 */ addi r4, r4, 1 -/* 802F4FC0 002F0C20 7C A0 18 39 */ and. r0, r5, r3 -/* 802F4FC4 002F0C24 41 82 00 08 */ beq lbl_802F4FCC -/* 802F4FC8 002F0C28 48 00 00 14 */ b lbl_802F4FDC -lbl_802F4FCC: -/* 802F4FCC 002F0C2C 54 63 08 3C */ slwi r3, r3, 1 -/* 802F4FD0 002F0C30 38 84 00 01 */ addi r4, r4, 1 -/* 802F4FD4 002F0C34 42 00 FF 60 */ bdnz lbl_802F4F34 -/* 802F4FD8 002F0C38 38 80 FF FF */ li r4, -1 -lbl_802F4FDC: -/* 802F4FDC 002F0C3C 38 04 00 28 */ addi r0, r4, 0x28 -lbl_802F4FE0: -/* 802F4FE0 002F0C40 7C 03 03 78 */ mr r3, r0 -/* 802F4FE4 002F0C44 4E 80 00 20 */ blr - -.global func_802F4FE8 -func_802F4FE8: -/* 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 -/* 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) -/* 802F500C 002F0C6C 7C 08 03 A6 */ mtlr r0 -/* 802F5010 002F0C70 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F5014 002F0C74 4E 80 00 20 */ blr - -.global func_802F5018 -func_802F5018: -/* 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 -/* 802F5024 002F0C84 7C 65 1B 78 */ mr r5, r3 -/* 802F5028 002F0C88 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F502C 002F0C8C 41 80 00 0C */ blt lbl_802F5038 -/* 802F5030 002F0C90 38 60 00 00 */ li r3, 0 -/* 802F5034 002F0C94 48 00 01 4C */ b lbl_802F5180 -lbl_802F5038: -/* 802F5038 002F0C98 2C 03 FF C2 */ cmpwi r3, -62 -/* 802F503C 002F0C9C 41 82 00 A8 */ beq lbl_802F50E4 -/* 802F5040 002F0CA0 40 80 00 5C */ bge lbl_802F509C -/* 802F5044 002F0CA4 2C 03 FF 91 */ cmpwi r3, -111 -/* 802F5048 002F0CA8 41 82 00 A8 */ beq lbl_802F50F0 -/* 802F504C 002F0CAC 40 80 00 30 */ bge lbl_802F507C -/* 802F5050 002F0CB0 2C 03 FF 87 */ cmpwi r3, -121 -/* 802F5054 002F0CB4 41 82 00 A8 */ beq lbl_802F50FC -/* 802F5058 002F0CB8 40 80 00 18 */ bge lbl_802F5070 -/* 802F505C 002F0CBC 3C 80 80 00 */ lis r4, 0x80000001@ha -/* 802F5060 002F0CC0 38 04 00 01 */ addi r0, r4, 0x80000001@l -/* 802F5064 002F0CC4 7C 03 00 00 */ cmpw r3, r0 -/* 802F5068 002F0CC8 40 80 00 FC */ bge lbl_802F5164 -/* 802F506C 002F0CCC 48 00 00 EC */ b lbl_802F5158 -lbl_802F5070: -/* 802F5070 002F0CD0 2C 03 FF 90 */ cmpwi r3, -112 -/* 802F5074 002F0CD4 40 80 00 B0 */ bge lbl_802F5124 -/* 802F5078 002F0CD8 48 00 00 EC */ b lbl_802F5164 -lbl_802F507C: -/* 802F507C 002F0CDC 2C 03 FF B4 */ cmpwi r3, -76 -/* 802F5080 002F0CE0 41 82 00 A4 */ beq lbl_802F5124 -/* 802F5084 002F0CE4 40 80 00 E0 */ bge lbl_802F5164 -/* 802F5088 002F0CE8 2C 03 FF 9D */ cmpwi r3, -99 -/* 802F508C 002F0CEC 40 80 00 D8 */ bge lbl_802F5164 -/* 802F5090 002F0CF0 2C 03 FF 9A */ cmpwi r3, -102 -/* 802F5094 002F0CF4 40 80 00 B8 */ bge lbl_802F514C -/* 802F5098 002F0CF8 48 00 00 CC */ b lbl_802F5164 -lbl_802F509C: -/* 802F509C 002F0CFC 2C 03 FF D9 */ cmpwi r3, -39 -/* 802F50A0 002F0D00 41 82 00 84 */ beq lbl_802F5124 -/* 802F50A4 002F0D04 40 80 00 1C */ bge lbl_802F50C0 -/* 802F50A8 002F0D08 2C 03 FF D3 */ cmpwi r3, -45 -/* 802F50AC 002F0D0C 41 82 00 20 */ beq lbl_802F50CC -/* 802F50B0 002F0D10 40 80 00 B4 */ bge lbl_802F5164 -/* 802F50B4 002F0D14 2C 03 FF D0 */ cmpwi r3, -48 -/* 802F50B8 002F0D18 41 82 00 6C */ beq lbl_802F5124 -/* 802F50BC 002F0D1C 48 00 00 A8 */ b lbl_802F5164 -lbl_802F50C0: -/* 802F50C0 002F0D20 2C 03 FF E4 */ cmpwi r3, -28 -/* 802F50C4 002F0D24 41 82 00 14 */ beq lbl_802F50D8 -/* 802F50C8 002F0D28 48 00 00 9C */ b lbl_802F5164 -lbl_802F50CC: -/* 802F50CC 002F0D2C 3C 60 FF FF */ lis r3, 0xFFFF3BE8@ha -/* 802F50D0 002F0D30 38 63 3B E8 */ addi r3, r3, 0xFFFF3BE8@l -/* 802F50D4 002F0D34 48 00 00 AC */ b lbl_802F5180 -lbl_802F50D8: -/* 802F50D8 002F0D38 3C 60 FF FF */ lis r3, 0xFFFF3B84@ha -/* 802F50DC 002F0D3C 38 63 3B 84 */ addi r3, r3, 0xFFFF3B84@l -/* 802F50E0 002F0D40 48 00 00 A0 */ b lbl_802F5180 -lbl_802F50E4: -/* 802F50E4 002F0D44 3C 60 FF FF */ lis r3, 0xFFFF3B20@ha -/* 802F50E8 002F0D48 38 63 3B 20 */ addi r3, r3, 0xFFFF3B20@l -/* 802F50EC 002F0D4C 48 00 00 94 */ b lbl_802F5180 -lbl_802F50F0: -/* 802F50F0 002F0D50 3C 60 FF FF */ lis r3, 0xFFFF3224@ha -/* 802F50F4 002F0D54 38 63 32 24 */ addi r3, r3, 0xFFFF3224@l -/* 802F50F8 002F0D58 48 00 00 88 */ b lbl_802F5180 -lbl_802F50FC: -/* 802F50FC 002F0D5C 2C 04 00 14 */ cmpwi r4, 0x14 -/* 802F5100 002F0D60 41 80 00 18 */ blt lbl_802F5118 -/* 802F5104 002F0D64 2C 04 00 1E */ cmpwi r4, 0x1e -/* 802F5108 002F0D68 40 80 00 10 */ bge lbl_802F5118 -/* 802F510C 002F0D6C 3C 60 FF FF */ lis r3, 0xFFFF3738@ha -/* 802F5110 002F0D70 38 63 37 38 */ addi r3, r3, 0xFFFF3738@l -/* 802F5114 002F0D74 48 00 00 6C */ b lbl_802F5180 -lbl_802F5118: -/* 802F5118 002F0D78 3C 60 FF FF */ lis r3, 0xFFFF38C8@ha -/* 802F511C 002F0D7C 38 63 38 C8 */ addi r3, r3, 0xFFFF38C8@l -/* 802F5120 002F0D80 48 00 00 60 */ b lbl_802F5180 -lbl_802F5124: -/* 802F5124 002F0D84 2C 04 00 14 */ cmpwi r4, 0x14 -/* 802F5128 002F0D88 41 80 00 18 */ blt lbl_802F5140 -/* 802F512C 002F0D8C 2C 04 00 1E */ cmpwi r4, 0x1e -/* 802F5130 002F0D90 40 80 00 10 */ bge lbl_802F5140 -/* 802F5134 002F0D94 3C 60 FF FF */ lis r3, 0xFFFF3738@ha -/* 802F5138 002F0D98 38 63 37 38 */ addi r3, r3, 0xFFFF3738@l -/* 802F513C 002F0D9C 48 00 00 44 */ b lbl_802F5180 -lbl_802F5140: -/* 802F5140 002F0DA0 3C 60 FF FF */ lis r3, 0xFFFF379C@ha -/* 802F5144 002F0DA4 38 63 37 9C */ addi r3, r3, 0xFFFF379C@l -/* 802F5148 002F0DA8 48 00 00 38 */ b lbl_802F5180 -lbl_802F514C: -/* 802F514C 002F0DAC 3C 60 FF FF */ lis r3, 0xFFFF34E0@ha -/* 802F5150 002F0DB0 38 63 34 E0 */ addi r3, r3, 0xFFFF34E0@l -/* 802F5154 002F0DB4 48 00 00 2C */ b lbl_802F5180 -lbl_802F5158: -/* 802F5158 002F0DB8 3C 60 FF FF */ lis r3, 0xFFFF3C4C@ha -/* 802F515C 002F0DBC 38 63 3C 4C */ addi r3, r3, 0xFFFF3C4C@l -/* 802F5160 002F0DC0 48 00 00 20 */ b lbl_802F5180 -lbl_802F5164: -/* 802F5164 002F0DC4 3C 60 80 44 */ lis r3, lbl_80445DA0@ha -/* 802F5168 002F0DC8 7C A4 2B 78 */ mr r4, r5 -/* 802F516C 002F0DCC 38 63 5D A0 */ addi r3, r3, lbl_80445DA0@l -/* 802F5170 002F0DD0 4C C6 31 82 */ crclr 6 -/* 802F5174 002F0DD4 4B D1 29 51 */ bl func_80007AC4 -/* 802F5178 002F0DD8 3C 60 FF FF */ lis r3, 0xFFFF3C4C@ha -/* 802F517C 002F0DDC 38 63 3C 4C */ addi r3, r3, 0xFFFF3C4C@l -lbl_802F5180: -/* 802F5180 002F0DE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 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/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 \ -- cgit v1.2.3