split bta_hh_main, bta_hh_utils, btm_acl, btm_dev, btm_devctl, btm_discovery, btm_inq, btm_main

1 files changed, 25 insertions, 25 deletions

diff --git a/asm/SDK/WUD/WUD.s b/asm/SDK/WUD/WUD.s
index 158ee7c..f61d79c 100644
--- a/asm/SDK/WUD/WUD.s
+++ b/asm/SDK/WUD/WUD.s
@@ -901,7 +901,7 @@ lbl_802B5878:
 /* 802B5938 002B1598  38 BE 00 46 */	addi r5, r30, 0x46

 /* 802B593C 002B159C  38 C6 8B 08 */	addi r6, r6, WUDStoredLinkKeyCallback@l

 /* 802B5940 002B15A0  38 60 00 01 */	li r3, 1

-/* 802B5944 002B15A4  48 01 13 F5 */	bl func_802C6D38

+/* 802B5944 002B15A4  48 01 13 F5 */	bl BTM_WriteStoredLinkKey

 /* 802B5948 002B15A8  38 00 00 08 */	li r0, 8

 lbl_802B594C:

 /* 802B594C 002B15AC  98 1D 00 0C */	stb r0, 0xc(r29)

@@ -1033,7 +1033,7 @@ lbl_802B5AE8:
 /* 802B5AEC 002B174C  28 00 00 01 */	cmplwi r0, 1

 /* 802B5AF0 002B1750  40 81 00 0C */	ble lbl_802B5AFC

 /* 802B5AF4 002B1754  38 7F 00 40 */	addi r3, r31, 0x40

-/* 802B5AF8 002B1758  48 00 F3 9D */	bl func_802C4E94

+/* 802B5AF8 002B1758  48 00 F3 9D */	bl btm_remove_acl

 lbl_802B5AFC:

 /* 802B5AFC 002B175C  3B DE 00 01 */	addi r30, r30, 1

 /* 802B5B00 002B1760  3B FF 00 60 */	addi r31, r31, 0x60

@@ -1046,7 +1046,7 @@ lbl_802B5B14:
 /* 802B5B18 002B1778  28 00 00 01 */	cmplwi r0, 1

 /* 802B5B1C 002B177C  40 81 00 0C */	ble lbl_802B5B28

 /* 802B5B20 002B1780  38 7F 00 40 */	addi r3, r31, 0x40

-/* 802B5B24 002B1784  48 00 F3 71 */	bl func_802C4E94

+/* 802B5B24 002B1784  48 00 F3 71 */	bl btm_remove_acl

 lbl_802B5B28:

 /* 802B5B28 002B1788  3B DE 00 01 */	addi r30, r30, 1

 /* 802B5B2C 002B178C  3B FF 00 60 */	addi r31, r31, 0x60

@@ -1247,7 +1247,7 @@ lbl_802B5DC0:
 /* 802B5DE4 002B1A44  98 1C 00 0E */	stb r0, 0xe(r28)

 /* 802B5DE8 002B1A48  38 7F 00 40 */	addi r3, r31, 0x40

 /* 802B5DEC 002B1A4C  38 84 8B 08 */	addi r4, r4, WUDStoredLinkKeyCallback@l

-/* 802B5DF0 002B1A50  48 01 10 19 */	bl func_802C6E08

+/* 802B5DF0 002B1A50  48 01 10 19 */	bl BTM_DeleteStoredLinkKey

 /* 802B5DF4 002B1A54  38 00 00 00 */	li r0, 0

 /* 802B5DF8 002B1A58  38 60 00 02 */	li r3, 2

 /* 802B5DFC 002B1A5C  98 1F 00 5C */	stb r0, 0x5c(r31)

@@ -1315,7 +1315,7 @@ lbl_802B5EC0:
 /* 802B5ED4 002B1B34  98 1F 00 0E */	stb r0, 0xe(r31)

 /* 802B5ED8 002B1B38  38 84 8B 08 */	addi r4, r4, WUDStoredLinkKeyCallback@l

 /* 802B5EDC 002B1B3C  38 60 00 00 */	li r3, 0

-/* 802B5EE0 002B1B40  48 01 0D 81 */	bl func_802C6C60

+/* 802B5EE0 002B1B40  48 01 0D 81 */	bl BTM_ReadStoredLinkKey

 lbl_802B5EE4:

 /* 802B5EE4 002B1B44  38 00 00 02 */	li r0, 2

 /* 802B5EE8 002B1B48  98 1F 00 0F */	stb r0, 0xf(r31)

