merge namespace hid

This commit is contained in:
Charlotte 🦝 Delenk 2022-10-21 17:08:26 +01:00
parent 7d7466a968
commit 9dfe9f3fb8
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
24 changed files with 258 additions and 267 deletions

View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@48825_8055F908"
"@48825_8055F908":
.4byte 0
.4byte 0

View file

@ -1,130 +0,0 @@
.include "macros.inc"
.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0
.global "T_BUTTON_CONVDATA_CL__25@unnamed@HIDAccessor_cpp@"
"T_BUTTON_CONVDATA_CL__25@unnamed@HIDAccessor_cpp@":
.4byte 0x00000002
.4byte 0x00000008
.4byte 0x00000008
.4byte 0
.4byte 0x00008000
.4byte 0x00000004
.4byte 0x00000004
.4byte 0
.4byte 0x00004000
.4byte 0x00000001
.4byte 0x00000001
.4byte 0
.4byte 0x00000001
.4byte 0x00000002
.4byte 0x00000002
.4byte 0
.4byte 0x00000010
.4byte 0x00000100
.4byte 0x00000100
.4byte 0
.4byte 0x00000040
.4byte 0x00000200
.4byte 0x00000200
.4byte 0
.4byte 0x00000400
.4byte 0x00000010
.4byte 0x00000010
.4byte 0
.4byte 0x00001000
.4byte 0x00001000
.4byte 0x00001000
.4byte 0
.4byte 0x00000800
.4byte 0x00008000
.4byte 0x00008000
.4byte 0
.4byte 0x00000008
.4byte 0x00000100
.4byte 0x00000800
.4byte 0
.4byte 0x00000020
.4byte 0x00000200
.4byte 0
.4byte 0
.4byte 0x00002000
.4byte 0x00000800
.4byte 0
.4byte 0
.4byte 0x00000200
.4byte 0x00000800
.4byte 0
.4byte 0
.4byte 0x00000080
.4byte 0x00000400
.4byte 0
.4byte 0
.4byte 0x00000004
.4byte 0x00000400
.4byte 0
.4byte 0
.global "T_BUTTON_CONVDATA_GC__25@unnamed@HIDAccessor_cpp@"
"T_BUTTON_CONVDATA_GC__25@unnamed@HIDAccessor_cpp@":
.4byte 0x00000001
.4byte 0x00000008
.4byte 0x00000008
.4byte 0x00000004
.4byte 0x00000002
.4byte 0x00000004
.4byte 0x00000004
.4byte 0x00000008
.4byte 0x00000004
.4byte 0x00000001
.4byte 0x00000001
.4byte 0x00000002
.4byte 0x00000008
.4byte 0x00000002
.4byte 0x00000002
.4byte 0x00000001
.4byte 0x00000100
.4byte 0x00000100
.4byte 0x00000100
.4byte 0
.4byte 0x00000200
.4byte 0x00000200
.4byte 0x00000200
.4byte 0
.4byte 0x00001000
.4byte 0x00000010
.4byte 0x00000010
.4byte 0
.4byte 0x00000010
.4byte 0x00001000
.4byte 0x00001000
.4byte 0
.4byte 0x00000400
.4byte 0x00000100
.4byte 0x00000800
.4byte 0
.4byte 0x00000800
.4byte 0x00000200
.4byte 0
.4byte 0
.4byte 0x00000040
.4byte 0x00000800
.4byte 0
.4byte 0
.4byte 0x00000020
.4byte 0x00000800
.4byte 0
.4byte 0
.global "T_STICK_CONVDATA__25@unnamed@HIDAccessor_cpp@"
"T_STICK_CONVDATA__25@unnamed@HIDAccessor_cpp@":
.4byte 0x00000008
.4byte 0x00000004
.4byte 0x00000004
.4byte 0x00000008
.4byte 0x00000001
.4byte 0x00000002
.4byte 0x00000002
.4byte 0x00000001

View file

@ -1,12 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@50596_8055F910"
"@50596_8055F910":
.4byte 0x3E800000
.global "@50617_8055F914"
"@50617_8055F914":
.4byte 0x3DCCCCCD

