Doc padmgr functions used

include/functions.h

@@ -3191,9 +3191,9 @@ u32 Padmgr_GetControllerBitmask(void);
 // void func_80174F7C(void);
 // void func_80174F9C(void);
 // OSMesgQueue* Padmgr_GetEventCallback(void);
-// void func_80175008(void);
+OSMesgQueue* PadMgr_LockSerialMesgQueue();
 void Padmgr_SetEventCallback(OSMesg pvParm1);
-// void func_8017506C(void);
+void PadMgr_UnlockSerialMesgQueue(OSMesgQueue* msgQ);
 // void Padmgr_Lock(void);
 // void Padmgr_Unlock(void);
 // void func_801750FC(void);

src/code/audio/code_801A51F0.c

@@ -1,9 +1,5 @@
 #include "global.h"
 
-// padmgr functions
-s32 func_80175008();
-void func_8017506C(s32);
-
 // internal voice functions
 u8* func_801A5A1C(s8* arg0);
 
@@ -63,7 +59,7 @@ s32 func_801A51F0(s32 errorCode) {
 }
 
 s32 func_801A5228(u8* arg0) {
-    s32 temp_s2;
+    OSMesgQueue* msgQ;
     s32 errorCode;
     u8 temp_s1;
     u8 i;
@@ -78,9 +74,10 @@ s32 func_801A5228(u8* arg0) {
     D_801FD5A0.unk_00 = arg0;
     
     temp_s1 = arg0[600];
-    temp_s2 = func_80175008();
+
+    msgQ = PadMgr_LockSerialMesgQueue();
     errorCode = osVoiceClearDictionary(&D_801FD5B8, temp_s1);
-    func_8017506C(temp_s2);
+    PadMgr_UnlockSerialMesgQueue(msgQ);
 
     if (errorCode != 0) {
         return errorCode;
@@ -92,11 +89,12 @@ s32 func_801A5228(u8* arg0) {
     }
 
     for (i = 0; i < temp_s1; i++) {
-        temp_s2 = func_80175008();
+
+        msgQ = PadMgr_LockSerialMesgQueue();
         indexTemp = i;
         index = indexTemp * 30;
         errorCode = osVoiceSetWord(&D_801FD5B8, &arg0[index]);
-        func_8017506C(temp_s2);
+        PadMgr_UnlockSerialMesgQueue(msgQ);
         
         if (func_801A51F0(errorCode) != 0) {
             func_801A5A1C(&arg0[index]);
@@ -108,13 +106,15 @@ s32 func_801A5228(u8* arg0) {
 
 s32 func_801A5390(void) {
     s32 temp_t6;
-    s32 sp18;
+    OSMesgQueue* msgQ;
 
     temp_t6 = D_801FD5A0.unk_08;
     D_801FD5A0.unk_08 = 0;
-    sp18 = func_80175008();
+
+    msgQ = PadMgr_LockSerialMesgQueue();
     osVoiceStartReadData(&D_801FD5B8);
-    func_8017506C(sp18);
+    PadMgr_UnlockSerialMesgQueue(msgQ);
+
     return temp_t6;
 }
 
@@ -132,12 +132,14 @@ void func_801A53E8(u16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4) {
 
 void func_801A541C(s32 analog, s32 digital) {
     s32 sp1C;
-    s32 sp18;
+    OSMesgQueue* msgQ;
 
     if (D_801FD5A0.unk_00 != 0) {
-        sp18 = func_80175008();
+
+        msgQ = PadMgr_LockSerialMesgQueue();
         sp1C = osVoiceControlGain(&D_801FD5B8, analog, digital);
-        func_8017506C(sp18);
+        PadMgr_UnlockSerialMesgQueue(msgQ);
+
         if (sp1C != 0) {
             func_801A51F0(sp1C);
         }
@@ -146,12 +148,13 @@ void func_801A541C(s32 analog, s32 digital) {
 
 s32 func_801A5488(u8* word) {
     s32 sp1C;
-    s32 sp18;
+    OSMesgQueue* msgQ;
     s32 temp_v0;
 
-    sp18 = func_80175008();
+    msgQ = PadMgr_LockSerialMesgQueue();
     sp1C = osVoiceCheckWord(word);
-    func_8017506C(sp18);
+    PadMgr_UnlockSerialMesgQueue(msgQ);
+
     return sp1C;
 }
 
@@ -164,7 +167,7 @@ s32 func_801A54D0(u16 arg0) {
     u8 phi_t0;
     u8 sp22;
     u8 i;
-    s32 sp1C;
+    OSMesgQueue* msgQ;
     
     phi_t0 = true;
     if (D_801FD5A0.unk_00 != 0) {
@@ -187,16 +190,17 @@ s32 func_801A54D0(u16 arg0) {
     }
     
     if (phi_t0) {
-        sp1C = func_80175008();
+        msgQ = PadMgr_LockSerialMesgQueue();
         errorCode = osVoiceStopReadData(&D_801FD5B8);
-        func_8017506C(sp1C);
+        PadMgr_UnlockSerialMesgQueue(msgQ);
 
         if ((errorCode == 0) || (D_801FD5A4 == 0)) {
-            sp1C = func_80175008();
+
+            msgQ = PadMgr_LockSerialMesgQueue();
             errorCode = osVoiceMaskDictionary(&D_801FD5B8, D_801FD608, ((sp22 - 1) / 8) + 1);
-            func_8017506C(sp1C);
+            PadMgr_UnlockSerialMesgQueue(msgQ);
         }
-        
+
         D_801FD5A4 = 0;
     }
     

src/code/padmgr.c

@@ -13,11 +13,11 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_GetEventCallback.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_80175008.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/PadMgr_LockSerialMesgQueue.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_SetEventCallback.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_8017506C.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/PadMgr_UnlockSerialMesgQueue.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/Padmgr_Lock.s")
 

tools/disasm/functions.txt

@@ -3170,9 +3170,9 @@
     0x80174F7C:("func_80174F7C",),
     0x80174F9C:("func_80174F9C",),
     0x80174FD4:("Padmgr_GetEventCallback",),
-    0x80175008:("func_80175008",),
+    0x80175008:("PadMgr_LockSerialMesgQueue",),
     0x8017503C:("Padmgr_SetEventCallback",),
-    0x8017506C:("func_8017506C",),
+    0x8017506C:("PadMgr_UnlockSerialMesgQueue",),
     0x8017509C:("Padmgr_Lock",),
     0x801750CC:("Padmgr_Unlock",),
     0x801750FC:("func_801750FC",),

tools/sizes/code_functions.csv

@@ -2684,9 +2684,9 @@ asm/non_matchings/code/padmgr/func_80174F44.s,func_80174F44,0x80174F44,0xE
 asm/non_matchings/code/padmgr/func_80174F7C.s,func_80174F7C,0x80174F7C,0x8
 asm/non_matchings/code/padmgr/func_80174F9C.s,func_80174F9C,0x80174F9C,0xE
 asm/non_matchings/code/padmgr/Padmgr_GetEventCallback.s,Padmgr_GetEventCallback,0x80174FD4,0xD
-asm/non_matchings/code/padmgr/func_80175008.s,func_80175008,0x80175008,0xD
+asm/non_matchings/code/padmgr/PadMgr_LockSerialMesgQueue.s,PadMgr_LockSerialMesgQueue,0x80175008,0xD
 asm/non_matchings/code/padmgr/Padmgr_SetEventCallback.s,Padmgr_SetEventCallback,0x8017503C,0xC
-asm/non_matchings/code/padmgr/func_8017506C.s,func_8017506C,0x8017506C,0xC
+asm/non_matchings/code/padmgr/PadMgr_UnlockSerialMesgQueue.s,PadMgr_UnlockSerialMesgQueue,0x8017506C,0xC
 asm/non_matchings/code/padmgr/Padmgr_Lock.s,Padmgr_Lock,0x8017509C,0xC
 asm/non_matchings/code/padmgr/Padmgr_Unlock.s,Padmgr_Unlock,0x801750CC,0xC
 asm/non_matchings/code/padmgr/func_801750FC.s,func_801750FC,0x801750FC,0x9A