@@ -1331,7 +1331,7 @@ lbl_802B5EFC:
 /* 802B5F08 002B1B68  38 7F 07 10 */	addi r3, r31, 0x710

 /* 802B5F0C 002B1B6C  4B FB 3B 6D */	bl OSCancelAlarm

 /* 802B5F10 002B1B70  38 61 00 08 */	addi r3, r1, 8

-/* 802B5F14 002B1B74  48 01 09 71 */	bl func_802C6884

+/* 802B5F14 002B1B74  48 01 09 71 */	bl BTM_ReadLocalVersion

 /* 802B5F18 002B1B78  88 81 00 08 */	lbz r4, 8(r1)

 /* 802B5F1C 002B1B7C  38 7E 02 C0 */	addi r3, r30, 0x2c0

 /* 802B5F20 002B1B80  4C C6 31 82 */	crclr 6

@@ -1395,7 +1395,7 @@ lbl_802B5EFC:
 /* 802B6008 002B1C68  7C 07 02 14 */	add r0, r7, r0

 /* 802B600C 002B1C6C  91 0D AE B4 */	stw r8, lbl_80640174-_SDA_BASE_(r13)

 /* 802B6010 002B1C70  90 0D AE BC */	stw r0, lbl_8064017C-_SDA_BASE_(r13)

-/* 802B6014 002B1C74  48 01 09 75 */	bl func_802C6988

+/* 802B6014 002B1C74  48 01 09 75 */	bl BTM_VendorSpecificCommand

 /* 802B6018 002B1C78  48 00 00 08 */	b lbl_802B6020

 lbl_802B601C:

 /* 802B601C 002B1C7C  48 00 13 95 */	bl WUDiInitSub

@@ -2384,7 +2384,7 @@ lbl_802B6DCC:
 lbl_802B6DD8:

 /* 802B6DD8 002B2A38  54 03 06 3E */	clrlwi r3, r0, 0x18

 /* 802B6DDC 002B2A3C  54 84 06 3E */	clrlwi r4, r4, 0x18

-/* 802B6DE0 002B2A40  48 00 ED 0D */	bl func_802C5AEC

+/* 802B6DE0 002B2A40  48 00 ED 0D */	bl BTM_SetAfhChannels

 /* 802B6DE4 002B2A44  7C 60 1B 78 */	mr r0, r3

 /* 802B6DE8 002B2A48  3C 60 80 44 */	lis r3, lbl_8043E4F8@ha

 /* 802B6DEC 002B2A4C  38 63 E4 F8 */	addi r3, r3, lbl_8043E4F8@l

@@ -2491,7 +2491,7 @@ remove_patch_cb:
 /* 802B6F44 002B2BA4  40 82 00 14 */	bne lbl_802B6F58

 /* 802B6F48 002B2BA8  3C 60 80 2B */	lis r3, reset_again_cb@ha

 /* 802B6F4C 002B2BAC  38 63 6F 30 */	addi r3, r3, reset_again_cb@l

-/* 802B6F50 002B2BB0  48 00 EA 3D */	bl func_802C598C

+/* 802B6F50 002B2BB0  48 00 EA 3D */	bl BTM_DeviceReset

 /* 802B6F54 002B2BB4  48 00 01 48 */	b lbl_802B709C

 lbl_802B6F58:

 /* 802B6F58 002B2BB8  80 6D AE BC */	lwz r3, lbl_8064017C-_SDA_BASE_(r13)

@@ -2580,7 +2580,7 @@ lbl_802B7074:
 /* 802B708C 002B2CEC  54 04 06 3E */	clrlwi r4, r0, 0x18

 /* 802B7090 002B2CF0  38 A1 00 08 */	addi r5, r1, 8

 /* 802B7094 002B2CF4  38 C6 70 AC */	addi r6, r6, write_patch_cb@l

-/* 802B7098 002B2CF8  48 00 F8 F1 */	bl func_802C6988

+/* 802B7098 002B2CF8  48 00 F8 F1 */	bl BTM_VendorSpecificCommand

 lbl_802B709C:

 /* 802B709C 002B2CFC  80 01 01 14 */	lwz r0, 0x114(r1)

 /* 802B70A0 002B2D00  7C 08 03 A6 */	mtlr r0

@@ -2629,7 +2629,7 @@ lbl_802B70FC:
 /* 802B7140 002B2DA0  54 04 06 3E */	clrlwi r4, r0, 0x18

 /* 802B7144 002B2DA4  38 A1 01 08 */	addi r5, r1, 0x108

 /* 802B7148 002B2DA8  38 C6 72 DC */	addi r6, r6, install_patch_cb@l

-/* 802B714C 002B2DAC  48 00 F8 3D */	bl func_802C6988