View file

@ -1,4 +0,0 @@
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_@@1HIDManager_cpp"

View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global "t_wpadInfoArray__24@unnamed@HIDManager_cpp@"
"t_wpadInfoArray__24@unnamed@HIDManager_cpp@":
.skip 0x60
.global "t_wpadInfoStatusArray__24@unnamed@HIDManager_cpp@"
"t_wpadInfoStatusArray__24@unnamed@HIDManager_cpp@":
.skip 0x10

View file

@ -1,6 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "t_dpdEnable__24@unnamed@HIDManager_cpp@"
"t_dpdEnable__24@unnamed@HIDManager_cpp@":
.skip 0x8

View file

@ -1,6 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "isExist___Q33hel6common40PrivateSingleton<Q23hid14LibInitializer>"
"isExist___Q33hel6common40PrivateSingleton<Q23hid14LibInitializer>":
.skip 0x8

View file

@ -1,28 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@49040_8055F918"
"@49040_8055F918":
.4byte 0x3DCCCCCD
.global "@49041_8055F91C"
"@49041_8055F91C":
.4byte 0x3F000000
.global "@49042_8055F920"
"@49042_8055F920":
.4byte 0x3E4CCCCD
.global "@49043_8055F924"
"@49043_8055F924":
.4byte 0x3D8F5C29
.global "@49044_8055F928"
"@49044_8055F928":
.4byte 0x3F800000
.4byte 0

View file

@ -1,26 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@48751_80456F40"
"@48751_80456F40":
.4byte 0x6869642F
.4byte 0x72756D62
.4byte 0x6C652F52
.4byte 0x756D626C
.4byte 0x652E6461
.4byte 0x742E636D
.4byte 0x70000000
.global "@48752_80456F5C"
"@48752_80456F5C":
.4byte 0x6869642F
.4byte 0x72756D62
.4byte 0x6C652F73
.4byte 0x75626761
.4byte 0x6D652F52
.4byte 0x756D626C
.4byte 0x652E6461
.4byte 0x742E636D
.4byte 0x70000000

View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "T_DAT_PATH_TABLE__Q23hid28@unnamed@RumbleResource_cpp@"
"T_DAT_PATH_TABLE__Q23hid28@unnamed@RumbleResource_cpp@":
.4byte "@48751_80456F40"
.4byte "@48752_80456F5C"

View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@49704"
"@49704":
.4byte 0x43300000
.4byte 0x80000000

View file

@ -38,3 +38,11 @@ update__Q23hid3DPDFfRC4Vec2RC4Vec2:
/* 801A22E0 0019E120 7C 08 03 A6 */ mtlr r0
/* 801A22E4 0019E124 38 21 00 10 */ addi r1, r1, 0x10
/* 801A22E8 0019E128 4E 80 00 20 */ blr
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@48825_8055F908"
"@48825_8055F908":
.4byte 0
.4byte 0

View file

