From d9dea8b3d8eb0f7dd7d0fad7bec67093e44a5bf3 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 1 Apr 2021 13:26:39 +1000 Subject: [PATCH] Decompile amgrGetFrameMesgQueue --- src/include/lib/audiomgr.h | 2 +- src/lib/audiomgr.c | 10 ++++------ src/lib/sched.c | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/include/lib/audiomgr.h b/src/include/lib/audiomgr.h index 5dc3d7852..6ed2edd44 100644 --- a/src/include/lib/audiomgr.h +++ b/src/include/lib/audiomgr.h @@ -13,7 +13,7 @@ void amgrCreate(ALSynConfig *config); #endif void amgrStartThread(void); -OSMesgQueue *amgr00009118(void); +OSMesgQueue *amgrGetFrameMesgQueue(void); void amgrStopThread(void); #endif diff --git a/src/lib/audiomgr.c b/src/lib/audiomgr.c index e2fa7c531..57daf4324 100644 --- a/src/lib/audiomgr.c +++ b/src/lib/audiomgr.c @@ -1316,12 +1316,10 @@ void amgrStartThread(void) g_AudioIsThreadRunning = true; } -GLOBAL_ASM( -glabel amgr00009118 -/* 9118: 3c028009 */ lui $v0,%hi(g_AudioManager+0x248) -/* 911c: 03e00008 */ jr $ra -/* 9120: 24421810 */ addiu $v0,$v0,%lo(g_AudioManager+0x248) -); +OSMesgQueue *amgrGetFrameMesgQueue(void) +{ + return &g_AudioManager.audioFrameMsgQ; +} /** * This doesn't set g_AudioIsThreadRunning to false, but that's okay because diff --git a/src/lib/sched.c b/src/lib/sched.c index a6b6d3d21..997ba3c1a 100644 --- a/src/lib/sched.c +++ b/src/lib/sched.c @@ -271,12 +271,12 @@ void func00002078(OSSched *sc) #if VERSION >= VERSION_PAL_FINAL if (var8005ced0 == 0 && (sc->frameCount & 1)) { osStopTimer(&var8008de18); - osSetTimer(&var8008de18, 280000, 0, amgr00009118(), &var8005cea8); + osSetTimer(&var8008de18, 280000, 0, amgrGetFrameMesgQueue(), &var8005cea8); } #else if (var8005ced0 == 0 && ((sc->frameCount & 1) || IS4MB())) { osStopTimer(&var8008de18); - osSetTimer(&var8008de18, 280000, 0, amgr00009118(), &var8005cea8); + osSetTimer(&var8008de18, 280000, 0, amgrGetFrameMesgQueue(), &var8005cea8); } #endif