+/* 802B714C 002B2DAC  48 00 F8 3D */	bl BTM_VendorSpecificCommand

 /* 802B7150 002B2DB0  48 00 01 74 */	b lbl_802B72C4

 lbl_802B7154:

 /* 802B7154 002B2DB4  7C 04 00 50 */	subf r0, r4, r0

@@ -2725,12 +2725,12 @@ lbl_802B7284:
 /* 802B72A4 002B2F04  54 04 06 3E */	clrlwi r4, r0, 0x18

 /* 802B72A8 002B2F08  38 A1 00 08 */	addi r5, r1, 8

 /* 802B72AC 002B2F0C  38 C6 70 AC */	addi r6, r6, write_patch_cb@l

-/* 802B72B0 002B2F10  48 00 F6 D9 */	bl func_802C6988

+/* 802B72B0 002B2F10  48 00 F6 D9 */	bl BTM_VendorSpecificCommand

 /* 802B72B4 002B2F14  48 00 00 10 */	b lbl_802B72C4

 lbl_802B72B8:

 /* 802B72B8 002B2F18  3C 60 80 2B */	lis r3, reset_again_cb@ha

 /* 802B72BC 002B2F1C  38 63 6F 30 */	addi r3, r3, reset_again_cb@l

-/* 802B72C0 002B2F20  48 00 E6 CD */	bl func_802C598C

+/* 802B72C0 002B2F20  48 00 E6 CD */	bl BTM_DeviceReset

 lbl_802B72C4:

 /* 802B72C4 002B2F24  80 01 02 14 */	lwz r0, 0x214(r1)

 /* 802B72C8 002B2F28  83 E1 02 0C */	lwz r31, 0x20c(r1)

@@ -2753,7 +2753,7 @@ install_patch_cb:
 /* 802B7304 002B2F64  40 82 00 14 */	bne lbl_802B7318

 /* 802B7308 002B2F68  3C 60 80 2B */	lis r3, reset_again_cb@ha

 /* 802B730C 002B2F6C  38 63 6F 30 */	addi r3, r3, reset_again_cb@l

-/* 802B7310 002B2F70  48 00 E6 7D */	bl func_802C598C

+/* 802B7310 002B2F70  48 00 E6 7D */	bl BTM_DeviceReset

 /* 802B7314 002B2F74  48 00 00 84 */	b lbl_802B7398

 lbl_802B7318:

 /* 802B7318 002B2F78  7C 65 00 50 */	subf r3, r5, r0

@@ -2784,12 +2784,12 @@ lbl_802B732C:
 /* 802B7378 002B2FD8  54 04 06 3E */	clrlwi r4, r0, 0x18

 /* 802B737C 002B2FDC  38 A1 00 08 */	addi r5, r1, 8

 /* 802B7380 002B2FE0  38 C6 72 DC */	addi r6, r6, install_patch_cb@l

-/* 802B7384 002B2FE4  48 00 F6 05 */	bl func_802C6988

+/* 802B7384 002B2FE4  48 00 F6 05 */	bl BTM_VendorSpecificCommand

 /* 802B7388 002B2FE8  48 00 00 10 */	b lbl_802B7398

 lbl_802B738C:

 /* 802B738C 002B2FEC  3C 60 80 2B */	lis r3, reset_again_cb@ha

 /* 802B7390 002B2FF0  38 63 6F 30 */	addi r3, r3, reset_again_cb@l

-/* 802B7394 002B2FF4  48 00 E5 F9 */	bl func_802C598C

+/* 802B7394 002B2FF4  48 00 E5 F9 */	bl BTM_DeviceReset

 lbl_802B7398:

 /* 802B7398 002B2FF8  80 01 01 14 */	lwz r0, 0x114(r1)

 /* 802B739C 002B2FFC  83 E1 01 0C */	lwz r31, 0x10c(r1)

@@ -2830,13 +2830,13 @@ WUDiInitSub:
 /* 802B741C 002B307C  38 61 00 0C */	addi r3, r1, 0xc

 /* 802B7420 002B3080  48 00 8D 05 */	bl BTA_DmSetDeviceName

 /* 802B7424 002B3084  38 61 00 08 */	addi r3, r1, 8

-/* 802B7428 002B3088  48 00 F4 A9 */	bl func_802C68D0

+/* 802B7428 002B3088  48 00 F4 A9 */	bl BTM_SetDeviceClass

 /* 802B742C 002B308C  3C 60 80 2C */	lis r3, WUDVendorSpecificCallback@ha

 /* 802B7430 002B3090  38 63 87 80 */	addi r3, r3, WUDVendorSpecificCallback@l