@ -472,3 +472,145 @@ checkInputSubStick__Q23hid11HIDAccessorCFRCQ33hel4math7Vector2f:
/* 801A292C 0019E76C 7C 60 00 26 */ mfcr r3
/* 801A2930 0019E770 54 63 17 FE */ extrwi r3, r3, 1, 1
/* 801A2934 0019E774 4E 80 00 20 */ blr
.include "macros.inc"
.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0
.global "T_BUTTON_CONVDATA_CL__25@unnamed@HIDAccessor_cpp@"
"T_BUTTON_CONVDATA_CL__25@unnamed@HIDAccessor_cpp@":
.4byte 0x00000002
.4byte 0x00000008
.4byte 0x00000008
.4byte 0
.4byte 0x00008000
.4byte 0x00000004
.4byte 0x00000004
.4byte 0
.4byte 0x00004000
.4byte 0x00000001
.4byte 0x00000001
.4byte 0
.4byte 0x00000001
.4byte 0x00000002
.4byte 0x00000002
.4byte 0
.4byte 0x00000010
.4byte 0x00000100
.4byte 0x00000100
.4byte 0
.4byte 0x00000040
.4byte 0x00000200
.4byte 0x00000200
.4byte 0
.4byte 0x00000400
.4byte 0x00000010
.4byte 0x00000010
.4byte 0
.4byte 0x00001000
.4byte 0x00001000
.4byte 0x00001000
.4byte 0
.4byte 0x00000800
.4byte 0x00008000
.4byte 0x00008000
.4byte 0
.4byte 0x00000008
.4byte 0x00000100
.4byte 0x00000800
.4byte 0
.4byte 0x00000020
.4byte 0x00000200
.4byte 0
.4byte 0
.4byte 0x00002000
.4byte 0x00000800
.4byte 0
.4byte 0
.4byte 0x00000200
.4byte 0x00000800
.4byte 0
.4byte 0
.4byte 0x00000080
.4byte 0x00000400
.4byte 0
.4byte 0
.4byte 0x00000004
.4byte 0x00000400
.4byte 0
.4byte 0
.global "T_BUTTON_CONVDATA_GC__25@unnamed@HIDAccessor_cpp@"
"T_BUTTON_CONVDATA_GC__25@unnamed@HIDAccessor_cpp@":
.4byte 0x00000001
.4byte 0x00000008
.4byte 0x00000008
.4byte 0x00000004
.4byte 0x00000002
.4byte 0x00000004
.4byte 0x00000004
.4byte 0x00000008
.4byte 0x00000004
.4byte 0x00000001
.4byte 0x00000001
.4byte 0x00000002
.4byte 0x00000008
.4byte 0x00000002
.4byte 0x00000002
.4byte 0x00000001
.4byte 0x00000100
.4byte 0x00000100
.4byte 0x00000100
.4byte 0
.4byte 0x00000200
.4byte 0x00000200
.4byte 0x00000200
.4byte 0
.4byte 0x00001000
.4byte 0x00000010
.4byte 0x00000010
.4byte 0
.4byte 0x00000010
.4byte 0x00001000
.4byte 0x00001000
.4byte 0
.4byte 0x00000400
.4byte 0x00000100
.4byte 0x00000800
.4byte 0
.4byte 0x00000800
.4byte 0x00000200
.4byte 0
.4byte 0
.4byte 0x00000040
.4byte 0x00000800
.4byte 0
.4byte 0
.4byte 0x00000020
.4byte 0x00000800
.4byte 0
.4byte 0
.global "T_STICK_CONVDATA__25@unnamed@HIDAccessor_cpp@"
"T_STICK_CONVDATA__25@unnamed@HIDAccessor_cpp@":
.4byte 0x00000008
.4byte 0x00000004
.4byte 0x00000004
.4byte 0x00000008
.4byte 0x00000001
.4byte 0x00000002
.4byte 0x00000002
.4byte 0x00000001
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@50596_8055F910"
"@50596_8055F910":
.4byte 0x3E800000
.global "@50617_8055F914"
"@50617_8055F914":
.4byte 0x3DCCCCCD

View file

@ -1135,3 +1135,23 @@ resetGCControllerAll__Q23hid10HIDManagerFv:
/* 801A3830 0019F670 7C 08 03 A6 */ mtlr r0
/* 801A3834 0019F674 38 21 00 10 */ addi r1, r1, 0x10
/* 801A3838 0019F678 4E 80 00 20 */ blr
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_@@1HIDManager_cpp"
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global "t_wpadInfoArray__24@unnamed@HIDManager_cpp@"
"t_wpadInfoArray__24@unnamed@HIDManager_cpp@":
.skip 0x60
.global "t_wpadInfoStatusArray__24@unnamed@HIDManager_cpp@"
"t_wpadInfoStatusArray__24@unnamed@HIDManager_cpp@":
.skip 0x10
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "t_dpdEnable__24@unnamed@HIDManager_cpp@"
"t_dpdEnable__24@unnamed@HIDManager_cpp@":
.skip 0x8

View file

@ -153,3 +153,37 @@ lbl_801A3A40:
/* 801A3A50 0019F890 7C 08 03 A6 */ mtlr r0
/* 801A3A54 0019F894 38 21 00 10 */ addi r1, r1, 0x10
/* 801A3A58 0019F898 4E 80 00 20 */ blr
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "isExist___Q33hel6common40PrivateSingleton<Q23hid14LibInitializer>"
"isExist___Q33hel6common40PrivateSingleton<Q23hid14LibInitializer>":
.skip 0x8
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@49040_8055F918"
"@49040_8055F918":
.4byte 0x3DCCCCCD
.global "@49041_8055F91C"
"@49041_8055F91C":
.4byte 0x3F000000
.global "@49042_8055F920"
"@49042_8055F920":
.4byte 0x3E4CCCCD
.global "@49043_8055F924"
"@49043_8055F924":
.4byte 0x3D8F5C29
.global "@49044_8055F928"
"@49044_8055F928":
.4byte 0x3F800000
.4byte 0

View file

@ -77,3 +77,37 @@ lbl_801A4250:
/* 801A425C 001A009C 7C 08 03 A6 */ mtlr r0
/* 801A4260 001A00A0 38 21 00 10 */ addi r1, r1, 0x10
/* 801A4264 001A00A4 4E 80 00 20 */ blr
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@48751_80456F40"
"@48751_80456F40":
.4byte 0x6869642F
.4byte 0x72756D62
.4byte 0x6C652F52
.4byte 0x756D626C
.4byte 0x652E6461
.4byte 0x742E636D
.4byte 0x70000000
.global "@48752_80456F5C"
"@48752_80456F5C":
.4byte 0x6869642F
.4byte 0x72756D62
.4byte 0x6C652F73
.4byte 0x75626761
.4byte 0x6D652F52
.4byte 0x756D626C
.4byte 0x652E6461
.4byte 0x742E636D
.4byte 0x70000000
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "T_DAT_PATH_TABLE__Q23hid28@unnamed@RumbleResource_cpp@"
"T_DAT_PATH_TABLE__Q23hid28@unnamed@RumbleResource_cpp@":
.4byte "@48751_80456F40"
.4byte "@48752_80456F5C"

View file

@ -45,3 +45,11 @@ normalized__Q23hid5StickCFv:
/* 801A4804 001A0644 D0 63 00 04 */ stfs f3, 0x4(r3)
/* 801A4808 001A0648 38 21 00 20 */ addi r1, r1, 0x20
/* 801A480C 001A064C 4E 80 00 20 */ blr
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@49704"
"@49704":
.4byte 0x43300000
.4byte 0x80000000

View file