-/* 802B7434 002B3094  48 00 F6 BD */	bl func_802C6AF0

+/* 802B7434 002B3094  48 00 F6 BD */	bl BTM_RegisterForVSEvents

 /* 802B7438 002B3098  3C 60 80 2C */	lis r3, WUDDeviceStatusCallback@ha

 /* 802B743C 002B309C  38 63 8A B8 */	addi r3, r3, WUDDeviceStatusCallback@l

-/* 802B7440 002B30A0  48 00 F5 31 */	bl func_802C6970

+/* 802B7440 002B30A0  48 00 F5 31 */	bl BTM_RegisterForDeviceStatusNotif

 /* 802B7444 002B30A4  3C A0 80 2C */	lis r5, WUDPowerManagerCallback@ha

 /* 802B7448 002B30A8  38 9D 07 0A */	addi r4, r29, 0x70a

 /* 802B744C 002B30AC  38 A5 8D F4 */	addi r5, r5, WUDPowerManagerCallback@l

@@ -2845,11 +2845,11 @@ WUDiInitSub:
 /* 802B7458 002B30B8  3C 60 00 01 */	lis r3, 0x00008000@ha

 /* 802B745C 002B30BC  38 03 80 00 */	addi r0, r3, 0x00008000@l

 /* 802B7460 002B30C0  54 03 04 3E */	clrlwi r3, r0, 0x10

-/* 802B7464 002B30C4  48 00 F7 5D */	bl func_802C6BC0

+/* 802B7464 002B30C4  48 00 F7 5D */	bl BTM_WritePageTimeout

 /* 802B7468 002B30C8  38 60 00 05 */	li r3, 5

-/* 802B746C 002B30CC  48 00 CA 19 */	bl func_802C3E84

+/* 802B746C 002B30CC  48 00 CA 19 */	bl BTM_SetDefaultLinkPolicy

 /* 802B7470 002B30D0  38 60 06 40 */	li r3, 0x640

-/* 802B7474 002B30D4  48 00 CD DD */	bl func_802C4250

+/* 802B7474 002B30D4  48 00 CD DD */	bl BTM_SetDefaultLinkSuperTout

 /* 802B7478 002B30D8  7F BF EB 78 */	mr r31, r29

 /* 802B747C 002B30DC  3B DD 01 24 */	addi r30, r29, 0x124

 /* 802B7480 002B30E0  3B 80 00 00 */	li r28, 0

@@ -3786,7 +3786,7 @@ lbl_802B8188:
 /* 802B8198 002B3DF8  38 7B 00 40 */	addi r3, r27, 0x40

 /* 802B819C 002B3DFC  4B FF F4 85 */	bl WUDiRemoveDevice

 /* 802B81A0 002B3E00  38 7B 00 40 */	addi r3, r27, 0x40

-/* 802B81A4 002B3E04  48 00 CC F1 */	bl func_802C4E94

+/* 802B81A4 002B3E04  48 00 CC F1 */	bl btm_remove_acl

 lbl_802B81A8:

 /* 802B81A8 002B3E08  38 7F 0C E8 */	addi r3, r31, 0xce8

 /* 802B81AC 002B3E0C  38 00 00 01 */	li r0, 1

@@ -3919,7 +3919,7 @@ lbl_802B8384:
 /* 802B83A0 002B4000  40 82 00 44 */	bne lbl_802B83E4

 lbl_802B83A4:

 /* 802B83A4 002B4004  7F 83 E3 78 */	mr r3, r28

-/* 802B83A8 002B4008  48 00 CA ED */	bl func_802C4E94

+/* 802B83A8 002B4008  48 00 CA ED */	bl btm_remove_acl

 /* 802B83AC 002B400C  2C 1A 00 00 */	cmpwi r26, 0

 /* 802B83B0 002B4010  38 7E 09 0C */	addi r3, r30, 0x90c

 /* 802B83B4 002B4014  38 9E 09 40 */	addi r4, r30, 0x940

@@ -4116,7 +4116,7 @@ lbl_802B866C:
 /* 802B8670 002B42D0  38 03 80 00 */	addi r0, r3, 0x00008000@l

 lbl_802B8674:

 /* 802B8674 002B42D4  54 03 04 3E */	clrlwi r3, r0, 0x10

-/* 802B8678 002B42D8  48 00 E5 49 */	bl func_802C6BC0

+/* 802B8678 002B42D8  48 00 E5 49 */	bl BTM_WritePageTimeout

 /* 802B867C 002B42DC  48 00 00 E4 */	b lbl_802B8760

 lbl_802B8680:

 /* 802B8680 002B42E0  38 7D 0A 50 */	addi r3, r29, 0xa50