@ -836,19 +836,20 @@ $(BUILD_DIR)/asm/src/hel/mint/AddOnMathDirection3.o \
$(BUILD_DIR)/asm/src/hel/mint/AddOnMathMath.o \
$(BUILD_DIR)/asm/src/hel/mint/AddOnMathVector3.o \
\
$(BUILD_DIR)/asm/src/hid/Accel.o \
$(BUILD_DIR)/asm/src/hid/Button.o \
$(BUILD_DIR)/asm/src/hid/DPD.o \
$(BUILD_DIR)/asm/src/hid/HIDAccessor.o \
$(BUILD_DIR)/asm/src/hid/HIDManager.o \
$(BUILD_DIR)/asm/src/hid/LibInitializer.o \
$(BUILD_DIR)/asm/src/hid/RumbleManager.o \
$(BUILD_DIR)/asm/src/hid/RumbleRequestor.o \
$(BUILD_DIR)/asm/src/hid/RumbleResource.o \
$(BUILD_DIR)/asm/src/hid/SimpleGCHID.o \
$(BUILD_DIR)/asm/src/hid/SimpleWRHID.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/Accel_801a21fc.o \
$(BUILD_DIR)/asm/src/Button_801a2224.o \
$(BUILD_DIR)/asm/src/DPD_801a2268.o \
$(BUILD_DIR)/asm/src/HIDAccessor_801a22ec.o \
$(BUILD_DIR)/asm/src/HIDManager_801a2938.o \
$(BUILD_DIR)/asm/src/LibInitializer_801a383c.o \
$(BUILD_DIR)/asm/src/RumbleManager_801a3a5c.o \
$(BUILD_DIR)/asm/src/RumbleRequestor_801a3e44.o \
$(BUILD_DIR)/asm/src/RumbleResource_801a4178.o \
$(BUILD_DIR)/asm/src/SimpleGCHID_801a4268.o \
$(BUILD_DIR)/asm/src/SimpleWRHID_801a4408.o \
$(BUILD_DIR)/asm/src/Stick_801a4778.o \
$(BUILD_DIR)/asm/src/Util_801a4810.o \
$(BUILD_DIR)/asm/src/Sequence_801a5b58.o \
@ -2947,7 +2948,6 @@ $(BUILD_DIR)/asm/src/Thread_80405f14.o \
$(BUILD_DIR)/asm/src/UIntAABBox_8040603c.o
# .ctors
O_FILES += \
$(BUILD_DIR)/asm/src/HIDManager_80406328.o \
$(BUILD_DIR)/asm/src/LandLayer_8040632c.o \
$(BUILD_DIR)/asm/src/MoveGridGroup_80406330.o \
$(BUILD_DIR)/asm/src/HeapMapUserRepos_80406334.o \
@ -3011,7 +3011,6 @@ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o
# .rodata
O_FILES += \
$(BUILD_DIR)/asm/src/HIDAccessor_80414970.o \
$(BUILD_DIR)/asm/src/Util_80414b40.o \
$(BUILD_DIR)/asm/src/Button_80414b60.o \
$(BUILD_DIR)/asm/src/UserTagProcessor_80414b70.o \
@ -3139,7 +3138,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
# .data
O_FILES += \
$(BUILD_DIR)/asm/src/RumbleResource_80456f40.o \
$(BUILD_DIR)/asm/src/Util_80456f80.o \
$(BUILD_DIR)/asm/src/Sequence_804571e8.o \
$(BUILD_DIR)/asm/src/AddWiiRemote_804572a8.o \
@ -4679,7 +4677,6 @@ $(BUILD_DIR)/asm/src/Alarm_804966e0.o \
$(BUILD_DIR)/asm/src/StateChanger_804966f0.o
# .bss
O_FILES += \
$(BUILD_DIR)/asm/src/HIDManager_80545378.o \
$(BUILD_DIR)/asm/src/HeapMapUserRepos_805453e8.o \
$(BUILD_DIR)/asm/src/Memory_80545bf8.o \
$(BUILD_DIR)/asm/src/Trophy_80545ed0.o \
@ -4724,7 +4721,6 @@ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o
# .sdata
O_FILES += \
$(BUILD_DIR)/asm/src/RumbleResource_80556ea0.o \
$(BUILD_DIR)/asm/src/Util_80556ea8.o \
$(BUILD_DIR)/asm/src/AddWiiRemote_80556f28.o \
$(BUILD_DIR)/asm/src/Button_80556f98.o \
@ -5062,8 +5058,6 @@ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o
# .sbss
O_FILES += \
$(BUILD_DIR)/asm/src/HIDManager_8055d278.o \
$(BUILD_DIR)/asm/src/LibInitializer_8055d280.o \
$(BUILD_DIR)/asm/src/ActorDiamond_8055d288.o \
$(BUILD_DIR)/asm/src/MoveGrid_8055d290.o \
$(BUILD_DIR)/asm/src/Memory_8055d2a0.o \
@ -5173,9 +5167,6 @@ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
$(BUILD_DIR)/asm/src/Alarm_8055df68.o
# .sdata2
O_FILES += \
$(BUILD_DIR)/asm/src/DPD_8055f908.o \
$(BUILD_DIR)/asm/src/HIDAccessor_8055f910.o \
$(BUILD_DIR)/asm/src/LibInitializer_8055f918.o \
$(BUILD_DIR)/asm/src/Stick_8055f930.o \
$(BUILD_DIR)/asm/src/Util_8055f938.o \
$(BUILD_DIR)/asm/src/AddWiiRemote_8055f940.o \